Skip to content
Snippets Groups Projects
Commit 8046848c authored by Reinhold Kainhofer's avatar Reinhold Kainhofer
Browse files

Recode everything to UTF-8

parent 0c7b7280
Branches
No related tags found
No related merge requests found
Showing
with 21 additions and 21 deletions
...@@ -166,10 +166,10 @@ INSTR.: $instr\n"; ...@@ -166,10 +166,10 @@ INSTR.: $instr\n";
sub parse_pe { sub parse_pe {
my ($filename, $pe, $inr, $instr, $comp, $title, $sonst, $libsig, $rismsig) = @_; 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. 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); my ($clef, $timesig, $keysig, $rest) = ($2, $4, $6, $7);
print "Writing $filename...\n"; print "Writing $filename...\n";
......
Test Composer Test Composer
Test case for clefs Test case for clefs
1.1.1: S 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 pae2xml Test Suite File 1-a-Clefs
1-a-Clefs 1-a-Clefs
\ No newline at end of file
Test Composer Test Composer
Test case for key signature change Test case for key signature change
1.1.1: S Key signatures 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 pae2xml Test Suite File 2-a-KeySignature
2-a-KeySignature 2-a-KeySignature
\ No newline at end of file
Test Composer Test Composer
Test case for time signatures Test case for time signatures
1.1.1: S 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 pae2xml Test Suite File 3-a-TimeSignature
3-a-TimeSignature 3-a-TimeSignature
\ No newline at end of file
Test Composer Test Composer
Test case for alternating time signature Test case for alternating time signature
1.1.1: S 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 pae2xml Test Suite File 3-b-TimeSignature-alternating
3-b-TimeSignature-alternating 3-b-TimeSignature-alternating
\ No newline at end of file
Test Composer Test Composer
Test case for missing time signatures Test case for missing time signatures
1.1.1: S 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 pae2xml Test Suite File 3-c-TimeSignature-missing
3-c-TimeSignature-missing 3-c-TimeSignature-missing
\ No newline at end of file
Test Composer Test Composer
Test case for barline types Test case for barline types
1.1.1: S One repeat 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 pae2xml Test Suite File 4-01a-Octaves
4-01a-Octaves 4-01a-Octaves
\ No newline at end of file
Test Composer Test Composer
Test case for durations Test case for durations
1.1.1: S 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 pae2xml Test Suite File 4-02a-Durations
4-02a-Durations 4-02a-Durations
Test Composer Test Composer
Test case for dotted durations Test case for dotted durations
1.1.1: S 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 pae2xml Test Suite File 4-02b-Durations-dotted
4-02b-Durations-dotted 4-02b-Durations-dotted
Test Composer Test Composer
Test case for neumic durations Test case for neumic durations
1.1.1: S 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 pae2xml Test Suite File 4-02c-Durations-neumic
4-02c-Durations-neumic 4-02c-Durations-neumic
Test Composer Test Composer
Test case for long durations Test case for long durations
1.1.1: S 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 pae2xml Test Suite File 4-02c-Durations-long
4-02c-Durations-long 4-02c-Durations-long
Test Composer Test Composer
Accidentals (c-cis-cis-cisis-ces-ceses-ceses-c/ces-as-bes-g-cis-aisis-beses-g/) Accidentals (c-cis-cis-cisis-ces-ceses-ceses-c/ces-as-bes-g-cis-aisis-beses-g/)
1.1.1: S accidentals 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 pae2xml Test Suite File 4-03a-Accidentals
4-03a-Accidentals 4-03a-Accidentals
Test Composer Test Composer
Test case for acciaccatura Test case for acciaccatura
1.1.1: S 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 pae2xml Test Suite File 4-05a-Grace-acciaccatura
4-05a-Grace-acciaccatura 4-05a-Grace-acciaccatura
Test Composer Test Composer
Test case for appoggiatura Test case for appoggiatura
1.1.1: S 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 pae2xml Test Suite File 4-05b-Grace-appoggiatura
4-05b-Grace-appoggiatura 4-05b-Grace-appoggiatura
Test Composer Test Composer
Test case for double appoggiatura Test case for double appoggiatura
1.1.1: S 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 pae2xml Test Suite File 4-05c-Grace-double-appoggiatura
4-05c-Grace-double-appoggiatura 4-05c-Grace-double-appoggiatura
Test Composer Test Composer
Test case for rest durations Test case for rest durations
1.1.1: S 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 pae2xml Test Suite File 4-06a-Rests-durations
4-06a-Rests-durations 4-06a-Rests-durations
Test Composer Test Composer
Test case for dotted durations on rests Test case for dotted durations on rests
1.1.1: S 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 pae2xml Test Suite File 4-06b-Rests-durations-dotted
4-06b-Rests-durations-dotted 4-06b-Rests-durations-dotted
Test Composer Test Composer
Test case for multi-measure rests Test case for multi-measure rests
1.1.1: S 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 pae2xml Test Suite File 4-06c-Rests-multimeasure
4-06c-Rests-multimeasure 4-06c-Rests-multimeasure
Test Composer Test Composer
Test case for barline types Test case for barline types
1.1.1: S One repeat 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 pae2xml Test Suite File 4-07a-Barlines
4-07a-Barlines 4-07a-Barlines
Test Composer Test Composer
Test case for articulations Test case for articulations
1.1.1: S 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 pae2xml Test Suite File 4-08a-OtherSymbols
4-08a-OtherSymbols 4-08a-OtherSymbols
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment