* lily/rest.cc (polyphonic_offset_callback): new function. Do

[lilypond.git] / scripts / abc2ly.py

diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index bde1e8cfe553a89982ab2ad3cc1af47ed1ceca09..df73f4079355c43941af61566d32808dcc35f30c 100644 (file)
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -151,10 +151,10 @@ def select_voice (name, rol):
                                      check_clef(value)
                              elif keyword == "name":
                                      value = re.sub ('\\\\','\\\\\\\\', value)
-                                     voices_append ("\\property Staff.instrument = %s\n" % value )
+                                     voices_append ("\\set Staff.instrument = %s\n" % value )
                                      __main__.part_names = 1
                              elif keyword == "sname" or keyword == "snm":
-                                     voices_append ("\\property Staff.instr = %s\n" % value )
+                                     voices_append ("\\set Staff.instr = %s\n" % value )
 
              else:
                      break
@@ -183,7 +183,7 @@ def dump_default_bar (outf):
        """
        Nowadays abc2ly outputs explicits barlines (?)
        """
-       outf.write ("\n\\property Score.defaultBarType=\"empty\"\n")
+       outf.write ("\n\\set Score.defaultBarType=\"empty\"\n")
 
 
 def dump_slyrics (outf):
@@ -605,12 +605,12 @@ def try_parse_header_line (ln, state):
                        if a == 'C':
                                if not state.common_time:
                                        state.common_time = 1
-                                       voices_append ("\\property Staff.TimeSignature \\override #\'style = #'C\n")
+                                       voices_append ("\\override Staff.TimeSignature #\'style = #'C\n")
                                a = '4/4'
                        if a == 'C|':
                                if not state.common_time:
                                        state.common_time = 1
-                                       voices_append ("\\property Staff.TimeSignature \\override #\'style = #'C\n")
+                                       voices_append ("\\override Staff.TimeSignature #\'style = #'C\n")
                                a = '2/2'
                        if not length_specified:
                                set_default_len_from_time_sig (a)