revamp flat symbol: use less points,

[lilypond.git] / scripts / abc2ly.py

diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index eac86759a21c1cfda5e4d0129734ab6553de4d9a..32a1ccfdbe8bd66b572d4300acb5d4c085ad7be1 100644 (file)
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -49,8 +49,11 @@
 
 
 #TODO:
+#
+# Convert to new chord styles.
+#
 # UNDEF -> None
- 
+#
   
   
 program_name = 'abc2ly'
@@ -177,7 +180,10 @@ def dump_lyrics (outf):
                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):
@@ -924,7 +930,6 @@ def try_parse_note (str, parser_state):
 
        (str, num,den,current_dots) = parse_duration (str, parser_state)
 
-
        if re.match('[ \t]*\)', str):
                str = string.lstrip (str)
        
@@ -934,9 +939,6 @@ def try_parse_note (str, parser_state):
                str = str[1:]
 
        
-       if slur_end:
-               voices_append ('%s' % ')' *slur_end )
-
        bar_acc = get_bar_acc(notename, octave, parser_state)
        pit = pitch_to_lilypond_name(notename, acc, bar_acc, global_key[notename])
        oct = octave_to_lilypond_quotes (octave)
@@ -960,7 +962,10 @@ def try_parse_note (str, parser_state):
                if not parser_state.parsing_tuplet:
                        voices_append ("}")
        if slur_begin:
-               voices_append ('%s' % '(' * slur_begin )
+               voices_append ('-(' * slur_begin )
+       if slur_end:
+               voices_append ('-)' *slur_end )
+
 
 
        return str