X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fconvert-ly.py;h=b683a293f33bfffdd4c98816fff3525620332825;hb=c6d314f038629a7054e72b6212bd5b8b7bba2d2c;hp=965d6d6978de39bbf9e8d75bbbab1ca4208132b2;hpb=51159f8679de00e6cd526ca2a16e1ea4d4294f81;p=lilypond.git

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 965d6d6978..b683a293f3 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -15,9 +15,6 @@
 # 0.2
 #  - rewrite in python
 
-program_name = 'convert-ly'
-version = '@TOPLEVEL_VERSION@'
-
 import os
 import sys
 import __main__
@@ -26,9 +23,13 @@ import  string
 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
 
@@ -2115,6 +2116,85 @@ def conv (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	
 ################################