Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Documentation/input/alphatex/beat-effects.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,19 @@ TexSample: true
$('#alphaTabBeatEffects').alphaTab();
</script>

<h2 id="dynamics">Dynamics</h2>

<p>
Dynamics are beat effects with the indicator <code>dy</code> followed by one of the supported dynamics values FFF, FF, F, MF, MP, P, PP or PPP
</p>

<div id="alphaTabBeatDynamics" data-tex="true">
1.1.8{dy ppp} 1.1{dy pp} 1.1{dy p} 1.1{dy mp} 1.1{dy mf} 1.1{dy f} 1.1{dy ff} 1.1{dy fff}
</div>
<script type="text/x-alphatab">
$('#alphaTabBeatDynamics').alphaTab();
</script>

<h2 id="tuplet-ranges">Tuplet Ranges</h2>

<p>
Expand Down
20 changes: 20 additions & 0 deletions Source/AlphaTab.Test.Js/test/alphaTab.tests.specs.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ describe("alphaTab.test.audio.MidiPlaybackControllerTest", function() {
alphaTab.test.TestPlatform.Done = done;
__instance.testRepeatCloseAlternateEndings();
});
it("testRepeatWithAlphaTex", function(done) {
alphaTab.test.TestPlatform.Done = done;
__instance.testRepeatWithAlphaTex();
done();
});
});
describe("alphaTab.test.importer.AlphaTexImporterTest", function() {
var __instance = new alphaTab.test.importer.AlphaTexImporterTest();
Expand Down Expand Up @@ -228,6 +233,21 @@ describe("alphaTab.test.importer.AlphaTexImporterTest", function() {
__instance.testRandomAnacrusis();
done();
});
it("testRepeat", function(done) {
alphaTab.test.TestPlatform.Done = done;
__instance.testRepeat();
done();
});
it("testDefaultTranspositionOnInstruments", function(done) {
alphaTab.test.TestPlatform.Done = done;
__instance.testDefaultTranspositionOnInstruments();
done();
});
it("testDynamics", function(done) {
alphaTab.test.TestPlatform.Done = done;
__instance.testDynamics();
done();
});
});
describe("alphaTab.test.importer.Gp3ImporterTest", function() {
var __instance = new alphaTab.test.importer.Gp3ImporterTest();
Expand Down
17 changes: 17 additions & 0 deletions Source/AlphaTab.Test/Importer/AlphaTexImporterTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -950,5 +950,22 @@ 1.2 3.2 0.1 1.1
Assert.AreEqual(0, score.Tracks[1].Staves[0].TranspositionPitch);
Assert.AreEqual(-12, score.Tracks[1].Staves[0].DisplayTranspositionPitch);
}

[TestMethod]
public void TestDynamics()
{
var tex = @"1.1.8{dy ppp} 1.1{dy pp} 1.1{dy p} 1.1{dy mp} 1.1{dy mf} 1.1{dy f} 1.1{dy ff} 1.1{dy fff}";
var score = ParseTex(tex);
Assert.AreEqual(DynamicValue.PPP, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[0].Dynamics);
Assert.AreEqual(DynamicValue.PP, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[1].Dynamics);
Assert.AreEqual(DynamicValue.P, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[2].Dynamics);
Assert.AreEqual(DynamicValue.MP, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[3].Dynamics);
Assert.AreEqual(DynamicValue.MF, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[4].Dynamics);
Assert.AreEqual(DynamicValue.F, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[5].Dynamics);
Assert.AreEqual(DynamicValue.FF, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[6].Dynamics);
Assert.AreEqual(DynamicValue.FFF, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[7].Dynamics);
}


}
}
34 changes: 34 additions & 0 deletions Source/AlphaTab/Importer/AlphaTexImporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1501,6 +1501,40 @@ private bool ApplyBeatEffect(Beat beat)
return true;
}

if (syData == "dy")
{
NewSy();
switch (_syData.ToString().ToLower())
{
case "ppp":
beat.Dynamics = DynamicValue.PPP;
break;
case "pp":
beat.Dynamics = DynamicValue.PP;
break;
case "p":
beat.Dynamics = DynamicValue.P;
break;
case "mp":
beat.Dynamics = DynamicValue.MP;
break;
case "mf":
beat.Dynamics = DynamicValue.MF;
break;
case "f":
beat.Dynamics = DynamicValue.F;
break;
case "ff":
beat.Dynamics = DynamicValue.FF;
break;
case "fff":
beat.Dynamics = DynamicValue.FFF;
break;
}
NewSy();
return true;
}

if (syData == "tp")
{
NewSy();
Expand Down