(sarabandeA):

[lilypond.git] / scripts / abc2ly.py

diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index 296bb48407cdf3acdf97048334b4a4c3564c2587..bde1e8cfe553a89982ab2ad3cc1af47ed1ceca09 100644 (file)
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -173,14 +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):
-       outf.write ("\n\\property Score.defaultBarType=\"empty\"\n")
+       """
+       Nowadays abc2ly outputs explicits barlines (?)
+       """
+       outf.write ("\n\\property Score.defaultBarType=\"empty\"\n")
 
 
 def dump_slyrics (outf):
@@ -237,7 +240,7 @@ def try_parse_q(a):
         
 def dump_score (outf):
        outf.write (r"""\score{
-        \notes <
+        \notes <<
 """)
 
        ks  = voice_idx_dict.keys ();
@@ -257,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:
@@ -265,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")
@@ -1264,19 +1267,19 @@ Convert ABC to lilypond.
 Usage: abc2ly [OPTIONS]... ABC-FILE
 
 Options:
-  -h, --help          this help
+  -h, --help          print this help
   -o, --output=FILE   set output filename to FILE
-  -v, --version       version information
-  -s, --strict        be strict about succes.
+  -v, --version       show version information
+  -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
+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 ():