diff --git a/pae2xml.pl b/pae2xml.pl index eaec39e14717f453be24142a73809c8a854429b0..35dbf61d58775203617d5b74b8d9fc9af52c56ce 100755 --- a/pae2xml.pl +++ b/pae2xml.pl @@ -296,7 +296,7 @@ sub parse_notes { } elsif ($notes =~ /^((\,|\')*(x|xx|b|bb|n)?\d*\.*(g|q)?(\-|A|B|C|D|E|F|G)t?\+?)(.*)$/) { # a note ($note, $notes) = ($1,$6); parse_note($note, $keysig, "", "", $qq); - } elsif ($notes =~ /^(\((\,|\')*(x|xx|b|bb|n)?\d*\.*(g|q)?(\-|A|B|C|D|E|F|G)t?\+?\))(.*)$/) { # one note with a fermata + } elsif ($notes =~ /^(\((\,|\')*(x|xx|b|bb|n)?\d*\.*(g|q)?(\-|A|B|C|D|E|F|G)[t\+]*\)[t\+]*)(.*)$/) { # one note with a fermata ($note, $notes) = ($1,$6); parse_note($note, $keysig, "", "", $qq); } elsif ($notes =~ /^(\(((\,|\')*(x|xx|b|bb|n)?\d*\.*(g|q)?(\-|A|B|C|D|E|F|G)t?\+?){3}\))(.*)$/) { # a triplet @@ -456,8 +456,8 @@ sub parse_note { ($actualnotes, $normalnotes) = ($1, $2); } - if ($note =~ /^\((.*)\)$/) { - $note = $1; + if ($note =~ /^\((.*)\)(.*)$/) { + $note = "$1$2"; $fermata = 1; } @@ -522,8 +522,8 @@ sub parse_note { print OUT $tienotation; } if ($fermata) { - print OUT ' - <fermata type="upright"/>'."\n"; } + print OUT " <fermata type=\"upright\"/>\n"; + } if ($trill eq "t") { print OUT ' <ornaments> <trill-mark/> diff --git a/sample_files/Articulations.pae b/sample_files/Articulations.pae new file mode 100644 index 0000000000000000000000000000000000000000..d546995ce389742da2565370a3de42a519a7b223 --- /dev/null +++ b/sample_files/Articulations.pae @@ -0,0 +1,7 @@ +Test Composer +Test case for articulations +1.1.1: S articulations +plain&easy: %G-2@c$� '4CCt(D)8(E)(F)t/ + +Test Library +00000000 \ No newline at end of file