]> git.donarmstrong.com Git - lilypond.git/blobdiff - scripts/convert-ly.py
* input/test/ambitus-mixed.ly (texidoc): new file.
[lilypond.git] / scripts / convert-ly.py
index 7d35e1539f24e7138f7fe5b8996f1b9274623cf6..d33e935d2b528083a13ec1c7236bd42c7cca1ade 100644 (file)
@@ -1,10 +1,12 @@
 #!@PYTHON@
 #
-# convert-ly.py -- convertor for lilypond versions
+# convert-ly.py -- Update old LilyPond input files (fix name?)
 # 
 # source file of the GNU LilyPond music typesetter
 # 
-# (c) 1998--2001
+# (c)  1998--2003  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+#                 Jan Nieuwenhuizen <janneke@gnu.org>
+
 
 # TODO
 #   use -f and -t for -s output
@@ -39,21 +41,20 @@ def identify ():
 
 def usage ():
        sys.stdout.write (
-               r"""Usage: %s [OPTION]... [FILE]... 
+               r"""Usage: %s [OPTIONS]... [FILE]... 
 Try to convert to newer lilypond-versions.  The version number of the
-input is guessed by default from \version directive
+input is guessed by default from \version directive.
 
 Options:
-  -a, --assume-old       apply all conversions to unversioned files
   -h, --help             print this help
-  -e, --edit             in place edit
-  -f, --from=VERSION     start from version. Overrides \version found in file.
-  -s, --show-rules       print all rules.
-  -t, --to=VERSION       target version
-  -n, --no-version       don't add new version stamp.
+  -e, --edit             edit in place
+  -f, --from=VERSION     start from version; overrides \version found in file
+  -s, --show-rules       print all rules
+  -t, --to=VERSION       show target version
+  -n, --no-version       don't add new version stamp
       --version          print program version
 
-Report bugs to bugs-gnu-music@gnu.org
+Report bugs to bugs-gnu-music@gnu.org.
 
 """ % program_name)
        
@@ -777,7 +778,7 @@ if 1:
 
 if 1:
        def conv (str):
-               str = re.sub ('([Cc])horda', '\\1orda', str)
+               str = re.sub ('([Cc])hord([ea])', '\\1ord\\2', str)
                return str
        
        conversions.append (((1,3,144), conv, 'Chorda -> Corda'))
@@ -818,6 +819,734 @@ if 1:
                return str
        conversions.append (((1,3,147), conv, 'default-neutral-direction -> neutral-direction'))
 
+if 1:
+       def conv (str):
+               str = re.sub ('\(align', '(axis', str)
+               str = re.sub ('\(rows', '(columns', str)
+               return str
+       conversions.append (((1,3,148), conv, '"(align" -> "(axis", "(rows" -> "(columns"'))
+
+
+if 1:
+       def conv (str):
+               str = re.sub ('SystemStartDelimiter', 'systemStartDelimiter', str)
+               return str
+       conversions.append (((1,5,33), conv, 'SystemStartDelimiter -> systemStartDelimiter'))
+
+if 1:
+       def conv (str):
+               str = re.sub ('arithmetic-multiplier', 'spacing-increment', str)
+               str = re.sub ('arithmetic-basicspace', 'shortest-duration-space', str)          
+               return str
+       
+       conversions.append (((1,5,38), conv, 'SystemStartDelimiter -> systemStartDelimiter'))
+
+
+if 1:
+       def conv (str):
+       
+               def func(match):
+                       break_dict = {
+                       "Instrument_name": "instrument-name",
+                       "Left_edge_item": "left-edge",
+                       "Span_bar": "span-bar",
+                       "Breathing_sign": "breathing-sign",
+                       "Staff_bar": "staff-bar",
+                       "Clef_item": "clef",
+                       "Key_item": "key-signature",
+                       "Time_signature": "time-signature",
+                       "Custos": "custos"
+                       }
+                       props =  match.group (1)
+                       for (k,v) in break_dict.items():
+                               props = re.sub (k, v, props)
+                       return  "breakAlignOrder = #'(%s)" % props
+
+               str = re.sub ("breakAlignOrder *= *#'\\(([a-z_\n\tA-Z ]+)\\)",
+                             func, str)
+               return str
+
+       # 40 ? 
+       conversions.append (((1,5,40), conv, 'breakAlignOrder property names'))
+       
+
+if 1:
+       def conv (str):
+               str = re.sub ('noAutoBeaming *= *##f', 'autoBeaming = ##t', str)
+               str = re.sub ('noAutoBeaming *= *##t', 'autoBeaming = ##f', str)
+               return str
+       
+       conversions.append (((1,5,49), conv, 'noAutoBeaming -> autoBeaming'))
+
+if 1:
+       def conv (str):
+               str = re.sub ('tuplet-bracket-visibility', 'bracket-visibility', str)
+               str = re.sub ('tuplet-number-visibility', 'number-visibility', str)             
+               return str
+       
+       conversions.append (((1,5,52), conv, 'tuplet-X-visibility -> X-visibility'))
+
+if 1:
+       def conv (str):
+               str = re.sub ('Pitch::transpose', 'ly-transpose-pitch', str)
+
+               return str
+       
+       conversions.append (((1,5,56), conv, 'Pitch::transpose -> ly-transpose-pitch'))
+
+if 1:
+       def conv (str):
+               str = re.sub ('textNonEmpty *= *##t', "TextScript \\set #'no-spacing-rods = ##f", str)
+               str = re.sub ('textNonEmpty *= *##f', "TextScript \\set #'no-spacing-rods = ##t", str)
+               return str
+       
+       conversions.append (((1,5,58), conv, 'deprecate textNonEmpty'))
+
+
+if 1:
+       def conv (str):
+               str = re.sub ('MinimumVerticalExtent', 'minimumV@rticalExtent', str)
+               str = re.sub ('minimumVerticalExtent', 'minimumV@rticalExtent', str)            
+               str = re.sub ('ExtraVerticalExtent', 'extraV@rticalExtent', str)
+               str = re.sub ('extraVerticalExtent', 'extraV@rticalExtent', str)                
+               str = re.sub ('VerticalExtent', 'verticalExtent', str)
+               str = re.sub ('extraV@rticalExtent', 'extraVerticalExtent', str)
+               str = re.sub ('minimumV@rticalExtent', 'minimumVerticalExtent', str)            
+               return str
+
+       conversions.append (((1,5,59), conv,
+       'XxxxVerticalExtent -> xxxVerticalExtent'))
+
+if 1:
+       def conv (str):
+               str = re.sub ('visibility-lambda', 'break-visibility', str)
+               return str
+
+       conversions.append (((1,5,62), conv,
+       'visibility-lambda -> break-visibility'))
+       
+
+if 1:
+       def conv (str):
+               if re.search (r'\addlyrics',str) \
+                      and re.search ('automaticMelismata', str)  == None:
+                       sys.stderr.write  ('automaticMelismata is turned on by default since 1.5.67. Please fix this by hand.')
+                       raise FatalConversionError()
+               return str
+
+       conversions.append (((1,5,67), conv,
+                            'automaticMelismata turned on by default'))
+
+if 1:
+       def conv (str):
+               str = re.sub ('ly-set-grob-property([^!])', 'ly-set-grob-property!\1', str)
+               str = re.sub ('ly-set-mus-property([^!])', 'ly-set-mus-property!\1', str)               
+               return str
+       
+       conversions.append (((1,5,68), conv, 'ly-set-X-property -> ly-set-X-property!'))
+
+if 1:
+       def conv (str):
+               str = re.sub ('extent-X', 'X-extent', str)
+               str = re.sub ('extent-Y', 'Y-extent', str)              
+               return str
+       
+       conversions.append (((1,5,71), conv, 'extent-[XY] -> [XY]-extent'))
+
+
+if 1:
+       def conv (str):
+               str = re.sub ("""#\(set! +point-and-click +line-column-location\)""",
+                             """#(set-point-and-click! \'line-column)""", str)
+               str = re.sub ("""#\(set![ \t]+point-and-click +line-location\)""",
+                             '#(set-point-and-click! \'line)', str)
+               str = re.sub ('#\(set! +point-and-click +#f\)',
+                             '#(set-point-and-click! \'none)', str)
+               return str
+       
+       conversions.append (((1,5,72), conv, 'set! point-and-click -> set-point-and-click!'))
+
+
+if 1:
+       def conv (str):
+               str = re.sub ('flag-style', 'stroke-style', str)
+               str = re.sub (r"""Stem([ ]+)\\override #'style""", r"""Stem \\override #'flag-style""", str);
+               str = re.sub (r"""Stem([ ]+)\\set([ ]+)#'style""", r"""Stem \\set #'flag-style""", str);
+               return str
+       
+       conversions.append (((1,6,5), conv, 'Stems: flag-style -> stroke-style; style -> flag-style'))
+
+
+if 1:
+       def subst_req_name (match):
+               return "(make-music-by-name \'%sEvent)" % regularize_id (match.group(1))
+
+       def conv (str):
+               str = re.sub ('\\(ly-make-music *\"([A-Z][a-z_]+)_req\"\\)', subst_req_name, str)
+               str = re.sub ('Request_chord', 'EventChord', str)
+               return str
+       
+       conversions.append (((1,7,1), conv, 'ly-make-music foo_bar_req -> make-music-by-name FooBarEvent'))
+
+
+if 1:
+       spanner_subst ={
+               "text" : 'TextSpanEvent',
+               "decrescendo" : 'DecrescendoEvent',
+               "crescendo" : 'CrescendoEvent',
+               "Sustain" : 'SustainPedalEvent',
+               "slur" : 'SlurEvent',
+               "UnaCorda" : 'UnaCordaEvent',
+               "Sostenuto" : 'SostenutoEvent',
+               }
+       def subst_ev_name (match):
+               stype = 'STOP'
+               if re.search ('start', match.group(1)):
+                       stype= 'START'
+
+               mtype = spanner_subst[match.group(2)]
+               return "(make-span-event '%s %s)" % (mtype , stype)
+
+       def subst_definition_ev_name(match):
+               return ' = #%s' % subst_ev_name (match) 
+       def subst_inline_ev_name (match):
+               s = subst_ev_name (match)
+               return '#(ly-export %s)' % s
+       def subst_csp_definition (match):
+               return ' = #(make-event-chord (list %s))' % subst_ev_name (match)
+       def subst_csp_inline (match):
+               return '#(ly-export (make-event-chord (list %s)))' % subst_ev_name (match)
+               
+       def conv (str):
+               str = re.sub (r' *= *\\spanrequest *([^ ]+) *"([^"]+)"', subst_definition_ev_name, str)
+               str = re.sub (r'\\spanrequest *([^ ]+) *"([^"]+)"', subst_inline_ev_name, str)
+               str = re.sub (r' *= *\\commandspanrequest *([^ ]+) *"([^"]+)"', subst_csp_definition, str)
+               str = re.sub (r'\\commandspanrequest *([^ ]+) *"([^"]+)"', subst_csp_inline, str)
+               str = re.sub (r'ly-id ', 'ly-import ', str)
+
+               str = re.sub (r' *= *\\script "([^"]+)"', ' = #(make-articulation "\\1")', str)
+               str = re.sub (r'\\script "([^"]+)"', '#(ly-export (make-articulation "\\1"))', str)
+               return str
+
+       conversions.append (((1,7,2), conv, '\\spanrequest -> #(make-span-event .. ), \script -> #(make-articulation .. )'))
+
+if 1:
+       def conv(str):
+               str = re.sub (r'\(ly-', '(ly:', str)
+
+               changed = [
+                       r'duration\?',
+                       r'font-metric\?',
+                       r'molecule\?',
+                       r'moment\?',
+                       r'music\?',
+                       r'pitch\?',
+                       'make-duration',
+                       'music-duration-length',
+                       'duration-log',
+                       'duration-dotcount',
+                       'intlog2',
+                       'duration-factor',
+                       'transpose-key-alist',
+                       'get-system',
+                       'get-broken-into',
+                       'get-original',
+                       'set-point-and-click!',
+                       'make-moment',
+                       'make-pitch',
+                       'pitch-octave',
+                       'pitch-alteration',
+                       'pitch-notename',
+                       'pitch-semitones',
+                       r'pitch<\?',
+                       r'dir\?',
+                       'music-duration-compress',
+                       'set-point-and-click!'
+                       ]
+
+               origre = r'\b(%s)' % string.join (changed, '|')
+               
+               str = re.sub (origre, r'ly:\1',str)
+               str = re.sub ('set-point-and-click!', 'set-point-and-click', str)
+               
+               return str
+       
+       conversions.append (((1,7,3), conv, 'ly- -> ly:'))
+
+if 1:
+       def conv(str):
+               if re.search ('new-chords-done',str):
+                       return str
+               
+               str = re.sub (r'<<', '< <', str)
+               str = re.sub (r'>>', '> >', str)
+               return str
+       
+       conversions.append (((1,7,4), conv, '<< >> -> < <  > >'))
+
+if 1:
+       def conv(str):
+               str = re.sub (r"\\transpose", r"\\transpose c'", str)
+               str = re.sub (r"\\transpose c' *([a-z]+)'", r"\\transpose c \1", str)
+               return str
+       conversions.append (((1,7,5), conv, '\\transpose TO -> \\transpose FROM  TO'))
+
+if 1:
+       def conv(str):
+               kws =   ['arpeggio',
+                        'sustainDown',
+                        'sustainUp',
+                        'f',
+                        'p',
+                        'pp',
+                        'ppp',
+                        'fp',
+                        'ff',
+                        'mf',
+                        'mp',
+                        'sfz',
+                        ]
+
+               origstr = string.join (kws, '|')
+               str = re.sub (r'([^_^-])\\(%s)\b' % origstr, r'\1-\\\2', str)
+               return str
+       conversions.append (((1,7,6), conv, 'note\\script -> note-\script'))
+
+
+if 1:
+       def conv(str):
+               str = re.sub (r"\\property *ChordNames *\. *ChordName *\\(set|override) *#'style *= *#('[a-z]+)",
+                             r"#(set-chord-name-style \2)", str)
+               str = re.sub (r"\\property *ChordNames *\. *ChordName *\\revert *#'style",
+                             r"", str)
+               return str
+       conversions.append (((1,7,10), conv, "\property ChordName #'style -> #(set-chord-name-style 'style)"))
+       
+
+
+if 1:
+       def conv(str):
+               str = re.sub (r"ly:transpose-pitch", "ly:pitch-transpose", str)
+               
+               return str
+       conversions.append (((1,7,11), conv, "transpose-pitch -> pitch-transpose"))
+
+if 1:
+       def conv(str):
+               str = re.sub (r"ly:get-molecule-extent", "ly:molecule-get-extent", str)
+               str = re.sub (r"ly:set-molecule-extent!", "ly:molecule-set-extent!", str)
+               str = re.sub (r"ly:add-molecule", "ly:molecule-add", str)
+               str = re.sub (r"ly:combine-molecule-at-edge", "ly:molecule-combine-at-edge", str)
+               str = re.sub (r"ly:align-to!", "ly:molecule-align-to!", str)
+               
+               return str
+       
+       conversions.append (((1,7,13), conv, "ly:XX-molecule-YY -> ly:molecule-XX-YY")) 
+
+if 1:
+       def conv(str):
+               str = re.sub (r"linewidth *= *-[0-9.]+ *(\\mm|\\cm|\\in|\\pt)?", 'raggedright = ##t', str )
+               return str
+       
+       conversions.append (((1,7,15), conv, "linewidth = -1 -> raggedright = ##t"))    
+
+if 1:
+       def conv(str):
+               str = re.sub ("divisiomaior",
+                             "divisioMaior", str)
+               str = re.sub ("divisiominima",
+                             "divisioMinima", str)
+               str = re.sub ("divisiomaxima",
+                             "divisioMaxima", str)
+               return str
+       
+       conversions.append (((1,7,16), conv, "divisiomaior -> divisioMaior"))
+
+if 1:
+       def conv(str):
+               str = re.sub ("Skip_req_swallow_translator",
+                             "Skip_event_swallow_translator", str)
+               return str
+       
+       conversions.append (((1,7,17), conv, "Skip_req  -> Skip_event"))
+
+if 1:
+       def conv(str):
+               str = re.sub ("groupOpen",
+                             "startGroup", str)
+               str = re.sub ("groupClose",
+                             "stopGroup", str)
+               str = re.sub ("#'outer",
+                             "#'enclose-bounds", str)
+
+               return str
+       
+       conversions.append (((1,7,18), conv,
+                            """groupOpen/Close  -> start/stopGroup,
+                            #'outer  -> #'enclose-bounds
+                            """))
+
+if 1:
+       def conv(str):
+               if re.search( r'\\GraceContext', str):
+                       sys.stderr.write ("GraceContext has been removed")
+                       sys.stderr.write ("please use #(add-to-grace-init .. )")
+                       raise FatalConversionError()
+
+               str = re.sub ('HaraKiriStaffContext', 'RemoveEmptyStaffContext', str)
+               return str
+       
+       conversions.append (((1,7,19), conv,"remove GraceContext"))
+
+
+
+if 1:
+       def conv(str):
+               str = re.sub (
+                       r"(set|override|revert) *#'type",
+                       r"\1 #'style",
+                       str)
+               return str
+       
+       conversions.append (((1,7,22), conv,"#'type -> #'style"))
+
+if 1:
+       def conv(str):
+               str = re.sub (
+                       "barNonAuto *= *##t",
+                       "automaticBars = ##f",
+                       str)
+               str = re.sub (
+                       "barNonAuto *= *##f",
+                       "automaticBars = ##t",
+                       str)
+               return str
+       
+       conversions.append (((1,7,23), conv,"barNonAuto -> automaticBars"))
+       
+
+if 1:
+       def conv(str):
+               if re.search( r'-(start|stop)Cluster', str):
+                       sys.stderr.write ("""Cluster syntax has been changed.
+Please refer to the manual for details, and convert manually.
+""")
+                       
+                       raise FatalConversionError()
+
+               return str
+       
+       conversions.append (((1,7,24), conv,"cluster syntax"))
+
+if 1:
+       def conv(str):
+               str = re.sub (r"\\property *Staff\.(Sustain|Sostenuto|UnaCorda)Pedal *\\(override|set) *#'pedal-type *",
+                               r"\property Staff.pedal\1Style ", str)
+               str = re.sub (r"\\property *Staff\.(Sustain|Sostenuto|UnaCorda)Pedal *\\revert *#'pedal-type", '', str)
+               return str
+       
+       conversions.append (((1,7,28), conv,"new Pedal style syntax"))
+
+
+
+if 1:
+
+       def sub_chord (m):
+               str = m.group(1)
+
+               origstr =  '<%s>' % str
+               if re.search (r'\\\\', str):
+                       return origstr
+
+               if re.search (r'\\property', str):
+                       return origstr
+
+               if re.match (r'^\s*\)?\s*\\[a-zA-Z]+', str):
+                       return origstr
+
+               durs = []
+               def sub_durs (m):
+                       durs.append(m.group(2))
+                       return m.group (1)
+
+               str = re.sub ("([a-z]+[,'!? ]*)([0-9.]+)", sub_durs, str)
+               dur_str = ''
+
+               for d in durs:
+                       if dur_str == '':
+                               dur_str = d
+                       if dur_str <> d:
+                               return '<%s>' % m.group (1)
+
+               pslur_strs = ['']
+               dyns = ['']
+               slur_strs = ['']
+
+               last_str = ''
+               while last_str <> str:
+                 last_str = str
+                 def sub_tremolos (m):
+                         tr = m.group (2)
+                         if tr not in slur_strs:
+                                 slur_strs.append (tr)
+                         return  m.group (1)
+                 
+                 str = re.sub (r"([a-z]+[',!? ]*)(:[0-9]+)", sub_tremolos, str)
+
+                 def sub_dyn_end (m):
+                         dyns.append (' \!')
+                         return ' ' + m.group(2)
+
+                 str = re.sub (r'(\\!)\s*([a-z]+)', sub_dyn_end, str)
+                 def sub_slurs(m):
+                         if '-)' not in slur_strs:
+                                 slur_strs.append ( ')')
+                         return m.group(1)
+                 def sub_p_slurs(m):
+                         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):
+                         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):
+                         if '-\(' not in slur_strs:
+                                 slur_strs.append ( '\(')
+                         return m.group(1)
+
+                 str = re.sub (r"([a-z]+[,'!?0-9 ]*)\\\(", sub_begin_p_slurs, str)
+
+                 def sub_dyns (m):
+                         s = m.group(0)
+                         if s == '@STARTCRESC@':
+                                 slur_strs.append ("\\<")
+                         elif s == '@STARTDECRESC@':
+                                 slur_strs.append ("\\>")
+                         elif s == r'-?\\!':
+                                 slur_strs.append ('\\!')
+                         return ''
+
+                 str = re.sub (r'@STARTCRESC@', sub_dyns, str)
+                 str = re.sub (r'-?\\!', sub_dyns, str)
+
+                 def sub_articulations (m):
+                         a = m.group(1)
+                         if a not in slur_strs:
+                                 slur_strs.append (a)
+                         return ''
+
+                 str = re.sub (r"([_^-]\@ACCENT\@)", sub_articulations, str)
+                 str = re.sub (r"([_^-]\\[a-z]+)", sub_articulations, str)
+                 str = re.sub (r"([_^-][>_.+|^-])", sub_articulations, str)
+
+                 def sub_pslurs(m):
+                         slur_strs.append ( ' \\)')
+                         return m.group(1)
+                 str = re.sub (r"\\\)[ ]*([a-z]+)", sub_pslurs, str)
+
+               suffix = string.join (slur_strs, '') + string.join (pslur_strs, '') \
+                        + string.join (dyns, '')
+
+               return '@STARTCHORD@%s@ENDCHORD@%s%s' % (str , dur_str, suffix)
+
+
+
+
+
+       def sub_chords (str):
+               simend = '>'
+               simstart = "<" 
+               chordstart = '<<'
+               chordend = '>>'
+               marker_str = '%% new-chords-done %%'
+
+               if re.search (marker_str,str):
+                       return str
+               str= re.sub (r'\\<', '@STARTCRESC@', str)
+               str= re.sub (r'\\>', '@STARTDECRESC@', str)
+               str= re.sub (r'([_^-])>', r'\1@ACCENT@', str)
+               str = re.sub ('<([^<>{}]+)>', sub_chord, str)
+
+               str = re.sub (r'\[ *(@STARTCHORD@[^@]+@ENDCHORD@[0-9.]*)',
+                             r'\1[',
+                             str)
+               str = re.sub (r'\\! *(@STARTCHORD@[^@]+@ENDCHORD@[0-9.]*)',
+                             r'\1\\!',
+                             str)
+               str = re.sub ('<([^?])', r'%s\1' % simstart, str)
+               str = re.sub ('>([^?])', r'%s\1' % simend,  str)
+               str = re.sub ('@STARTCRESC@', r'\\<', str)
+               str = re.sub ('@STARTDECRESC@', r'\\>' ,str)
+               str = re.sub (r'\\context *Voice *@STARTCHORD@', '@STARTCHORD@', str)
+               str = re.sub ('@STARTCHORD@', chordstart, str)
+               str = re.sub ('@ENDCHORD@', chordend, str)
+               str = re.sub (r'@ACCENT@', '>', str)
+               return str
+
+       def articulation_substitute (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)
+               str = re.sub (r"""([^-])\\! *([a-z]+[,']*[!?]?[0-9:]*\.*)""",
+                             r"\1 \2\\!", str)
+               return str
+       
+       def conv_relative(str):
+               if re.search (r"\\relative", str):
+                       str= "#(ly:set-option 'old-relative)\n" + str
+
+               return str
+       
+       def conv (str):
+               str =  conv_relative (str)
+               str = sub_chords (str)
+
+               str = articulation_substitute (str)
+               
+               return str
+       
+       conversions.append (((1,9,0), conv, """New relative mode,
+Postfix articulations, new chord syntax."""))
+
+if 1:
+       def conv (str):
+               if re.search ("font-style",str):
+                       sys.stderr.write ("font-style is deprecated. Please remove.")
+                       raise FatalConversionError()
+                       
+               str = re.sub (r'-\\markup', r'@\\markup', str)
+               str = re.sub (r'-\\', r'\\', str)
+               str = re.sub (r'-\)', ')', str)
+               str = re.sub (r'-\(', '(', str)
+               str = re.sub ('-\[', '[', str)
+               str = re.sub ('-\]', ']', str)
+               str = re.sub ('-~', '~', str)
+               str = re.sub (r'@\\markup', r'-\\markup', str)
+               return str
+
+       conversions.append (((1,9,1), conv, """Remove - before articulation"""))
+if 1:
+       def conv (str):
+               str = re.sub ('ly:set-context-property',
+                             'ly:set-context-property!', str)
+               str = re.sub ('\\\\newcontext', '\\\\new', str)
+               str = re.sub ('\\\\grace[\t\n ]*([^{ ]+)',
+                             r'\\grace { \1 }', str) 
+               str = re.sub ("\\\\grace[\t\n ]*{([^}]+)}",
+                             r"""\\grace {
+  \\property Voice.Stem \\override #'stroke-style = #"grace"
+  \1
+  \\property Voice.Stem \\revert #'stroke-style }
+""", str)
+               
+               return str
+       
+       conversions.append (((1,9,2), conv, """\newcontext -> \new"""))
+
+if 1:
+       def conv (str):
+               str = re.sub ('accacciatura',
+                             'acciaccatura', str)
+
+               if re.search ("context-spec-music", str):
+                       sys.stderr.write ("context-spec-music takes a symbol for the context now. Update by hand.")
+                                         
+                       raise FatalConversionError()
+               
+               str = re.sub ('fingerHorizontalDirection *= *#(LEFT|-1)',
+                             "fingeringOrientations = #'(up down left)", str)
+               str = re.sub ('fingerHorizontalDirection *= *#(RIGHT|1)',
+                             "fingeringOrientations = #'(up down right)", str)
+
+               return str
+       
+       conversions.append (((1,9,3), conv,
+                            """\acciaccatura misspelling, fingerHorizontalDirection -> fingeringOrientations"""))
+
+
+def conv (str):
+       if re.search ('\\figures', str):
+               sys.stderr.write ("Warning: attempting automatic \\figures conversion.  Check results!");
+               
+       
+       def figures_replace (m):
+               s = m.group (1)
+               s = re.sub ('<', '@FIGOPEN@',s)
+               s = re.sub ('>', '@FIGCLOSE@',s)
+               return '\\figures { %s }' % s
+       
+       str = re.sub (r'\\figures[ \t\n]*{([^}]+)}', figures_replace, str)
+       str = re.sub (r'\\<', '@STARTCRESC@', str)
+       str = re.sub (r'\\>', '@STARTDECRESC@', str)
+       str = re.sub (r'([-^_])>', r'\1@ACCENT@', str)
+       str = re.sub (r'<<', '@STARTCHORD@', str)
+       str = re.sub (r'>>', '@ENDCHORD@', str)
+       str = re.sub (r'>', '@ENDSIMUL@', str)
+       str = re.sub (r'<', '@STARTSIMUL@', str)
+       str = re.sub ('@STARTDECRESC@', '\\>', str)
+       str = re.sub ('@STARTCRESC@', '\\<', str)
+       str = re.sub ('@ACCENT@', '>', str)
+       str = re.sub ('@ENDCHORD@', '>', str)
+       str = re.sub ('@STARTCHORD@', '<', str)
+       str = re.sub ('@STARTSIMUL@', '<<', str)
+       str = re.sub ('@ENDSIMUL@', '>>', str)
+       str = re.sub ('@FIGOPEN@', '<', str)
+       str = re.sub ('@FIGCLOSE@', '>', str)
+
+       return str
+
+conversions.append (((1,9,4), conv, 'Swap < > and << >>'))
+
+
+def conv (str):
+       str = re.sub ('HaraKiriVerticalGroup', 'RemoveEmptyVerticalGroup', str)
+
+       return str
+
+conversions.append (((1,9,5), conv, 'HaraKiriVerticalGroup -> RemoveEmptyVerticalGroup'))
+
+def conv (str):
+       if re.search ("ly:get-font", str) :
+               sys.stderr.write (r"(ly:get-font foo ..)  has been replaced by" + \
+                                 " (ly:paper-get-font (ly:grob-get-paper foo) .. ).\n" +\
+                                 "please update manually.")
+               
+               raise FatalConversionError()
+       
+       if re.search ("\\pitch *#", str) :
+               sys.stderr.write (r"\\pitch has been deprecated. " +\
+                                 " Use Scheme code to construct arbitrary note events.")
+               
+               raise FatalConversionError()
+       
+       return str
+               
+
+conversions.append (((1,9,6), conv, 'ly:get-font deprecated.'))
+
+def conv (str):
+       def sub_alteration (m):
+               alt = m.group (3)
+               alt = {
+                       '-1': 'FLAT',
+                       '-2': 'DOUBLE-FLAT',
+                       '0': 'NATURAL',
+                       '1': 'SHARP',
+                       '2': 'DOUBLE-SHARP',
+                       }[alt]
+               
+               return '(ly:make-pitch %s %s %s)' % (m.group(1), m.group (2), alt)
+       
+       str =re.sub ("\\(ly:make-pitch *([0-9-]+) *([0-9-]+) *([0-9-]+) *\\)", sub_alteration, str) 
+       return str
+conversions.append (((1,9,7), conv, 'use symbolic constants for alterations.'))
+
+
 
 ################################
 #      END OF CONVERSIONS      
@@ -921,7 +1650,7 @@ from_version = ()
 outfile_name = ''
 
 (options, files) = getopt.getopt (
-       sys.argv[1:], 'ao:f:t:senh', ['no-version', 'assume-old', 'version', 'output', 'show-rules', 'help', 'edit', 'from=', 'to='])
+       sys.argv[1:], 'ao:f:t:senh', ['no-version', 'version', 'output', 'show-rules', 'help', 'edit', 'from=', 'to='])
 
 for opt in options:
        o = opt[0]
@@ -943,8 +1672,6 @@ for opt in options:
                sys.exit(0)
        elif o == '--output' or o == '-o':
                outfile_name = a
-       elif o == '--assume-old' or o == '-a':
-               assume_old = 1
        elif o == '--no-version' or o == '-n':
                add_version = 0
        else:
@@ -961,7 +1688,7 @@ for f in files:
                do_one_file (f)
        except UnknownVersion:
                sys.stderr.write ('\n')
-               sys.stderr.write ("%s: can't determine version for %s" % (program_name, f))
+               sys.stderr.write ("%s: can't determine version for `%s'" % (program_name, f))
                sys.stderr.write ('\n')
                if assume_old:
                        fv = from_version
@@ -969,6 +1696,7 @@ for f in files:
                        do_one_file (f)
                        from_version = fv
                else:
-                       sys.stderr.write ("%s: skipping: %s " % (program_name,  f))
+                       sys.stderr.write ("%s: skipping: `%s' " % (program_name,  f))
                pass
+
 sys.stderr.write ('\n')