From 0e070fddfc42ab25f496d2966d182c5d10280362 Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Wed, 17 Mar 2010 15:14:03 +0100 Subject: [PATCH] abc2ly: process slurs before tuplets Also add regtest --- input/regression/abc2ly/tuplet-slur.abc | 5 +++++ scripts/abc2ly.py | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 input/regression/abc2ly/tuplet-slur.abc diff --git a/input/regression/abc2ly/tuplet-slur.abc b/input/regression/abc2ly/tuplet-slur.abc new file mode 100644 index 0000000000..1538cd4e48 --- /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 5994669dae..8adc6e4ac5 100644 --- 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 \ -- 2.39.2