X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fconvert-ly.py;h=7ef3e908cb077141c54077475fefb9da750cef18;hb=160d482c6a0d59f27c8ccb1c99660a2ade551b29;hp=91fd16942c2594891f9c946ee9669b7770e65af9;hpb=b9fc4bb5b3ce7d75e7e5284352eeaa04bbe78e14;p=lilypond.git

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 91fd16942c..7ef3e908cb 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1265,11 +1265,11 @@ if 1:
 			return origstr
 
 		durs = []
-		def sub_durs (m):
+		def sub_durs (m, durs = durs):
 			durs.append(m.group(2))
 			return m.group (1)
 
-		str = re.sub ("([a-z]+[,'!? ]*)([0-9.]+)", sub_durs, str)
+		str = re.sub (r"([a-z]+[,'!? ]*)([0-9]+\.*)", sub_durs, str)
 		dur_str = ''
 
 		for d in durs:
@@ -1285,7 +1285,8 @@ if 1:
 		last_str = ''
 		while last_str <> str:
 			last_str = str
-			def sub_tremolos (m):
+
+			def sub_tremolos (m, slur_strs = slur_strs):
 				tr = m.group (2)
 				if tr not in slur_strs:
 					slur_strs.append (tr)
@@ -1294,31 +1295,31 @@ if 1:
   			str = re.sub (r"([a-z]+[',!? ]*)(:[0-9]+)",
 				      sub_tremolos, str)
 
-			def sub_dyn_end (m):
+			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):
+			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):
+			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):
+			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):
+			def sub_begin_p_slurs(m, slur_strs = slur_strs):
 				if '-\(' not in slur_strs:
 					slur_strs.append ('\(')
 				return m.group(1)
@@ -1326,7 +1327,7 @@ if 1:
 			str = re.sub (r"([a-z]+[,'!?0-9 ]*)\\\(",
 				sub_begin_p_slurs, str)
 
-			def sub_dyns (m):
+			def sub_dyns (m, slur_strs = slur_strs):
 				s = m.group(0)
 				if s == '@STARTCRESC@':
 					slur_strs.append ("\\<")
@@ -1339,7 +1340,7 @@ if 1:
 			str = re.sub (r'@STARTCRESC@', sub_dyns, str)
 			str = re.sub (r'-?\\!', sub_dyns, str)
 
-			def sub_articulations (m):
+			def sub_articulations (m, slur_strs = slur_strs):
 				a = m.group(1)
 				if a not in slur_strs:
 					slur_strs.append (a)
@@ -1351,8 +1352,10 @@ if 1:
 				      str)
 			str = re.sub (r"([_^-][>_.+|^-])", sub_articulations,
 				      str)
+			str = re.sub (r'([_^-]"[^"]+")', sub_articulations,
+				      str)
 
-			def sub_pslurs(m):
+			def sub_pslurs(m, slur_strs = slur_strs):
 				slur_strs.append (' \\)')
 				return m.group(1)
 			str = re.sub (r"\\\)[ ]*([a-z]+)", sub_pslurs, str)
@@ -1406,7 +1409,9 @@ if 1:
 	def articulation_substitute (str):
 		str = re.sub (r"""([^-])\[ *([a-z]+[,']*[!?]?[0-9:]*\.*)""",
 			      r"\1 \2[", str)
-		str = re.sub (r"""([^-])\) *([a-z]+[,']*[!?]?[0-9:]*\.*)""",
+		str = re.sub (r"""([^-])\\\) *([a-z]+[,']*[!?]?[0-9:]*\.*)""",
+			      r"\1 \2\\)", str)
+		str = re.sub (r"""([^-\\])\) *([a-z]+[,']*[!?]?[0-9:]*\.*)""",
 			      r"\1 \2)", str)
 		str = re.sub (r"""([^-])\\! *([a-z]+[,']*[!?]?[0-9:]*\.*)""",
 			      r"\1 \2\\!", str)
@@ -1652,6 +1657,70 @@ def conv (str):
 
 conversions.append (((2,1,7), conv, """\\translator Staff -> \\change Staff"""))
 
+def conv (str):
+	str =re.sub (r"\\newaddlyrics", r"\\lyricsto", str)
+	return str
+
+conversions.append (((2,1,10), conv, """\\newaddlyrics -> \\lyricsto"""))
+
+def conv (str):
+	str = re.sub (r'\\include\s*"paper([0-9]+)(-init)?.ly"',
+		      r"#(set-staff-size \1)", str)
+
+	def sub_note (match):
+		dur = ''
+		log = string.atoi (match.group (1))
+		dots = string.atoi (match.group (2))
+		
+		if log >= 0:
+			dur = '%d' % (1 << log)
+		else:
+			dur = { -1 : 'breve',
+				-2 : 'longa',
+				-3 : 'maxima'}[log]
+
+		dur += ('.' * dots)
+		
+		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)
+	return str
+
+conversions.append (((2,1,11), conv, """\\include "paper16.ly" -> #(set-staff-size 16)
+\note #3 #1 #1 -> \note #"8." #1
+"""))
+
+
+def conv (str):
+	str =re.sub (r"OttavaSpanner", r"OttavaBracket", str)
+	return str
+
+conversions.append (((2,1,12), conv, """OttavaSpanner -> OttavaBracket"""))
+
+
+def conv (str):
+	str =re.sub (r"\(set-staff-size ", r"(set-global-staff-size ", str)
+	return str
+
+conversions.append (((2,1,13), conv, """set-staff-size -> set-global-staff-size"""))
+
+def conv (str):
+	str =re.sub (r"#'style\s*=\s*#'dotted-line",
+		     r"#'dash-fraction = #0.0 ", str)
+	return str
+
+conversions.append (((2,1,14), conv, """style = dotted -> dash-fraction = 0"""))
+
+def conv (str):
+	str =re.sub (r'LyricsVoice\s*\.\s*instrument\s*=\s*("[^"]*")',
+		     r'LyricsVoice . vocalName = \1', str)
+	
+	str =re.sub (r'LyricsVoice\s*\.\s*instr\s*=\s*("[^"]*")',
+		     r'LyricsVoice . vocNam = \1', str)
+	return str
+
+conversions.append (((2,1,15), conv, """LyricsVoice . instr(ument) -> vocalName"""))
 
 ################################
 #	END OF CONVERSIONS	
@@ -1787,7 +1856,7 @@ identify ()
 for f in files:
 	if f == '-':
 		f = ''
-	if not os.path.isfile (f):
+	elif not os.path.isfile (f):
 		continue
 	try:
 		do_one_file (f)