Avoid implicit sign conversion: size_t vs. ssize_t

[lilypond.git] / scripts / abc2ly.py

diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index 5994669daec286c15b87c664c88ebb753604824f..ac99b292b5b23fa8aa19ad05757ecec1739c9b62 100644 (file)
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -1045,15 +1045,16 @@ def try_parse_note (str, parser_state):
 
     voices_append (articulation)
 
-    if parser_state.parsing_tuplet:
-        parser_state.parsing_tuplet = parser_state.parsing_tuplet - 1
-        if not parser_state.parsing_tuplet:
-            voices_append ("}")
     if slur_begin:
         voices_append ('-(' * slur_begin )
     if slur_end:
         voices_append ('-)' *slur_end )
 
+    if parser_state.parsing_tuplet:
+        parser_state.parsing_tuplet = parser_state.parsing_tuplet - 1
+        if not parser_state.parsing_tuplet:
+            voices_append ("}")
+
     if global_options.beams and \
      str[0] in '^=_ABCDEFGabcdefg' and \
      not parser_state.parsing_beam and \
@@ -1331,6 +1332,7 @@ def parse_file (fn):
 
         orig_ln = ln
 
+        ln = junk_space (ln, state)
         ln = try_parse_header_line (ln, state)
 
         # Try nibbling characters off until the line doesn't change.