Make 2-argument form of \accidentalStyle

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index 6ea53ea37d33a1d35c316b962fdeba69b742c332..ad518547c4a093223078d7515533128cbae909ed 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3283,7 +3283,7 @@ def paren_matcher (n):
     return
 
 def undollar_scm (m):
-    return re.sub (r"\$", "", m.group (0))
+    return re.sub (r"\$(.?)", r"\1", m.group (0))
 
 def undollar_embedded (m):
     str = re.sub (r"#\$", "#", m.group (1))
@@ -3346,6 +3346,16 @@ def conv (str):
         stderr_write ('\n')
     return str
 
+@rule ((2, 15, 20), r"$(set-accidental-style ...) -> \accidentalStyle")
+def conv (str):
+    str = re.sub (r"\$\(set-accidental-style\s+'([-a-z]+)\)",
+                  r'\\accidentalStyle "\1"', str)
+    str = re.sub (r"\$\(set-accidental-style\s+'([-a-z]+)\s+'([-A-Za-z]+)\s*\)",
+                  r'''\\accidentalStyle #'\2 "\1"''', str)
+    str = re.sub (r"(@funindex\s+)set-accidental-style",
+                  r"\1\\accidentalStyle", 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,