diff --git a/pae2xml.pl b/pae2xml.pl index 7853b3b9a42ee55dcfe425738aeaad9808ce1b66..730db04c0712e2bb0fb6b9ab9705b8885b073651 100755 --- a/pae2xml.pl +++ b/pae2xml.pl @@ -166,10 +166,10 @@ INSTR.: $instr\n"; sub parse_pe { my ($filename, $pe, $inr, $instr, $comp, $title, $sonst, $libsig, $rismsig) = @_; - $pe =~ s/@�/@0�/gs; # make missing time signature explicit + $pe =~ s/@ü/@0ü/gs; # make missing time signature explicit while ($pe =~ s/([^\-])(\d+)(\'|\,)(A|B|C|D|E|F|G)/$1$3$2$4/gs) {}; # octave first, then duration. Truly global. - if ($pe =~ /^\s*(%([\w\-\+\d]+))?(@([\d\w\/ ]+))?\s*&?\s*(\$([^�]*))?�(.*)$/gs) { + if ($pe =~ /^\s*(%([\w\-\+\d]+))?(@([\d\w\/ ]+))?\s*&?\s*(\$([^ü]*))?ü(.*)$/gs) { my ($clef, $timesig, $keysig, $rest) = ($2, $4, $6, $7); print "Writing $filename...\n"; diff --git a/sample_files/1-a-Clefs.pae b/sample_files/1-a-Clefs.pae index e326cb2a0ae7c6cd0da64e8a6a9cfe5795c35d41..7077e55e384120127df9b3761cbf8614ce4a8351 100644 --- a/sample_files/1-a-Clefs.pae +++ b/sample_files/1-a-Clefs.pae @@ -1,7 +1,7 @@ Test Composer Test case for clefs 1.1.1: S Clefs -plain&easy: %G-2@c$bB� '1C/%G-4 1C/2D%C-1 2E/%F-4 1C/%g-21 C/%C+3 1C/ +plain&easy: %G-2@c$bBü '1C/%G-4 1C/2D%C-1 2E/%F-4 1C/%g-21 C/%C+3 1C/ pae2xml Test Suite File 1-a-Clefs 1-a-Clefs \ No newline at end of file diff --git a/sample_files/2-a-KeySignature.pae b/sample_files/2-a-KeySignature.pae index 01d895e60ce454c9cf80fd5f24944e72b754f110..f7b1b339042e3ea9419b96698e5b18ed02e72683 100644 --- a/sample_files/2-a-KeySignature.pae +++ b/sample_files/2-a-KeySignature.pae @@ -1,7 +1,7 @@ Test Composer Test case for key signature change 1.1.1: S Key signatures -plain&easy: %G-2@c$xFC� '1C/$bBEA 4FCAB/$x 4FCAB/8FCAB$bBEA 8FCAB/ +plain&easy: %G-2@c$xFCü '1C/$bBEA 4FCAB/$x 4FCAB/8FCAB$bBEA 8FCAB/ pae2xml Test Suite File 2-a-KeySignature 2-a-KeySignature \ No newline at end of file diff --git a/sample_files/3-a-TimeSignature.pae b/sample_files/3-a-TimeSignature.pae index 9a3657ee466bede3710b6ca9d8ed958f3ac9d913..053c56e09a701a4e489c8e8f9f7f0b1d2d47b452 100644 --- a/sample_files/3-a-TimeSignature.pae +++ b/sample_files/3-a-TimeSignature.pae @@ -1,7 +1,7 @@ Test Composer Test case for time signatures 1.1.1: S time signatures -plain&easy: %G-2@c$� '1C/@2/4 2C/@12/16 2.C/@3 2C/@c 1C/@c3 C/@c3/2 1.C/@c/ 1C/@o 2.C/@o. 2.C/@4/4 3/4 1C/2.C/1C/@c 1C/@4 9C// +plain&easy: %G-2@c$ü '1C/@2/4 2C/@12/16 2.C/@3 2C/@c 1C/@c3 C/@c3/2 1.C/@c/ 1C/@o 2.C/@o. 2.C/@4/4 3/4 1C/2.C/1C/@c 1C/@4 9C// pae2xml Test Suite File 3-a-TimeSignature 3-a-TimeSignature \ No newline at end of file diff --git a/sample_files/3-b-TimeSignature-alternating.pae b/sample_files/3-b-TimeSignature-alternating.pae index d10a382d12cd0042b2db1b666c697d7218b113dd..8d252f202c27259c9c9d4a8b2ec89dde247a633f 100644 --- a/sample_files/3-b-TimeSignature-alternating.pae +++ b/sample_files/3-b-TimeSignature-alternating.pae @@ -1,7 +1,7 @@ Test Composer Test case for alternating time signature 1.1.1: S alternating time signature -plain&easy: %G-2@4/4 3/4$� '1C/2.C/1C/2.C// +plain&easy: %G-2@4/4 3/4$ü '1C/2.C/1C/2.C// pae2xml Test Suite File 3-b-TimeSignature-alternating 3-b-TimeSignature-alternating \ No newline at end of file diff --git a/sample_files/3-c-TimeSignature-missing.pae b/sample_files/3-c-TimeSignature-missing.pae index 7ee85ad9b508103dcb4f15224c7896ae20924cc6..98c456969a0ed295cfb36c456d367fd3fe686bfc 100644 --- a/sample_files/3-c-TimeSignature-missing.pae +++ b/sample_files/3-c-TimeSignature-missing.pae @@ -1,7 +1,7 @@ Test Composer Test case for missing time signatures 1.1.1: S missing time signatures -plain&easy: %G-2@c� '1C/@2/4 2C/@12/16 2.C/@3 2C/@c 1C/@c3 C/@c3/2 1.C/@c/ 1C/@o 2.C/@o. 2.C/@4/4 3/4 1C/2.C/1C/@c 1C/@4 9C// +plain&easy: %G-2@cü '1C/@2/4 2C/@12/16 2.C/@3 2C/@c 1C/@c3 C/@c3/2 1.C/@c/ 1C/@o 2.C/@o. 2.C/@4/4 3/4 1C/2.C/1C/@c 1C/@4 9C// pae2xml Test Suite File 3-c-TimeSignature-missing 3-c-TimeSignature-missing \ No newline at end of file diff --git a/sample_files/4-01a-Octaves.pae b/sample_files/4-01a-Octaves.pae index 33e9e845d27803025d4f4db96d918592058d7f5f..d9ea0e8c7f73e31b041afd03b5cf430b8a0e46a6 100644 --- a/sample_files/4-01a-Octaves.pae +++ b/sample_files/4-01a-Octaves.pae @@ -1,7 +1,7 @@ Test Composer Test case for barline types 1.1.1: S One repeat -plain&easy: %C-1@c$� 4CEGB/,,,CEGB/,,CEGB/,CEGB/'CEGB/''CEGB/'''CEGB/''''CEGB/,CEGB/ +plain&easy: %C-1@c$ü 4CEGB/,,,CEGB/,,CEGB/,CEGB/'CEGB/''CEGB/'''CEGB/''''CEGB/,CEGB/ pae2xml Test Suite File 4-01a-Octaves 4-01a-Octaves \ No newline at end of file diff --git a/sample_files/4-02a-Durations.pae b/sample_files/4-02a-Durations.pae index 4c5779ca407205694c2d16a91c28ed737d74ba8b..2fd3ff21a6d62793c18c295a1605ffe9db8a7a8b 100644 --- a/sample_files/4-02a-Durations.pae +++ b/sample_files/4-02a-Durations.pae @@ -1,7 +1,7 @@ Test Composer Test case for durations 1.1.1: S durations -plain&easy: %G-2@8/2$� '1CD2EF4GA8BC6DE3FG5AB7CD5-/1-2-4-8-6-3-5-7--1--/0C/0-/9D-/ +plain&easy: %G-2@8/2$ü '1CD2EF4GA8BC6DE3FG5AB7CD5-/1-2-4-8-6-3-5-7--1--/0C/0-/9D-/ pae2xml Test Suite File 4-02a-Durations 4-02a-Durations diff --git a/sample_files/4-02b-Durations-dotted.pae b/sample_files/4-02b-Durations-dotted.pae index 4f01314baa8e4e14c0c1a77000732e227c09d52a..0bdb84d679bc5542df2e6525d58b04f1178271f3 100644 --- a/sample_files/4-02b-Durations-dotted.pae +++ b/sample_files/4-02b-Durations-dotted.pae @@ -1,7 +1,7 @@ Test Composer Test case for dotted durations 1.1.1: S dotted durations -plain&easy: %G-2@8/2$� '1.CD1-/1..CD2-/2.EF2..EF4-2-/4.GA4..GA4...GA6-4.-1-/8.BA8..BA6.DE6..DE3.FG3..FG3.-6.-8.-2.-1.-/1C +plain&easy: %G-2@8/2$ü '1.CD1-/1..CD2-/2.EF2..EF4-2-/4.GA4..GA4...GA6-4.-1-/8.BA8..BA6.DE6..DE3.FG3..FG3.-6.-8.-2.-1.-/1C pae2xml Test Suite File 4-02b-Durations-dotted 4-02b-Durations-dotted diff --git a/sample_files/4-02c-Durations-neumic.pae b/sample_files/4-02c-Durations-neumic.pae index 63c55c1573d042a4490a3bd7238ef18677e23ecf..1f7ce422d503a537238c3b36da899ed9775e0593 100644 --- a/sample_files/4-02c-Durations-neumic.pae +++ b/sample_files/4-02c-Durations-neumic.pae @@ -1,7 +1,7 @@ Test Composer Test case for neumic durations 1.1.1: S neumic durations -plain&easy: %G-2@c$� '4C7.D +plain&easy: %G-2@c$ü '4C7.D pae2xml Test Suite File 4-02c-Durations-neumic 4-02c-Durations-neumic diff --git a/sample_files/4-02d-Durations-long.pae b/sample_files/4-02d-Durations-long.pae index 87c53dee8baa19df380984076342ceceb4bc1770..1d9754ae02261368de57df1b3f24d3b47506e6fd 100644 --- a/sample_files/4-02d-Durations-long.pae +++ b/sample_files/4-02d-Durations-long.pae @@ -1,7 +1,7 @@ Test Composer Test case for long durations 1.1.1: S long durations -plain&easy: %G-2@16/2$� '0CD/9EF0G// +plain&easy: %G-2@16/2$ü '0CD/9EF0G// pae2xml Test Suite File 4-02c-Durations-long 4-02c-Durations-long diff --git a/sample_files/4-03a-Accidentals.pae b/sample_files/4-03a-Accidentals.pae index 99861dffc73b596ae8bfa355631cbe818556864e..f5ea5bf2e981a2170c138072e9cc5bb06d514332 100644 --- a/sample_files/4-03a-Accidentals.pae +++ b/sample_files/4-03a-Accidentals.pae @@ -1,7 +1,7 @@ Test Composer Accidentals (c-cis-cis-cisis-ces-ceses-ceses-c/ces-as-bes-g-cis-aisis-beses-g/) 1.1.1: S accidentals -plain&easy: %G-2@c$� '8CxCCxxCbCbbCCnC/$bBEADGC 8CABnGxCxxAbbBG/BAGCxBAGB/ +plain&easy: %G-2@c$ü '8CxCCxxCbCbbCCnC/$bBEADGC 8CABnGxCxxAbbBG/BAGCxBAGB/ pae2xml Test Suite File 4-03a-Accidentals 4-03a-Accidentals diff --git a/sample_files/4-05a-Grace-acciaccatura.pae b/sample_files/4-05a-Grace-acciaccatura.pae index fa7c6104baf146d5c0a9c1f7a20701ad3a524d99..5eb218202131d026addb34cd5744543a75d9dae9 100644 --- a/sample_files/4-05a-Grace-acciaccatura.pae +++ b/sample_files/4-05a-Grace-acciaccatura.pae @@ -1,7 +1,7 @@ Test Composer Test case for acciaccatura 1.1.1: S acciaccatura -plain&easy: %G-2@c� '2Ag''C{8D'B}''4C/'2A''xgC{8D'B}''4C/ +plain&easy: %G-2@cü '2Ag''C{8D'B}''4C/'2A''xgC{8D'B}''4C/ pae2xml Test Suite File 4-05a-Grace-acciaccatura 4-05a-Grace-acciaccatura diff --git a/sample_files/4-05b-Grace-appoggiatura.pae b/sample_files/4-05b-Grace-appoggiatura.pae index e0e061cd46d290f069b9bb98def6e60a6537867b..70c1354f73555ff96fda733ca2838921c4c5bbe1 100644 --- a/sample_files/4-05b-Grace-appoggiatura.pae +++ b/sample_files/4-05b-Grace-appoggiatura.pae @@ -1,7 +1,7 @@ Test Composer Test case for appoggiatura 1.1.1: S appoggiatura -plain&easy: %G-2@c� '2Aq''8C{'8AG}4A/ +plain&easy: %G-2@cü '2Aq''8C{'8AG}4A/ pae2xml Test Suite File 4-05b-Grace-appoggiatura 4-05b-Grace-appoggiatura diff --git a/sample_files/4-05c-Grace-double-appoggiatura.pae b/sample_files/4-05c-Grace-double-appoggiatura.pae index 3c6eae85cdb7eae2b69e3eb084de96ebc62b1afc..906a1bee67107f182f8d948e4818ed20ed76d9da 100644 --- a/sample_files/4-05c-Grace-double-appoggiatura.pae +++ b/sample_files/4-05c-Grace-double-appoggiatura.pae @@ -1,7 +1,7 @@ Test Composer Test case for double appoggiatura 1.1.1: S double appoggiatura -plain&easy: %G-2@c� '2Aqq{6B''C}r{8D'B}''4C/ +plain&easy: %G-2@cü '2Aqq{6B''C}r{8D'B}''4C/ pae2xml Test Suite File 4-05c-Grace-double-appoggiatura 4-05c-Grace-double-appoggiatura diff --git a/sample_files/4-06a-Rests-durations.pae b/sample_files/4-06a-Rests-durations.pae index 4f3f635b0d6a0c49ff38798b8f7c9093d782998d..0ed45f79858b6455a1696283be339aad8690e2fc 100644 --- a/sample_files/4-06a-Rests-durations.pae +++ b/sample_files/4-06a-Rests-durations.pae @@ -1,7 +1,7 @@ Test Composer Test case for rest durations 1.1.1: S rest durations -plain&easy: %G-2@16/2$� '0-9-1-2-4-8-6-3-5-7--// +plain&easy: %G-2@16/2$ü '0-9-1-2-4-8-6-3-5-7--// pae2xml Test Suite File 4-06a-Rests-durations 4-06a-Rests-durations diff --git a/sample_files/4-06b-Rests-durations-dotted.pae b/sample_files/4-06b-Rests-durations-dotted.pae index 10be42d5ebee25ba94da82edf665acefcf83db2c..92f2c9b69e3260024191e382ad1f2dfc43b610a5 100644 --- a/sample_files/4-06b-Rests-durations-dotted.pae +++ b/sample_files/4-06b-Rests-durations-dotted.pae @@ -1,7 +1,7 @@ Test Composer Test case for dotted durations on rests 1.1.1: S dotted durations on rests -plain&easy: %G-2@4/2$� '1.-2-/1..-4-/1...-8-/2.-2..-4.-/4.-4..-4...-8..-2-/@c 8.-8..-8...-6..-4-/6.-6..-6...-3.-3..-3..-5.-2-// +plain&easy: %G-2@4/2$ü '1.-2-/1..-4-/1...-8-/2.-2..-4.-/4.-4..-4...-8..-2-/@c 8.-8..-8...-6..-4-/6.-6..-6...-3.-3..-3..-5.-2-// pae2xml Test Suite File 4-06b-Rests-durations-dotted 4-06b-Rests-durations-dotted diff --git a/sample_files/4-06c-Rests-multimeasure.pae b/sample_files/4-06c-Rests-multimeasure.pae index 943ffbec255f80a241c8033f85ae66005ce3b991..44c217ffd019b3edf3442692656599fe1ce1a388 100644 --- a/sample_files/4-06c-Rests-multimeasure.pae +++ b/sample_files/4-06c-Rests-multimeasure.pae @@ -1,7 +1,7 @@ Test Composer Test case for multi-measure rests 1.1.1: S Multi-measure rests -plain&easy: %C-1@c$bB� '=/2AB/=3/=/2AB/=15/2AB/ +plain&easy: %C-1@c$bBü '=/2AB/=3/=/2AB/=15/2AB/ pae2xml Test Suite File 4-06c-Rests-multimeasure 4-06c-Rests-multimeasure diff --git a/sample_files/4-07a-Barlines.pae b/sample_files/4-07a-Barlines.pae index 302b59d9bfc99802f18501dca90d634e722bb81c..df37894e37a4ebb1ee3b07e150d93880baa8d255 100644 --- a/sample_files/4-07a-Barlines.pae +++ b/sample_files/4-07a-Barlines.pae @@ -1,7 +1,7 @@ Test Composer Test case for barline types 1.1.1: S One repeat -plain&easy: %C-1@c$bB� '4CDE/GABG://CDEF//:GABD//FGAB://:AGFC:// +plain&easy: %C-1@c$bBü '4CDE/GABG://CDEF//:GABD//FGAB://:AGFC:// pae2xml Test Suite File 4-07a-Barlines 4-07a-Barlines diff --git a/sample_files/4-08a-OtherSymbols.pae b/sample_files/4-08a-OtherSymbols.pae index 49ec38ab94ffbf9fa81cbe9117ef3056a78c3962..a124f7bc554df3b8ddc748d1916d0e6654c9f54a 100644 --- a/sample_files/4-08a-OtherSymbols.pae +++ b/sample_files/4-08a-OtherSymbols.pae @@ -1,7 +1,7 @@ Test Composer Test case for articulations 1.1.1: S articulations -plain&easy: %G-2@c$� '4CCt(D)8(E)(F)t/ +plain&easy: %G-2@c$ü '4CCt(D)8(E)(F)t/ pae2xml Test Suite File 4-08a-OtherSymbols 4-08a-OtherSymbols diff --git a/sample_files/4-08b-Ties.pae b/sample_files/4-08b-Ties.pae index d980fa2e5e5bcaaa5180b64d11a46360814786fd..653eed19185e958d900ac3e589390c13d99ccfca 100644 --- a/sample_files/4-08b-Ties.pae +++ b/sample_files/4-08b-Ties.pae @@ -1,7 +1,7 @@ Test Composer Test case for Ties 1.1.1: S Ties -plain&easy: %G-2@c$bB� '4C+C+CD/8DD+DC2A/ +plain&easy: %G-2@c$bBü '4C+C+CD/8DD+DC2A/ pae2xml Test Suite File 4-08b-Ties 4-08b-Ties diff --git a/sample_files/4-09a-Beams.pae b/sample_files/4-09a-Beams.pae index 9fa27e8841cf877cc783fcecd7f2920497cda1e9..1bfaf8145580220642b732e8aac63ec4691a4ef1 100644 --- a/sample_files/4-09a-Beams.pae +++ b/sample_files/4-09a-Beams.pae @@ -1,7 +1,7 @@ Test Composer Test case for beams 1.1.1: S beams -plain&easy: %G-2@4/4$bBEA� {''6E'B8G}{GA}-''C{'3B8..G}// +plain&easy: %G-2@4/4$bBEAü {''6E'B8G}{GA}-''C{'3B8..G}// pae2xml Test Suite File 4-09a-Beams 4-09a-Beams diff --git a/sample_files/4-10a-Tuplets.pae b/sample_files/4-10a-Tuplets.pae index 0cb927321d30c57a87e0897bab983eadcddebc67..9ac1cf2c28a3eda6d0df1e9b7b41858639e8d554 100644 --- a/sample_files/4-10a-Tuplets.pae +++ b/sample_files/4-10a-Tuplets.pae @@ -1,7 +1,7 @@ Test Composer Test case for tuplets 1.1.1: S tuplets -plain&easy: %G-2@c$� '1C/4C4('6DEFGA;5)2C/8C8({'3DEFGA};5)4C2-/8-8(6ABC;3)8-8({6ABC};3)8-(6ABC)8-({6ABC})/1C// +plain&easy: %G-2@c$ü '1C/4C4('6DEFGA;5)2C/8C8({'3DEFGA};5)4C2-/8-8(6ABC;3)8-8({6ABC};3)8-(6ABC)8-({6ABC})/1C// pae2xml Test Suite File 4-10a-Tuplets 4-10a-Tuplets diff --git a/sample_files/4-11a-Shortcuts-repetition.pae b/sample_files/4-11a-Shortcuts-repetition.pae index d81a3895812e1379daf810c5bda1279b588adcaa..de74a3a51a3bb02c3a83ccfc97ac4f53e1f0a91a 100644 --- a/sample_files/4-11a-Shortcuts-repetition.pae +++ b/sample_files/4-11a-Shortcuts-repetition.pae @@ -1,7 +1,7 @@ Test Composer Test case for repetitions 1.1.1: S repetitions -plain&easy: %C-1@c$bB� '4A!'6BG!fff4A/ +plain&easy: %C-1@c$bBü '4A!'6BG!fff4A/ pae2xml Test Suite File 4-11a-Shortcuts-repetition 4-11a-Shortcuts-repetition diff --git a/sample_files/4-11b-Shortcuts-measure-repeat.pae b/sample_files/4-11b-Shortcuts-measure-repeat.pae index 7af2fcbced3f24aca1d95d124838312d2930ea15..464ba6609e40d410355b7d299a7bb1779563be31 100644 --- a/sample_files/4-11b-Shortcuts-measure-repeat.pae +++ b/sample_files/4-11b-Shortcuts-measure-repeat.pae @@ -1,11 +1,11 @@ Test Composer Test case for measure repeats 1.1.1: S One repeat -plain&easy: %C-1@c$bB� '4A4.B8AGE/i/FD8.C'6B4xA/ +plain&easy: %C-1@c$bBü '4A4.B8AGE/i/FD8.C'6B4xA/ 1.1.2: S Double repeat -plain&easy: %C-1@c$bB� '4A4.B8AGE/i/i/FD8.C'6B4xA/ +plain&easy: %C-1@c$bBü '4A4.B8AGE/i/i/FD8.C'6B4xA/ 1.1.3: S Barlines -plain&easy: %C-1@c$bB� '4A4.B8AGE://:i/:i:/FD8.C'6B4xA/ +plain&easy: %C-1@c$bBü '4A4.B8AGE://:i/:i:/FD8.C'6B4xA/ pae2xml Test Suite File 4-11b-Shortcuts-measure-repeat 4-11b-Shortcuts-measure-repeat diff --git a/sample_files/4-11c-Shortcuts-rhythmic-model.pae b/sample_files/4-11c-Shortcuts-rhythmic-model.pae index c669bd169337555b8fbe8655a8a69c7192ec786f..6c147e9f14ca25421f88361fa240b405077e5a65 100644 --- a/sample_files/4-11c-Shortcuts-rhythmic-model.pae +++ b/sample_files/4-11c-Shortcuts-rhythmic-model.pae @@ -1,7 +1,7 @@ Test Composer Test case for a rhythmic model 1.1.1: S rhythmic model -plain&easy: %G-2@6/8� '2.C/'8.68{AB''C}{DEF}/{GAB}{'''CDE}/8'CDEFGA// +plain&easy: %G-2@6/8ü '2.C/'8.68{AB''C}{DEF}/{GAB}{'''CDE}/8'CDEFGA// pae2xml Test Suite 4-11c-Shortcuts-rhythmic-model 4-11c-Shortcuts-rhythmic-model diff --git a/sample_files/4-11d-Shortcuts-rhythmic-model-beaming.pae b/sample_files/4-11d-Shortcuts-rhythmic-model-beaming.pae index 9322e0eb47bcc4032538a00f80516eb0287dc3e4..885912b784cebf5e1dbd420f0c8e2621ab555153 100644 --- a/sample_files/4-11d-Shortcuts-rhythmic-model-beaming.pae +++ b/sample_files/4-11d-Shortcuts-rhythmic-model-beaming.pae @@ -1,7 +1,7 @@ Test Composer Test case for a rhythmic model with enclosing beaming 1.1.1: S rhythmic model with enclosing beaming -plain&easy: %G-2@c$xFC� {8.6''FADD}{DFEG}/{FA}{DD} +plain&easy: %G-2@c$xFCü {8.6''FADD}{DFEG}/{FA}{DD} pae2xml Test Suite 4-11d-Shortcuts-rhythmic-model-beaming 4-11d-Shortcuts-rhythmic-model-beaming diff --git a/sample_files/4-12a-Change-Clef-Key-Time.pae b/sample_files/4-12a-Change-Clef-Key-Time.pae index b3d2dd1ea87f92c4fd70faeb2503498687f478f3..abe91842c2a5f80f164af02e783ceade933dd1c0 100644 --- a/sample_files/4-12a-Change-Clef-Key-Time.pae +++ b/sample_files/4-12a-Change-Clef-Key-Time.pae @@ -1,7 +1,7 @@ Test Composer Test case for clef/key/time changes 1.1.1: S clef/key/time changes -plain&easy: %G-2@c$bB� '1C/%C-1$bBEA@c '2A-//$xFC 8B-4-2-/@3/2 1C2-// +plain&easy: %G-2@c$bBü '1C/%C-1$bBEA@c '2A-//$xFC 8B-4-2-/@3/2 1C2-// pae2xml Test Suite File 4-12a-Change-Clef-Key-Time 4-12a-Change-Clef-Key-Time diff --git a/sample_files/4-14a-Chords.pae b/sample_files/4-14a-Chords.pae index e4a19b267ee14805d9e10435e7b1ffc64320a594..f792e819ef5d3f8752a6f5ba3312e98990702c2b 100644 --- a/sample_files/4-14a-Chords.pae +++ b/sample_files/4-14a-Chords.pae @@ -1,7 +1,7 @@ Test Composer Test case for chords 1.1.1: S Chords -plain&easy: %G-2@c$� ''2D^'A^xF''C^,G^E// +plain&easy: %G-2@c$ü ''2D^'A^xF''C^,G^E// pae2xml Test Suite File 4-14a-Chords 4-14a-Chords diff --git a/sample_files/6-a-InvalidSpace.pae b/sample_files/6-a-InvalidSpace.pae index 900d3754f26e6f56501a0da5469409cfb6c8932e..b5e51ec5446bae7a631c96e25840391ea876feb1 100644 --- a/sample_files/6-a-InvalidSpace.pae +++ b/sample_files/6-a-InvalidSpace.pae @@ -1,7 +1,7 @@ Test Composer Test case for invalid spaces inside Plaine and Easie code 1.1.1: S -plain&easy: %C-1@c$bB� '4C DEF/ GAB''C// +plain&easy: %C-1@c$bBü '4C DEF/ GAB''C// pae2xml Test Suite File 6-a-InvalidSpace 6-a-InvalidSpace diff --git a/sample_files/6-b-NoteModifier-order.pae b/sample_files/6-b-NoteModifier-order.pae index 6c1506b53bbdcf8c7cd8bde738755a8531cea772..f48bd1f62316699e23260a7eb0fb3b94557940df 100644 --- a/sample_files/6-b-NoteModifier-order.pae +++ b/sample_files/6-b-NoteModifier-order.pae @@ -1,7 +1,7 @@ Test Composer Test case for order of note modifiers 1.1.1: S element order -plain&easy: %G-2@c� '2A''gC{8,D'B}4''Ct+/1C// +plain&easy: %G-2@cü '2A''gC{8,D'B}4''Ct+/1C// pae2xml Test Suite File 6-b-NoteModifier-order 6-b-NoteModifier-order