* 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 de7decda9666e62a5215bfee5cc925d261bac0be..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
@@ -173,17 +173,17 @@ def dump_header (outf,hdr):
 
 def dump_lyrics (outf):
        if (len(lyrics)):
-               outf.write("\n\\score\n{\n    \\context Lyrics\n    <\n")
+               outf.write("\n\\score\n{\n    \\context Lyrics\n    <<\n")
                for i in range (len (lyrics)):
                        outf.write ( lyrics [i])
                        outf.write ("\n")
-               outf.write("    >\n    \\paper{}\n}\n")
+               outf.write("    >>\n    \\paper{}\n}\n")
 
 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):
@@ -240,7 +240,7 @@ def try_parse_q(a):
         
 def dump_score (outf):
        outf.write (r"""\score{
-        \notes <
+        \notes <<
 """)
 
        ks  = voice_idx_dict.keys ();
@@ -260,7 +260,7 @@ def dump_score (outf):
                outf.write ("\t    \\voice%s " % m)
                outf.write ("\n\t}\n")
                if len ( slyrics [voice_idx_dict[k]] ):
-                       outf.write ("\n\t\\context Lyrics=\"%s\" \n\t<\t" % k)
+                       outf.write ("\n\t\\context Lyrics=\"%s\" \n\t<<\t" % k)
                        if re.match('[1-9]',k):
                                m = alphabet[string.atoi(k)]
                        else:
@@ -268,8 +268,8 @@ def dump_score (outf):
                        for i in range (len(slyrics[voice_idx_dict[k]])):
                                l=alphabet[i]
                                outf.write("\n\t  { \\words%sV%s }" % ( m, l) )
-                       outf.write ( "\n\t>\n" )
-       outf.write ("\n    >")
+                       outf.write ( "\n\t>>\n" )
+       outf.write ("\n    >>")
        outf.write ("\n\t\\paper {\n")
        if part_names:
                outf.write ("\t    \\translator \n\t    {\n")
@@ -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)
@@ -1273,13 +1273,13 @@ Options:
   -s, --strict        be strict about succes
   
 This program converts ABC music files (see
-http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) To LilyPond input.
+http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input.
 
 
 Report bugs to bug-lilypond@gnu.org.
 
 Written by Han-Wen Nienhuys <hanwen@cs.uu.nl>, Laura Conrad
-<lconrad@laymusic.org>, Roy Rankin <Roy.Rankin@@alcatel.com.au>
+<lconrad@laymusic.org>, Roy Rankin <Roy.Rankin@@alcatel.com.au>.
 """
 
 def print_version ():