abc2ly: process slurs before tuplets

Also add regtest

diff --git a/input/regression/abc2ly/tuplet-slur.abc b/input/regression/abc2ly/tuplet-slur.abc
new file mode 100644 (file)
index 0000000..1538cd4
--- /dev/null
+++ b/input/regression/abc2ly/tuplet-slur.abc
@@ -0,0 +1,5 @@
+X: 2
+T: Tuplets and slurs
+M: 4/4
+K: C
+a ((3gab) a (3(gab)

diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index 5994669daec286c15b87c664c88ebb753604824f..8adc6e4ac5890885d41f2f193b2c06b060fe075e 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 \