From 8046848c1914ae6d24739293796aefcc5b32be48 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Mon, 16 May 2011 16:04:51 +0200
Subject: [PATCH] Recode everything to UTF-8

---
 pae2xml.pl                                              | 4 ++--
 sample_files/1-a-Clefs.pae                              | 2 +-
 sample_files/2-a-KeySignature.pae                       | 2 +-
 sample_files/3-a-TimeSignature.pae                      | 2 +-
 sample_files/3-b-TimeSignature-alternating.pae          | 2 +-
 sample_files/3-c-TimeSignature-missing.pae              | 2 +-
 sample_files/4-01a-Octaves.pae                          | 2 +-
 sample_files/4-02a-Durations.pae                        | 2 +-
 sample_files/4-02b-Durations-dotted.pae                 | 2 +-
 sample_files/4-02c-Durations-neumic.pae                 | 2 +-
 sample_files/4-02d-Durations-long.pae                   | 2 +-
 sample_files/4-03a-Accidentals.pae                      | 2 +-
 sample_files/4-05a-Grace-acciaccatura.pae               | 2 +-
 sample_files/4-05b-Grace-appoggiatura.pae               | 2 +-
 sample_files/4-05c-Grace-double-appoggiatura.pae        | 2 +-
 sample_files/4-06a-Rests-durations.pae                  | 2 +-
 sample_files/4-06b-Rests-durations-dotted.pae           | 2 +-
 sample_files/4-06c-Rests-multimeasure.pae               | 2 +-
 sample_files/4-07a-Barlines.pae                         | 2 +-
 sample_files/4-08a-OtherSymbols.pae                     | 2 +-
 sample_files/4-08b-Ties.pae                             | 2 +-
 sample_files/4-09a-Beams.pae                            | 2 +-
 sample_files/4-10a-Tuplets.pae                          | 2 +-
 sample_files/4-11a-Shortcuts-repetition.pae             | 2 +-
 sample_files/4-11b-Shortcuts-measure-repeat.pae         | 6 +++---
 sample_files/4-11c-Shortcuts-rhythmic-model.pae         | 2 +-
 sample_files/4-11d-Shortcuts-rhythmic-model-beaming.pae | 2 +-
 sample_files/4-12a-Change-Clef-Key-Time.pae             | 2 +-
 sample_files/4-14a-Chords.pae                           | 2 +-
 sample_files/6-a-InvalidSpace.pae                       | 2 +-
 sample_files/6-b-NoteModifier-order.pae                 | 2 +-
 31 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/pae2xml.pl b/pae2xml.pl
index 7853b3b..730db04 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 e326cb2..7077e55 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 01d895e..f7b1b33 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 9a3657e..053c56e 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 d10a382..8d252f2 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 7ee85ad..98c4569 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 33e9e84..d9ea0e8 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 4c5779c..2fd3ff2 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 4f01314..0bdb84d 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 63c55c1..1f7ce42 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 87c53de..1d9754a 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 99861df..f5ea5bf 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 fa7c610..5eb2182 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 e0e061c..70c1354 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 3c6eae8..906a1be 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 4f3f635..0ed45f7 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 10be42d..92f2c9b 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 943ffbe..44c217f 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 302b59d..df37894 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 49ec38a..a124f7b 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 d980fa2..653eed1 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 9fa27e8..1bfaf81 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 0cb9273..9ac1cf2 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 d81a389..de74a3a 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 7af2fcb..464ba66 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 c669bd1..6c147e9 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 9322e0e..885912b 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 b3d2dd1..abe9184 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 e4a19b2..f792e81 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 900d375..b5e51ec 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 6c1506b..f48bd1f 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
-- 
GitLab