if dur_str <> d:
return '<%s>' % m.group (1)
-
+ pslur_strs = ['']
dyns = ['']
- def sub_dyn_end (m):
- dyns.append (' -\!')
- return m.group(2)
-
- str = re.sub (r'(\\!)\s*([a-z]+)', sub_dyn_end, str)
-
slur_strs = ['']
- def sub_slurs(m):
- if '-)' not in slur_strs:
- slur_strs.append ( '-)')
- return m.group(1)
- def sub_p_slurs(m):
- if '-\)' not in slur_strs:
- slur_strs.append ( '-\)')
- return m.group(1)
- str = re.sub (r"\)[ ]*([a-z]+)", sub_slurs, str)
- str = re.sub (r"\\\)[ ]*([a-z]+)", sub_p_slurs, str)
- def sub_begin_slurs(m):
- if '-(' not in slur_strs:
- slur_strs.append ( '-(')
- return m.group(1)
- str = re.sub (r"([a-z]+[,'!?0-9 ]*)\(", sub_begin_slurs, str)
- def sub_begin_p_slurs(m):
- if '-\(' not in slur_strs:
- slur_strs.append ( '-\(')
- return m.group(1)
-
- str = re.sub (r"([a-z]+[,'!?0-9 ]*)\\\(", sub_begin_p_slurs, str)
-
- def sub_dyns (m):
- s = m.group(0)
- if s == '@STARTCRESC@':
- slur_strs.append ("-\\<")
- elif s == '@STARTDECRESC@':
- slur_strs.append ("-\\>")
- elif s == r'-?\\!':
- slur_strs.append ('-\\!')
- return ''
-
- str = re.sub (r'@STARTCRESC@', sub_dyns, str)
- str = re.sub (r'-?\\!', sub_dyns, str)
-
- def sub_articulations (m):
- a = m.group(1)
- if a not in slur_strs:
- slur_strs.append (a)
- return ''
-
- str = re.sub (r"([_^-]\@ACCENT\@)", sub_articulations, str)
- str = re.sub (r"([_^-]\\[a-z]+)", sub_articulations, str)
- str = re.sub (r"([_^-][>_.+|^-])", sub_articulations, str)
-
- pslur_strs = ['']
- def sub_pslurs(m):
- slur_strs.append ( ' -\\)')
- return m.group(1)
- str = re.sub (r"\\\)[ ]*([a-z]+)", sub_pslurs, str)
+
+ last_str = ''
+ while last_str <> str:
+ last_str = str
+ def sub_dyn_end (m):
+ dyns.append (' -\!')
+ return ' ' + m.group(2)
+
+ str = re.sub (r'(\\!)\s*([a-z]+)', sub_dyn_end, str)
+ def sub_slurs(m):
+ if '-)' not in slur_strs:
+ slur_strs.append ( '-)')
+ return m.group(1)
+ def sub_p_slurs(m):
+ if '-\)' not in slur_strs:
+ slur_strs.append ( '-\)')
+ return m.group(1)
+ str = re.sub (r"\)[ ]*([a-z]+)", sub_slurs, str)
+ str = re.sub (r"\\\)[ ]*([a-z]+)", sub_p_slurs, str)
+ def sub_begin_slurs(m):
+ if '-(' not in slur_strs:
+ slur_strs.append ( '-(')
+ return m.group(1)
+ str = re.sub (r"([a-z]+[,'!?0-9 ]*)\(", sub_begin_slurs, str)
+ def sub_begin_p_slurs(m):
+ if '-\(' not in slur_strs:
+ slur_strs.append ( '-\(')
+ return m.group(1)
+
+ str = re.sub (r"([a-z]+[,'!?0-9 ]*)\\\(", sub_begin_p_slurs, str)
+
+ def sub_dyns (m):
+ s = m.group(0)
+ if s == '@STARTCRESC@':
+ slur_strs.append ("-\\<")
+ elif s == '@STARTDECRESC@':
+ slur_strs.append ("-\\>")
+ elif s == r'-?\\!':
+ slur_strs.append ('-\\!')
+ return ''
+
+ str = re.sub (r'@STARTCRESC@', sub_dyns, str)
+ str = re.sub (r'-?\\!', sub_dyns, str)
+
+ def sub_articulations (m):
+ a = m.group(1)
+ if a not in slur_strs:
+ slur_strs.append (a)
+ return ''
+
+ str = re.sub (r"([_^-]\@ACCENT\@)", sub_articulations, str)
+ str = re.sub (r"([_^-]\\[a-z]+)", sub_articulations, str)
+ str = re.sub (r"([_^-][>_.+|^-])", sub_articulations, str)
+
+ def sub_pslurs(m):
+ slur_strs.append ( ' -\\)')
+ return m.group(1)
+ str = re.sub (r"\\\)[ ]*([a-z]+)", sub_pslurs, str)
suffix = string.join (slur_strs, '') + string.join (pslur_strs, '') \
+ string.join (dyns, '')
trebleEentje = \notes \relative c' \context Voice {
\stemBoth
<<e e'>>2 r4 |
- <<f as!>>2-\(-\mf <<as( c>>8.-> <<f as>>16-)-\) |
+ <<f as!>>2-\(-\mf <<as c>>8.-(-> <<f as>>16-)-\) |
% urg: slurs with staccati are ugly
- <<e g>>4. <<e g(>>8-. <<e g>>-. <<e g>>-)-. |
- <<f g>>4. <<b, g'(>>8-. <<d g>>-. <<f g>>-)-. |
+ <<e g>>4. <<e g>>8-.-( <<e g>>-. <<e g>>-)-. |
+ <<f g>>4. <<b, g'>>8-.-( <<d g>>-. <<f g>>-)-. |
<<e g>>2 <<e g>>4-\pp |
<<f a>>2-\( <<a c>>8.-( <<f a>>16-)-\) |
- <<e g>>4.-\( <<e( g>>8-. <<e g>>-. <<e g>>-)-\)-. |
- <<f g>>4. <<b, g'(>>8-. <<d g>>-. <<f g>>-)-. |
+ <<e g>>4.-\( <<e g>>8-(-. <<e g>>-. <<e g>>-)-\)-. |
+ <<f g>>4. <<b, g'>>8-(-. <<d g>>-. <<f g>>-)-. |
%60
<<e g>>2 r4 |
}
<<e e'>>2. |
%61
R2. |
- [<<g, g'>>8.-\< <<g g'>>16 <<b b'>>8. <<b\> b'>>16 -\! <<d d'>>8. <<d d'>>16] |
+ [<<g, g'>>8.-\< <<g g'>>16 <<b b'>>8. <<b b'>>16-\>-\! <<d d'>>8. <<d d'>>16] |
%% score has double slur on chord.
< { c4( )b } { c'4 b } > \!r |
% four copied from begin eentje
<<f as!>>2-( <<as c>>8.-> <<f as>>16-) |
- <<e g>>4. <<e g(>>8-. <<e g>>-. <<e g>>-)-. |
- <<f g>>4. <<b, g'(>>8-. <<d g>>-. <<f g>>-)-. |
+ <<e g>>4. <<e g>>8-(-. <<e g>>-. <<e g>>-)-. |
+ <<f g>>4. <<b, g'>>8-(-. <<d g>>-. <<f g>>-)-. |
%80
\property Voice . TextScript \override #'font-shape = #'italic
<<g, g'>>8 [<<g' d'>> <<d' f>> <<g, d'>> <<as b d >>-> <<b d f>>] |
<<g, g'>>8 [<<g' d'>> <<d' f>> <<g, d'>> <<gis b d >>-> <<b d f>>] |
%65
- <<gis, gis'>>8 [<<d''\> e>> <<e b'>> <<d e>> <<e b'>> <<de>> -\!] |
+ <<gis, gis'>>8 [<<d'' e>>-\> <<e b'>> <<d e>> <<e b'>> <<d e>> -\!] |
<<a, a'>>8 [<<c' e>> <<e a>> <<c e>> <<e a>> <<c e>>] |
<<a, a'>>8 [<<a' d f>> <<d f a>> <<a d f>> <<d f a>> <<a d f>>] |
<<a, a'>>8 [<<a' c e>> <<c e a>> <<a c e>> <<c e a>> <<a c e>>] |
as' des'^1 c'8^#'(finger "2-3") h~h )c'16 \clef F [e,16(^2 f, g,] |
\break
- [as,^5 )h,,^2] \clef G [<<c a^3(>>8 <<c g^2>>16 c'] <<c es ges c'^5>>4.~
+ [as,^5 h,,^2-)-] \clef G [<<c a^3>>8-( <<c g^2>>16 c'] <<c es ges c'^5>>4.~
<<c es ges c'>>8-) s4 s8 r16 h^2( c' d' |
es' ges-1 f-2 a-1 c'-2 f'-4 \stemUp \tieUp e'-5 d' c' b-4 a^\prall^#'(finger "2-4-3") g |
- )f f'-5( e'-5 d'-4 c'-3 )f'-5 <<f^4 a^5(>>4 <<e^3 g^5>>8 |
+ )f f'-5( e'-5 d'-4 c'-3 )f'-5 <<f^4 a^5>>4-( <<e^3 g^5>>8 |
<<a, f^4>>4 <<g, e^3>>8 f16^4 d'^5~[d'8. c'16^4] |
\break
<)f8^3 \context Voice = another { \m a,16^\pp \u c8 c16] } > \m g, \u c_3 \m b,^#'(finger "2-1") \u c8 c16 \m a, \u c]~ | \stemBoth
s2. s
\u s4. \grace {f8(} )f4 e8 |
f g16_2 b_1 a_2 gis_1 c_2 h, c cis_1 d_2 b,_1 |
- \tieDown c4.~<<f, c >>16-\< \tieBoth <<f h>>~[<< f^3 h \> >>8 -\! << e b^2>> -\!] |
+ \tieDown c4.~<<f, c >>16-\< \tieBoth <<f h>>~[<< f^3 h >>8-\> -\! << e b^2>> -\!] |
\translator Staff=mid
\transpose c' c {
a4^1( g8^1 b4 a8^2 |
- f8..^1 f32^1 g8^2 )a8.. \slurUp <<f f'^3(>>32 <<g g'^4>>8 |
- <<a a'^5>>8..-) <<f f'^3(>>32 <<g g'^4>>8 <<a a'^5 \> >>4.-) ~ |
+ f8..^1 f32^1 g8^2 )a8.. \slurUp <<f f'^3>>32-( <<g g'^4>>8 |
+ <<a a'^5>>8..-) <<f f'^3>>32-( <<g g'^4>>8 <<a a'^5 >>4.-\>-) ~ |
a~ \! a^\fermata \bar "|."
}
}