# 0.2
# - rewrite in python
-program_name = 'convert-ly'
-version = '@TOPLEVEL_VERSION@'
-
import os
import sys
import __main__
import re
import time
+program_name = sys.argv[0]
+
+version = '@TOPLEVEL_VERSION@'
+
# Did we ever have \mudela-version? I doubt it.
# lilypond_version_re_str = '\\\\version *\"(.*)\"'
-lilypond_version_re_str = '\\\\(mudela-)?version *\"(.*)\"'
+lilypond_version_re_str = '\\\\(mudela-)?version *\"([^"]+)\"'
lilypond_version_re = re.compile (lilypond_version_re_str)
add_version = 1
return str
conversions.append ((
- ((0,1,20), conv, 'deprecated \\textstyle, new \key syntax')))
+ ((0,1,20), conv, 'deprecated \\textstyle, new \\key syntax')))
if 1:
return str
conversions.append (((1,3,4), conv,
- '\\cadenza -> \cadenza{On|Off}'))
+ '\\cadenza -> \\cadenza{On|Off}'))
if 1:
def conv (str):
str = re.sub (r'@ACCENT@', '>', str)
return str
+ def text_markup (str):
+ str = re.sub (r"""([-_^]) *# *' *\( *music *(\"[^"]*\") *\)""",
+ r"\1\\markup { \\musicglyph #\2 }", str)
+ str = re.sub (r"""([-_^]) *# *' *\( *([a-z]+) *([^()]*)\)""",
+ r"\1\\markup { \\\2 \3 }", str)
+ str = re.sub (r"""\\mark *# *' *\( *music *(\"[^"]*\") *\)""",
+ r"\\mark \\markup { \\musicglyph #\1 }", str)
+ str = re.sub (r"""\\mark *# *' *\( *([a-z]+) *([^()]*)\)""",
+ r"\\mark \\markup { \\\1 \2 }", str)
+ return str
+
def articulation_substitute (str):
str = re.sub (r"""([^-])\[ *([a-z]+[,']*[!?]?[0-9:]*\.*)""",
r"\1 \2[", str)
return str
def conv (str):
+ str = re.sub (r"#'\(\)", "@SCM_EOL@", str)
str = conv_relative (str)
str = sub_chords (str)
+ str = text_markup (str)
str = articulation_substitute (str)
+ str = re.sub ("@SCM_EOL@", "#'()", str)
return str
conversions.append (((1,9,0), conv, """New relative mode,
-Postfix articulations, new chord syntax."""))
+Postfix articulations, new text markup syntax, new chord syntax."""))
if 1:
def conv (str):
def func(match):
return "#'font-size = #%d" % (2*string.atoi (match.group (1)))
- str =re.sub (r"#'font-relative-size\s*=\s*#([0-9-]+)", func, str)
+ 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)
return s
str = re.sub (r'\\(translator|with)\s*{[^}]+}', subst_in_trans, str)
- str = re.sub (r"""\\override\s*autoBeamSettings\s*#([^=]+)\s*=\s*#\(ly:make-moment\s+(\d+)\s+(\d)\s*\)""",
- r"""#(override-auto-beam-setting \1 \2 \3)""",
- str)
+ def sub_abs (m):
+
+ context = m.group ('context')
+ d = m.groupdict ()
+ if context:
+ context = " '%s" % context[:-1] # -1: remove .
+ else:
+ context = ''
+
+ d['context'] = context
+
+ 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)
return str
conversions.append (((2,1,23), conv, """Property setting syntax in \\translator{ }"""))
def conv (str):
str = re.sub (r'music-list\?', 'ly:music-list?', str)
+ str = re.sub (r'\|\s*~', '~ |', str)
return str
conversions.append (((2,1,24), conv, """music-list? -> ly:music-list?"""))
str = re.sub (r'\\modernCautionaries', "#(set-accidental-style 'modern-cautionary)", str)
str = re.sub (r'\\modernVoiceAccidental', "#(set-accidental-style 'modern-voice)", str)
str = re.sub (r'\\modernVoiceCautionaries', "#(set-accidental-style 'modern-voice-cautionary)", str)
- str = re.sub (r'\\pianoAccidentals', "#(set-accidental-style 'piano)' , str)", str)
+ str = re.sub (r'\\pianoAccidentals', "#(set-accidental-style 'piano)", str)
str = re.sub (r'\\pianoCautionaries', "#(set-accidental-style 'piano-cautionary)", str)
str = re.sub (r'\\forgetAccidentals', "#(set-accidental-style 'forget)", str)
str = re.sub (r'\\noResetKey', "#(set-accidental-style 'no-reset)", str)
conversions.append (((2,1,25), conv, """Scheme grob function renaming"""))
+def conv (str):
+ str = re.sub ('ly:set-grob-property!', 'ly:grob-set-property!',str)
+ str = re.sub ('ly:set-mus-property!', 'ly:music-set-property!',str)
+ str = re.sub ('ly:set-context-property!', 'ly:context-set-property!', str)
+ str = re.sub ('ly:get-grob-property', 'ly:grob-property',str)
+ str = re.sub ('ly:get-mus-property', 'ly:music-property',str)
+ str = re.sub ('ly:get-context-property', 'ly:context-property',str)
+
+ return str
+
+conversions.append (((2,1,26), conv, """More Scheme function renaming"""))
+
+def conv (str):
+ def subst (m):
+ g = string.atoi (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]
+
+
+ print s , lower_pitches, g, a, s
+ 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
+
+
+ str = re.sub (r"\\set ([A-Za-z]+\s*\.\s*)?transposing\s*=\s*#([-0-9]+)",
+ subst, str)
+ return str
+
+conversions.append (((2,1,27), conv, """property transposing -> tuning"""))
+
+def conv (str):
+ str = re.sub (r'make-music-by-name', 'make-music', str)
+ str = re.sub (r"\\override\s+.*Arpeggio\s+#.print-function\s+=\s+\\arpeggioBracket", r"\\arpeggioBracket", str)
+ return str
+
+conversions.append (((2,1,28), conv,
+ """make-music-by-name -> make-music,
+new syntax for setting \\arpeggioBracket"""))
+
+def conv (str):
+ str = re.sub (r'\\center([^-])', '\\center-align\\1', str)
+ str = re.sub (r'\\translator', '\\context', str)
+ return str
+
+conversions.append (((2,1,29), conv,
+ '\\center -> \\center-align, \\translator -> \\context'))
+
+
+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)
+ str = re.sub (r'ly:translator-find',
+ 'ly:context-find', str)
+ str = re.sub ('ly:unset-context-property','ly:context-unset-property',
+ str)
+
+ str = re.sub (r'ly:get-mutable-properties',
+ 'ly:mutable-music-properties',str)
+ str = re.sub (r'centralCPosition',
+ 'middleCPosition',str)
+ return str
+
+conversions.append (((2,1,30), conv,
+ '''\\threeq{flat,sharp} -> \\sesqui{flat,sharp}
+ly:get-mutable-properties -> ly:mutable-music-properties
+centralCPosition -> middleCPosition
+ly:unset-context-property -> ly:context-unset-property
+ly:translator-find -> ly:context-find
+ly:get-stencil-extent -> ly:stencil-extent
+'''))
+
+
+def conv (str):
+ str = re.sub (r'\\alias\s*"?Timing"?', '', str)
+ return str
+
+conversions.append (((2,1,31), conv,
+ '''remove \\alias Timing'''))
+
+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)
+
+ return str
+
+conversions.append (((2,1,33), conv,
+ '''breakAlignOrder -> break-align-orders.'''))
+
+def conv (str):
+ str = re.sub (r"\(set-paper-size",
+ "(set-default-paper-size",str)
+ return str
+
+conversions.append (((2,1,34), conv,
+ '''set-paper-size -> set-default-paper-size.'''))
+
+def conv (str):
+ str = re.sub (r"ly:mutable-music-properties",
+ "ly:music-mutable-properties", str)
+ return str
+
+conversions.append (((2,1, 36), conv,
+ '''ly:mutable-music-properties -> ly:music-mutable-properties'''))
+
+
+
+def conv (str):
+ return str
+
+conversions.append (((2,2, 0), conv,
+ '''clean up version. '''))
+
+def conv (str):
+ return re.sub (r'\\apply\b', r'\\applymusic', str)
+
+conversions.append (((2, 3, 1), conv,
+ '''\\apply -> \\applymusic'''))
+
+def conv (str):
+ 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)
+
+
+ str = re.sub (r'\\([a-zA-Z]+)Context\b', func, str)
+
+ str = re.sub ('ly:paper-lookup', 'ly:output-def-lookup', str)
+ return str
+
+conversions.append (((2, 3, 2), conv,
+ '''\\FooContext -> \\Foo'''))
+
+def conv (str):
+ str = re.sub (r'\\notes\b', '', str)
+
+ return str
+
+conversions.append (((2, 3, 4), conv,
+ '''remove \\notes'''))
+
+
+
+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)
+ return str
+
+conversions.append (((2, 3, 8), conv,
+ '''remove \\consistsend, strip \\lyrics from \\lyricsto.'''))
+
+def conv (str):
+ str = re.sub (r'neo_mensural', 'neomensural', str)
+ str = re.sub (r'if-text-padding', 'bound-padding', str)
+ return str
+
+conversions.append (((2, 3, 9), conv,
+ '''neo_mensural -> neomensural, if-text-padding -> bound-padding'''))
+
+
+
+def conv (str):
+ str = re.sub (r'\\addlyrics', r'\\oldaddlyrics', str)
+ str = re.sub (r'\\newlyrics', r'\\addlyrics', str)
+ return str
+
+conversions.append (((2, 3, 10), conv,
+ '''\\addlyrics -> \\oldaddlyrics, \\newlyrics -> \\addlyrics'''))
+
+def conv (str):
+ str = re.sub (r'\\setMmRestFermata\s+(R[0-9.*/]*)',
+ r'\1^\\fermataMarkup', str)
+ return str
+
+conversions.append (((2, 3, 11), conv,
+ '''\\setMmRestFermata -> ^\\fermataMarkup'''))
+
+def conv (str):
+ str = re.sub (r'\\newpage', r'\\pageBreak', str)
+ str = re.sub (r'\\scriptUp', r"""{
+ \\override TextScript #'direction = #1
+ \\override Script #'direction = #1
+}""", str)
+ str = re.sub (r'\\scriptDown', r"""{
+ \\override TextScript #'direction = #-1
+ \\override Script #'direction = #-1
+}""", str)
+ str = re.sub (r'\\scriptBoth', r"""{
+ \\revert TextScript #'direction
+ \\override Script #'direction
+}""", str)
+ str = re.sub ('soloADue', 'printPartCombineTexts', str)
+ str = re.sub (r'\\applymusic\s*#notes-to-clusters',
+ '\\makeClusters', str)
+ return str
+
+conversions.append (((2, 3, 12), conv,
+ '''\\newpage -> \\pageBreak, junk \\script{up,down,both},
+soloADue -> printPartCombineTexts, #notes-to-clusters -> \\makeClusters
+'''))
+
+
+def conv_mode_experiment (str):
+ str = re.sub (r'\\chords\b', r'\\chordmode', str)
+ str = re.sub (r'\\lyrics\b', r'\\lyricmode', str)
+ str = re.sub (r'\\figures\b', r'\\figuremode', str)
+ str = re.sub (r'\\drums\b', r'\\drummode', str)
+ str = re.sub (r'\\chordmode\s*\\new ChordNames', r'\\chords', str)
+ str = re.sub (r'\\new ChordNames\s*\\chordmode', r'\\chords', str)
+ str = re.sub (r'\\new FiguredBass\s*\\figuremode', r'\\figures', str)
+ str = re.sub (r'\\figuremode\s*\new FiguredBass', r'\\figures', str)
+ str = re.sub (r'\\new DrumStaff\s*\\drummode', r'\\drums', str)
+ str = re.sub (r'\\drummode\s*\\new DrumStaff', r'\\drums', str)
+
+ return str
+
+#conversions.append (((2, 3, 9), conv,
+# '''fold \new FooContext \foomode into \foo.'''))
+
################################
# END OF CONVERSIONS
################################
projects / lilypond.git / blobdiff