From c09c3567aa1e08e6bc42a3e2f09c97b152b3f107 Mon Sep 17 00:00:00 2001
From: David Chiang <dchiang@nd.edu>
Date: Sat, 11 Oct 2025 12:22:35 -0400
Subject: [PATCH] New syntax for separating gabc and nabc voices. - & advances
 to the next voice, but doesn't cycle back to the first voice. - | is for
 cycling back to the first voice, but for backwards compatibility also can be
 used in place of &.

---
 src/gabc/gabc-score-determination.l |  7 +++++--
 src/gabc/gabc-score-determination.y | 21 +++++++++++++++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/gabc/gabc-score-determination.l b/src/gabc/gabc-score-determination.l
index 9d1664c5..6a491ee8 100644
--- a/src/gabc/gabc-score-determination.l
+++ b/src/gabc/gabc-score-determination.l
@@ -383,13 +383,16 @@ semicolon. */
         BEGIN(notes);
         return OPENING_BRACKET;
     }
-<notes>(\$.|[^|\)])+ {
+<notes>(\$.|[^|&\)])+ {
         gabc_score_determination_lval.text =
                 gregorio_strdup(gabc_score_determination_text);
         return NOTES;
     }
 <notes>\| {
-        return NABC_CUT;
+        return NABC_MAJOR_CUT;
+    }
+<notes>& {
+        return NABC_MINOR_CUT;
     }
 <notes>\) {
         BEGIN(score);
diff --git a/src/gabc/gabc-score-determination.y b/src/gabc/gabc-score-determination.y
index d1a1576e..a0b055d0 100644
--- a/src/gabc/gabc-score-determination.y
+++ b/src/gabc/gabc-score-determination.y
@@ -722,7 +722,7 @@ static char *concatenate(char *first, char *const second) {
 %token ALT_BEGIN ALT_END
 %token NLBA_B NLBA_E
 %token EUOUAE_B EUOUAE_E
-%token NABC_CUT NABC_LINES
+%token NABC_MAJOR_CUT NABC_MINOR_CUT NABC_LINES
 %token CLEAR
 %token PROTRUSION PROTRUSION_VALUE PROTRUSION_END PROTRUDING_PUNCTUATION
 
@@ -866,10 +866,10 @@ note:
         nabc_state=0;
         update_position_with_space();
     }
-    | NOTES NABC_CUT {
+    | NOTES NABC_MAJOR_CUT {
         if (!nabc_lines) {
-            gregorio_message(_("You used character \"|\" in gabc without "
-                               "setting \"nabc-lines\" parameter. Please "
+            gregorio_message(_("You used an nabc separator \"|\" without "
+                               "setting the \"nabc-lines\" parameter. Please "
                                "set it in your gabc header."),
                              "det_score", VERBOSITY_FATAL, 0);
         }
@@ -877,6 +877,19 @@ note:
         free($1.text);
         nabc_state = (nabc_state + 1) % (nabc_lines+1);
     }
+    | NOTES NABC_MINOR_CUT {
+        if (!nabc_lines) {
+            gregorio_message(_("You used an nabc separator \"&\" without "
+                               "setting the \"nabc-lines\" parameter. Please "
+                               "set it in your gabc header."),
+                             "det_score", VERBOSITY_FATAL, 0);
+        }
+        gabc_y_add_notes($1.text, @1);
+        free($1.text);
+        nabc_state = (nabc_state + 1) % (nabc_lines+1);
+        if (nabc_state == 0)
+            gregorio_message(_("Too many nabc segments"), "det_score", VERBOSITY_FATAL, 0);
+    }
     | CLOSING_BRACKET {
         elements[voice]=NULL;
         nabc_state=0;