Merge master into nested-bookparts

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index fd483a8e2ca41f2f80ebeccdd6f0eca7aa5ff21f..e94bf30e7625c5c5d6cd0863d46607805d9b13e0 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2622,7 +2622,7 @@ def conv (str):
                   r"\override \2Beam #'breakable", str)
     str = re.sub (r'(\\set\s+)?allowBeamBreak',
                   r"\override Beam #'breakable", str)
-    str = re.sub (r'addquote' , 'addQuote', str)
+    str = re.sub (r'addquote', 'addQuote', str)
     if re.search ("Span_dynamic_performer", str):
         stderr_write ("Span_dynamic_performer has been merged into Dynamic_performer")
 
@@ -2727,16 +2727,16 @@ def conv (str):
     return str
 
 
-@rule ((2, 11, 50), "metronomeMarkFormatter uses text markup as second argument")
+@rule ((2, 11, 50), _ ("metronomeMarkFormatter uses text markup as second argument,\n\
+fret diagram properties moved to fret-diagram-details."))
 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") %
                           "\t(format-metronome-markup text dur count context)\n")
-    return str
 
-@rule ((2,11,50), "Fret diagram properties moved to fret-diagram-details")
-def conv (str):
+    ## warning 2/2: fret diagram properties moved to fret-diagram-details
     fret_props = ['barre-type', 
                 'dot-color', 
                 'dot-radius',
@@ -2750,16 +2750,88 @@ def conv (str):
                 'open-string',
                 'orientation']
     for prop in fret_props:
-      if re.search ( prop, str):
-          stderr_write ('\n')
+      if re.search (prop, str):
           stderr_write (NOT_SMART %
             prop + " in fret-diagram properties. Use fret-diagram-details.")
           stderr_write ('\n')
     return str
 
-@rule ((2, 11, 48), "\\octave -> \\octaveCheck")
+@rule ((2, 11, 51), "\\octave -> \\octaveCheck, \\arpeggioUp -> \\arpeggioArrowUp,\n\
+\\arpeggioDown -> \\arpeggioArrowDown, \\arpeggioNeutral -> \\arpeggioNormal,\n\
+\\setTextCresc -> \\crescTextCresc, \\setTextDecresc -> \\dimTextDecresc,\n\
+\\setTextDecr -> \\dimTextDecr, \\setTextDim -> \\dimTextDim,\n\
+\\setHairpinCresc -> \\crescHairpin, \\setHairpinDecresc -> \\dimHairpin,\n\
+\\sustainUp -> \\sustainOff, \\sustainDown -> \\sustainOn\n\
+\\sostenutoDown -> \\sostenutoOn, \\sostenutoUp -> \\sostenutoOff")
 def conv (str):
     str = re.sub (r"\\octave", r"\\octaveCheck", str)
+    str = re.sub (r"arpeggioUp", r"arpeggioArrowUp", str)
+    str = re.sub (r"arpeggioDown", r"arpeggioArrowDown", str)
+    str = re.sub (r"arpeggioNeutral", r"arpeggioNormal", str)
+    str = re.sub (r"setTextCresc", r"crescTextCresc", str)
+    str = re.sub (r"setTextDecresc", r"dimTextDecresc", str)
+    str = re.sub (r"setTextDecr", r"dimTextDecr", str)
+    str = re.sub (r"setTextDim", r"dimTextDim", str)
+    str = re.sub (r"setHairpinCresc", r"crescHairpin", str)
+    str = re.sub (r"setHairpinDecresc", r"dimHairpin", str)
+    str = re.sub (r"sustainUp", r"sustainOff", str)
+    str = re.sub (r"sustainDown", r"sustainOn", str)
+    str = re.sub (r"sostenutoDown", r"sostenutoOn", str)
+    str = re.sub (r"sostenutoUp", r"sostenutoOff", str)
+    return str
+
+@rule ((2, 11, 52), "\\setHairpinDim -> \\dimHairpin")
+def conv (str):
+    str = str.replace ("setHairpinDim", "dimHairpin")
+    return str
+
+@rule ((2, 11, 53), "infinite-spacing-height -> extra-spacing-height")
+def conv (str):
+    str = re.sub (r"infinite-spacing-height\s+=\s+##t", r"extra-spacing-height = #'(-inf.0 . +inf.0)", str)
+    str = re.sub (r"infinite-spacing-height\s+=\s+##f", r"extra-spacing-height = #'(0 . 0)", str)
+    return str
+
+@rule ((2, 11, 55), "#(set-octavation oct) -> \\ottava #oct,\n\
+\\put-adjacent markup axis dir markup -> \\put-adjacent axis dir markup markup")
+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."))
     return str
 
+@rule ((2, 11, 57), "\\center-align -> \\center-column, \\hcenter -> \\center-align")
+def conv (str):
+    str = re.sub (r"([\\:]+)center-align", r"\1center-column", str)
+    str = re.sub (r"hcenter(\s+)", r"center-align\1", str)
+    return str
+
+@rule ((2, 11, 60), "printallheaders -> print-all-headers")
+def conv (str):
+    str = re.sub (r"printallheaders", r"print-all-headers", str)
+    return str
+
+@rule ((2, 11, 61), "gregorian-init.ly -> gregorian.ly")
+def conv (str):
+    str = re.sub (r'\\include(\s+)"gregorian-init.ly"', r'\\include\1"gregorian.ly"', str)
+    return str
+
+@rule ((2, 11, 62), "makam-init.ly -> makam.ly, \\bigger -> \\larger")
+def conv (str):
+    str = re.sub (r'\\include(\s+)"makam-init.ly"', r'\\include\1"makam.ly"', str)
+    str = re.sub (r"\\bigger", r"\\larger", str)
+    return str
 
+# Guidelines to write rules (please keep this at the end of this file)
+#
+# - keep at most one rule per version; if several conversions should be done,
+# concatenate them into a single "conv" function;
+#
+# - enclose strings to be localized with `_(' and  `)';
+#
+# - write rule for bumping major stable version with
+#
+#     _ ("bump version for release")
+#  
+# as exact description.