@rule ((0, 1, 9), _ ('\\header { key = concat + with + operator }'))
def conv(str):
if re.search ('\\\\multi', str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % "\\multi")
- stderr_write ('\n')
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "\\multi")
+ stderr_write ('\n')
return str
@rule ((0, 1, 19), _ ('deprecated %s') % '\\octave')
def conv (str):
if re.search ('\\\\octave', str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % "\\octave")
- stderr_write ('\n')
- stderr_write (UPDATE_MANUALLY)
- stderr_write ('\n')
- # raise FatalConversionError ()
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "\\octave")
+ stderr_write ('\n')
+ stderr_write (UPDATE_MANUALLY)
+ stderr_write ('\n')
+ # raise FatalConversionError ()
return str
@rule ((0, 1, 20), _ ('deprecated \\textstyle, new \\key syntax'))
def conv (str):
str = re.sub ('\\\\textstyle([^;]+);',
- '\\\\property Lyrics . textstyle = \\1', str)
+ '\\\\property Lyrics . textstyle = \\1', str)
# harmful to current .lys
# str = re.sub ('\\\\key([^;]+);', '\\\\accidentals \\1;', str)
return str
@rule ((1, 0, 2), _ ('\\header { key = concat + with + operator }'))
def conv(str):
if re.search ('\\\\header', str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % _ ("new \\header format"))
- stderr_write ('\n')
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % _ ("new \\header format"))
+ stderr_write ('\n')
return str
@rule ((1, 0, 6), 'foo = \\translator {\\type .. } ->\\translator {\\type ..; foo; }')
def conv(str):
if re.search ('[a-zA-Z]+ = *\\translator',str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % _ ("\\translator syntax"))
- stderr_write ('\n')
- # raise FatalConversionError ()
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % _ ("\\translator syntax"))
+ stderr_write ('\n')
+ # raise FatalConversionError ()
return str
@rule ((1, 0, 18), _ ('\\repeat NUM Music Alternative -> \\repeat FOLDSTR Music Alternative'))
def conv(str):
if re.search ('\\\\repeat',str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % "\\repeat")
- stderr_write ('\n')
- # raise FatalConversionError ()
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "\\repeat")
+ stderr_write ('\n')
+ # raise FatalConversionError ()
return str
@rule ((1, 3, 5), 'beamAuto moment properties')
def conv (str):
str = re.sub ('"?beamAuto([^"=]+)"? *= *"([0-9]+)/([0-9]+)" *;*',
- 'beamAuto\\1 = #(make-moment \\2 \\3)',
- str)
+ 'beamAuto\\1 = #(make-moment \\2 \\3)',
+ str)
return str
@rule ((1, 3, 17), 'stemStyle -> flagStyle')
def conv (str):
str = re.sub ('stemStyle',
- 'flagStyle',
- str)
+ 'flagStyle',
+ str)
return str
@rule ((1, 3, 18), 'staffLineLeading -> staffSpace')
def conv (str):
str = re.sub ('staffLineLeading',
- 'staffSpace',
- str)
+ 'staffSpace',
+ str)
return str
@rule ((1, 3, 23), _ ('deprecate %s ') % '\\repetitions')
def conv(str):
if re.search ('\\\\repetitions',str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % "\\repetitions")
- stderr_write ('\n')
- # raise FatalConversionError ()
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "\\repetitions")
+ stderr_write ('\n')
+ # raise FatalConversionError ()
return str
@rule ((1, 3, 35), 'textEmptyDimension -> textNonEmpty')
def conv (str):
str = re.sub ('textEmptyDimension *= *##t',
- 'textNonEmpty = ##f',
- str)
+ 'textNonEmpty = ##f',
+ str)
str = re.sub ('textEmptyDimension *= *##f',
- 'textNonEmpty = ##t',
- str)
+ 'textNonEmpty = ##t',
+ str)
return str
@rule ((1, 3, 38), '\musicalpitch { a b c } -> #\'(a b c)')
def conv (str):
str = re.sub ("([a-z]+)[ \t]*=[ \t]*\\\\musicalpitch *{([- 0-9]+)} *\n",
- "(\\1 . (\\2))\n", str)
+ "(\\1 . (\\2))\n", str)
str = re.sub ("\\\\musicalpitch *{([0-9 -]+)}",
- "\\\\musicalpitch #'(\\1)", str)
+ "\\\\musicalpitch #'(\\1)", str)
if re.search ('\\\\notenames',str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % _ ("new \\notenames format"))
- stderr_write ('\n')
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % _ ("new \\notenames format"))
+ stderr_write ('\n')
return str
@rule ((1, 3, 39), '\\key A ; ->\\key a;')
def conv (str):
def replace (match):
- return '\\key %s;' % match.group (1).lower ()
+ return '\\key %s;' % match.group (1).lower ()
str = re.sub ("\\\\key ([^;]+);", replace, str)
return str
@rule ((1, 3, 41), '[:16 c4 d4 ] -> \\repeat "tremolo" 2 { c16 d16 }')
def conv (str):
if re.search ('\\[:',str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % _ ("new tremolo format"))
- stderr_write ('\n')
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % _ ("new tremolo format"))
+ stderr_write ('\n')
return str
@rule ((1, 3, 58), 'noteHeadStyle value: string -> symbol')
def conv (str):
if re.search ('\\\\keysignature', str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % '\\keysignature')
- stderr_write ('\n')
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % '\\keysignature')
+ stderr_write ('\n')
return str
@rule ((1, 3, 68), 'latexheaders = "\\input global" -> latexheaders = "global"')
def conv (str):
str = re.sub (r'latexheaders *= *"\\\\input ',
- 'latexheaders = "',
- str)
+ 'latexheaders = "',
+ str)
return str
def conv (str):
str = re.sub ('ChordNames*', 'ChordNames', str)
if re.search ('\\\\textscript "[^"]* *"[^"]*"', str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % _ ("new \\textscript markup text"))
- stderr_write ('\n')
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % _ ("new \\textscript markup text"))
+ stderr_write ('\n')
str = re.sub ('\\textscript +("[^"]*")', '\\textscript #\\1', str)
return str
@rule ((1, 3, 117), _ ('identifier names: %s') % '$!foo_bar_123 -> xfooBarABC')
def conv (str):
def regularize_dollar_reference (match):
- return regularize_id (match.group (1))
+ return regularize_id (match.group (1))
def regularize_assignment (match):
- return '\n' + regularize_id (match.group (1)) + ' = '
+ return '\n' + regularize_id (match.group (1)) + ' = '
str = re.sub ('\$([^\t\n ]+)', regularize_dollar_reference, str)
str = re.sub ('\n([^ \t\n]+)[ \t]*= *', regularize_assignment, str)
return str
@rule ((1, 3, 120), 'paper_xxx -> paperXxxx, pedalup -> pedalUp.')
def conv (str):
def regularize_paper (match):
- return regularize_id (match.group (1))
+ return regularize_id (match.group (1))
str = re.sub ('(paper_[a-z]+)', regularize_paper, str)
str = re.sub ('sustainup', 'sustainUp', str)
str = re.sub ('nobreak', 'noBreak', str)
def conv (str):
def func(match):
- break_dict = {
- "Instrument_name": "instrument-name",
- "Left_edge_item": "left-edge",
- "Span_bar": "span-bar",
- "Breathing_sign": "breathing-sign",
- "Staff_bar": "staff-bar",
- "Clef_item": "clef",
- "Key_item": "key-signature",
- "Time_signature": "time-signature",
- "Custos": "custos"
- }
- props = match.group (1)
- for (k,v) in break_dict.items():
- props = re.sub (k, v, props)
- return "breakAlignOrder = #'(%s)" % props
+ break_dict = {
+ "Instrument_name": "instrument-name",
+ "Left_edge_item": "left-edge",
+ "Span_bar": "span-bar",
+ "Breathing_sign": "breathing-sign",
+ "Staff_bar": "staff-bar",
+ "Clef_item": "clef",
+ "Key_item": "key-signature",
+ "Time_signature": "time-signature",
+ "Custos": "custos"
+ }
+ props = match.group (1)
+ for (k,v) in break_dict.items():
+ props = re.sub (k, v, props)
+ return "breakAlignOrder = #'(%s)" % props
str = re.sub ("breakAlignOrder *= *#'\\(([a-z_\n\tA-Z ]+)\\)",
- func, str)
+ func, str)
return str
@rule ((1, 5, 67), _ ('automaticMelismata turned on by default'))
def conv (str):
if re.search (r'\addlyrics',str) \
- and re.search ('automaticMelismata', str) == None:
- stderr_write ('\n')
- stderr_write (NOT_SMART % "automaticMelismata; turned on by default since 1.5.67.")
- stderr_write ('\n')
- raise FatalConversionError ()
+ and re.search ('automaticMelismata', str) == None:
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "automaticMelismata; turned on by default since 1.5.67.")
+ stderr_write ('\n')
+ raise FatalConversionError ()
return str
@rule ((1, 5, 72), 'set! point-and-click -> set-point-and-click!')
def conv (str):
str = re.sub ("""#\(set! +point-and-click +line-column-location\)""",
- """#(set-point-and-click! \'line-column)""", str)
+ """#(set-point-and-click! \'line-column)""", str)
str = re.sub ("""#\(set![ \t]+point-and-click +line-location\)""",
- '#(set-point-and-click! \'line)', str)
+ '#(set-point-and-click! \'line)', str)
str = re.sub ('#\(set! +point-and-click +#f\)',
- '#(set-point-and-click! \'none)', str)
+ '#(set-point-and-click! \'none)', str)
return str
spanner_subst ={
- "text" : 'TextSpanEvent',
- "decrescendo" : 'DecrescendoEvent',
- "crescendo" : 'CrescendoEvent',
- "Sustain" : 'SustainPedalEvent',
- "slur" : 'SlurEvent',
- "UnaCorda" : 'UnaCordaEvent',
- "Sostenuto" : 'SostenutoEvent',
- }
+ "text" : 'TextSpanEvent',
+ "decrescendo" : 'DecrescendoEvent',
+ "crescendo" : 'CrescendoEvent',
+ "Sustain" : 'SustainPedalEvent',
+ "slur" : 'SlurEvent',
+ "UnaCorda" : 'UnaCordaEvent',
+ "Sostenuto" : 'SostenutoEvent',
+ }
def subst_ev_name (match):
stype = 'STOP'
if re.search ('start', match.group(1)):
- stype= 'START'
+ stype= 'START'
mtype = spanner_subst[match.group(2)]
return "(make-span-event '%s %s)" % (mtype , stype)
str = re.sub (r'\(ly-', '(ly:', str)
changed = [
- r'duration\?',
- r'font-metric\?',
- r'molecule\?',
- r'moment\?',
- r'music\?',
- r'pitch\?',
- 'make-duration',
- 'music-duration-length',
- 'duration-log',
- 'duration-dotcount',
- 'intlog2',
- 'duration-factor',
- 'transpose-key-alist',
- 'get-system',
- 'get-broken-into',
- 'get-original',
- 'set-point-and-click!',
- 'make-moment',
- 'make-pitch',
- 'pitch-octave',
- 'pitch-alteration',
- 'pitch-notename',
- 'pitch-semitones',
- r'pitch<\?',
- r'dir\?',
- 'music-duration-compress',
- 'set-point-and-click!'
- ]
+ r'duration\?',
+ r'font-metric\?',
+ r'molecule\?',
+ r'moment\?',
+ r'music\?',
+ r'pitch\?',
+ 'make-duration',
+ 'music-duration-length',
+ 'duration-log',
+ 'duration-dotcount',
+ 'intlog2',
+ 'duration-factor',
+ 'transpose-key-alist',
+ 'get-system',
+ 'get-broken-into',
+ 'get-original',
+ 'set-point-and-click!',
+ 'make-moment',
+ 'make-pitch',
+ 'pitch-octave',
+ 'pitch-alteration',
+ 'pitch-notename',
+ 'pitch-semitones',
+ r'pitch<\?',
+ r'dir\?',
+ 'music-duration-compress',
+ 'set-point-and-click!'
+ ]
origre = r'\b(%s)' % '|'.join (changed)
@rule ((1, 7, 4), '<< >> -> < < > >')
def conv(str):
if re.search ('new-chords-done',str):
- return str
+ return str
str = re.sub (r'<<', '< <', str)
str = re.sub (r'>>', '> >', str)
@rule ((1, 7, 6), 'note\\script -> note-\script')
def conv(str):
kws = ['arpeggio',
- 'sustainDown',
- 'sustainUp',
- 'f',
- 'p',
- 'pp',
- 'ppp',
- 'fp',
- 'ff',
- 'mf',
- 'mp',
- 'sfz',
- ]
+ 'sustainDown',
+ 'sustainUp',
+ 'f',
+ 'p',
+ 'pp',
+ 'ppp',
+ 'fp',
+ 'ff',
+ 'mf',
+ 'mp',
+ 'sfz',
+ ]
origstr = '|'.join (kws)
str = re.sub (r'([^_^-])\\(%s)\b' % origstr, r'\1-\\\2', str)
@rule ((1, 7, 10), "\property ChordName #'style -> #(set-chord-name-style 'style)")
def conv(str):
str = re.sub (r"\\property *ChordNames *\. *ChordName *\\(set|override) *#'style *= *#('[a-z]+)",
- r"#(set-chord-name-style \2)", str)
+ r"#(set-chord-name-style \2)", str)
str = re.sub (r"\\property *ChordNames *\. *ChordName *\\revert *#'style",
- r"", str)
+ r"", str)
return str
@rule ((1, 7, 16), "divisiomaior -> divisioMaior")
def conv(str):
str = re.sub ("divisiomaior",
- "divisioMaior", str)
+ "divisioMaior", str)
str = re.sub ("divisiominima",
- "divisioMinima", str)
+ "divisioMinima", str)
str = re.sub ("divisiomaxima",
- "divisioMaxima", str)
+ "divisioMaxima", str)
return str
@rule ((1, 7, 17), "Skip_req -> Skip_event")
def conv(str):
str = re.sub ("Skip_req_swallow_translator",
- "Skip_event_swallow_translator", str)
+ "Skip_event_swallow_translator", str)
return str
@rule ((1, 7, 18), "groupOpen/Close -> start/stopGroup, #'outer -> #'enclose-bounds")
def conv(str):
str = re.sub ("groupOpen",
- "startGroup", str)
+ "startGroup", str)
str = re.sub ("groupClose",
- "stopGroup", str)
+ "stopGroup", str)
str = re.sub ("#'outer",
- "#'enclose-bounds", str)
+ "#'enclose-bounds", str)
return str
@rule ((1, 7, 19), _ ("remove %s") % "GraceContext")
def conv(str):
if re.search( r'\\GraceContext', str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % "GraceContext")
- stderr_write (FROM_TO \
- % ("GraceContext", "#(add-to-grace-init .. )"))
- stderr_write ('\n')
- stderr_write (UPDATE_MANUALLY)
- stderr_write ('\n')
- raise FatalConversionError ()
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "GraceContext")
+ stderr_write (FROM_TO \
+ % ("GraceContext", "#(add-to-grace-init .. )"))
+ stderr_write ('\n')
+ stderr_write (UPDATE_MANUALLY)
+ stderr_write ('\n')
+ raise FatalConversionError ()
str = re.sub ('HaraKiriStaffContext', 'RemoveEmptyStaffContext', str)
return str
@rule ((1, 7, 22), "#'type -> #'style")
def conv(str):
str = re.sub (
- r"(set|override|revert) *#'type",
- r"\1 #'style",
- str)
+ r"(set|override|revert) *#'type",
+ r"\1 #'style",
+ str)
return str
@rule ((1, 7, 23), "barNonAuto -> automaticBars")
def conv(str):
str = re.sub (
- "barNonAuto *= *##t",
- "automaticBars = ##f",
- str)
+ "barNonAuto *= *##t",
+ "automaticBars = ##f",
+ str)
str = re.sub (
- "barNonAuto *= *##f",
- "automaticBars = ##t",
- str)
+ "barNonAuto *= *##f",
+ "automaticBars = ##t",
+ str)
return str
@rule ((1, 7, 24), _ ("cluster syntax"))
def conv(str):
if re.search( r'-(start|stop)Cluster', str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % _ ("cluster syntax"))
- stderr_write ('\n')
- stderr_write (UPDATE_MANUALLY)
- stderr_write ('\n')
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % _ ("cluster syntax"))
+ stderr_write ('\n')
+ stderr_write (UPDATE_MANUALLY)
+ stderr_write ('\n')
- raise FatalConversionError ()
+ raise FatalConversionError ()
return str
@rule ((1, 7, 28), _ ("new Pedal style syntax"))
def conv(str):
str = re.sub (r"\\property *Staff\.(Sustain|Sostenuto|UnaCorda)Pedal *\\(override|set) *#'pedal-type *",
- r"\property Staff.pedal\1Style ", str)
+ r"\property Staff.pedal\1Style ", str)
str = re.sub (r"\\property *Staff\.(Sustain|Sostenuto|UnaCorda)Pedal *\\revert *#'pedal-type", '', str)
return str
origstr = '<%s>' % str
if re.search (r'\\\\', str):
- return origstr
+ return origstr
if re.search (r'\\property', str):
- return origstr
+ return origstr
if re.match (r'^\s*\)?\s*\\[a-zA-Z]+', str):
- return origstr
+ return origstr
durs = []
def sub_durs (m, durs = durs):
- durs.append(m.group(2))
- return m.group (1)
+ durs.append(m.group(2))
+ return m.group (1)
str = re.sub (r"([a-z]+[,'!? ]*)([0-9]+\.*)", sub_durs, str)
dur_str = ''
for d in durs:
- if dur_str == '':
- dur_str = d
- if dur_str <> d:
- return '<%s>' % m.group (1)
+ if dur_str == '':
+ dur_str = d
+ if dur_str <> d:
+ return '<%s>' % m.group (1)
pslur_strs = ['']
dyns = ['']
last_str = ''
while last_str <> str:
- last_str = str
-
- def sub_tremolos (m, slur_strs = slur_strs):
- tr = m.group (2)
- if tr not in slur_strs:
- slur_strs.append (tr)
- return m.group (1)
-
- str = re.sub (r"([a-z]+[',!? ]*)(:[0-9]+)",
- sub_tremolos, str)
-
- def sub_dyn_end (m, dyns = dyns):
- dyns.append (' \!')
- return ' ' + m.group(2)
-
- str = re.sub (r'(\\!)\s*([a-z]+)', sub_dyn_end, str)
- def sub_slurs(m, slur_strs = slur_strs):
- if '-)' not in slur_strs:
- slur_strs.append (')')
- return m.group(1)
-
- def sub_p_slurs(m, slur_strs = slur_strs):
- 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, slur_strs = slur_strs):
- 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, slur_strs = slur_strs):
- 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, slur_strs = slur_strs):
- 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, slur_strs = slur_strs):
- 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)
- str = re.sub (r'([_^-]"[^"]+")', sub_articulations,
- str)
-
- def sub_pslurs(m, slur_strs = slur_strs):
- slur_strs.append (' \\)')
- return m.group(1)
- str = re.sub (r"\\\)[ ]*([a-z]+)", sub_pslurs, str)
+ last_str = str
+
+ def sub_tremolos (m, slur_strs = slur_strs):
+ tr = m.group (2)
+ if tr not in slur_strs:
+ slur_strs.append (tr)
+ return m.group (1)
+
+ str = re.sub (r"([a-z]+[',!? ]*)(:[0-9]+)",
+ sub_tremolos, str)
+
+ def sub_dyn_end (m, dyns = dyns):
+ dyns.append (' \!')
+ return ' ' + m.group(2)
+
+ str = re.sub (r'(\\!)\s*([a-z]+)', sub_dyn_end, str)
+ def sub_slurs(m, slur_strs = slur_strs):
+ if '-)' not in slur_strs:
+ slur_strs.append (')')
+ return m.group(1)
+
+ def sub_p_slurs(m, slur_strs = slur_strs):
+ 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, slur_strs = slur_strs):
+ 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, slur_strs = slur_strs):
+ 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, slur_strs = slur_strs):
+ 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, slur_strs = slur_strs):
+ 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)
+ str = re.sub (r'([_^-]"[^"]+")', sub_articulations,
+ str)
+
+ def sub_pslurs(m, slur_strs = slur_strs):
+ slur_strs.append (' \\)')
+ return m.group(1)
+ str = re.sub (r"\\\)[ ]*([a-z]+)", sub_pslurs, str)
## end of while <>
suffix = ''.join (slur_strs) + ''.join (pslur_strs) \
- + ''.join (dyns)
+ + ''.join (dyns)
return '@STARTCHORD@%s@ENDCHORD@%s%s' % (str , dur_str, suffix)
marker_str = '%% new-chords-done %%'
if re.search (marker_str,str):
- return str
+ return str
str = re.sub ('<<', '@STARTCHORD@', str)
str = re.sub ('>>', '@ENDCHORD@', str)
# <<a b>>-[ c d]
# and gets skipped by articulation_substitute
str = re.sub (r'\[ *(@STARTCHORD@[^@]+@ENDCHORD@[0-9.]*)',
- r'\1-[', str)
+ r'\1-[', str)
str = re.sub (r'\\! *(@STARTCHORD@[^@]+@ENDCHORD@[0-9.]*)',
- r'\1-\\!', str)
+ r'\1-\\!', str)
str = re.sub (r'<([^?])', r'%s\1' % simstart, str)
str = re.sub (r'>([^?])', r'%s\1' % simend, str)
str = re.sub ('@STARTCRESC@', r'\\<', str)
str = re.sub ('@STARTDECRESC@', r'\\>' ,str)
str = re.sub (r'\\context *Voice *@STARTCHORD@',
- '@STARTCHORD@', str)
+ '@STARTCHORD@', str)
str = re.sub ('@STARTCHORD@', chordstart, str)
str = re.sub ('@ENDCHORD@', chordend, str)
str = re.sub (r'@ACCENT@', '>', str)
# Find the beginning of each markup:
match = markup_start.search (str)
while match:
- result = result + str[:match.end (1)] + " \markup"
- str = str[match.end( 2):]
- # Count matching parentheses to find the end of the
- # current markup:
- nesting_level = 0
- pars = re.finditer(r"[()]",str)
- for par in pars:
- if par.group () == '(':
- nesting_level = nesting_level + 1
- else:
- nesting_level = nesting_level - 1
- if nesting_level == 0:
- markup_end = par.end ()
- break
- # The full markup in old syntax:
- markup = str[:markup_end]
- # Modify to new syntax:
- markup = musicglyph.sub (r"{\\musicglyph", markup)
- markup = columns.sub (r"{", markup)
- markup = submarkup_start.sub (r"{\\\1", markup)
- markup = leftpar.sub ("{", markup)
- markup = rightpar.sub ("}", markup)
-
- result = result + markup
- # Find next markup
- str = str[markup_end:]
- match = markup_start.search(str)
+ result = result + str[:match.end (1)] + " \markup"
+ str = str[match.end( 2):]
+ # Count matching parentheses to find the end of the
+ # current markup:
+ nesting_level = 0
+ pars = re.finditer(r"[()]",str)
+ for par in pars:
+ if par.group () == '(':
+ nesting_level = nesting_level + 1
+ else:
+ nesting_level = nesting_level - 1
+ if nesting_level == 0:
+ markup_end = par.end ()
+ break
+ # The full markup in old syntax:
+ markup = str[:markup_end]
+ # Modify to new syntax:
+ markup = musicglyph.sub (r"{\\musicglyph", markup)
+ markup = columns.sub (r"{", markup)
+ markup = submarkup_start.sub (r"{\\\1", markup)
+ markup = leftpar.sub ("{", markup)
+ markup = rightpar.sub ("}", markup)
+
+ result = result + markup
+ # Find next markup
+ str = str[markup_end:]
+ match = markup_start.search(str)
result = result + str
return result
def articulation_substitute (str):
str = re.sub (r"""([^-])\[ *(\\?\)?[a-z]+[,']*[!?]?[0-9:]*\.*)""",
- r"\1 \2[", str)
+ r"\1 \2[", str)
str = re.sub (r"""([^-])\\\) *([a-z]+[,']*[!?]?[0-9:]*\.*)""",
- r"\1 \2\\)", str)
+ r"\1 \2\\)", str)
str = re.sub (r"""([^-\\])\) *([a-z]+[,']*[!?]?[0-9:]*\.*)""",
- r"\1 \2)", str)
+ r"\1 \2)", str)
str = re.sub (r"""([^-])\\! *([a-z]+[,']*[!?]?[0-9:]*\.*)""",
- r"\1 \2\\!", str)
+ r"\1 \2\\!", str)
return str
string_or_scheme = re.compile ('("(?:[^"\\\\]|\\\\.)*")|(#\\s*\'?\\s*\\()')
# Find the beginning of next string or Scheme expr.:
match = string_or_scheme.search (str)
while match:
- # Convert the preceding LilyPond code:
- previous_chunk = str[:match.start()]
- result = result + articulation_substitute (previous_chunk)
- if match.group (1): # Found a string
- # Copy the string to output:
- result = result + match.group (1)
- str = str[match.end(1):]
- else: # Found a Scheme expression. Count
- # matching parentheses to find its end
- str = str[match.start ():]
- nesting_level = 0
- pars = re.finditer(r"[()]",str)
- for par in pars:
- if par.group () == '(':
- nesting_level = nesting_level + 1
- else:
- nesting_level = nesting_level - 1
- if nesting_level == 0:
- scheme_end = par.end ()
- break
- # Copy the Scheme expression to output:
- result = result + str[:scheme_end]
- str = str[scheme_end:]
- # Find next string or Scheme expression:
- match = string_or_scheme.search (str)
+ # Convert the preceding LilyPond code:
+ previous_chunk = str[:match.start()]
+ result = result + articulation_substitute (previous_chunk)
+ if match.group (1): # Found a string
+ # Copy the string to output:
+ result = result + match.group (1)
+ str = str[match.end(1):]
+ else: # Found a Scheme expression. Count
+ # matching parentheses to find its end
+ str = str[match.start ():]
+ nesting_level = 0
+ pars = re.finditer(r"[()]",str)
+ for par in pars:
+ if par.group () == '(':
+ nesting_level = nesting_level + 1
+ else:
+ nesting_level = nesting_level - 1
+ if nesting_level == 0:
+ scheme_end = par.end ()
+ break
+ # Copy the Scheme expression to output:
+ result = result + str[:scheme_end]
+ str = str[scheme_end:]
+ # Find next string or Scheme expression:
+ match = string_or_scheme.search (str)
# Convert the remainder of the file
result = result + articulation_substitute (str)
return result
def conv_relative(str):
if re.search (r"\\relative", str):
- str= "#(ly:set-option 'old-relative)\n" + str
+ str= "#(ly:set-option 'old-relative)\n" + str
return str
@rule ((1, 9, 1), _ ("Remove - before articulation"))
def conv (str):
if re.search ("font-style",str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % "font-style")
- stderr_write ('\n')
- stderr_write (UPDATE_MANUALLY)
- stderr_write ('\n')
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "font-style")
+ stderr_write ('\n')
+ stderr_write (UPDATE_MANUALLY)
+ stderr_write ('\n')
- raise FatalConversionError ()
+ raise FatalConversionError ()
str = re.sub (r'-\\markup', r'@\\markup', str)
str = re.sub (r'-\\', r'\\', str)
@rule ((1, 9, 2), "\\newcontext -> \\new")
def conv (str):
str = re.sub ('ly:set-context-property',
- 'ly:set-context-property!', str)
+ 'ly:set-context-property!', str)
str = re.sub ('\\\\newcontext', '\\\\new', str)
str = re.sub ('\\\\grace[\t\n ]*([^{ ]+)',
- r'\\grace { \1 }', str)
+ r'\\grace { \1 }', str)
str = re.sub ("\\\\grace[\t\n ]*{([^}]+)}",
- r"""\\grace {
+ r"""\\grace {
\\property Voice.Stem \\override #'stroke-style = #"grace"
\1
\\property Voice.Stem \\revert #'stroke-style }
", fingerHorizontalDirection -> fingeringOrientations")
def conv (str):
str = re.sub ('accacciatura',
- 'acciaccatura', str)
+ 'acciaccatura', str)
if re.search ("context-spec-music", str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % "context-spec-music")
- stderr_write ('\n')
- stderr_write (UPDATE_MANUALLY)
- stderr_write ('\n')
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "context-spec-music")
+ stderr_write ('\n')
+ stderr_write (UPDATE_MANUALLY)
+ stderr_write ('\n')
- raise FatalConversionError ()
+ raise FatalConversionError ()
str = re.sub ('fingerHorizontalDirection *= *#(LEFT|-1)',
- "fingeringOrientations = #'(up down left)", str)
+ "fingeringOrientations = #'(up down left)", str)
str = re.sub ('fingerHorizontalDirection *= *#(RIGHT|1)',
- "fingeringOrientations = #'(up down right)", str)
+ "fingeringOrientations = #'(up down right)", str)
return str
@rule ((1, 9, 4), _ ('Swap < > and << >>'))
def conv (str):
if re.search ('\\figures', str):
- warning (_ ("attempting automatic \\figures conversion. Check results!"));
+ warning (_ ("attempting automatic \\figures conversion. Check results!"));
def figures_replace (m):
- s = m.group (1)
- s = re.sub ('<', '@FIGOPEN@',s)
- s = re.sub ('>', '@FIGCLOSE@',s)
- return '\\figures { %s }' % s
+ s = m.group (1)
+ s = re.sub ('<', '@FIGOPEN@',s)
+ s = re.sub ('>', '@FIGCLOSE@',s)
+ return '\\figures { %s }' % s
str = re.sub (r'\\figures[ \t\n]*{([^}]+)}', figures_replace, str)
str = re.sub (r'\\<', '@STARTCRESC@', str)
@rule ((1, 9, 6), _ ('deprecate %s') % 'ly:get-font')
def conv (str):
if re.search ("ly:get-font", str) :
- stderr_write ('\n')
- stderr_write (NOT_SMART % "(ly:-get-font")
- stderr_write ('\n')
- stderr_write (FROM_TO \
- % ("(ly:paper-get-font (ly:grob-get-paper foo) .. )",
- "(ly:paper-get-font (ly:grob-get-paper foo) .. )"))
- stderr_write (UPDATE_MANUALLY)
- stderr_write ('\n')
- raise FatalConversionError ()
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "(ly:-get-font")
+ stderr_write ('\n')
+ stderr_write (FROM_TO \
+ % ("(ly:paper-get-font (ly:grob-get-paper foo) .. )",
+ "(ly:paper-get-font (ly:grob-get-paper foo) .. )"))
+ stderr_write (UPDATE_MANUALLY)
+ stderr_write ('\n')
+ raise FatalConversionError ()
if re.search ("\\pitch *#", str) :
- stderr_write ('\n')
- stderr_write (NOT_SMART % "\\pitch")
- stderr_write ('\n')
- stderr_write (_ ("Use Scheme code to construct arbitrary note events."))
- stderr_write ('\n')
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "\\pitch")
+ stderr_write ('\n')
+ stderr_write (_ ("Use Scheme code to construct arbitrary note events."))
+ stderr_write ('\n')
- raise FatalConversionError ()
+ raise FatalConversionError ()
return str
remove \\outputproperty, move ly:verbose into ly:get-option'''))
def conv (str):
def sub_alteration (m):
- alt = m.group (3)
- alt = {
- '-1': 'FLAT',
- '-2': 'DOUBLE-FLAT',
- '0': 'NATURAL',
- '1': 'SHARP',
- '2': 'DOUBLE-SHARP',
- }[alt]
-
- return '(ly:make-pitch %s %s %s)' % (m.group(1), m.group (2),
- alt)
+ alt = m.group (3)
+ alt = {
+ '-1': 'FLAT',
+ '-2': 'DOUBLE-FLAT',
+ '0': 'NATURAL',
+ '1': 'SHARP',
+ '2': 'DOUBLE-SHARP',
+ }[alt]
+
+ return '(ly:make-pitch %s %s %s)' % (m.group(1), m.group (2),
+ alt)
str =re.sub ("\\(ly:make-pitch *([0-9-]+) *([0-9-]+) *([0-9-]+) *\\)",
- sub_alteration, str)
+ sub_alteration, str)
str = re.sub ("ly:verbose", "ly:get-option 'verbose", str)
m= re.search ("\\\\outputproperty #([^#]+)[\t\n ]*#'([^ ]+)", str)
if m:
- stderr_write (_ (\
- r"""\outputproperty found,
+ stderr_write (_ (\
+ r"""\outputproperty found,
Please hand-edit, using
\applyoutput #(outputproperty-compatibility %s '%s <GROB PROPERTY VALUE>)
as a substitution text.""") % (m.group (1), m.group (2)) )
- raise FatalConversionError ()
+ raise FatalConversionError ()
if re.search ("ly:(make-pitch|pitch-alteration)", str) \
- or re.search ("keySignature", str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % "pitches")
- stderr_write ('\n')
- stderr_write (
- _ ("""The alteration field of Scheme pitches was multiplied by 2
+ or re.search ("keySignature", str):
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "pitches")
+ stderr_write ('\n')
+ stderr_write (
+ _ ("""The alteration field of Scheme pitches was multiplied by 2
to support quarter tone accidentals. You must update the following constructs manually:
* calls of ly:make-pitch and ly:pitch-alteration
* keySignature settings made with \property
"""))
- raise FatalConversionError ()
+ raise FatalConversionError ()
return str
@rule ((1, 9, 8), "dash-length -> dash-fraction")
def conv (str):
if re.search ("dash-length",str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % "dash-length")
- stderr_write ('\n')
- stderr_write (FROM_TO % ("dash-length", "dash-fraction"))
- stderr_write ('\n')
- stderr_write (UPDATE_MANUALLY)
- stderr_write ('\n')
- raise FatalConversionError ()
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "dash-length")
+ stderr_write ('\n')
+ stderr_write (FROM_TO % ("dash-length", "dash-fraction"))
+ stderr_write ('\n')
+ stderr_write (UPDATE_MANUALLY)
+ stderr_write ('\n')
+ raise FatalConversionError ()
return str
@rule ((2, 1, 1), "font-relative-size -> font-size")
def conv (str):
def func(match):
- return "#'font-size = #%d" % (2*int (match.group (1)))
+ return "#'font-size = #%d" % (2*int (match.group (1)))
str =re.sub (r"#'font-relative-size\s*=\s*#\+?([0-9-]+)", func, str)
str =re.sub (r"#'font-family\s*=\s*#'ancient",
- r"#'font-family = #'music", str)
+ r"#'font-family = #'music", str)
return str
@rule ((2, 1, 4), _ ("removal of automaticMelismata; use melismaBusyProperties instead."))
def conv (str):
def func (match):
- c = match.group (1)
- b = match.group (2)
+ c = match.group (1)
+ b = match.group (2)
- if b == 't':
- if c == 'Score':
- return ''
- else:
- return r" \property %s.melismaBusyProperties \unset" % c
- elif b == 'f':
- return r"\property %s.melismaBusyProperties = #'(melismaBusy)" % c
+ if b == 't':
+ if c == 'Score':
+ return ''
+ else:
+ return r" \property %s.melismaBusyProperties \unset" % c
+ elif b == 'f':
+ return r"\property %s.melismaBusyProperties = #'(melismaBusy)" % c
str = re.sub (r"\\property ([a-zA-Z]+)\s*\.\s*automaticMelismata\s*=\s*##([ft])", func, str)
return str
""")
def conv (str):
str = re.sub (r'\\include\s*"paper([0-9]+)(-init)?.ly"',
- r"#(set-staff-size \1)", str)
+ r"#(set-staff-size \1)", str)
def sub_note (match):
- dur = ''
- log = int (match.group (1))
- dots = int (match.group (2))
+ dur = ''
+ log = int (match.group (1))
+ dots = int (match.group (2))
- if log >= 0:
- dur = '%d' % (1 << log)
- else:
- dur = { -1 : 'breve',
- -2 : 'longa',
- -3 : 'maxima'}[log]
+ if log >= 0:
+ dur = '%d' % (1 << log)
+ else:
+ dur = { -1 : 'breve',
+ -2 : 'longa',
+ -3 : 'maxima'}[log]
- dur += ('.' * dots)
+ dur += ('.' * dots)
- return r'\note #"%s" #%s' % (dur, match.group (3))
+ return r'\note #"%s" #%s' % (dur, match.group (3))
str = re.sub (r'\\note\s+#([0-9-]+)\s+#([0-9]+)\s+#([0-9.-]+)',
- sub_note, str)
+ sub_note, str)
return str
@rule ((2, 1, 14), "style = dotted -> dash-fraction = 0")
def conv (str):
str = re.sub (r"#'style\s*=\s*#'dotted-line",
- r"#'dash-fraction = #0.0 ", str)
+ r"#'dash-fraction = #0.0 ", str)
return str
@rule ((2, 1, 15), "LyricsVoice . instr(ument) -> vocalName")
def conv (str):
str = re.sub (r'LyricsVoice\s*\.\s*instrument\s*=\s*("[^"]*")',
- r'LyricsVoice . vocalName = \1', str)
+ r'LyricsVoice . vocalName = \1', str)
str = re.sub (r'LyricsVoice\s*\.\s*instr\s*=\s*("[^"]*")',
- r'LyricsVoice . vocNam = \1', str)
+ r'LyricsVoice . vocNam = \1', str)
return str
@rule ((2, 1, 16), '\\musicglyph #"accidentals-NUM" -> \\sharp/flat/etc.')
def conv (str):
def sub_acc (m):
- d = {
- '4': 'doublesharp',
- '3': 'threeqsharp',
- '2': 'sharp',
- '1': 'semisharp',
- '0': 'natural',
- '-1': 'semiflat',
- '-2': 'flat',
- '-3': 'threeqflat',
- '-4': 'doubleflat'}
- return '\\%s' % d[m.group (1)]
+ d = {
+ '4': 'doublesharp',
+ '3': 'threeqsharp',
+ '2': 'sharp',
+ '1': 'semisharp',
+ '0': 'natural',
+ '-1': 'semiflat',
+ '-2': 'flat',
+ '-3': 'threeqflat',
+ '-4': 'doubleflat'}
+ return '\\%s' % d[m.group (1)]
str = re.sub (r'\\musicglyph\s*#"accidentals-([0-9-]+)"',
- sub_acc, str)
+ sub_acc, str)
return str
def conv (str):
if re.search (r'\\partcombine', str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % "\\partcombine")
- stderr_write ('\n')
- stderr_write (UPDATE_MANUALLY)
- stderr_write ('\n')
- raise FatalConversionError ()
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "\\partcombine")
+ stderr_write ('\n')
+ stderr_write (UPDATE_MANUALLY)
+ stderr_write ('\n')
+ raise FatalConversionError ()
# this rule doesn't really work,
# too lazy to figure out why.
str = re.sub (r'\\context\s+Voice\s*=\s*one\s*\\partcombine\s+Voice\s*\\context\s+Thread\s*=\s*one(.*)\s*'
- + r'\\context\s+Thread\s*=\s*two',
- '\\\\newpartcombine\n\\1\n', str)
+ + r'\\context\s+Thread\s*=\s*two',
+ '\\\\newpartcombine\n\\1\n', str)
return str
Harmonic notes. Thread context removed. Lyrics context removed."""))
def conv (str):
if re.search ('include "drumpitch', str):
- stderr_write (_ ("Drums found. Enclose drum notes in \\drummode"))
+ stderr_write (_ ("Drums found. Enclose drum notes in \\drummode"))
str = re.sub (r'\\include "drumpitch-init.ly"','', str)
if re.search ('drums->paper', str):
- stderr_write (_ ("\n%s found. Check file manually!\n") % _("Drum notation"))
+ stderr_write (_ ("\n%s found. Check file manually!\n") % _("Drum notation"))
str = re.sub (r"""\\apply\s+#\(drums->paper\s+'([a-z]+)\)""",
- r"""\property DrumStaff.drumStyleTable = #\1-style""",
- str)
+ r"""\property DrumStaff.drumStyleTable = #\1-style""",
+ str)
if re.search ('Thread', str):
- stderr_write (_ ("\n%s found. Check file manually!\n") % "Thread");
+ stderr_write (_ ("\n%s found. Check file manually!\n") % "Thread");
str = re.sub (r"""(\\once\s*)?\\property\s+Thread\s*\.\s*NoteHead\s*"""
- + r"""\\(set|override)\s*#'style\s*=\s*#'harmonic"""
- + r"""\s+([a-z]+[,'=]*)([0-9]*\.*)"""
- ,r"""<\3\\harmonic>\4""", str)
+ + r"""\\(set|override)\s*#'style\s*=\s*#'harmonic"""
+ + r"""\s+([a-z]+[,'=]*)([0-9]*\.*)"""
+ ,r"""<\3\\harmonic>\4""", str)
str = re.sub (r"""\\new Thread""", """\context Voice""", str)
str = re.sub (r"""Thread""", """Voice""", str)
if re.search ('\bLyrics\b', str):
- stderr_write (_ ("\n%s found. Check file manually!\n") % "Lyrics");
+ stderr_write (_ ("\n%s found. Check file manually!\n") % "Lyrics");
str = re.sub (r"""LyricsVoice""", r"""L@ricsVoice""", str)
str = re.sub (r"""\bLyrics\b""", r"""LyricsVoice""", str)
str = re.sub (r'brew-new-markup-molecule', 'Text_item::print', str)
str = re.sub (r'LyricsVoice', 'Lyrics', str)
str = re.sub (r'tupletInvisible',
- r"TupletBracket \\set #'transparent", str)
-# str = re.sub (r'molecule', 'collage', str)
+ r"TupletBracket \\set #'transparent", str)
+# str = re.sub (r'molecule', 'collage', str)
#molecule -> collage
str = re.sub (r"\\property\s+[a-zA-Z]+\s*\.\s*[a-zA-Z]+\s*"
- + r"\\set\s*#'X-extent-callback\s*=\s*#Grob::preset_extent",
- "", str)
+ + r"\\set\s*#'X-extent-callback\s*=\s*#Grob::preset_extent",
+ "", str)
return str
""" % _ ("new syntax for property settings:"))
def conv (str):
str = re.sub (r'(\\property[^=]+)=\s*([-0-9]+)',
- r'\1= #\2', str)
+ r'\1= #\2', str)
str = re.sub (r'\\property\s+([^. ]+)\s*\.\s*([^\\=]+)\s*\\(set|override)',
- r"\\overrid@ \1.\2 ", str)
+ r"\\overrid@ \1.\2 ", str)
str = re.sub (r'\\property\s+([^. ]+)\s*\.\s*([^\\= ]+)\s*=\s*',
- r'\\s@t \1.\2 = ', str)
+ r'\\s@t \1.\2 = ', str)
str = re.sub (r'\\property\s+([^. ]+)\s*\.\s*([^\\= ]+)\s*\\unset',
- r'\\uns@t \1.\2 ', str)
+ r'\\uns@t \1.\2 ', str)
str = re.sub (r'\\property\s+([^. ]+)\s*\.\s*([^\\= ]+)\s*\\revert'
- + r"\s*#'([-a-z0-9_]+)",
- r"\\rev@rt \1.\2 #'\3", str)
+ + r"\s*#'([-a-z0-9_]+)",
+ r"\\rev@rt \1.\2 #'\3", str)
str = re.sub (r'Voice\.', '', str)
str = re.sub (r'Lyrics\.', '', str)
str = re.sub (r'ChordNames\.', '', str)
@rule ((2, 1, 23), _ ("Property setting syntax in \\translator{ }"))
def conv (str):
def subst_in_trans (match):
- s = match.group (0)
- s = re.sub (r'\s([a-zA-Z]+)\s*\\override',
- r' \\override \1', s)
- s = re.sub (r'\s([a-zA-Z]+)\s*\\set',
- r' \\override \1', s)
- s = re.sub (r'\s([a-zA-Z]+)\s*\\revert',
- r' \\revert \1', s)
- return s
+ s = match.group (0)
+ s = re.sub (r'\s([a-zA-Z]+)\s*\\override',
+ r' \\override \1', s)
+ s = re.sub (r'\s([a-zA-Z]+)\s*\\set',
+ r' \\override \1', s)
+ s = re.sub (r'\s([a-zA-Z]+)\s*\\revert',
+ r' \\revert \1', s)
+ return s
str = re.sub (r'\\(translator|with)\s*{[^}]+}', subst_in_trans, str)
def sub_abs (m):
- context = m.group ('context')
- d = m.groupdict ()
- if context:
- context = " '%s" % context[:-1] # -1: remove .
- else:
- context = ''
+ context = m.group ('context')
+ d = m.groupdict ()
+ if context:
+ context = " '%s" % context[:-1] # -1: remove .
+ else:
+ context = ''
- d['context'] = context
+ d['context'] = context
- return r"""#(override-auto-beam-setting %(prop)s %(num)s %(den)s%(context)s)""" % d
+ return r"""#(override-auto-beam-setting %(prop)s %(num)s %(den)s%(context)s)""" % d
str = re.sub (r"""\\override\s*(?P<context>[a-zA-Z]+\s*\.\s*)?autoBeamSettings"""
- +r"""\s*#(?P<prop>[^=]+)\s*=\s*#\(ly:make-moment\s+(?P<num>\d+)\s+(?P<den>\d)\s*\)""",
- sub_abs, str)
+
+r"""\s*#(?P<prop>[^=]+)\s*=\s*#\(ly:make-moment\s+(?P<num>\d+)\s+(?P<den>\d)\s*\)""",
+ sub_abs, str)
return str
str = re.sub (r'ly:get-broken-into', 'ly:spanner-broken-into', str)
str = re.sub (r'Melisma_engraver', 'Melisma_translator', str)
if re.search ("ly:get-paper-variable", str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % "ly:paper-get-variable")
- stderr_write ('\n')
- stderr_write (_ ('use %s') % '(ly:paper-lookup (ly:grob-paper ))')
- stderr_write ('\n')
- raise FatalConversionError ()
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "ly:paper-get-variable")
+ stderr_write ('\n')
+ stderr_write (_ ('use %s') % '(ly:paper-lookup (ly:grob-paper ))')
+ stderr_write ('\n')
+ raise FatalConversionError ()
str = re.sub (r'\\defaultAccidentals', "#(set-accidental-style 'default)", str)
str = re.sub (r'\\voiceAccidentals', "#(set-accidental-style 'voice)", str)
@rule ((2, 1, 27), "property transposing -> tuning")
def conv (str):
def subst (m):
- g = int (m.group (2))
- o = g / 12
- g -= o * 12
- if g < 0:
- g += 12
- o -= 1
+ g = int (m.group (2))
+ o = g / 12
+ g -= o * 12
+ if g < 0:
+ g += 12
+ o -= 1
- lower_pitches = filter (lambda x : x <= g, [0, 2, 4, 5, 7, 9, 11, 12])
- s = len (lower_pitches) -1
- a = g - lower_pitches [-1]
+ lower_pitches = filter (lambda x : x <= g, [0, 2, 4, 5, 7, 9, 11, 12])
+ s = len (lower_pitches) -1
+ a = g - lower_pitches [-1]
- str = 'cdefgab' [s]
- str += ['eses', 'es', '', 'is', 'isis'][a + 2]
- if o < 0:
- str += ',' * (-o - 1)
- elif o >= 0:
- str += "'" * (o + 1)
+ str = 'cdefgab' [s]
+ str += ['eses', 'es', '', 'is', 'isis'][a + 2]
+ if o < 0:
+ str += ',' * (-o - 1)
+ elif o >= 0:
+ str += "'" * (o + 1)
- return '\\transposition %s ' % str
+ return '\\transposition %s ' % str
str = re.sub (r"\\set ([A-Za-z]+\s*\.\s*)?transposing\s*=\s*#([-0-9]+)",
- subst, str)
+ subst, str)
return str
def conv (str):
str = re.sub (r'\\threeq(flat|sharp)', r'\\sesqui\1', str)
str = re.sub (r'ly:stencil-get-extent',
- 'ly:stencil-extent', str)
+ 'ly:stencil-extent', str)
str = re.sub (r'ly:translator-find',
- 'ly:context-find', str)
+ 'ly:context-find', str)
str = re.sub ('ly:unset-context-property','ly:context-unset-property',
- str)
+ str)
str = re.sub (r'ly:get-mutable-properties',
- 'ly:mutable-music-properties',str)
+ 'ly:mutable-music-properties',str)
str = re.sub (r'centralCPosition',
- 'middleCPosition',str)
+ 'middleCPosition',str)
return str
@rule ((2, 1, 33), 'breakAlignOrder -> break-align-orders.')
def conv (str):
str = re.sub (r"(\\set\s+)?(?P<context>(Score\.)?)breakAlignOrder\s*=\s*#'(?P<list>[^\)]+)",
- r"\n\\override \g<context>BreakAlignment #'break-align-orders = "
- + "#(make-vector 3 '\g<list>)", str)
+ r"\n\\override \g<context>BreakAlignment #'break-align-orders = "
+ + "#(make-vector 3 '\g<list>)", str)
return str
@rule ((2, 1, 34), 'set-paper-size -> set-default-paper-size.')
def conv (str):
str = re.sub (r"\(set-paper-size",
- "(set-default-paper-size",str)
+ "(set-default-paper-size",str)
return str
@rule ((2, 1, 36), 'ly:mutable-music-properties -> ly:music-mutable-properties')
def conv (str):
str = re.sub (r"ly:mutable-music-properties",
- "ly:music-mutable-properties", str)
+ "ly:music-mutable-properties", str)
return str
@rule ((2, 3, 2), '\\FooContext -> \\Foo')
def conv (str):
if re.search ('textheight', str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % "textheight")
- stderr_write ('\n')
- stderr_write (UPDATE_MANUALLY)
- stderr_write ('\n')
- stderr_write (
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "textheight")
+ stderr_write ('\n')
+ stderr_write (UPDATE_MANUALLY)
+ stderr_write ('\n')
+ stderr_write (
_ ("""Page layout has been changed, using paper size and margins.
textheight is no longer used.
"""))
str = re.sub (r'\\OrchestralScoreContext', '\\Score', str)
def func(m):
- if m.group(1) not in ['RemoveEmptyStaff',
- 'AncientRemoveEmptyStaffContext',
- 'EasyNotation']:
- return '\\' + m.group (1)
- else:
- return m.group (0)
+ if m.group(1) not in ['RemoveEmptyStaff',
+ 'AncientRemoveEmptyStaffContext',
+ 'EasyNotation']:
+ return '\\' + m.group (1)
+ else:
+ return m.group (0)
str = re.sub (r'\\([a-zA-Z]+)Context\b', func, str)
def conv (str):
str = re.sub (r'\\consistsend', '\\consists', str)
str = re.sub (r'\\lyricsto\s+("?[a-zA-Z]+"?)(\s*\\new Lyrics\s*)?\\lyrics',
- r'\\lyricsto \1 \2', str)
+ r'\\lyricsto \1 \2', str)
return str
str = re.sub (r'\\addlyrics', r'\\oldaddlyrics', str)
str = re.sub (r'\\newlyrics', r'\\addlyrics', str)
if re.search (r"\\override\s*TextSpanner", str):
- stderr_write ("\nWarning: TextSpanner has been split into DynamicTextSpanner and TextSpanner\n")
+ stderr_write ("\nWarning: TextSpanner has been split into DynamicTextSpanner and TextSpanner\n")
return str
@rule ((2, 3, 11), '\\setMmRestFermata -> ^\\fermataMarkup')
def conv (str):
str = re.sub (r'\\setMmRestFermata\s+(R[0-9.*/]*)',
- r'\1^\\fermataMarkup', str)
+ r'\1^\\fermataMarkup', str)
return str
}""", str)
str = re.sub ('soloADue', 'printPartCombineTexts', str)
str = re.sub (r'\\applymusic\s*#notes-to-clusters',
- '\\makeClusters', str)
+ '\\makeClusters', str)
str = re.sub (r'pagenumber\s*=', 'firstpagenumber = ', str)
return str
def conv (str):
str = re.sub (r'(slur|stem|phrasingSlur|tie|dynamic|dots|tuplet|arpeggio|)Both', r'\1Neutral', str)
str = re.sub (r"\\applymusic\s*#\(remove-tag\s*'([a-z-0-9]+)\)",
- r"\\removeWithTag #'\1", str)
+ r"\\removeWithTag #'\1", str)
return str
str = re.sub (r'\\paper', r'\\layout', str)
str = re.sub (r'\\bookpaper', r'\\paper', str)
if re.search ('paper-set-staff-size', str):
- warning (_ ('''staff size should be changed at top-level
+ warning (_ ('''staff size should be changed at top-level
with
#(set-global-staff-size <STAFF-HEIGHT-IN-POINT>)
@rule ((2, 3, 23), r'\context Foo = NOTENAME -> \context Foo = "NOTENAME"')
def conv (str):
str = re.sub (r'\\context\s+([a-zA-Z]+)\s*=\s*([a-z]+)\s',
- r'\\context \1 = "\2" ',
- str )
+ r'\\context \1 = "\2" ',
+ str )
return str
@rule ((2, 3, 24), _ ('''regularize other identifiers'''))
def conv (str):
def sub(m):
- return regularize_id (m.group (1))
+ return regularize_id (m.group (1))
str = re.sub (r'(maintainer_email|maintainer_web|midi_stuff|gourlay_maxmeasures)',
- sub, str)
+ sub, str)
return str
@rule ((2, 5, 0), '\\quote -> \\quoteDuring')
def conv (str):
str = re.sub (r'\\quote\s+"?([a-zA-Z0-9]+)"?\s+([0-9.*/]+)',
- r'\\quoteDuring #"\1" { \skip \2 }',
- str)
+ r'\\quoteDuring #"\1" { \skip \2 }',
+ str)
return str
@rule ((2, 5, 1), 'ly:import-module -> ly:module-copy')
def conv (str):
str = re.sub (r'ly:import-module',
- r'ly:module-copy', str)
+ r'ly:module-copy', str)
return str
@rule ((2, 5, 2), '\markup .. < .. > .. -> \markup .. { .. } ..')
def conv (str):
str = re.sub (r'\\(column|fill-line|dir-column|center-align|right-align|left-align|bracketed-y-column)\s*<(([^>]|<[^>]*>)*)>',
- r'\\\1 {\2}', str)
+ r'\\\1 {\2}', str)
str = re.sub (r'\\(column|fill-line|dir-column|center-align|right-align|left-align|bracketed-y-column)\s*<(([^>]|<[^>]*>)*)>',
- r'\\\1 {\2}', str)
+ r'\\\1 {\2}', str)
str = re.sub (r'\\(column|fill-line|dir-column|center-align|right-align|left-align|bracketed-y-column)\s*<(([^>]|<[^>]*>)*)>',
- r'\\\1 {\2}', str)
+ r'\\\1 {\2}', str)
def get_markup (m):
- s = m.group (0)
- s = re.sub (r'''((\\"|})\s*){''', '\2 \\line {', s)
- return s
+ s = m.group (0)
+ s = re.sub (r'''((\\"|})\s*){''', '\2 \\line {', s)
+ return s
str = re.sub (r'\\markup\s*{([^}]|{[^}]*})*}', get_markup, str)
return str
@rule ((2, 5, 12), '\set Slur #\'dashed = #X -> \slurDashed')
def conv (str):
str = re.sub (r"\\override\s+(Voice\.)?Slur #'dashed\s*=\s*#\d*(\.\d+)?",
- r"\\slurDashed", str)
+ r"\\slurDashed", str)
return str
def conv (str):
input_encoding = 'latin1'
def func (match):
- encoding = match.group (1)
-
- # FIXME: automatic recoding of other than latin1?
- if encoding == 'latin1':
- return match.group (2)
-
- stderr_write ('\n')
- stderr_write (NOT_SMART % ("\\encoding: %s" % encoding))
- stderr_write ('\n')
- stderr_write (_ ("LilyPond source must be UTF-8"))
- stderr_write ('\n')
- if encoding == 'TeX':
- stderr_write (_ ("Try the texstrings backend"))
- stderr_write ('\n')
- else:
- stderr_write ( _("Do something like: %s") % \
- ("recode %s..utf-8 FILE" % encoding))
- stderr_write ('\n')
- stderr_write (_ ("Or save as UTF-8 in your editor"))
- stderr_write ('\n')
- raise FatalConversionError ()
-
- return match.group (0)
+ encoding = match.group (1)
+
+ # FIXME: automatic recoding of other than latin1?
+ if encoding == 'latin1':
+ return match.group (2)
+
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % ("\\encoding: %s" % encoding))
+ stderr_write ('\n')
+ stderr_write (_ ("LilyPond source must be UTF-8"))
+ stderr_write ('\n')
+ if encoding == 'TeX':
+ stderr_write (_ ("Try the texstrings backend"))
+ stderr_write ('\n')
+ else:
+ stderr_write ( _("Do something like: %s") % \
+ ("recode %s..utf-8 FILE" % encoding))
+ stderr_write ('\n')
+ stderr_write (_ ("Or save as UTF-8 in your editor"))
+ stderr_write ('\n')
+ raise FatalConversionError ()
+
+ return match.group (0)
str = re.sub (r'\\encoding\s+"?([a-zA-Z0-9]+)"?(\s+)', func, str)
de_input = codecs.getdecoder (input_encoding)
en_utf_8 = codecs.getencoder ('utf_8')
try:
- de_ascii (str)
+ de_ascii (str)
# only in python >= 2.3
# except UnicodeDecodeError:
except UnicodeError:
- # do not re-recode UTF-8 input
- try:
- de_utf_8 (str)
- #except UnicodeDecodeError:
- except UnicodeError:
- str = en_utf_8 (de_input (str)[0])[0]
+ # do not re-recode UTF-8 input
+ try:
+ de_utf_8 (str)
+ #except UnicodeDecodeError:
+ except UnicodeError:
+ str = en_utf_8 (de_input (str)[0])[0]
@rule ((2, 5, 17), _ ('remove %s') % 'ly:stencil-set-extent!')
def conv (str):
if re.search ("ly:stencil-set-extent!", str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % "ly:stencil-set-extent!")
- stderr_write ('\n')
- stderr_write ('use (set! VAR (ly:make-stencil (ly:stencil-expr VAR) X-EXT Y-EXT))\n')
- raise FatalConversionError ()
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "ly:stencil-set-extent!")
+ stderr_write ('\n')
+ stderr_write ('use (set! VAR (ly:make-stencil (ly:stencil-expr VAR) X-EXT Y-EXT))\n')
+ raise FatalConversionError ()
if re.search ("ly:stencil-align-to!", str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % "ly:stencil-align-to!")
- stderr_write ('\n')
- stderr_write ('use (set! VAR (ly:stencil-aligned-to VAR AXIS DIR))\n')
- raise FatalConversionError ()
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % "ly:stencil-align-to!")
+ stderr_write ('\n')
+ stderr_write ('use (set! VAR (ly:stencil-aligned-to VAR AXIS DIR))\n')
+ raise FatalConversionError ()
return str
def conv (str):
if re.search ("(override-|revert-)auto-beam-setting", str)\
or re.search ("autoBeamSettings", str):
- stderr_write ('\n')
- stderr_write (NOT_SMART % _ ("auto beam settings"))
- stderr_write ('\n')
- stderr_write (_ ('''
+ stderr_write ('\n')
+ stderr_write (NOT_SMART % _ ("auto beam settings"))
+ stderr_write ('\n')
+ stderr_write (_ ('''
Auto beam settings must now specify each interesting moment in a measure
explicitly; 1/4 is no longer multiplied to cover moments 1/2 and 3/4 too.
'''))
- stderr_write (UPDATE_MANUALLY)
- stderr_write ('\n')
- raise FatalConversionError ()
+ stderr_write (UPDATE_MANUALLY)
+ stderr_write ('\n')
+ raise FatalConversionError ()
return str
str = re.sub('ly:parser-define', 'ly:parser-define!', str)
str = re.sub('excentricity', 'eccentricity', str)
str = re.sub(r'\\(consists|remove) *"?Timing_engraver"?',
- r'\\\1 "Timing_translator" \\\1 "Default_bar_line_engraver"',
- str)
+ r'\\\1 "Timing_translator" \\\1 "Default_bar_line_engraver"',
+ str)
return str
str = re.sub('Performer_group_performer', 'Performer_group', str)
str = re.sub('Engraver_group_engraver', 'Engraver_group', str)
str = re.sub (r"#'inside-slur\s*=\s*##t *",
- r"#'avoid-slur = #'inside ", str)
+ r"#'avoid-slur = #'inside ", str)
str = re.sub (r"#'inside-slur\s*=\s*##f *",
- r"#'avoid-slur = #'around ", str)
+ r"#'avoid-slur = #'around ", str)
str = re.sub (r"#'inside-slur",
- r"#'avoid-slur", str)
+ r"#'avoid-slur", str)
return str
@rule ((2, 7, 13), 'layout engine refactoring [FIXME]')
def conv (str):
def subber (match):
- newkey = {'spacing-procedure': 'springs-and-rods',
- 'after-line-breaking-callback' : 'after-line-breaking',
- 'before-line-breaking-callback' : 'before-line-breaking',
- 'print-function' : 'stencil'} [match.group(3)]
- what = match.group (1)
- grob = match.group (2)
-
- if what == 'revert':
- return "revert %s #'callbacks %% %s\n" % (grob, newkey)
- elif what == 'override':
- return "override %s #'callbacks #'%s" % (grob, newkey)
- else:
- raise 'urg'
- return ''
+ newkey = {'spacing-procedure': 'springs-and-rods',
+ 'after-line-breaking-callback' : 'after-line-breaking',
+ 'before-line-breaking-callback' : 'before-line-breaking',
+ 'print-function' : 'stencil'} [match.group(3)]
+ what = match.group (1)
+ grob = match.group (2)
+
+ if what == 'revert':
+ return "revert %s #'callbacks %% %s\n" % (grob, newkey)
+ elif what == 'override':
+ return "override %s #'callbacks #'%s" % (grob, newkey)
+ else:
+ raise 'urg'
+ return ''
str = re.sub(r"(override|revert)\s*([a-zA-Z.]+)\s*#'(spacing-procedure|after-line-breaking-callback"
- + r"|before-line-breaking-callback|print-function)",
- subber, str)
+ + r"|before-line-breaking-callback|print-function)",
+ subber, str)
if re.search ('bar-size-procedure', str):
- stderr_write (NOT_SMART % "bar-size-procedure")
+ stderr_write (NOT_SMART % "bar-size-procedure")
if re.search ('space-function', str):
- stderr_write (NOT_SMART % "space-function")
+ stderr_write (NOT_SMART % "space-function")
if re.search ('verticalAlignmentChildCallback', str):
- stderr_write (_ ('verticalAlignmentChildCallback has been deprecated'))
+ stderr_write (_ ('verticalAlignmentChildCallback has been deprecated'))
return str
@rule ((2, 7, 14), _ ('Remove callbacks property, deprecate XY-extent-callback.'))
def conv (str):
str = re.sub (r"\\override +([A-Z.a-z]+) #'callbacks",
- r"\\override \1", str)
+ r"\\override \1", str)
str = re.sub (r"\\revert ([A-Z.a-z]+) #'callbacks % ([a-zA-Z]+)",
- r"\\revert \1 #'\2", str)
+ r"\\revert \1 #'\2", str)
str = re.sub (r"([XY]-extent)-callback", r'\1', str)
str = re.sub (r"RemoveEmptyVerticalGroup", "VerticalAxisGroup", str)
str = re.sub (r"\\set ([a-zA-Z]*\.?)minimumVerticalExtent",
- r"\\override \1VerticalAxisGroup #'minimum-Y-extent",
- str)
+ r"\\override \1VerticalAxisGroup #'minimum-Y-extent",
+ str)
str = re.sub (r"minimumVerticalExtent",
- r"\\override VerticalAxisGroup #'minimum-Y-extent",
- str)
+ r"\\override VerticalAxisGroup #'minimum-Y-extent",
+ str)
str = re.sub (r"\\set ([a-zA-Z]*\.?)extraVerticalExtent",
- r"\\override \1VerticalAxisGroup #'extra-Y-extent", str)
+ r"\\override \1VerticalAxisGroup #'extra-Y-extent", str)
str = re.sub (r"\\set ([a-zA-Z]*\.?)verticalExtent",
- r"\\override \1VerticalAxisGroup #'Y-extent", str)
+ r"\\override \1VerticalAxisGroup #'Y-extent", str)
return str
@rule ((2, 7, 15), _ ('Use grob closures iso. XY-offset-callbacks.'))
def conv (str):
if re.search ('[XY]-offset-callbacks', str):
- stderr_write (NOT_SMART % "[XY]-offset-callbacks")
+ stderr_write (NOT_SMART % "[XY]-offset-callbacks")
if re.search ('position-callbacks', str):
- stderr_write (NOT_SMART % "position-callbacks")
+ stderr_write (NOT_SMART % "position-callbacks")
return str
@rule ((2, 7, 22), r"\tag #'(a b) -> \tag #'a \tag #'b")
def conv (str):
def sub_syms (m):
- syms = m.group (1).split ()
- tags = ["\\tag #'%s" % s for s in syms]
- return ' '.join (tags)
+ syms = m.group (1).split ()
+ tags = ["\\tag #'%s" % s for s in syms]
+ return ' '.join (tags)
str = re.sub (r"\\tag #'\(([^)]+)\)", sub_syms, str)
return str
@rule ((2, 7, 24), _ ('deprecate %s') % 'number-visibility')
def conv (str):
str = re.sub (r"#'number-visibility",
- "#'number-visibility % number-visibility is deprecated. Tune the TupletNumber instead\n",
- str)
+ "#'number-visibility % number-visibility is deprecated. Tune the TupletNumber instead\n",
+ str)
return str
def conv (str):
for a in ['beamed-lengths', 'beamed-minimum-free-lengths',
'lengths',
- 'beamed-extreme-minimum-free-lengths']:
- str = re.sub (r"\\override\s+Stem\s+#'%s" % a,
- r"\\override Stem #'details #'%s" % a,
- str)
+ 'beamed-extreme-minimum-free-lengths']:
+ str = re.sub (r"\\override\s+Stem\s+#'%s" % a,
+ r"\\override Stem #'details #'%s" % a,
+ str)
return str
@rule ((2, 7, 31), "Foo_bar::bla_bla -> ly:foo-bar::bla-bla")
def conv (str):
def sub_cxx_id (m):
- str = m.group(1)
- return 'ly:' + str.lower ().replace ('_','-')
+ str = m.group(1)
+ return 'ly:' + str.lower ().replace ('_','-')
str = re.sub (r'([A-Z][a-z_0-9]+::[a-z_0-9]+)',
- sub_cxx_id, str)
+ sub_cxx_id, str)
return str
@rule ((2, 7, 32), _ ("foobar -> foo-bar for \paper, \layout"))
def conv (str):
identifier_subs = [
- ('inputencoding', 'input-encoding'),
- ('printpagenumber', 'print-page-number'),
- ('outputscale', 'output-scale'),
- ('betweensystemspace', 'between-system-space'),
- ('betweensystempadding', 'between-system-padding'),
- ('pagetopspace', 'page-top-space'),
- ('raggedlastbottom', 'ragged-last-bottom'),
- ('raggedright', 'ragged-right'),
- ('raggedlast', 'ragged-last'),
- ('raggedbottom', 'ragged-bottom'),
- ('aftertitlespace', 'after-title-space'),
- ('beforetitlespace', 'before-title-space'),
- ('betweentitlespace', 'between-title-space'),
- ('topmargin', 'top-margin'),
- ('bottommargin', 'bottom-margin'),
- ('headsep', 'head-separation'),
- ('footsep', 'foot-separation'),
- ('rightmargin', 'right-margin'),
- ('leftmargin', 'left-margin'),
- ('printfirstpagenumber', 'print-first-page-number'),
- ('firstpagenumber', 'first-page-number'),
- ('hsize', 'paper-width'),
- ('vsize', 'paper-height'),
- ('horizontalshift', 'horizontal-shift'),
- ('staffspace', 'staff-space'),
- ('linethickness', 'line-thickness'),
- ('ledgerlinethickness', 'ledger-line-thickness'),
- ('blotdiameter', 'blot-diameter'),
- ('staffheight', 'staff-height'),
- ('linewidth', 'line-width'),
- ('annotatespacing', 'annotate-spacing')
- ]
+ ('inputencoding', 'input-encoding'),
+ ('printpagenumber', 'print-page-number'),
+ ('outputscale', 'output-scale'),
+ ('betweensystemspace', 'between-system-space'),
+ ('betweensystempadding', 'between-system-padding'),
+ ('pagetopspace', 'page-top-space'),
+ ('raggedlastbottom', 'ragged-last-bottom'),
+ ('raggedright', 'ragged-right'),
+ ('raggedlast', 'ragged-last'),
+ ('raggedbottom', 'ragged-bottom'),
+ ('aftertitlespace', 'after-title-space'),
+ ('beforetitlespace', 'before-title-space'),
+ ('betweentitlespace', 'between-title-space'),
+ ('topmargin', 'top-margin'),
+ ('bottommargin', 'bottom-margin'),
+ ('headsep', 'head-separation'),
+ ('footsep', 'foot-separation'),
+ ('rightmargin', 'right-margin'),
+ ('leftmargin', 'left-margin'),
+ ('printfirstpagenumber', 'print-first-page-number'),
+ ('firstpagenumber', 'first-page-number'),
+ ('hsize', 'paper-width'),
+ ('vsize', 'paper-height'),
+ ('horizontalshift', 'horizontal-shift'),
+ ('staffspace', 'staff-space'),
+ ('linethickness', 'line-thickness'),
+ ('ledgerlinethickness', 'ledger-line-thickness'),
+ ('blotdiameter', 'blot-diameter'),
+ ('staffheight', 'staff-height'),
+ ('linewidth', 'line-width'),
+ ('annotatespacing', 'annotate-spacing')
+ ]
for (a,b) in identifier_subs:
- ### for C++:
- ## str = re.sub ('"%s"' % a, '"%s"' b, str)
+ ### for C++:
+ ## str = re.sub ('"%s"' % a, '"%s"' b, str)
- str = re.sub (a, b, str)
+ str = re.sub (a, b, str)
return str
@rule ((2, 7, 40), "rehearsalMarkAlignSymbol/barNumberAlignSymbol -> break-align-symbol")
def conv (str):
str = re.sub (r'\\set\s+Score\s*\.\s*barNumberAlignSymbol\s*=',
- r"\\override Score.BarNumber #'break-align-symbol = ", str)
+ r"\\override Score.BarNumber #'break-align-symbol = ", str)
str = re.sub (r'\\set\s*Score\s*\.\s*rehearsalMarkAlignSymbol\s*=',
- r"\\override Score.RehearsalMark #'break-align-symbol = ", str)
+ r"\\override Score.RehearsalMark #'break-align-symbol = ", str)
return str
if re.search ('tupletNumberFormatFunction', str):
stderr_write ("\n")
- stderr_write ("tupletNumberFormatFunction has been removed. Use #'text property on TupletNumber")
+ stderr_write ("tupletNumberFormatFunction has been removed. Use #'text property on TupletNumber")
stderr_write ("\n")
return str
str)
if re.search ('edge-text', str):
- stderr_write (NOT_SMART % _ ("edge-text settings for TextSpanner."))
- stderr_write (_ ("Use\n\n%s") %
+ stderr_write (NOT_SMART % _ ("edge-text settings for TextSpanner."))
+ stderr_write (_ ("Use\n\n%s") %
"\t\\override TextSpanner #'bound-details #'right #'text = <right-text>\n"
"\t\\override TextSpanner #'bound-details #'left #'text = <left-text>\n")
return str
r"scripts.caesura.curved", str)
if re.search ('dash-fraction', str):
- stderr_write (NOT_SMART % _ ("all settings related to dashed lines.\n"))
- stderr_write (_ ("Use \\override ... #'style = #'line for solid lines and\n"))
- stderr_write (_ ("\t\\override ... #'style = #'dashed-line for dashed lines."))
+ stderr_write (NOT_SMART % _ ("all settings related to dashed lines.\n"))
+ stderr_write (_ ("Use \\override ... #'style = #'line for solid lines and\n"))
+ stderr_write (_ ("\t\\override ... #'style = #'dashed-line for dashed lines."))
return str
def conv (str):
## warning 1/2: metronomeMarkFormatter uses text markup as second argument
if re.search ('metronomeMarkFormatter', str):
- stderr_write (NOT_SMART % _ ("metronomeMarkFormatter got an additional text argument.\n"))
- stderr_write (_ ("The function assigned to Score.metronomeMarkFunction now uses the signature\n%s") %
+ stderr_write (NOT_SMART % _ ("metronomeMarkFormatter got an additional text argument.\n"))
+ stderr_write (_ ("The function assigned to Score.metronomeMarkFunction now uses the signature\n%s") %
"\t(format-metronome-markup text dur count context)\n")
## warning 2/2: fret diagram properties moved to fret-diagram-details
def conv (str):
str = re.sub (r"#\(set-octavation (-*[0-9]+)\)", r"\\ottava #\1", str)
if re.search ('put-adjacent', str):
- stderr_write (NOT_SMART % _ ("\\put-adjacent argument order.\n"))
- stderr_write (_ ("Axis and direction now come before markups:\n"))
- stderr_write (_ ("\\put-adjacent axis dir markup markup."))
+ stderr_write (NOT_SMART % _ ("\\put-adjacent argument order.\n"))
+ stderr_write (_ ("Axis and direction now come before markups:\n"))
+ stderr_write (_ ("\\put-adjacent axis dir markup markup."))
return str
@rule ((2, 11, 57), "\\center-align -> \\center-column, \\hcenter -> \\center-align")
\"accordion.accEtcbase\" -> \"accordion.etcbass\""))
def conv(str):
def sub_acc (m):
- d = {
+ d = {
'Dot': 'dot',
'Discant': 'discant',
'Bayanbase': 'bayanbass',
'Freebase': 'freebass',
'OldEE': 'oldEE'
}
- return '"accordion.%s"' % d[m.group (1)]
+ return '"accordion.%s"' % d[m.group (1)]
str = re.sub (r'"accordion\.acc([a-zA-Z]+)"',
- sub_acc, str)
+ sub_acc, str)
if re.search(r'overrideBeamSettings', str):
stderr_write("\n")
stderr_write(NOT_SMART % _("\\overrideBeamSettings. Use \\set beamExceptions or \\overrideTimeSignatureSettings.\n"))
str = re.sub (r'\(space\s+\.\s+([0-9]*\.?[0-9]*)\)', r'(basic-distance . \1)', str)
str = re.sub (r"#'space\s+=\s+#?([0-9]*\.?[0-9]*)", r"#'basic-distance = #\1", str)
if re.search (r'HarmonicParenthesesItem', str):
- stderr_write ("\n")
- stderr_write (NOT_SMART % ("HarmonicParenthesesItem.\n"))
- stderr_write (_ ("HarmonicParenthesesItem has been eliminated.\n"))
- stderr_write (_ ("Harmonic parentheses are part of the TabNoteHead grob.\n"))
- stderr_write (UPDATE_MANUALLY);
+ stderr_write ("\n")
+ stderr_write (NOT_SMART % ("HarmonicParenthesesItem.\n"))
+ stderr_write (_ ("HarmonicParenthesesItem has been eliminated.\n"))
+ stderr_write (_ ("Harmonic parentheses are part of the TabNoteHead grob.\n"))
+ stderr_write (UPDATE_MANUALLY);
return str
@rule ((2, 13, 44),
def conv(str):
def semitones2pitch(semitones):
- steps = [0, 0, 1, 1, 2, 3, 3, 4, 4, 5, 5, 6]
- alterations = ["NATURAL", "SHARP", "NATURAL", "SHARP", "NATURAL", "NATURAL", "SHARP", "NATURAL", "SHARP", "NATURAL", "SHARP", "NATURAL"]
- octave = 0
- while semitones > 11:
- octave += 1
- semitones -=12
- while semitones < 0:
- octave -= 1
- semitones += 12
- pitchArgs = "%d %d %s" % (octave, steps[semitones], alterations[semitones])
- return pitchArgs
+ steps = [0, 0, 1, 1, 2, 3, 3, 4, 4, 5, 5, 6]
+ alterations = ["NATURAL", "SHARP", "NATURAL", "SHARP", "NATURAL", "NATURAL", "SHARP", "NATURAL", "SHARP", "NATURAL", "SHARP", "NATURAL"]
+ octave = 0
+ while semitones > 11:
+ octave += 1
+ semitones -=12
+ while semitones < 0:
+ octave -= 1
+ semitones += 12
+ pitchArgs = "%d %d %s" % (octave, steps[semitones], alterations[semitones])
+ return pitchArgs
def convert_tones (semitone_list):
- tones = semitone_list.split ()
- res = ""
- for tone in tones:
- args = semitones2pitch(int(tone))
- res += ",(ly:make-pitch " + args + ") "
- return res
+ tones = semitone_list.split ()
+ res = ""
+ for tone in tones:
+ args = semitones2pitch(int(tone))
+ res += ",(ly:make-pitch " + args + ") "
+ return res
def new_tunings (matchobj):
- return "stringTunings = #`(" + convert_tones(matchobj.group(1)) + ")"
+ return "stringTunings = #`(" + convert_tones(matchobj.group(1)) + ")"
str = re.sub (r"stringTunings\s*=\s*#'\(([\d\s-]*)\)", \
new_tunings , str)
class Xml_node:
def __init__ (self):
- self._children = []
- self._data = None
- self._original = None
- self._name = 'xml_node'
- self._parent = None
+ self._children = []
+ self._data = None
+ self._original = None
+ self._name = 'xml_node'
+ self._parent = None
self._attribute_dict = {}
def get_parent (self):
return self._parent
def is_first (self):
- return self._parent.get_typed_children (self.__class__)[0] == self
+ return self._parent.get_typed_children (self.__class__)[0] == self
def original (self):
- return self._original
+ return self._original
def get_name (self):
- return self._name
+ return self._name
def get_text (self):
- if self._data:
- return self._data
+ if self._data:
+ return self._data
- if not self._children:
- return ''
+ if not self._children:
+ return ''
- return ''.join ([c.get_text () for c in self._children])
+ return ''.join ([c.get_text () for c in self._children])
def message (self, msg):
ly.stderr_write (msg+'\n')
return [c for c in self._children if isinstance(c, klass)]
def get_named_children (self, nm):
- return self.get_typed_children (get_class (nm))
+ return self.get_typed_children (get_class (nm))
def get_named_child (self, nm):
- return self.get_maybe_exist_named_child (nm)
+ return self.get_maybe_exist_named_child (nm)
def get_children (self, predicate):
- return [c for c in self._children if predicate(c)]
+ return [c for c in self._children if predicate(c)]
def get_all_children (self):
- return self._children
+ return self._children
def get_maybe_exist_named_child (self, name):
- return self.get_maybe_exist_typed_child (get_class (name))
+ return self.get_maybe_exist_typed_child (get_class (name))
def get_maybe_exist_typed_child (self, klass):
- cn = self.get_typed_children (klass)
- if len (cn)==0:
- return None
- elif len (cn) == 1:
- return cn[0]
- else:
- raise "More than 1 child", klass
+ cn = self.get_typed_children (klass)
+ if len (cn)==0:
+ return None
+ elif len (cn) == 1:
+ return cn[0]
+ else:
+ raise "More than 1 child", klass
def get_unique_typed_child (self, klass):
- cn = self.get_typed_children(klass)
- if len (cn) <> 1:
- sys.stderr.write (self.__dict__ + '\n')
- raise 'Child is not unique for', (klass, 'found', cn)
+ cn = self.get_typed_children(klass)
+ if len (cn) <> 1:
+ sys.stderr.write (self.__dict__ + '\n')
+ raise 'Child is not unique for', (klass, 'found', cn)
- return cn[0]
+ return cn[0]
def get_named_child_value_number (self, name, default):
n = self.get_maybe_exist_named_child (name)
class Music_xml_node (Xml_node):
def __init__ (self):
- Xml_node.__init__ (self)
- self.duration = Rational (0)
- self.start = Rational (0)
+ Xml_node.__init__ (self)
+ self.duration = Rational (0)
+ self.start = Rational (0)
class Work (Xml_node):
def get_work_information (self, tag):
class Duration (Music_xml_node):
def get_length (self):
- dur = int (self.get_text ()) * Rational (1,4)
- return dur
+ dur = int (self.get_text ()) * Rational (1,4)
+ return dur
class Hash_comment (Music_xml_node):
pass
class Pitch (Music_xml_node):
def get_step (self):
- ch = self.get_unique_typed_child (get_class (u'step'))
- step = ch.get_text ().strip ()
- return step
+ ch = self.get_unique_typed_child (get_class (u'step'))
+ step = ch.get_text ().strip ()
+ return step
def get_octave (self):
- ch = self.get_unique_typed_child (get_class (u'octave'))
- octave = ch.get_text ().strip ()
- return int (octave)
+ ch = self.get_unique_typed_child (get_class (u'octave'))
+ octave = ch.get_text ().strip ()
+ return int (octave)
def get_alteration (self):
- ch = self.get_maybe_exist_typed_child (get_class (u'alter'))
- return interpret_alter_element (ch)
+ ch = self.get_maybe_exist_typed_child (get_class (u'alter'))
+ return interpret_alter_element (ch)
class Unpitched (Music_xml_node):
def get_step (self):
- ch = self.get_unique_typed_child (get_class (u'display-step'))
- step = ch.get_text ().strip ()
- return step
+ ch = self.get_unique_typed_child (get_class (u'display-step'))
+ step = ch.get_text ().strip ()
+ return step
def get_octave (self):
- ch = self.get_unique_typed_child (get_class (u'display-octave'))
+ ch = self.get_unique_typed_child (get_class (u'display-octave'))
- if ch:
- octave = ch.get_text ().strip ()
- return int (octave)
- else:
- return None
+ if ch:
+ octave = ch.get_text ().strip ()
+ return int (octave)
+ else:
+ return None
class Measure_element (Music_xml_node):
def get_voice_id (self):
- voice_id = self.get_maybe_exist_named_child ('voice')
- if voice_id:
- return voice_id.get_text ()
- else:
- return None
+ voice_id = self.get_maybe_exist_named_child ('voice')
+ if voice_id:
+ return voice_id.get_text ()
+ else:
+ return None
def is_first (self):
# Look at all measure elements (previously we had self.__class__, which
# only looked at objects of the same type!
- cn = self._parent.get_typed_children (Measure_element)
+ cn = self._parent.get_typed_children (Measure_element)
# But only look at the correct voice; But include Attributes, too, which
# are not tied to any particular voice
- cn = [c for c in cn if (c.get_voice_id () == self.get_voice_id ()) or isinstance (c, Attributes)]
- return cn[0] == self
+ cn = [c for c in cn if (c.get_voice_id () == self.get_voice_id ()) or isinstance (c, Attributes)]
+ return cn[0] == self
class Attributes (Measure_element):
def __init__ (self):
- Measure_element.__init__ (self)
- self._dict = {}
+ Measure_element.__init__ (self)
+ self._dict = {}
self._original_tag = None
self._time_signature_cache = None
def is_first (self):
- cn = self._parent.get_typed_children (self.__class__)
+ cn = self._parent.get_typed_children (self.__class__)
if self._original_tag:
return cn[0] == self._original_tag
else:
return cn[0] == self
def set_attributes_from_previous (self, dict):
- self._dict.update (dict)
+ self._dict.update (dict)
def read_self (self):
- for c in self.get_all_children ():
- self._dict[c.get_name()] = c
+ for c in self.get_all_children ():
+ self._dict[c.get_name()] = c
def get_named_attribute (self, name):
- return self._dict.get (name)
+ return self._dict.get (name)
def single_time_sig_to_fraction (self, sig):
if len (sig) < 2:
if ch:
log = ch.get_text ().strip()
return musicxml_duration_to_log (log)
- elif self.get_maybe_exist_named_child (u'grace'):
- # FIXME: is it ok to default to eight note for grace notes?
- return 3
+ elif self.get_maybe_exist_named_child (u'grace'):
+ # FIXME: is it ok to default to eight note for grace notes?
+ return 3
else:
return None
def is_implicit (self):
return hasattr (self, 'implicit') and self.implicit == 'yes'
def get_notes (self):
- return self.get_typed_children (get_class (u'note'))
+ return self.get_typed_children (get_class (u'note'))
class Syllabic (Music_xml_node):
def continued (self):
class Musicxml_voice:
def __init__ (self):
- self._elements = []
- self._staves = {}
- self._start_staff = None
+ self._elements = []
+ self._staves = {}
+ self._start_staff = None
self._lyrics = []
self._has_lyrics = False
def add_element (self, e):
- self._elements.append (e)
- if (isinstance (e, Note)
- and e.get_maybe_exist_typed_child (Staff)):
- name = e.get_maybe_exist_typed_child (Staff).get_text ()
+ self._elements.append (e)
+ if (isinstance (e, Note)
+ and e.get_maybe_exist_typed_child (Staff)):
+ name = e.get_maybe_exist_typed_child (Staff).get_text ()
- if not self._start_staff and not e.get_maybe_exist_typed_child (Grace):
- self._start_staff = name
- self._staves[name] = True
+ if not self._start_staff and not e.get_maybe_exist_typed_child (Grace):
+ self._start_staff = name
+ self._staves[name] = True
lyrics = e.get_typed_children (Lyric)
if not self._has_lyrics:
self._lyrics.append (nr)
def insert (self, idx, e):
- self._elements.insert (idx, e)
+ self._elements.insert (idx, e)
def get_lyrics_numbers (self):
if (len (self._lyrics) == 0) and self._has_lyrics:
class Part (Music_xml_node):
def __init__ (self):
Music_xml_node.__init__ (self)
- self._voices = {}
+ self._voices = {}
self._staff_attributes_dict = {}
def get_part_list (self):
return n.get_named_child ('part-list')
def interpret (self):
- """Set durations and starting points."""
+ """Set durations and starting points."""
"""The starting point of the very first note is 0!"""
part_list = self.get_part_list ()
- now = Rational (0)
- factor = Rational (1)
- attributes_dict = {}
+ now = Rational (0)
+ factor = Rational (1)
+ attributes_dict = {}
attributes_object = None
- measures = self.get_typed_children (Measure)
+ measures = self.get_typed_children (Measure)
last_moment = Rational (-1)
last_measure_position = Rational (-1)
measure_position = Rational (0)
# Graces at the end of a measure need to have their position set to the
# previous number!
pending_graces = []
- for m in measures:
+ for m in measures:
# implicit measures are used for artificial measures, e.g. when
# a repeat bar line splits a bar into two halves. In this case,
# don't reset the measure position to 0. They are also used for
if isinstance (n, Hash_text):
continue
- dur = Rational (0)
+ dur = Rational (0)
if n.__class__ == Attributes:
- n.set_attributes_from_previous (attributes_dict)
- n.read_self ()
- attributes_dict = n._dict.copy ()
+ n.set_attributes_from_previous (attributes_dict)
+ n.read_self ()
+ attributes_dict = n._dict.copy ()
attributes_object = n
- factor = Rational (1,
- int (attributes_dict.get ('divisions').get_text ()))
+ factor = Rational (1,
+ int (attributes_dict.get ('divisions').get_text ()))
- if (n.get_maybe_exist_typed_child (Duration)):
- mxl_dur = n.get_maybe_exist_typed_child (Duration)
- dur = mxl_dur.get_length () * factor
+ if (n.get_maybe_exist_typed_child (Duration)):
+ mxl_dur = n.get_maybe_exist_typed_child (Duration)
+ dur = mxl_dur.get_length () * factor
- if n.get_name() == 'backup':
- dur = - dur
+ if n.get_name() == 'backup':
+ dur = - dur
# reset all graces before the backup to after-graces:
graces_to_aftergraces (pending_graces)
pending_graces = []
- if n.get_maybe_exist_typed_child (Grace):
- dur = Rational (0)
+ if n.get_maybe_exist_typed_child (Grace):
+ dur = Rational (0)
rest = n.get_maybe_exist_typed_child (Rest)
- if (rest
+ if (rest
and attributes_object
and attributes_object.get_measure_length () == dur):
return attributes
def extract_voices (part):
- voices = {}
- measures = part.get_typed_children (Measure)
- elements = []
- for m in measures:
+ voices = {}
+ measures = part.get_typed_children (Measure)
+ elements = []
+ for m in measures:
if m.partial > 0:
elements.append (Partial (m.partial))
- elements.extend (m.get_all_children ())
+ elements.extend (m.get_all_children ())
# make sure we know all voices already so that dynamics, clefs, etc.
# can be assigned to the correct voices
voice_to_staff_dict = {}
staff_to_voice_dict[s].append (v)
- start_attr = None
+ start_attr = None
assign_to_next_note = []
id = None
- for n in elements:
- voice_id = n.get_maybe_exist_typed_child (get_class ('voice'))
+ for n in elements:
+ voice_id = n.get_maybe_exist_typed_child (get_class ('voice'))
if voice_id:
id = voice_id.get_text ()
else:
# We don't need backup/forward any more, since we have already
# assigned the correct onset times.
# TODO: Let Grouping through. Also: link, print, bokmark sound
- if not (isinstance (n, Note) or isinstance (n, Attributes) or
+ if not (isinstance (n, Note) or isinstance (n, Attributes) or
isinstance (n, Direction) or isinstance (n, Partial) or
isinstance (n, Barline) or isinstance (n, Harmony) or
isinstance (n, FiguredBass) or isinstance (n, Print)):
- continue
+ continue
- if isinstance (n, Attributes) and not start_attr:
- start_attr = n
- continue
+ if isinstance (n, Attributes) and not start_attr:
+ start_attr = n
+ continue
if isinstance (n, Attributes):
# assign these only to the voices they really belongs to!
voices[id].add_element (i)
assign_to_next_note = []
- if start_attr:
+ if start_attr:
for (s, vids) in staff_to_voice_dict.items ():
staff_attributes = part.extract_attributes_for_staff (start_attr, s)
staff_attributes.read_self ()
part._voices = voices
def get_voices (self):
- return self._voices
+ return self._voices
def get_staff_attributes (self):
return self._staff_attributes_dict
class Notations (Music_xml_node):
def get_tie (self):
- ts = self.get_named_children ('tied')
- starts = [t for t in ts if t.type == 'start']
- if starts:
- return starts[0]
- else:
- return None
+ ts = self.get_named_children ('tied')
+ starts = [t for t in ts if t.type == 'start']
+ if starts:
+ return starts[0]
+ else:
+ return None
def get_tuplets (self):
- return self.get_typed_children (Tuplet)
+ return self.get_typed_children (Tuplet)
class Time_modification(Music_xml_node):
def get_fraction (self):
- b = self.get_maybe_exist_named_child ('actual-notes')
- a = self.get_maybe_exist_named_child ('normal-notes')
- return (int(a.get_text ()), int (b.get_text ()))
+ b = self.get_maybe_exist_named_child ('actual-notes')
+ a = self.get_maybe_exist_named_child ('normal-notes')
+ return (int(a.get_text ()), int (b.get_text ()))
def get_normal_type (self):
tuplet_type = self.get_maybe_exist_named_child ('normal-type')
class Accidental (Music_xml_node):
def __init__ (self):
- Music_xml_node.__init__ (self)
- self.editorial = False
- self.cautionary = False
+ Music_xml_node.__init__ (self)
+ self.editorial = False
+ self.cautionary = False
class Music_xml_spanner (Music_xml_node):
def get_type (self):
class Slur (Music_xml_spanner):
def get_type (self):
- return self.type
+ return self.type
class Beam (Music_xml_spanner):
def get_type (self):
- return self.get_text ()
+ return self.get_text ()
def is_primary (self):
if hasattr (self, 'number'):
return self.number == "1"
## for every input file. Only add those classes, that are either directly
## used by class name or extend Music_xml_node in some way!
class_dict = {
- '#comment': Hash_comment,
+ '#comment': Hash_comment,
'#text': Hash_text,
- 'accidental': Accidental,
- 'attributes': Attributes,
+ 'accidental': Accidental,
+ 'attributes': Attributes,
'barline': Barline,
'bar-style': BarStyle,
'bass': Bass,
- 'beam' : Beam,
+ 'beam' : Beam,
'beats': Beats,
'beat-type': BeatType,
'beat-unit': BeatUnit,
'beat-unit-dot': BeatUnitDot,
'bend' : Bend,
'bracket' : Bracket,
- 'chord': Chord,
+ 'chord': Chord,
'dashes' : Dashes,
'degree' : ChordModification,
- 'dot': Dot,
- 'direction': Direction,
+ 'dot': Dot,
+ 'direction': Direction,
'direction-type': DirType,
- 'duration': Duration,
+ 'duration': Duration,
'elision': Elision,
'extend': Extend,
'frame': Frame,
'frame-note': Frame_Note,
'figured-bass': FiguredBass,
'glissando': Glissando,
- 'grace': Grace,
+ 'grace': Grace,
'harmony': Harmony,
'identification': Identification,
'key-alter': KeyAlter,
'key-octave': KeyOctave,
'key-step': KeyStep,
'lyric': Lyric,
- 'measure': Measure,
- 'notations': Notations,
- 'note': Note,
+ 'measure': Measure,
+ 'notations': Notations,
+ 'note': Note,
'octave-shift': Octave_shift,
- 'part': Part,
+ 'part': Part,
'part-group': Part_group,
- 'part-list': Part_list,
+ 'part-list': Part_list,
'pedal': Pedal,
'per-minute': PerMinute,
- 'pitch': Pitch,
+ 'pitch': Pitch,
'print': Print,
- 'rest': Rest,
+ 'rest': Rest,
'root': Root,
'score-part': Score_part,
'slide': Slide,
- 'slur': Slur,
- 'staff': Staff,
+ 'slur': Slur,
+ 'staff': Staff,
'syllabic': Syllabic,
'text': Text,
- 'time-modification': Time_modification,
+ 'time-modification': Time_modification,
'tuplet': Tuplet,
- 'type': Type,
- 'unpitched': Unpitched,
+ 'type': Type,
+ 'unpitched': Unpitched,
'wavy-line': Wavy_line,
'wedge': Wedge,
'words': Words,
if classname:
return classname
else:
- class_name = name2class_name (name)
- klass = new.classobj (class_name, (Music_xml_node,) , {})
- class_dict[name] = klass
+ class_name = name2class_name (name)
+ klass = new.classobj (class_name, (Music_xml_node,) , {})
+ class_dict[name] = klass
return klass
def lxml_demarshal_node (node):
py_node._children = filter (lambda x: x, py_node._children)
for c in py_node._children:
- c._parent = py_node
+ c._parent = py_node
for (k, v) in node.items ():
py_node.__dict__[k] = v
py_node._name = name
py_node._children = [minidom_demarshal_node (cn) for cn in node.childNodes]
for c in py_node._children:
- c._parent = py_node
+ c._parent = py_node
if node.attributes:
- for (nm, value) in node.attributes.items ():
- py_node.__dict__[nm] = value
+ for (nm, value) in node.attributes.items ():
+ py_node.__dict__[nm] = value
py_node._attribute_dict[nm] = value
py_node._data = None
if node.nodeType == node.TEXT_NODE and node.data:
- py_node._data = node.data
+ py_node._data = node.data
py_node._original = node
return py_node
projects / lilypond.git / commitdiff