musicxml-io 0.9.4 → 0.9.6

package/dist/{chunk-67EEVKG4.mjs → chunk-2GFWDBCV.mjs}

@@ -6,7 +6,7 @@ import {
   ValidationException,
   generateId,
   validate
-} from "./chunk-T6KNPR45.mjs";
+} from "./chunk-SQSIGPRD.mjs";
 import {
   bpmToUsPerQuarter,
   buildGridTimeline,
@@ -45,12 +45,6 @@ var RBRACKET = 93;
 function isXmlWhitespace(code) {
   return code === 32 || code === 10 || code === 9 || code === 13;
 }
-function isWhitespaceOnly(s) {
-  for (let i = 0; i < s.length; i++) {
-    if (!isXmlWhitespace(s.charCodeAt(i))) return false;
-  }
-  return true;
-}
 function parseXml(xml) {
   const root = [];
   const stack = [];
@@ -61,14 +55,17 @@ function parseXml(xml) {
     const lt = xml.indexOf("<", pos);
     if (lt === -1) break;
     if (lt > pos) {
-      let text = xml.slice(pos, lt);
-      if (!isWhitespaceOnly(text)) {
-        text = decodeXmlEntities(text);
-        children.push(
-          INVALID_XML_CHARS_TEST.test(text) ? text.replace(INVALID_XML_CHARS_RE, "") : text
-        );
+      let whitespaceOnly = true;
+      for (let i = pos; i < lt; i++) {
+        if (!isXmlWhitespace(xml.charCodeAt(i))) {
+          whitespaceOnly = false;
+          break;
+        }
+      }
+      if (!whitespaceOnly) {
+        children.push(decodeXmlEntities(xml.slice(pos, lt)));
       } else if (children.length === 0 && xml.charCodeAt(lt + 1) === SLASH) {
-        children.push(text);
+        children.push(xml.slice(pos, lt));
       }
     }
     const c = xml.charCodeAt(lt + 1);
@@ -95,9 +92,7 @@ function parseXml(xml) {
         pos = end === -1 ? len : end + 3;
       } else if (xml.startsWith("<![CDATA[", lt)) {
         const end = xml.indexOf("]]>", lt + 9);
-        let text = xml.slice(lt + 9, end === -1 ? len : end);
-        if (INVALID_XML_CHARS_TEST.test(text)) text = text.replace(INVALID_XML_CHARS_RE, "");
-        children.push(text);
+        children.push(xml.slice(lt + 9, end === -1 ? len : end));
         pos = end === -1 ? len : end + 3;
       } else {
         let i = lt + 2;
@@ -563,6 +558,7 @@ function parseCredits(elements) {
       if (a["letter-spacing"]) cw.letterSpacing = a["letter-spacing"];
       if (a["xml:lang"]) cw.xmlLang = a["xml:lang"];
       if (a["xml:space"]) cw.xmlSpace = a["xml:space"];
+      if (a["color"]) cw.color = a["color"];
       return cw;
     });
     const images = collectElements(content, "credit-image", (_c, a) => {
@@ -592,6 +588,7 @@ function parseDisplayTexts(elements) {
     if (a["font-style"]) dt.fontStyle = a["font-style"];
     if (a["font-weight"]) dt.fontWeight = a["font-weight"];
     if (a["xml:space"]) dt.xmlSpace = a["xml:space"];
+    if (a["color"]) dt.color = a["color"];
     return dt;
   });
 }
@@ -615,6 +612,7 @@ function parsePartList(elements) {
           if (pnAttrs["print-object"] === "no") {
             partInfo.namePrintObject = false;
           }
+          if (pnAttrs["color"]) partInfo.nameColor = pnAttrs["color"];
           break;
         }
       }
@@ -633,6 +631,7 @@ function parsePartList(elements) {
           if (paAttrs["print-object"] === "no") {
             partInfo.abbreviationPrintObject = false;
           }
+          if (paAttrs["color"]) partInfo.abbreviationColor = paAttrs["color"];
           break;
         }
       }
@@ -707,12 +706,18 @@ function parsePartList(elements) {
         groupType: attrs["type"] === "stop" ? "stop" : "start"
       };
       if (attrs["number"]) group.number = parseInt(attrs["number"], 10);
-      const name = getElementText(content, "group-name");
-      if (name) group.groupName = name;
+      parseFirstElement(content, "group-name", (c, a) => {
+        const name = extractText(c);
+        if (name) group.groupName = name;
+        if (a["color"]) group.groupNameColor = a["color"];
+      });
       const gnd = parseFirstElement(content, "group-name-display", (c) => parseDisplayTexts(c));
       if (gnd) group.groupNameDisplay = gnd;
-      const abbr = getElementText(content, "group-abbreviation");
-      if (abbr) group.groupAbbreviation = abbr;
+      parseFirstElement(content, "group-abbreviation", (c, a) => {
+        const abbr = extractText(c);
+        if (abbr) group.groupAbbreviation = abbr;
+        if (a["color"]) group.groupAbbreviationColor = a["color"];
+      });
       const gad = parseFirstElement(content, "group-abbreviation-display", (c) => parseDisplayTexts(c));
       if (gad) group.groupAbbreviationDisplay = gad;
       parseFirstElement(content, "group-symbol", (c, a) => {
@@ -721,6 +726,7 @@ function parsePartList(elements) {
           group.groupSymbol = symbol;
         }
         if (a["default-x"]) group.groupSymbolDefaultX = parseFloat(a["default-x"]);
+        if (a["color"]) group.groupSymbolColor = a["color"];
       });
       const barline = getElementText(content, "group-barline");
       if (barline && ["yes", "no", "Mensurstrich"].includes(barline)) {
@@ -878,6 +884,7 @@ function parseAttributes(elements, xmlAttrs = {}) {
       if (keyAttrs["number"]) key.number = parseInt(keyAttrs["number"], 10);
       if (keyAttrs["print-object"] === "no") key.printObject = false;
       else if (keyAttrs["print-object"] === "yes") key.printObject = true;
+      if (keyAttrs["color"]) key.color = keyAttrs["color"];
       keys.push(key);
     }
   }
@@ -954,6 +961,7 @@ function parseTimeSignature(elements, parentElements) {
       if (attrs["print-object"] === "no") {
         time.printObject = false;
       }
+      if (attrs["color"]) time.color = attrs["color"];
       break;
     }
   }
@@ -1008,6 +1016,9 @@ function parseClef(elements, attrs) {
   if (attrs["after-barline"] === "yes") {
     clef.afterBarline = true;
   }
+  if (attrs["color"]) {
+    clef.color = attrs["color"];
+  }
   return clef;
 }
 function parseTranspose(elements) {
@@ -1037,6 +1048,7 @@ function parseNote(elements, attrs) {
   if (attrs["print-dot"] === "yes") note.printDot = true;
   if (attrs["print-spacing"] === "yes") note.printSpacing = true;
   if (attrs["print-spacing"] === "no") note.printSpacing = false;
+  if (attrs["color"]) note.color = attrs["color"];
   let dotCount = 0;
   let notationsIndex = 0;
   let tieElements;
@@ -1069,6 +1081,7 @@ function parseNote(elements, attrs) {
         break;
       case "dot":
         dotCount++;
+        if (elAttrs["color"] && note.dotColor === void 0) note.dotColor = elAttrs["color"];
         break;
       case "instrument":
         if (elAttrs["id"]) note.instrument = elAttrs["id"];
@@ -1106,6 +1119,7 @@ function parseNote(elements, attrs) {
         const noteType = extractText(c);
         if (isValidNoteType(noteType)) note.noteType = noteType;
         if (elAttrs["size"]) note.noteTypeSize = elAttrs["size"];
+        if (elAttrs["color"]) note.noteTypeColor = elAttrs["color"];
         break;
       }
       case "accidental": {
@@ -1131,6 +1145,7 @@ function parseNote(elements, attrs) {
           note.stem = { value: stemValue };
           if (elAttrs["default-x"]) note.stem.defaultX = parseFloat(elAttrs["default-x"]);
           if (elAttrs["default-y"]) note.stem.defaultY = parseFloat(elAttrs["default-y"]);
+          if (elAttrs["color"]) note.stem.color = elAttrs["color"];
         }
         break;
       }
@@ -1141,6 +1156,7 @@ function parseNote(elements, attrs) {
           if (elAttrs["filled"] === "yes") nhInfo.filled = true;
           else if (elAttrs["filled"] === "no") nhInfo.filled = false;
           if (elAttrs["parentheses"] === "yes") nhInfo.parentheses = true;
+          if (elAttrs["color"]) nhInfo.color = elAttrs["color"];
           note.notehead = nhInfo;
         }
         break;
@@ -1240,6 +1256,7 @@ function parseBeam(elements, attrs) {
   if (attrs["fan"] && validFans.includes(attrs["fan"])) {
     beam.fan = attrs["fan"];
   }
+  if (attrs["color"]) beam.color = attrs["color"];
   return beam;
 }
 function parseNotations(elements, notationsIndex = 0) {
@@ -1254,6 +1271,7 @@ function parseNotations(elements, notationsIndex = 0) {
         tiedType: attrs["type"] || "start",
         number: attrs["number"] ? parseInt(attrs["number"], 10) : void 0,
         orientation: attrs["orientation"],
+        color: attrs["color"],
         notationsIndex
       };
       notations.push(tied);
@@ -1272,6 +1290,7 @@ function parseNotations(elements, notationsIndex = 0) {
         bezierX2: attrs["bezier-x2"] ? parseFloat(attrs["bezier-x2"]) : void 0,
         bezierY2: attrs["bezier-y2"] ? parseFloat(attrs["bezier-y2"]) : void 0,
         placement: attrs["placement"],
+        color: attrs["color"],
         notationsIndex
       };
       notations.push(slur);
@@ -1366,6 +1385,7 @@ function parseNotations(elements, notationsIndex = 0) {
             if (artAttrs["default-y"]) {
               artNotation.defaultY = parseFloat(artAttrs["default-y"]);
             }
+            if (artAttrs["color"]) artNotation.color = artAttrs["color"];
             notations.push(artNotation);
           }
         }
@@ -1387,7 +1407,11 @@ function parseNotations(elements, notationsIndex = 0) {
       ];
       const accidentalMarks = collectElements(ornContent, "accidental-mark", (c, a) => {
         const value = extractText(c);
-        return isValidAccidental(value) ? { value, placement: a["placement"] } : null;
+        return isValidAccidental(value) ? {
+          value,
+          placement: a["placement"],
+          color: a["color"]
+        } : null;
       }).filter((m) => m !== null);
       for (const orn of ornContent) {
         if (typeof orn === "string") continue;
@@ -1403,6 +1427,7 @@ function parseNotations(elements, notationsIndex = 0) {
             if (ornAttrs["default-y"]) {
               ornNotation.defaultY = parseFloat(ornAttrs["default-y"]);
             }
+            if (ornAttrs["color"]) ornNotation.color = ornAttrs["color"];
             if (accidentalMarks.length > 0 && notations.filter((n) => n.type === "ornament").length === 0) {
               ornNotation.accidentalMarks = accidentalMarks;
             }
@@ -1422,6 +1447,7 @@ function parseNotations(elements, notationsIndex = 0) {
           if (wlAttrs["default-y"]) {
             wlNotation.defaultY = parseFloat(wlAttrs["default-y"]);
           }
+          if (wlAttrs["color"]) wlNotation.color = wlAttrs["color"];
           notations.push(wlNotation);
         }
         if (orn.tagName === "tremolo") {
@@ -1437,6 +1463,7 @@ function parseNotations(elements, notationsIndex = 0) {
           };
           if (tremAttrs["default-x"]) tremNotation.defaultX = parseFloat(tremAttrs["default-x"]);
           if (tremAttrs["default-y"]) tremNotation.defaultY = parseFloat(tremAttrs["default-y"]);
+          if (tremAttrs["color"]) tremNotation.color = tremAttrs["color"];
           notations.push(tremNotation);
         }
       }
@@ -1499,6 +1526,7 @@ function parseNotations(elements, notationsIndex = 0) {
           if (hasElement(bendContent, "pre-bend")) techNotation.preBend = true;
           if (hasElement(bendContent, "release")) techNotation.release = true;
           if (hasElement(bendContent, "with-bar")) techNotation.withBar = true;
+          if (techAttrs["color"]) techNotation.color = techAttrs["color"];
           notations.push(techNotation);
         }
         for (const techType of technicalTypes) {
@@ -1553,6 +1581,9 @@ function parseNotations(elements, notationsIndex = 0) {
             if (techAttrs["font-size"]) {
               notation.fontSize = techAttrs["font-size"];
             }
+            if (techAttrs["color"]) {
+              notation.color = techAttrs["color"];
+            }
             notations.push(notation);
           }
         }
@@ -1605,6 +1636,7 @@ function parseNotations(elements, notationsIndex = 0) {
           notationsIndex
         };
         if (otherDynamics) dynNotation.otherDynamics = otherDynamics;
+        if (dynAttrs["color"]) dynNotation.color = dynAttrs["color"];
         notations.push(dynNotation);
       }
     } else if (el.tagName === "fermata") {
@@ -1615,6 +1647,7 @@ function parseNotations(elements, notationsIndex = 0) {
         shape: shape || void 0,
         fermataType: a["type"],
         placement: a["placement"],
+        color: a["color"],
         notationsIndex
       };
       if (a["default-x"]) fermataNotation.defaultX = parseFloat(a["default-x"]);
@@ -1630,6 +1663,7 @@ function parseNotations(elements, notationsIndex = 0) {
       };
       if (arpAttrs["default-x"]) arpNotation.defaultX = parseFloat(arpAttrs["default-x"]);
       if (arpAttrs["default-y"]) arpNotation.defaultY = parseFloat(arpAttrs["default-y"]);
+      if (arpAttrs["color"]) arpNotation.color = arpAttrs["color"];
       notations.push(arpNotation);
     } else if (el.tagName === "non-arpeggiate") {
       const nonArpAttrs = el.attributes;
@@ -1638,6 +1672,7 @@ function parseNotations(elements, notationsIndex = 0) {
         nonArpeggiateType: nonArpAttrs["type"],
         number: nonArpAttrs["number"] ? parseInt(nonArpAttrs["number"], 10) : void 0,
         placement: nonArpAttrs["placement"],
+        color: nonArpAttrs["color"],
         notationsIndex
       });
     } else if (el.tagName === "accidental-mark") {
@@ -1648,6 +1683,7 @@ function parseNotations(elements, notationsIndex = 0) {
         type: "accidental-mark",
         value,
         placement: amAttrs["placement"],
+        color: amAttrs["color"],
         notationsIndex
       });
     } else if (el.tagName === "glissando") {
@@ -1666,6 +1702,7 @@ function parseNotations(elements, notationsIndex = 0) {
         number: glissAttrs["number"] ? parseInt(glissAttrs["number"], 10) : void 0,
         lineType: glissAttrs["line-type"],
         text,
+        color: glissAttrs["color"],
         notationsIndex
       });
     } else if (el.tagName === "slide") {
@@ -1677,6 +1714,7 @@ function parseNotations(elements, notationsIndex = 0) {
         slideType: slideAttrs["type"] === "stop" ? "stop" : "start",
         number: slideAttrs["number"] ? parseInt(slideAttrs["number"], 10) : void 0,
         lineType: slideAttrs["line-type"],
+        color: slideAttrs["color"],
         notationsIndex
       };
       if (slideText) slideNotation.text = slideText;
@@ -1704,12 +1742,14 @@ function parseLyric(elements, attrs) {
       }
     } else if (el.tagName === "text") {
       const content = el.children;
+      const textColor = el.attributes["color"];
       let foundText = false;
       for (const item of content) {
         if (typeof item === "string") {
           textElements.push({
             text: item,
-            syllabic: currentSyllabic
+            syllabic: currentSyllabic,
+            color: textColor
           });
           currentSyllabic = void 0;
           foundText = true;
@@ -1719,7 +1759,8 @@ function parseLyric(elements, attrs) {
       if (!foundText) {
         textElements.push({
           text: "",
-          syllabic: currentSyllabic
+          syllabic: currentSyllabic,
+          color: textColor
         });
         currentSyllabic = void 0;
       }
@@ -1748,9 +1789,15 @@ function parseLyric(elements, attrs) {
   if (attrs["placement"]) {
     lyric.placement = attrs["placement"];
   }
+  if (attrs["color"]) {
+    lyric.color = attrs["color"];
+  }
   if (textElements.length > 0 && textElements[0].syllabic) {
     lyric.syllabic = textElements[0].syllabic;
   }
+  if (textElements.length > 0 && textElements[0].color) {
+    lyric.textColor = textElements[0].color;
+  }
   if (textElements.length > 1) {
     lyric.textElements = textElements;
   }
@@ -1762,8 +1809,9 @@ function parseLyric(elements, attrs) {
     if (el.tagName === "extend") {
       const extendAttrs = el.attributes;
       const extendType = extendAttrs["type"];
-      if (extendType) {
-        lyric.extend = { type: extendType };
+      const extendColor = extendAttrs["color"];
+      if (extendType || extendColor) {
+        lyric.extend = { type: extendType, color: extendColor };
       } else {
         lyric.extend = true;
       }
@@ -1905,6 +1953,7 @@ function parseDirectionTypes(elements) {
             if (dynAttrs["default-y"]) result.defaultY = parseFloat(dynAttrs["default-y"]);
             if (dynAttrs["relative-x"]) result.relativeX = parseFloat(dynAttrs["relative-x"]);
             if (dynAttrs["halign"]) result.halign = dynAttrs["halign"];
+            if (dynAttrs["color"]) result.color = dynAttrs["color"];
             results.push(result);
             foundStandard = true;
             break;
@@ -1918,6 +1967,7 @@ function parseDirectionTypes(elements) {
             if (dynAttrs["default-y"]) result.defaultY = parseFloat(dynAttrs["default-y"]);
             if (dynAttrs["relative-x"]) result.relativeX = parseFloat(dynAttrs["relative-x"]);
             if (dynAttrs["halign"]) result.halign = dynAttrs["halign"];
+            if (dynAttrs["color"]) result.color = dynAttrs["color"];
             results.push(result);
           }
         }
@@ -1932,6 +1982,7 @@ function parseDirectionTypes(elements) {
         if (wedgeAttrs["spread"]) result.spread = parseFloat(wedgeAttrs["spread"]);
         if (wedgeAttrs["default-y"]) result.defaultY = parseFloat(wedgeAttrs["default-y"]);
         if (wedgeAttrs["relative-x"]) result.relativeX = parseFloat(wedgeAttrs["relative-x"]);
+        if (wedgeAttrs["color"]) result.color = wedgeAttrs["color"];
         results.push(result);
       }
       continue;
@@ -1976,6 +2027,7 @@ function parseDirectionTypes(elements) {
         if (metAttrs["default-y"]) result.defaultY = parseFloat(metAttrs["default-y"]);
         if (metAttrs["font-family"]) result.fontFamily = metAttrs["font-family"];
         if (metAttrs["font-size"]) result.fontSize = metAttrs["font-size"];
+        if (metAttrs["color"]) result.color = metAttrs["color"];
         results.push(result);
       }
       continue;
@@ -2010,6 +2062,7 @@ function parseDirectionTypes(elements) {
         if (a["default-y"]) result.defaultY = parseFloat(a["default-y"]);
         if (a["font-size"]) result.fontSize = a["font-size"];
         if (a["font-weight"]) result.fontWeight = a["font-weight"];
+        if (a["color"]) result.color = a["color"];
         results.push(result);
       }
       continue;
@@ -2024,6 +2077,7 @@ function parseDirectionTypes(elements) {
         if (bracketAttrs["line-type"]) result.lineType = bracketAttrs["line-type"];
         if (bracketAttrs["default-y"]) result.defaultY = parseFloat(bracketAttrs["default-y"]);
         if (bracketAttrs["relative-x"]) result.relativeX = parseFloat(bracketAttrs["relative-x"]);
+        if (bracketAttrs["color"]) result.color = bracketAttrs["color"];
         results.push(result);
       }
       continue;
@@ -2037,13 +2091,16 @@ function parseDirectionTypes(elements) {
         if (dashAttrs["dash-length"]) result.dashLength = parseFloat(dashAttrs["dash-length"]);
         if (dashAttrs["default-y"]) result.defaultY = parseFloat(dashAttrs["default-y"]);
         if (dashAttrs["space-length"]) result.spaceLength = parseFloat(dashAttrs["space-length"]);
+        if (dashAttrs["color"]) result.color = dashAttrs["color"];
         results.push(result);
       }
       continue;
     }
     if (el.tagName === "accordion-registration") {
       const accContent = el.children;
+      const accRegAttrs = el.attributes;
       const result = { kind: "accordion-registration" };
+      if (accRegAttrs["color"]) result.color = accRegAttrs["color"];
       for (const acc of accContent) {
         if (typeof acc === "string") continue;
         if (acc.tagName === "accordion-high") {
@@ -2076,34 +2133,23 @@ function parseDirectionTypes(elements) {
           if (otherAttrs["default-y"]) result.defaultY = parseFloat(otherAttrs["default-y"]);
           if (otherAttrs["halign"]) result.halign = otherAttrs["halign"];
           if (otherAttrs["print-object"] === "no") result.printObject = false;
+          if (otherAttrs["color"]) result.color = otherAttrs["color"];
           results.push(result);
           break;
         }
       }
       continue;
     }
-    if (el.tagName === "segno") {
-      results.push({ kind: "segno" });
-      continue;
-    }
-    if (el.tagName === "coda") {
-      results.push({ kind: "coda" });
-      continue;
-    }
-    if (el.tagName === "eyeglasses") {
-      results.push({ kind: "eyeglasses" });
-      continue;
-    }
-    if (el.tagName === "damp") {
-      results.push({ kind: "damp" });
-      continue;
-    }
-    if (el.tagName === "damp-all") {
-      results.push({ kind: "damp-all" });
+    if (el.tagName === "segno" || el.tagName === "coda" || el.tagName === "eyeglasses" || el.tagName === "damp" || el.tagName === "damp-all") {
+      const markerColor = el.attributes["color"];
+      const result = { kind: el.tagName };
+      if (markerColor) result.color = markerColor;
+      results.push(result);
       continue;
     }
     if (el.tagName === "scordatura") {
       const scordContent = el.children;
+      const scordColor = el.attributes["color"];
       const accords = [];
       for (const sc of scordContent) {
         if (typeof sc === "string") continue;
@@ -2124,11 +2170,12 @@ function parseDirectionTypes(elements) {
           }
         }
       }
-      results.push({ kind: "scordatura", accords: accords.length > 0 ? accords : void 0 });
+      results.push({ kind: "scordatura", accords: accords.length > 0 ? accords : void 0, color: scordColor });
       continue;
     }
     if (el.tagName === "harp-pedals") {
       const harpContent = el.children;
+      const harpColor = el.attributes["color"];
       const pedalTunings = [];
       for (const hp of harpContent) {
         if (typeof hp === "string") continue;
@@ -2144,7 +2191,7 @@ function parseDirectionTypes(elements) {
           }
         }
       }
-      results.push({ kind: "harp-pedals", pedalTunings: pedalTunings.length > 0 ? pedalTunings : void 0 });
+      results.push({ kind: "harp-pedals", pedalTunings: pedalTunings.length > 0 ? pedalTunings : void 0, color: harpColor });
       continue;
     }
     if (el.tagName === "image") {
@@ -2166,6 +2213,7 @@ function parseDirectionTypes(elements) {
         if (pedalAttrs["default-y"]) result.defaultY = parseFloat(pedalAttrs["default-y"]);
         if (pedalAttrs["relative-x"]) result.relativeX = parseFloat(pedalAttrs["relative-x"]);
         if (pedalAttrs["halign"]) result.halign = pedalAttrs["halign"];
+        if (pedalAttrs["color"]) result.color = pedalAttrs["color"];
         results.push(result);
       }
       continue;
@@ -2176,6 +2224,7 @@ function parseDirectionTypes(elements) {
       if (shiftType === "up" || shiftType === "down" || shiftType === "stop") {
         const result = { kind: "octave-shift", type: shiftType };
         if (shiftAttrs["size"]) result.size = parseInt(shiftAttrs["size"], 10);
+        if (shiftAttrs["color"]) result.color = shiftAttrs["color"];
         results.push(result);
       }
       continue;
@@ -2222,10 +2271,13 @@ function parseDirectionTypes(elements) {
 function parseBarline(elements, attrs) {
   const location = attrs["location"] || "right";
   const barline = { _id: attrs["id"] || generateId(), location };
-  const barStyle = getElementText(elements, "bar-style");
-  if (barStyle && isValidBarStyle(barStyle)) {
-    barline.barStyle = barStyle;
-  }
+  parseFirstElement(elements, "bar-style", (c, a) => {
+    const barStyle = extractText(c);
+    if (barStyle && isValidBarStyle(barStyle)) {
+      barline.barStyle = barStyle;
+      if (a["color"]) barline.barStyleColor = a["color"];
+    }
+  });
   for (const el of elements) {
     if (typeof el === "string") continue;
     if (el.tagName === "repeat") {
@@ -2251,6 +2303,7 @@ function parseBarline(elements, attrs) {
         if (endingText) barline.ending.text = endingText;
         if (endingAttrs["default-y"]) barline.ending.defaultY = parseFloat(endingAttrs["default-y"]);
         if (endingAttrs["end-length"]) barline.ending.endLength = parseFloat(endingAttrs["end-length"]);
+        if (endingAttrs["color"]) barline.ending.color = endingAttrs["color"];
       }
     }
   }
@@ -2428,6 +2481,7 @@ function parseStaffDetails(elements, attrs) {
 function parseMeasureStyle(elements, attrs) {
   const ms = {};
   if (attrs["number"]) ms.number = parseInt(attrs["number"], 10);
+  if (attrs["color"]) ms.color = attrs["color"];
   const multipleRest = getElementText(elements, "multiple-rest");
   if (multipleRest) ms.multipleRest = parseInt(multipleRest, 10);
   for (const el of elements) {
@@ -2469,6 +2523,7 @@ function parseHarmony(elements, attrs) {
   if (attrs["default-y"]) harmony.defaultY = parseFloat(attrs["default-y"]);
   if (attrs["halign"]) harmony.halign = attrs["halign"];
   if (attrs["font-size"]) harmony.fontSize = attrs["font-size"];
+  if (attrs["color"]) harmony.color = attrs["color"];
   const root = getElementContent(elements, "root");
   if (root) {
     const rootStep = getElementText(root, "root-step");
@@ -2489,6 +2544,7 @@ function parseHarmony(elements, attrs) {
       }
       if (kindAttrs["text"] !== void 0) harmony.kindText = kindAttrs["text"];
       if (kindAttrs["halign"]) harmony.kindHalign = kindAttrs["halign"];
+      if (kindAttrs["color"]) harmony.kindColor = kindAttrs["color"];
       break;
     }
   }
@@ -2583,6 +2639,8 @@ function parseHarmony(elements, attrs) {
       }
     }
     if (frameNotes.length > 0) frameObj.frameNotes = frameNotes;
+    const frameColor = parseFirstElement(elements, "frame", (_c, a) => a["color"]);
+    if (frameColor) frameObj.color = frameColor;
     if (Object.keys(frameObj).length > 0) harmony.frame = frameObj;
   }
   const offset = getElementText(elements, "offset");
@@ -2598,6 +2656,7 @@ function parseFiguredBass(elements, attrs) {
     figures: []
   };
   if (attrs["parentheses"] === "yes") fb.parentheses = true;
+  if (attrs["color"]) fb.color = attrs["color"];
   const duration = getElementText(elements, "duration");
   if (duration) fb.duration = parseInt(duration, 10);
   for (const el of elements) {
@@ -2628,8 +2687,9 @@ function parseFiguredBass(elements, attrs) {
         } else if (figEl.tagName === "extend") {
           const extendAttrs = figEl.attributes;
           const extendType = extendAttrs["type"];
-          if (extendType) {
-            figure.extend = { type: extendType };
+          const extendColor = extendAttrs["color"];
+          if (extendType || extendColor) {
+            figure.extend = { type: extendType, color: extendColor };
           } else {
             figure.extend = true;
           }
@@ -2760,6 +2820,148 @@ function parseAuto(data) {
   return parse(xmlString);
 }
 
+// src/abc-decorations.ts
+var ABC_BODY_FIELD_MARKER = "__abc_field__";
+var DECORATIONS = [
+  // --- Articulations ---------------------------------------------------
+  { spellings: [".", "staccato"], canonical: ".", target: { kind: "articulation", articulation: "staccato" } },
+  { spellings: ["L", "accent", "emphasis", ">"], canonical: "L", target: { kind: "articulation", articulation: "accent" } },
+  { spellings: ["marcato"], canonical: "!marcato!", target: { kind: "articulation", articulation: "strong-accent" } },
+  { spellings: ["tenuto"], canonical: "!tenuto!", target: { kind: "articulation", articulation: "tenuto" } },
+  { spellings: ["breath"], canonical: "!breath!", target: { kind: "articulation", articulation: "breath-mark" } },
+  // --- Ornaments -------------------------------------------------------
+  { spellings: ["T", "trill"], canonical: "T", target: { kind: "ornament", ornament: "trill-mark" } },
+  { spellings: ["M", "lowermordent", "mordent"], canonical: "M", target: { kind: "ornament", ornament: "mordent" } },
+  { spellings: ["P", "uppermordent", "pralltriller"], canonical: "P", target: { kind: "ornament", ornament: "inverted-mordent" } },
+  { spellings: ["turn", "gruppetto"], canonical: "!turn!", target: { kind: "ornament", ornament: "turn" } },
+  { spellings: ["invertedturn"], canonical: "!invertedturn!", target: { kind: "ornament", ornament: "inverted-turn" } },
+  { spellings: ["trill("], canonical: "!trill(!", target: { kind: "trill-line", wavyLineType: "start" } },
+  { spellings: ["trill)"], canonical: "!trill)!", target: { kind: "trill-line", wavyLineType: "stop" } },
+  { spellings: ["arpeggio"], canonical: "!arpeggio!", target: { kind: "arpeggiate" } },
+  // --- Technical -------------------------------------------------------
+  { spellings: ["u", "upbow"], canonical: "u", target: { kind: "technical", technical: "up-bow" } },
+  { spellings: ["v", "downbow"], canonical: "v", target: { kind: "technical", technical: "down-bow" } },
+  { spellings: ["open"], canonical: "!open!", target: { kind: "technical", technical: "open-string" } },
+  { spellings: ["thumb"], canonical: "!thumb!", target: { kind: "technical", technical: "thumb-position" } },
+  { spellings: ["snap"], canonical: "!snap!", target: { kind: "technical", technical: "snap-pizzicato" } },
+  { spellings: ["+", "plus"], canonical: "!plus!", target: { kind: "technical", technical: "stopped" } },
+  // --- Fermatas --------------------------------------------------------
+  { spellings: ["H", "fermata"], canonical: "H", target: { kind: "fermata" } },
+  { spellings: ["invertedfermata"], canonical: "!invertedfermata!", target: { kind: "fermata", inverted: true } },
+  // --- Wedges (hairpins) -----------------------------------------------
+  { spellings: ["crescendo(", "<("], canonical: "!crescendo(!", target: { kind: "wedge", wedge: "crescendo", stop: false } },
+  { spellings: ["crescendo)", "<)"], canonical: "!crescendo)!", target: { kind: "wedge", wedge: "crescendo", stop: true } },
+  { spellings: ["diminuendo(", ">("], canonical: "!diminuendo(!", target: { kind: "wedge", wedge: "diminuendo", stop: false } },
+  { spellings: ["diminuendo)", ">)"], canonical: "!diminuendo)!", target: { kind: "wedge", wedge: "diminuendo", stop: true } },
+  // --- Navigation marks ------------------------------------------------
+  { spellings: ["S", "segno"], canonical: "S", target: { kind: "segno" } },
+  { spellings: ["O", "coda"], canonical: "O", target: { kind: "coda" } },
+  { spellings: ["D.S."], canonical: "!D.S.!", target: { kind: "words", text: "D.S." } },
+  { spellings: ["D.C."], canonical: "!D.C.!", target: { kind: "words", text: "D.C." } },
+  { spellings: ["dacoda"], canonical: "!dacoda!", target: { kind: "words", text: "Da Coda" } },
+  { spellings: ["dacapo"], canonical: "!dacapo!", target: { kind: "words", text: "Da Capo" } },
+  { spellings: ["fine"], canonical: "!fine!", target: { kind: "words", text: "Fine" } }
+];
+for (let n = 0; n <= 5; n++) {
+  DECORATIONS.push({
+    spellings: [String(n)],
+    canonical: `!${n}!`,
+    target: { kind: "fingering", fingering: String(n) }
+  });
+}
+var ABC_DYNAMICS = /* @__PURE__ */ new Set([
+  "pppppp",
+  "ppppp",
+  "pppp",
+  "ppp",
+  "pp",
+  "p",
+  "mp",
+  "mf",
+  "f",
+  "ff",
+  "fff",
+  "ffff",
+  "fffff",
+  "ffffff",
+  "sf",
+  "sfz",
+  "sffz",
+  "sfp",
+  "sfpp",
+  "fp",
+  "rf",
+  "rfz",
+  "fz",
+  "pf"
+]);
+var ABC_SHORTHAND_DECORATIONS = /* @__PURE__ */ new Set([
+  ".",
+  "~",
+  "H",
+  "J",
+  "L",
+  "M",
+  "O",
+  "P",
+  "R",
+  "S",
+  "T",
+  "u",
+  "v"
+]);
+var BY_SPELLING = /* @__PURE__ */ new Map();
+for (const def of DECORATIONS) {
+  for (const spelling of def.spellings) {
+    BY_SPELLING.set(spelling, def);
+  }
+}
+function targetKey(target) {
+  switch (target.kind) {
+    case "articulation":
+      return `articulation:${target.articulation}`;
+    case "ornament":
+      return `ornament:${target.ornament}`;
+    case "technical":
+      return `technical:${target.technical}`;
+    case "fingering":
+      return `fingering:${target.fingering}`;
+    case "fermata":
+      return `fermata:${target.inverted ? "inverted" : "upright"}`;
+    case "arpeggiate":
+      return "arpeggiate";
+    case "trill-line":
+      return `trill-line:${target.wavyLineType}`;
+    case "dynamics":
+      return `dynamics:${target.value}`;
+    case "wedge":
+      return `wedge:${target.wedge}:${target.stop ? "stop" : "start"}`;
+    case "segno":
+      return "segno";
+    case "coda":
+      return "coda";
+    case "words":
+      return `words:${target.text}`;
+  }
+}
+var CANONICAL_BY_TARGET = /* @__PURE__ */ new Map();
+for (const def of DECORATIONS) {
+  CANONICAL_BY_TARGET.set(targetKey(def.target), def.canonical);
+}
+function lookupAbcDecoration(spelling) {
+  if (ABC_DYNAMICS.has(spelling)) {
+    return { kind: "dynamics", value: spelling };
+  }
+  const def = BY_SPELLING.get(spelling);
+  return def ? def.target : null;
+}
+function abcDecorationFor(target) {
+  if (target.kind === "dynamics") {
+    return ABC_DYNAMICS.has(target.value) ? `!${target.value}!` : null;
+  }
+  return CANONICAL_BY_TARGET.get(targetKey(target)) ?? null;
+}
+
 // src/importers/abc.ts
 var DIVISIONS = 960;
 var NOTE_TYPE_MAP = {
@@ -2774,6 +2976,7 @@ var NOTE_TYPE_MAP = {
   0.125: "32nd",
   0.0625: "64th"
 };
+var NOTE_TYPE_ENTRIES = Object.entries(NOTE_TYPE_MAP).map(([quarterNotes, type]) => [parseFloat(quarterNotes), type]);
 var KEY_FIFTHS = {
   "Cb": -7,
   "Gb": -6,
@@ -2835,38 +3038,38 @@ var MODE_NAME = {
   "locrian": "locrian",
   "loc": "locrian"
 };
-var DYNAMICS_VALUES = /* @__PURE__ */ new Set([
-  "pppppp",
-  "ppppp",
-  "pppp",
-  "ppp",
-  "pp",
-  "p",
-  "mp",
-  "mf",
-  "f",
-  "ff",
-  "fff",
-  "ffff",
-  "fffff",
-  "ffffff",
-  "sf",
-  "sfz",
-  "sffz",
-  "sfp",
-  "sfpp",
-  "fp",
-  "rf",
-  "rfz",
-  "fz",
-  "pf"
-]);
+var DYNAMICS_VALUES = ABC_DYNAMICS;
+var ENDING_SPEC = /^(\d+(?:[,-]\d+)*)/;
+var MICROTONE_ACCIDENTALS = {
+  "0.5": "quarter-sharp",
+  "-0.5": "quarter-flat",
+  "1.5": "three-quarters-sharp",
+  "-1.5": "three-quarters-flat"
+};
+function appendToHeaderField(header, field, text) {
+  switch (field) {
+    case "T":
+      header.title = (header.title ?? "") + text;
+      break;
+    case "C":
+      header.composer = (header.composer ?? "") + text;
+      break;
+    default: {
+      const extra = header.extraFields;
+      if (extra && extra.length > 0 && extra[extra.length - 1].field === field) {
+        extra[extra.length - 1].value += text;
+      }
+      break;
+    }
+  }
+}
 function parseHeader(lines) {
   const header = { voices: [], extraFields: [], directives: [] };
   let bodyStartIndex = 0;
   let foundKey = false;
   let postKHeaderDone = false;
   const headerFieldOrder = [];
+  let lastField = null;
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i].trim();
     if (line === "") continue;
@@ -2890,10 +3093,18 @@ function parseHeader(lines) {
       }
       continue;
     }
-    const fieldMatch = line.match(/^([A-Za-z]):\s*(.*)/);
+    const continuationMatch = line.match(/^\+:(.*)$/);
+    if (continuationMatch && !foundKey && lastField) {
+      appendToHeaderField(header, lastField, continuationMatch[1]);
+      headerFieldOrder.push(line);
+      continue;
+    }
+    const fieldMatch = line.match(/^([A-Za-z]):(.*)/);
     const postKFields = /* @__PURE__ */ new Set(["I", "N"]);
     if (fieldMatch && (!foundKey || fieldMatch[1] === "V" || foundKey && postKFields.has(fieldMatch[1]))) {
-      const [, field, value] = fieldMatch;
+      const [, field, rawFieldValue] = fieldMatch;
+      const value = rawFieldValue.trimStart();
+      lastField = field;
       if (foundKey && field !== "V") {
         if (!postKHeaderDone) {
           header.extraFields.push({ field, value: value.trim() });
@@ -2929,6 +3140,7 @@ function parseHeader(lines) {
           break;
         case "K":
           header.key = value.trim();
+          header.clef = line;
           foundKey = true;
           bodyStartIndex = i + 1;
           headerFieldOrder.push(line);
@@ -2939,6 +3151,7 @@ function parseHeader(lines) {
           const nameMatch = voiceValue.match(/name=["']?([^"'\s]+)["']?/i);
           const nmMatch = voiceValue.match(/nm=["']([^"']*)["']/i);
           const clefMatch = voiceValue.match(/clef=(\S+)/i);
+          const octaveMatch = voiceValue.match(/octave\s*=\s*(-?\d+)/i);
           const displayName = nameMatch ? nameMatch[1] : nmMatch ? nmMatch[1] : voiceId;
           const hasParams = clefMatch || nameMatch || nmMatch || /\b(Program|merge|up|down|bass|treble|alto|tenor|soprano|octave|snm|stem)\b/i.test(voiceValue);
           const isBodyVoiceSwitch = foundKey && !hasParams;
@@ -2949,12 +3162,14 @@ function parseHeader(lines) {
           if (existingVoice) {
             if (nameMatch || nmMatch) existingVoice.name = displayName;
             if (clefMatch) existingVoice.clef = clefMatch[1];
+            if (octaveMatch) existingVoice.octave = parseInt(octaveMatch[1], 10);
             if (foundKey && !isBodyVoiceSwitch) existingVoice.fullLine = lines[i];
           } else {
             header.voices.push({
               id: voiceId,
               name: displayName,
               clef: clefMatch ? clefMatch[1] : void 0,
+              octave: octaveMatch ? parseInt(octaveMatch[1], 10) : void 0,
               fullLine: lines[i]
             });
           }
@@ -3020,12 +3235,29 @@ function parseTimeSignature2(meterStr) {
   if (trimmed === "C|" || trimmed.toLowerCase() === "cut") {
     return { beats: "2", beatType: 2, symbol: "cut" };
   }
+  if (trimmed.toLowerCase() === "none") {
+    return { beats: "4", beatType: 4, senzaMisura: true };
+  }
   const match = trimmed.match(/^(\d+)\/(\d+)$/);
   if (match) {
     return { beats: match[1], beatType: parseInt(match[2], 10) };
   }
+  const additive = trimmed.match(/^\(?\s*(\d+(?:\s*\+\s*\d+)+)\s*\)?\/(\d+)$/);
+  if (additive) {
+    const groups = additive[1].split("+").map((g) => parseInt(g.trim(), 10));
+    return {
+      beats: groups.join("+"),
+      beatType: parseInt(additive[2], 10),
+      beatsList: groups
+    };
+  }
   return { beats: "4", beatType: 4 };
 }
+function timeSignatureWholeNotes(time) {
+  const beats = time.beatsList ? time.beatsList.reduce((sum, b) => sum + b, 0) : parseInt(time.beats, 10);
+  if (!Number.isFinite(beats) || time.beatType === 0) return 1;
+  return beats / time.beatType;
+}
 function parseUnitNoteLength(lengthStr, meterStr) {
   if (lengthStr) {
     const match = lengthStr.trim().match(/^(\d+)\/(\d+)$/);
@@ -3033,12 +3265,9 @@ function parseUnitNoteLength(lengthStr, meterStr) {
       return { num: parseInt(match[1], 10), den: parseInt(match[2], 10) };
     }
   }
-  if (meterStr) {
-    const mMatch = meterStr.trim().match(/^(\d+)\/(\d+)$/);
-    if (mMatch) {
-      const ratio = parseInt(mMatch[1], 10) / parseInt(mMatch[2], 10);
-      return ratio >= 0.75 ? { num: 1, den: 8 } : { num: 1, den: 16 };
-    }
+  if (meterStr && meterStr.trim() !== "") {
+    const ratio = timeSignatureWholeNotes(parseTimeSignature2(meterStr));
+    return ratio >= 0.75 ? { num: 1, den: 8 } : { num: 1, den: 16 };
   }
   return { num: 1, den: 8 };
 }
@@ -3048,8 +3277,7 @@ function lengthToDuration(num, den, unitNote) {
 }
 function durationToNoteType(duration) {
   const quarterNotes = duration / DIVISIONS;
-  for (const [qnStr, type] of Object.entries(NOTE_TYPE_MAP)) {
-    const qn = parseFloat(qnStr);
+  for (const [qn, type] of NOTE_TYPE_ENTRIES) {
     if (Math.abs(quarterNotes - qn) < 1e-3) {
       return { noteType: type, dots: 0 };
     }
@@ -3062,8 +3290,8 @@ function durationToNoteType(duration) {
   }
   let bestType = "quarter";
   let bestDiff = Infinity;
-  for (const [qnStr, type] of Object.entries(NOTE_TYPE_MAP)) {
-    const diff = Math.abs(quarterNotes - parseFloat(qnStr));
+  for (const [qn, type] of NOTE_TYPE_ENTRIES) {
+    const diff = Math.abs(quarterNotes - qn);
     if (diff < bestDiff) {
       bestDiff = diff;
       bestType = type;
@@ -3165,18 +3393,18 @@ function tokenizeBody(bodyLines) {
       isContinuation = false;
       continue;
     }
-    const lyricsMatch = line.match(/^w:\s*(.*)/);
+    const lyricsMatch = line.match(/^w:(.*)/);
     if (lyricsMatch) {
       const syllables = parseLyricLine(lyricsMatch[1]);
       voiceTokens.get(currentVoice).push({
         type: "lyrics",
-        value: lyricsMatch[1],
+        value: lyricsMatch[1].trimStart(),
         syllables
       });
       isContinuation = false;
       continue;
     }
-    const bodyKeyMatch = line.match(/^K:\s*(.*)/);
+    const bodyKeyMatch = line.match(/^K:(.*)/);
     if (bodyKeyMatch) {
       const currentTokens2 = voiceTokens.get(currentVoice);
       if (currentTokens2.length > 0) {
@@ -3185,12 +3413,17 @@ function tokenizeBody(bodyLines) {
           currentTokens2.push({ type: "line_break", value: "\n" });
         }
       }
-      currentTokens2.push({ type: "inline_field", value: `K:${bodyKeyMatch[1]}` });
+      currentTokens2.push({ type: "inline_field", value: `K:${bodyKeyMatch[1]}`, standalone: true });
       currentTokens2.push({ type: "line_break", value: "\n" });
       isContinuation = false;
       continue;
     }
-    if (/^[A-Za-z]:\s*/.test(line) && !/^\[/.test(line)) {
+    const bodyFieldMatch = /^[A-Za-z]:/.test(line);
+    if (bodyFieldMatch && !/^\[/.test(line)) {
+      voiceTokens.get(currentVoice).push({
+        type: "inline_field",
+        value: `${ABC_BODY_FIELD_MARKER}${line}`
+      });
       isContinuation = false;
       continue;
     }
@@ -3213,7 +3446,7 @@ function tokenizeBody(bodyLines) {
     }
     for (const token of tokens) {
       if (token.type === "inline_field") {
-        const fieldMatch = token.value.match(/^V:\s*(.+)/);
+        const fieldMatch = token.value.match(/^V:(.+)/);
         if (fieldMatch) {
           const voiceId = fieldMatch[1].trim().split(/\s+/)[0];
           currentVoice = voiceId;
@@ -3287,13 +3520,22 @@ function tokenizeMusicLine(line) {
     if (ch === '"') {
       const end = line.indexOf('"', i + 1);
       if (end !== -1) {
-        tokens.push({ type: "chord_symbol", value: line.slice(i + 1, end) });
+        const text = line.slice(i + 1, end);
+        if (/^[\^_<>@]/.test(text)) {
+          tokens.push({
+            type: "annotation",
+            value: text.slice(1),
+            annotationPlacement: text[0]
+          });
+        } else {
+          tokens.push({ type: "chord_symbol", value: text });
+        }
         i = end + 1;
         continue;
       }
     }
-    if (ch === "!") {
-      const end = line.indexOf("!", i + 1);
+    if (ch === "!" || ch === "+") {
+      const end = line.indexOf(ch, i + 1);
       if (end !== -1) {
         tokens.push({ type: "decoration", value: line.slice(i + 1, end) });
         i = end + 1;
@@ -3301,8 +3543,9 @@ function tokenizeMusicLine(line) {
       }
     }
     if (ch === "{") {
-      tokens.push({ type: "grace_start", value: "{" });
-      i++;
+      const isSlash = i + 1 < line.length && line[i + 1] === "/";
+      tokens.push({ type: "grace_start", value: isSlash ? "{/" : "{", slashGrace: isSlash });
+      i += isSlash ? 2 : 1;
       continue;
     }
     if (ch === "}") {
@@ -3310,6 +3553,22 @@ function tokenizeMusicLine(line) {
       i++;
       continue;
     }
+    if (ch === ".") {
+      const next = i + 1 < line.length ? line[i + 1] : "";
+      if (next === "(") {
+        tokens.push({ type: "slur_start", value: ".(", dotted: true });
+        i += 2;
+        continue;
+      }
+      if (next === "|") {
+        const dottedBar = parseBarLine(line, i + 1);
+        if (dottedBar) {
+          tokens.push({ type: "bar", value: "." + dottedBar.token.value, barType: "dotted" });
+          i = dottedBar.nextIndex;
+          continue;
+        }
+      }
+    }
     if (ch === "(" && i + 1 < line.length && /\d/.test(line[i + 1])) {
       const tupletResult = parseTuplet(line, i);
       if (tupletResult) {
@@ -3339,7 +3598,7 @@ function tokenizeMusicLine(line) {
         tokens.push(barResult.token);
         i = barResult.nextIndex;
         if (i < line.length && /\d/.test(line[i])) {
-          const numMatch = line.slice(i).match(/^(\d+)/);
+          const numMatch = line.slice(i).match(ENDING_SPEC);
           if (numMatch) {
             tokens.push({ type: "ending", value: numMatch[1] });
             i += numMatch[1].length;
@@ -3350,7 +3609,7 @@ function tokenizeMusicLine(line) {
       }
     }
     if (ch === "[" && i + 1 < line.length && /\d/.test(line[i + 1])) {
-      const numMatch = line.slice(i + 1).match(/^(\d+)/);
+      const numMatch = line.slice(i + 1).match(ENDING_SPEC);
       if (numMatch) {
         tokens.push({ type: "ending", value: numMatch[1], bracket: true });
         i += 1 + numMatch[1].length;
@@ -3397,14 +3656,22 @@ function tokenizeMusicLine(line) {
       tokens.push({ type: "chord_end", value: "]", durationNum: dur.num, durationDen: dur.den });
       continue;
     }
-    if ((ch === "v" || ch === "u" || ch === "T" || ch === "M") && i + 1 < line.length) {
+    if (ABC_SHORTHAND_DECORATIONS.has(ch) && i + 1 < line.length) {
       const nextCh = line[i + 1];
-      if (isNoteStart(nextCh) || nextCh === "[" || nextCh === "z" || nextCh === "x" || nextCh === "v" || nextCh === "u" || nextCh === "T" || nextCh === "M" || nextCh === "(" || nextCh === "!" || nextCh === '"') {
+      if (isNoteStart(nextCh) || nextCh === "[" || nextCh === "{" || nextCh === "z" || nextCh === "Z" || nextCh === "x" || nextCh === "X" || nextCh === "y" || ABC_SHORTHAND_DECORATIONS.has(nextCh) || nextCh === "(" || nextCh === "!" || nextCh === "+" || nextCh === '"') {
         tokens.push({ type: "decoration", value: ch });
         i++;
         continue;
       }
     }
+    if (ch === "y") {
+      const start = i;
+      i++;
+      const dur = parseDuration(line, i);
+      i = dur.nextIndex;
+      tokens.push({ type: "spacer", value: line.slice(start, i) });
+      continue;
+    }
     if (isNoteStart(ch) || ch === "z" || ch === "Z" || ch === "x" || ch === "X") {
       const noteResult = parseNoteToken(line, i);
       if (noteResult) {
@@ -3450,11 +3717,13 @@ function parseTuplet(line, i) {
 }
 function parseBarLine(line, i) {
   const patterns = [
+    ["[|]", "invisible"],
     [":|]", "end-repeat-final"],
     [":||:", "double-repeat"],
     ["::", "double-repeat"],
     [":|:", "double-repeat"],
     ["|>|", "thick-thin"],
+    ["[|:", "start-repeat"],
     ["|:", "start-repeat"],
     [":|", "end-repeat"],
     ["||", "double"],
@@ -3481,15 +3750,18 @@ function parseBarLine(line, i) {
 function parseNoteToken(line, i) {
   const start = i;
   if (line[i] === "z" || line[i] === "Z" || line[i] === "x" || line[i] === "X") {
+    const restLetter = line[i];
     i++;
     const dur2 = parseDuration(line, i);
     i = dur2.nextIndex;
+    const isMultiMeasure = restLetter === "Z";
     return {
       token: {
         type: "rest",
         value: line.slice(start, i),
-        durationNum: dur2.num,
-        durationDen: dur2.den
+        durationNum: isMultiMeasure ? 1 : dur2.num,
+        durationDen: isMultiMeasure ? 1 : dur2.den,
+        restMeasures: isMultiMeasure ? Math.max(1, dur2.num) : void 0
       },
       nextIndex: i
     };
@@ -3503,6 +3775,9 @@ function parseNoteToken(line, i) {
       accidental = 2;
       i++;
     }
+    const micro = parseMicrotoneFactor(line, i);
+    accidental *= micro.factor;
+    i = micro.nextIndex;
   } else if (line[i] === "_") {
     accidental = -1;
     i++;
@@ -3510,6 +3785,9 @@ function parseNoteToken(line, i) {
       accidental = -2;
       i++;
     }
+    const micro = parseMicrotoneFactor(line, i);
+    accidental *= micro.factor;
+    i = micro.nextIndex;
   } else if (line[i] === "=") {
     accidental = 0;
     explicitNatural = true;
@@ -3547,6 +3825,14 @@ function parseNoteToken(line, i) {
     nextIndex: i
   };
 }
+function parseMicrotoneFactor(line, i) {
+  const match = line.slice(i).match(/^(\d{0,3})\/(\d{0,3})/);
+  if (!match) return { factor: 1, nextIndex: i };
+  const num = match[1] === "" ? 1 : parseInt(match[1], 10);
+  const den = match[2] === "" ? 2 : parseInt(match[2], 10);
+  if (den === 0) return { factor: 1, nextIndex: i };
+  return { factor: num / den, nextIndex: i + match[0].length };
+}
 function abcNoteToPitch(letter, accidental) {
   const isLower = letter === letter.toLowerCase();
   const step = letter.toUpperCase();
@@ -3585,9 +3871,8 @@ function buildScore(header, voiceTokensList, voiceIds, headerFieldOrder, inlineV
   const unitNote = parseUnitNoteLength(header.unitNoteLength, header.meter);
   const timeSignature = parseTimeSignature2(header.meter || "4/4");
   const keySignature = parseKeySignature2(header.key || "C");
-  const beatsNum = parseInt(timeSignature.beats, 10);
-  const beatType = timeSignature.beatType;
-  const measureDuration = Math.round(beatsNum / beatType * 4 * DIVISIONS);
+  const headerClef = header.clef ? parseAbcClefSpec(header.clef) : void 0;
+  const measureDuration = Math.round(timeSignatureWholeNotes(timeSignature) * 4 * DIVISIONS);
   const parts = [];
   const partListEntries = [];
   const miscellaneous = [];
@@ -3688,8 +3973,12 @@ function buildScore(header, voiceTokensList, voiceIds, headerFieldOrder, inlineV
       id: partId,
       name: voiceName
     });
-    const voiceClef = headerVoice ? abcClefToMusicXml(headerVoice.clef) : void 0;
-    const buildResult = buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDuration, voiceClef);
+    const voiceClef = headerVoice?.clef ? abcClefToMusicXml(headerVoice.clef) : headerClef;
+    const octaveShift = headerVoice?.octave ?? 0;
+    const buildResult = buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDuration, voiceClef, octaveShift);
+    if (octaveShift !== 0) {
+      miscellaneous.push({ name: `abc-voice-octave-${voiceIndex}`, value: String(octaveShift) });
+    }
     parts.push({
       _id: generateId(),
       id: partId,
@@ -3709,15 +3998,23 @@ function buildScore(header, voiceTokensList, voiceIds, headerFieldOrder, inlineV
       let lyricsAfterAll = true;
       let seenLyrics = false;
       const lyricLineCounts = [];
-      for (const token of tokens) {
+      const lyricLineVerses = [];
+      let verse = 0;
+      for (let ti = 0; ti < tokens.length; ti++) {
+        const token = tokens[ti];
         if (token.type === "lyrics") {
           hasLyrics2 = true;
           seenLyrics = true;
+          verse = ti > 0 && tokens[ti - 1].type === "lyrics" ? verse + 1 : 1;
           lyricLineCounts.push(token.syllables?.length || 0);
+          lyricLineVerses.push(verse);
         } else if (seenLyrics && (token.type === "note" || token.type === "rest" || token.type === "bar")) {
           lyricsAfterAll = false;
         }
       }
+      if (hasLyrics2 && lyricLineVerses.some((v) => v > 1)) {
+        miscellaneous.push({ name: "abc-lyrics-line-verses", value: JSON.stringify(lyricLineVerses) });
+      }
       if (hasLyrics2 && lyricsAfterAll) {
         miscellaneous.push({ name: "abc-lyrics-after-all", value: "true" });
       }
@@ -3758,13 +4055,14 @@ function buildScore(header, voiceTokensList, voiceIds, headerFieldOrder, inlineV
   };
 }
 function parseTempoToDirection(tempoStr) {
-  const match = tempoStr.match(/(?:(\d+)\/(\d+)\s*=\s*)?(\d+)/);
-  if (!match) return null;
-  const perMinute = parseInt(match[3], 10);
+  const withUnit = tempoStr.match(/(\d{1,4})\/(\d{1,4})\s*=\s*(\d{1,6})/);
+  const rateOnly = withUnit ? null : tempoStr.match(/\d{1,6}/);
+  if (!withUnit && !rateOnly) return null;
+  const perMinute = parseInt(withUnit ? withUnit[3] : rateOnly[0], 10);
   let beatUnit = "quarter";
-  if (match[1] && match[2]) {
-    const num = parseInt(match[1], 10);
-    const den = parseInt(match[2], 10);
+  if (withUnit) {
+    const num = parseInt(withUnit[1], 10);
+    const den = parseInt(withUnit[2], 10);
     const quarterNotes = num / den * 4;
     const found = NOTE_TYPE_MAP[quarterNotes];
     if (found) beatUnit = found;
@@ -3777,20 +4075,44 @@ function parseTempoToDirection(tempoStr) {
     sound: { tempo: perMinute }
   };
 }
+var ABC_CLEF_NAMES = {
+  "treble": { sign: "G", line: 2 },
+  "bass": { sign: "F", line: 4 },
+  "bass3": { sign: "F", line: 3 },
+  "alto": { sign: "C", line: 3 },
+  "tenor": { sign: "C", line: 4 },
+  "soprano": { sign: "C", line: 1 },
+  "mezzo": { sign: "C", line: 2 },
+  "mezzo-soprano": { sign: "C", line: 2 },
+  "baritone": { sign: "C", line: 5 },
+  "perc": { sign: "percussion" },
+  "percussion": { sign: "percussion" },
+  "none": { sign: "G", line: 2 }
+};
 function abcClefToMusicXml(abcClef) {
   if (!abcClef) return { sign: "G", line: 2 };
-  const c = abcClef.toLowerCase();
-  if (c === "treble" || c === "treble-8va" || c === "treble+8") return { sign: "G", line: 2 };
-  if (c === "bass" || c === "bass3") return { sign: "F", line: 4 };
-  if (c === "alto") return { sign: "C", line: 3 };
-  if (c === "tenor") return { sign: "C", line: 4 };
-  if (c === "soprano") return { sign: "C", line: 1 };
-  if (c === "mezzo" || c === "mezzo-soprano") return { sign: "C", line: 2 };
-  if (c === "baritone") return { sign: "C", line: 5 };
-  if (c === "perc" || c === "percussion") return { sign: "percussion" };
-  return { sign: "G", line: 2 };
-}
-function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDuration, clef) {
+  const match = abcClef.trim().toLowerCase().match(/^([a-z-]*?)\s*([+-])?(8|15)(?:va|vb)?$/);
+  const baseName = match ? match[1] : abcClef.trim().toLowerCase();
+  const base = ABC_CLEF_NAMES[baseName] ?? ABC_CLEF_NAMES[abcClef.trim().toLowerCase()];
+  if (!base) return { sign: "G", line: 2 };
+  const clef = { ...base };
+  if (match && match[3]) {
+    const octaves = match[3] === "15" ? 2 : 1;
+    clef.clefOctaveChange = match[2] === "+" ? octaves : -octaves;
+  }
+  return clef;
+}
+function parseAbcClefSpec(fieldValue) {
+  const explicit = fieldValue.match(/clef\s*=\s*(\S+)/i);
+  if (explicit) return abcClefToMusicXml(explicit[1]);
+  for (const word of fieldValue.trim().split(/\s+/).slice(1)) {
+    if (word.includes("=")) continue;
+    const bare = word.toLowerCase().replace(/([+-]?(?:8|15)(?:va|vb)?)$/, "");
+    if (ABC_CLEF_NAMES[bare] && bare !== "none") return abcClefToMusicXml(word);
+  }
+  return void 0;
+}
+function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDuration, clef, octaveShift = 0) {
   const measures = [];
   let currentEntries = [];
   let hasIndividualChordDurations = false;
@@ -3801,40 +4123,40 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
   let pendingTie = false;
   let slurDepth = 0;
   let pendingSlurStarts = 0;
+  const pendingSlurDotted = [];
   let slurStartNotes = [];
   let inGrace = false;
   let pendingBrokenRhythm = null;
   let tupletState = null;
   const pendingPreNoteItems = [];
+  let pendingNotations = [];
+  let graceSlash = false;
   let pendingEndingNumber = null;
   let currentLyrics = [];
   let noteCountForLyrics = 0;
+  let lyricVerse = 0;
+  let lyricTargets = [];
   let inChord = false;
   let chordNotes = [];
   let chordNoteTies = [];
   let currentUnitNote = { ...unitNote };
   let pendingTupletStart = false;
   let pendingKeyChange = null;
+  let pendingTimeChange = null;
   const lineBreaks = [];
+  let pendingMultipleRest = null;
   function flushPendingPreNoteItems() {
     for (const item of pendingPreNoteItems) {
-      if (item.kind === "harmony") {
-        const harmony = createHarmonyEntry(item.value);
-        if (harmony) currentEntries.push(harmony);
-      } else if (item.kind === "dynamic") {
-        const dynDir = createDynamicsDirection(item.value);
-        if (dynDir) currentEntries.push(dynDir);
-      } else if (item.kind === "decoration") {
-        const decoDir = {
-          _id: generateId(),
-          type: "direction",
-          directionTypes: [{ kind: "words", text: item.value }]
-        };
-        currentEntries.push(decoDir);
-      }
+      currentEntries.push(item);
     }
     pendingPreNoteItems.length = 0;
   }
+  function attachPendingNotations(entry) {
+    if (pendingNotations.length === 0) return;
+    if (!entry.notations) entry.notations = [];
+    entry.notations.push(...pendingNotations);
+    pendingNotations = [];
+  }
   function finalizeMeasure(endBarType) {
     const measure = {
       _id: generateId(),
@@ -3851,6 +4173,13 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
       };
       isFirstMeasure = false;
     }
+    if (pendingMultipleRest !== null) {
+      if (!measure.attributes) {
+        measure.attributes = { _id: generateId() };
+      }
+      measure.attributes.measureStyle = [{ multipleRest: pendingMultipleRest }];
+      pendingMultipleRest = null;
+    }
     if (pendingKeyChange) {
       if (!measure.attributes) {
         measure.attributes = { _id: generateId() };
@@ -3859,6 +4188,13 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
       measure.attributes.key = parseKeySignature2(kValue);
       pendingKeyChange = null;
     }
+    if (pendingTimeChange) {
+      if (!measure.attributes) {
+        measure.attributes = { _id: generateId() };
+      }
+      measure.attributes.time = pendingTimeChange;
+      pendingTimeChange = null;
+    }
     if (endBarType || currentBarlines.length > 0) {
       measure.barlines = [...currentBarlines];
       if (endBarType) {
@@ -3883,8 +4219,9 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
           chordNotes.push(token);
           break;
         }
-        const entry = createNoteEntry(token, currentUnitNote, pendingTie, inGrace, tupletState);
+        const entry = createNoteEntry(token, currentUnitNote, pendingTie, inGrace, tupletState, graceSlash, octaveShift);
         pendingTie = false;
+        attachPendingNotations(entry);
         if (pendingBrokenRhythm) {
           const n = pendingBrokenRhythm.length;
           const divisor = Math.pow(2, n);
@@ -3904,7 +4241,7 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
         flushPendingPreNoteItems();
         while (pendingSlurStarts > 0) {
           if (!entry.notations) entry.notations = [];
-          entry.notations.push({ type: "slur", slurType: "start", number: slurDepth - pendingSlurStarts + 1 });
+          entry.notations.push(makeSlurStart(slurDepth - pendingSlurStarts + 1, pendingSlurDotted.shift() === true));
           slurStartNotes.push(entry);
           pendingSlurStarts--;
         }
@@ -3947,11 +4284,25 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
         break;
       }
       case "rest": {
-        if (inChord) break;
+        if (inChord) {
+          chordNotes.push(token);
+          break;
+        }
         const restEntry = createRestEntry(token, currentUnitNote, tupletState, measureDuration);
         flushPendingPreNoteItems();
+        attachPendingNotations(restEntry);
         currentEntries.push(restEntry);
         currentPosition += restEntry.duration;
+        const restMeasures = token.restMeasures || 1;
+        if (restMeasures > 1) {
+          pendingMultipleRest = restMeasures;
+          for (let extra = 1; extra < restMeasures; extra++) {
+            finalizeMeasure();
+            const filler = createRestEntry(token, currentUnitNote, null, measureDuration);
+            currentEntries.push(filler);
+            currentPosition += filler.duration;
+          }
+        }
         if (tupletState) {
           tupletState.remaining--;
           if (tupletState.remaining <= 0) {
@@ -3968,16 +4319,7 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
       case "chord_end": {
         inChord = false;
         if (chordNotes.length > 0) {
-          for (const item of pendingPreNoteItems) {
-            if (item.kind === "harmony") {
-              const harmony = createHarmonyEntry(item.value);
-              if (harmony) currentEntries.push(harmony);
-            } else if (item.kind === "dynamic") {
-              const dynDir = createDynamicsDirection(item.value);
-              if (dynDir) currentEntries.push(dynDir);
-            }
-          }
-          pendingPreNoteItems.length = 0;
+          flushPendingPreNoteItems();
           const chordDurNum = token.durationNum || 1;
           const chordDurDen = token.durationDen || 1;
           const hasIndividualDurations = chordNotes.some(
@@ -3993,13 +4335,14 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
               chordToken.durationNum = chordDurNum;
               chordToken.durationDen = chordDurDen;
             }
-            const entry = createNoteEntry(chordToken, currentUnitNote, false, inGrace, tupletState);
+            const entry = chordToken.type === "rest" ? createRestEntry(chordToken, currentUnitNote, tupletState, measureDuration) : createNoteEntry(chordToken, currentUnitNote, false, inGrace, tupletState, graceSlash, octaveShift);
             chordToken.durationNum = originalNum;
             chordToken.durationDen = originalDen;
             if (ci === 0) {
+              attachPendingNotations(entry);
               while (pendingSlurStarts > 0) {
                 if (!entry.notations) entry.notations = [];
-                entry.notations.push({ type: "slur", slurType: "start", number: slurDepth - pendingSlurStarts + 1 });
+                entry.notations.push(makeSlurStart(slurDepth - pendingSlurStarts + 1, pendingSlurDotted.shift() === true));
                 slurStartNotes.push(entry);
                 pendingSlurStarts--;
               }
@@ -4075,7 +4418,7 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
             type: "start"
           }
         };
-        if (ti > 0 && tokens[ti - 1].type === "bar" && (!tokens[ti - 1].barType || tokens[ti - 1].barType === "regular") && currentEntries.length === 0) {
+        if (!token.bracket && ti > 0 && tokens[ti - 1].type === "bar" && (!tokens[ti - 1].barType || tokens[ti - 1].barType === "regular") && currentEntries.length === 0) {
           endingBarline.barStyle = "regular";
         }
         currentBarlines.push(endingBarline);
@@ -4103,6 +4446,7 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
       case "slur_start":
         slurDepth++;
         pendingSlurStarts++;
+        pendingSlurDotted.push(token.dotted === true);
         break;
       case "slur_end":
         if (slurDepth > 0) {
@@ -4119,9 +4463,11 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
         break;
       case "grace_start":
         inGrace = true;
+        graceSlash = token.slashGrace === true;
         break;
       case "grace_end":
         inGrace = false;
+        graceSlash = false;
         break;
       case "broken_rhythm": {
         const brokenN = token.value.length;
@@ -4151,21 +4497,47 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
         };
         pendingTupletStart = true;
         break;
-      case "chord_symbol":
-        pendingPreNoteItems.push({ kind: "harmony", value: token.value });
+      case "chord_symbol": {
+        const harmony = createHarmonyEntry(token.value);
+        if (harmony) pendingPreNoteItems.push(harmony);
         break;
-      case "decoration":
-        if (DYNAMICS_VALUES.has(token.value)) {
-          pendingPreNoteItems.push({ kind: "dynamic", value: token.value });
-        } else {
-          const isShorthand = token.value.length === 1 && /^[vuTM]$/.test(token.value);
-          const decoText = isShorthand ? token.value : `!${token.value}!`;
-          pendingPreNoteItems.push({ kind: "decoration", value: decoText });
+      }
+      case "annotation":
+        pendingPreNoteItems.push(
+          createAnnotationDirection(token.value, token.annotationPlacement || "@")
+        );
+        break;
+      case "spacer":
+        pendingPreNoteItems.push(createRawWordsDirection(token.value));
+        break;
+      case "decoration": {
+        const target = lookupAbcDecoration(token.value);
+        if (!target) {
+          const isShorthand = token.value.length === 1 && ABC_SHORTHAND_DECORATIONS.has(token.value);
+          pendingPreNoteItems.push(
+            createRawWordsDirection(isShorthand ? token.value : `!${token.value}!`)
+          );
+          break;
+        }
+        const notation = decorationToNotation(target);
+        if (notation) {
+          pendingNotations.push(notation);
+          break;
         }
+        const direction = decorationToDirection(target);
+        if (direction) pendingPreNoteItems.push(direction);
         break;
+      }
       case "lyrics": {
         const syllables = token.syllables || [];
-        applyLyricsToExistingNotes(measures, currentEntries, syllables);
+        const previousWasLyrics = ti > 0 && tokens[ti - 1].type === "lyrics";
+        if (previousWasLyrics) {
+          lyricVerse++;
+        } else {
+          lyricVerse = 1;
+          lyricTargets = collectUnlyricedNotes(measures, currentEntries);
+        }
+        applyLyricsToNotes(lyricTargets, syllables, lyricVerse);
         break;
       }
       case "overlay": {
@@ -4181,25 +4553,37 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
         break;
       }
       case "inline_field": {
-        const lMatch = token.value.match(/^L:\s*(\d+)\/(\d+)/);
-        if (lMatch) {
-          currentUnitNote = { num: parseInt(lMatch[1], 10), den: parseInt(lMatch[2], 10) };
-          const inlineEntry = {
-            _id: generateId(),
-            type: "direction",
-            directionTypes: [{ kind: "words", text: `[L:${lMatch[1]}/${lMatch[2]}]` }]
-          };
-          currentEntries.push(inlineEntry);
+        if (token.value.startsWith(ABC_BODY_FIELD_MARKER)) {
+          currentEntries.push(createRawWordsDirection(token.value));
+          break;
+        }
+        const fieldMatch = token.value.match(/^([A-Za-z]):(.*)$/);
+        if (!fieldMatch) break;
+        const [, field, rawValue] = fieldMatch;
+        const value = rawValue.trim();
+        if (!token.standalone) {
+          currentEntries.push(createRawWordsDirection(`[${field}:${value}]`));
+        }
+        if (field === "K") {
+          pendingKeyChange = `K:${rawValue}`;
+          break;
         }
-        const kMatch = token.value.match(/^K:\s*(.*)/);
-        if (kMatch) {
-          pendingKeyChange = `K:${kMatch[1]}`;
+        if (field === "L") {
+          const lMatch = value.match(/^(\d+)\/(\d+)/);
+          if (lMatch) {
+            currentUnitNote = { num: parseInt(lMatch[1], 10), den: parseInt(lMatch[2], 10) };
+          }
+        } else if (field === "M") {
+          pendingTimeChange = parseTimeSignature2(value);
+        } else if (field === "Q") {
+          const tempoDirection = parseTempoToDirection(value);
+          if (tempoDirection) currentEntries.push(tempoDirection);
         }
         break;
       }
       case "space":
         break;
-      case "line_break":
+      case "line_break": {
         flushPendingPreNoteItems();
         if (currentEntries.length > 0) {
           const breakText = token.value === "\\\n" ? "__abc_line_cont__" : "__abc_line_break__";
@@ -4210,7 +4594,8 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
           };
           currentEntries.push(lineBreakDir);
         }
-        if (measures.length > 0) {
+        const onlyMarkersSoFar = currentEntries.length > 0 && !currentEntries.some((e) => e.type === "note");
+        if (measures.length > 0 && !onlyMarkersSoFar) {
           if (token.value === "\\\n") {
             lineBreaks.push(-measures.length);
           } else {
@@ -4218,6 +4603,7 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
           }
         }
         break;
+      }
       default:
         break;
     }
@@ -4228,22 +4614,20 @@ function buildMeasures(tokens, unitNote, keySignature, timeSignature, measureDur
   applyTieStops(measures);
   return { measures, lineBreaks, hasIndividualChordDurations };
 }
-function applyLyricsToExistingNotes(finalizedMeasures, currentEntries, syllables) {
-  const allNotes = [];
-  for (const measure of finalizedMeasures) {
-    for (const entry of measure.entries) {
-      if (entry.type === "note" && !entry.rest && !entry.grace && !entry.chord) {
-        allNotes.push(entry);
+function collectUnlyricedNotes(finalizedMeasures, currentEntries) {
+  const notes = [];
+  const collect = (entries) => {
+    for (const entry of entries) {
+      if (entry.type === "note" && !entry.rest && !entry.grace && !entry.chord && (!entry.lyrics || entry.lyrics.length === 0)) {
+        notes.push(entry);
       }
     }
-  }
-  for (const entry of currentEntries) {
-    if (entry.type === "note" && !entry.rest && !entry.grace && !entry.chord) {
-      allNotes.push(entry);
-    }
-  }
-  const unlyricedNotes = allNotes.filter((n) => !n.lyrics || n.lyrics.length === 0);
-  const targetNotes = unlyricedNotes.slice(0, syllables.length);
+  };
+  for (const measure of finalizedMeasures) collect(measure.entries);
+  collect(currentEntries);
+  return notes;
+}
+function applyLyricsToNotes(targetNotes, syllables, verse) {
   for (let si = 0; si < syllables.length && si < targetNotes.length; si++) {
     const syllable = syllables[si];
     if (!syllable || syllable === "" || syllable === "*") continue;
@@ -4257,11 +4641,8 @@ function applyLyricsToExistingNotes(finalizedMeasures, currentEntries, syllables
         syllabic = isHyphenated ? "middle" : "end";
       }
     }
-    note.lyrics = [{
-      number: 1,
-      text,
-      syllabic
-    }];
+    if (!note.lyrics) note.lyrics = [];
+    note.lyrics.push({ number: verse, text, syllabic });
   }
 }
 function applyTieStops(measures) {
@@ -4294,7 +4675,7 @@ function applyTieStops(measures) {
     }
   }
 }
-function createNoteEntry(token, unitNote, _hasTieStop, isGrace, tupletState) {
+function createNoteEntry(token, unitNote, _hasTieStop, isGrace, tupletState, graceSlash = false, octaveShift = 0) {
   const num = token.durationNum || 1;
   const den = token.durationDen || 1;
   let duration;
@@ -4307,17 +4688,18 @@ function createNoteEntry(token, unitNote, _hasTieStop, isGrace, tupletState) {
     }
   }
   const { noteType, dots } = durationToNoteType(isGrace ? lengthToDuration(num, den, unitNote) : duration);
+  const pitch = token.pitch && octaveShift !== 0 ? { ...token.pitch, octave: token.pitch.octave + octaveShift } : token.pitch;
   const entry = {
     _id: generateId(),
     type: "note",
-    pitch: token.pitch,
+    pitch,
     duration,
     voice: "1",
     noteType,
     dots: dots > 0 ? dots : void 0
   };
   if (isGrace) {
-    entry.grace = { slash: true };
+    entry.grace = { slash: graceSlash };
     entry.noteType = "eighth";
   }
   if (tupletState && !isGrace) {
@@ -4342,6 +4724,11 @@ function createNoteEntry(token, unitNote, _hasTieStop, isGrace, tupletState) {
       case -2:
         entry.accidental = { value: "double-flat" };
         break;
+      default: {
+        const named = MICROTONE_ACCIDENTALS[String(token.accidental)];
+        if (named) entry.accidental = { value: named };
+        break;
+      }
     }
   }
   return entry;
@@ -4401,6 +4788,12 @@ function createBarline(barType, location, endingNumber) {
     case "thick-thin":
       barline.barStyle = "heavy-light";
       break;
+    case "invisible":
+      barline.barStyle = "none";
+      break;
+    case "dotted":
+      barline.barStyle = "dotted";
+      break;
     default:
       return null;
   }
@@ -4484,6 +4877,85 @@ function createHarmonyEntry(chordStr) {
   }
   return entry;
 }
+function makeSlurStart(number, dotted) {
+  return dotted ? { type: "slur", slurType: "start", number, lineType: "dotted" } : { type: "slur", slurType: "start", number };
+}
+function decorationToNotation(target) {
+  switch (target.kind) {
+    case "articulation":
+      return { type: "articulation", articulation: target.articulation };
+    case "ornament":
+      return { type: "ornament", ornament: target.ornament };
+    case "technical":
+      return { type: "technical", technical: target.technical };
+    case "fingering":
+      return { type: "technical", technical: "fingering", text: target.fingering };
+    case "fermata":
+      return target.inverted ? { type: "fermata", fermataType: "inverted" } : { type: "fermata" };
+    case "arpeggiate":
+      return { type: "arpeggiate" };
+    case "trill-line":
+      return { type: "ornament", ornament: "wavy-line", wavyLineType: target.wavyLineType };
+    default:
+      return null;
+  }
+}
+function decorationToDirection(target) {
+  switch (target.kind) {
+    case "dynamics":
+      return createDynamicsDirection(target.value);
+    case "wedge":
+      return {
+        _id: generateId(),
+        type: "direction",
+        directionTypes: [{ kind: "wedge", type: target.stop ? "stop" : target.wedge }],
+        placement: "below"
+      };
+    case "segno":
+      return { _id: generateId(), type: "direction", directionTypes: [{ kind: "segno" }], placement: "above" };
+    case "coda":
+      return { _id: generateId(), type: "direction", directionTypes: [{ kind: "coda" }], placement: "above" };
+    case "words":
+      return {
+        _id: generateId(),
+        type: "direction",
+        directionTypes: [{ kind: "words", text: target.text }],
+        placement: "above"
+      };
+    default:
+      return null;
+  }
+}
+function annotationPlacement(marker) {
+  switch (marker) {
+    case "^":
+      return { placement: "above" };
+    case "_":
+      return { placement: "below" };
+    case "<":
+      return { halign: "right" };
+    case ">":
+      return { halign: "left" };
+    default:
+      return { halign: "center" };
+  }
+}
+function createAnnotationDirection(text, marker) {
+  const { placement, halign } = annotationPlacement(marker);
+  return {
+    _id: generateId(),
+    type: "direction",
+    directionTypes: [{ kind: "words", text, ...halign ? { halign } : {} }],
+    ...placement ? { placement } : {}
+  };
+}
+function createRawWordsDirection(text) {
+  return {
+    _id: generateId(),
+    type: "direction",
+    directionTypes: [{ kind: "words", text }]
+  };
+}
 function createDynamicsDirection(dynamic) {
   if (!DYNAMICS_VALUES.has(dynamic)) return null;
   return {
@@ -4496,8 +4968,30 @@ function createDynamicsDirection(dynamic) {
     placement: "below"
   };
 }
+function splitTunes(lines) {
+  const tunes = [];
+  let fileHeader = [];
+  let current = null;
+  for (const line of lines) {
+    if (/^X:/.test(line.trim())) {
+      if (current) tunes.push(current);
+      current = [...fileHeader, line];
+      fileHeader = [];
+      continue;
+    }
+    if (current) current.push(line);
+    else fileHeader.push(line);
+  }
+  if (current) tunes.push(current);
+  return tunes.length > 0 ? tunes : [lines];
+}
+function parseAbcTunes(abcString) {
+  return splitTunes(abcString.split("\n")).map((tuneLines) => parseTune(tuneLines));
+}
 function parseAbc(abcString) {
-  const lines = abcString.split("\n");
+  return parseTune(splitTunes(abcString.split("\n"))[0]);
+}
+function parseTune(lines) {
   const { header, bodyStartIndex, headerFieldOrder } = parseHeader(lines);
   const bodyLines = lines.slice(bodyStartIndex);
   const { tokens: voiceTokensList, voiceIds, inlineVoiceMarkers, voiceDeclarationLines, bodyComments, bodyDirectives, wFields, voiceInterleavePattern, groupBarCounts, voiceComments, preVoiceComments, trailingComments } = tokenizeBody(bodyLines);
@@ -4822,6 +5316,7 @@ function serializeCredit(credit, indent, out) {
       if (cw.letterSpacing) attrs2 += ` letter-spacing="${escapeXml(cw.letterSpacing)}"`;
       if (cw.xmlLang) attrs2 += ` xml:lang="${escapeXml(cw.xmlLang)}"`;
       if (cw.xmlSpace) attrs2 += ` xml:space="${escapeXml(cw.xmlSpace)}"`;
+      if (cw.color) attrs2 += ` color="${escapeXml(cw.color)}"`;
       out.push(`${indent}${indent}<credit-words${attrs2}>${escapeXml(cw.text)}</credit-words>`);
     }
   }
@@ -4846,6 +5341,7 @@ function serializeDisplayTexts(texts, indent, out) {
     if (dt.fontStyle) attrs += ` font-style="${escapeXml(dt.fontStyle)}"`;
     if (dt.fontWeight) attrs += ` font-weight="${escapeXml(dt.fontWeight)}"`;
     if (dt.xmlSpace) attrs += ` xml:space="${escapeXml(dt.xmlSpace)}"`;
+    if (dt.color) attrs += ` color="${escapeXml(dt.color)}"`;
     out.push(`${indent}<display-text${attrs}>${escapeXml(dt.text)}</display-text>`);
   }
 }
@@ -4854,6 +5350,7 @@ function serializeScorePart(part, indent, out) {
   if (part.name !== void 0) {
     let pnAttrs = "";
     if (part.namePrintObject === false) pnAttrs += ' print-object="no"';
+    if (part.nameColor) pnAttrs += ` color="${escapeXml(part.nameColor)}"`;
     out.push(`${indent}  <part-name${pnAttrs}>${escapeXml(part.name)}</part-name>`);
   }
   if (part.partNameDisplay && part.partNameDisplay.length > 0) {
@@ -4864,6 +5361,7 @@ function serializeScorePart(part, indent, out) {
   if (part.abbreviation !== void 0) {
     let paAttrs = "";
     if (part.abbreviationPrintObject === false) paAttrs += ' print-object="no"';
+    if (part.abbreviationColor) paAttrs += ` color="${escapeXml(part.abbreviationColor)}"`;
     out.push(`${indent}  <part-abbreviation${paAttrs}>${escapeXml(part.abbreviation)}</part-abbreviation>`);
   }
   if (part.partAbbreviationDisplay && part.partAbbreviationDisplay.length > 0) {
@@ -4937,7 +5435,8 @@ function serializePartGroup(group, indent, out) {
   if (group._id) attrs += ` id="${escapeXml(group._id)}"`;
   out.push(`${indent}<part-group${attrs}>`);
   if (group.groupName) {
-    out.push(`${indent}  <group-name>${escapeXml(group.groupName)}</group-name>`);
+    const gnAttrs = group.groupNameColor ? ` color="${escapeXml(group.groupNameColor)}"` : "";
+    out.push(`${indent}  <group-name${gnAttrs}>${escapeXml(group.groupName)}</group-name>`);
   }
   if (group.groupNameDisplay && group.groupNameDisplay.length > 0) {
     out.push(`${indent}  <group-name-display>`);
@@ -4945,7 +5444,8 @@ function serializePartGroup(group, indent, out) {
     out.push(`${indent}  </group-name-display>`);
   }
   if (group.groupAbbreviation) {
-    out.push(`${indent}  <group-abbreviation>${escapeXml(group.groupAbbreviation)}</group-abbreviation>`);
+    const gaAttrs = group.groupAbbreviationColor ? ` color="${escapeXml(group.groupAbbreviationColor)}"` : "";
+    out.push(`${indent}  <group-abbreviation${gaAttrs}>${escapeXml(group.groupAbbreviation)}</group-abbreviation>`);
   }
   if (group.groupAbbreviationDisplay && group.groupAbbreviationDisplay.length > 0) {
     out.push(`${indent}  <group-abbreviation-display>`);
@@ -4953,8 +5453,9 @@ function serializePartGroup(group, indent, out) {
     out.push(`${indent}  </group-abbreviation-display>`);
   }
   if (group.groupSymbol) {
-    const defaultXAttr = group.groupSymbolDefaultX !== void 0 ? ` default-x="${group.groupSymbolDefaultX}"` : "";
-    out.push(`${indent}  <group-symbol${defaultXAttr}>${group.groupSymbol}</group-symbol>`);
+    let gsAttrs = group.groupSymbolDefaultX !== void 0 ? ` default-x="${group.groupSymbolDefaultX}"` : "";
+    if (group.groupSymbolColor) gsAttrs += ` color="${escapeXml(group.groupSymbolColor)}"`;
+    out.push(`${indent}  <group-symbol${gsAttrs}>${group.groupSymbol}</group-symbol>`);
   }
   if (group.groupBarline) {
     out.push(`${indent}  <group-barline>${group.groupBarline}</group-barline>`);
@@ -5090,6 +5591,7 @@ function serializeKey(key, indent, out) {
   if (key.number !== void 0) keyAttrs += ` number="${key.number}"`;
   if (key.printObject === false) keyAttrs += ' print-object="no"';
   else if (key.printObject === true) keyAttrs += ' print-object="yes"';
+  if (key.color) keyAttrs += ` color="${escapeXml(key.color)}"`;
   out.push(`${indent}<key${keyAttrs}>`);
   if (key.cancel !== void 0) {
     const locationAttr = key.cancelLocation ? ` location="${key.cancelLocation}"` : "";
@@ -5128,6 +5630,7 @@ function serializeTime(time, indent, out) {
   let attrs = "";
   if (time.symbol) attrs += ` symbol="${time.symbol}"`;
   if (time.printObject === false) attrs += ' print-object="no"';
+  if (time.color) attrs += ` color="${escapeXml(time.color)}"`;
   out.push(`${indent}<time${attrs}>`);
   if (time.senzaMisura) {
     out.push(`${indent}  <senza-misura/>`);
@@ -5153,6 +5656,7 @@ function serializeClef(clef, indent, out) {
   if (clef.printObject === false) attrs += ' print-object="no"';
   else if (clef.printObject === true) attrs += ' print-object="yes"';
   if (clef.afterBarline) attrs += ' after-barline="yes"';
+  if (clef.color) attrs += ` color="${escapeXml(clef.color)}"`;
   out.push(`${indent}<clef${attrs}>`);
   out.push(`${indent}  <sign>${clef.sign}</sign>`);
   if (clef.line !== void 0) {
@@ -5219,7 +5723,8 @@ function serializeNote(note, indent, out) {
     "dynamics": note.dynamics,
     "print-object": note.printObject === false ? false : void 0,
     "print-dot": note.printDot !== void 0 ? note.printDot : void 0,
-    "print-spacing": note.printSpacing
+    "print-spacing": note.printSpacing,
+    "color": note.color
   });
   out.push(`${indent}<note${noteAttrs}>`);
   if (note.grace) {
@@ -5283,12 +5788,16 @@ function serializeNote(note, indent, out) {
     out.push(`${indent}  <voice>${note.voice}</voice>`);
   }
   if (note.noteType) {
-    const typeAttrs = note.noteTypeSize ? ` size="${escapeXml(note.noteTypeSize)}"` : "";
+    const typeAttrs = buildAttrs({
+      "size": note.noteTypeSize,
+      "color": note.noteTypeColor
+    });
     out.push(`${indent}  <type${typeAttrs}>${note.noteType}</type>`);
   }
   if (note.dots) {
+    const dotAttrs = note.dotColor ? ` color="${escapeXml(note.dotColor)}"` : "";
     for (let i = 0; i < note.dots; i++) {
-      out.push(`${indent}  <dot/>`);
+      out.push(`${indent}  <dot${dotAttrs}/>`);
     }
   }
   if (note.accidental) {
@@ -5322,14 +5831,16 @@ function serializeNote(note, indent, out) {
   if (note.stem) {
     const stemAttrs = buildAttrs({
       "default-x": note.stem.defaultX,
-      "default-y": note.stem.defaultY
+      "default-y": note.stem.defaultY,
+      "color": note.stem.color
     });
     out.push(`${indent}  <stem${stemAttrs}>${note.stem.value}</stem>`);
   }
   if (note.notehead) {
     const nhAttrs = buildAttrs({
       "filled": note.notehead.filled,
-      "parentheses": note.notehead.parentheses || void 0
+      "parentheses": note.notehead.parentheses || void 0,
+      "color": note.notehead.color
     });
     out.push(`${indent}  <notehead${nhAttrs}>${note.notehead.value}</notehead>`);
   }
@@ -5364,8 +5875,9 @@ function serializePitch(pitch, indent, out) {
   out.push(`${indent}</pitch>`);
 }
 function serializeBeam(beam, indent, out) {
-  const fanAttr = beam.fan ? ` fan="${beam.fan}"` : "";
-  out.push(`${indent}<beam number="${beam.number}"${fanAttr}>${beam.type}</beam>`);
+  let beamAttrs = beam.fan ? ` fan="${beam.fan}"` : "";
+  if (beam.color) beamAttrs += ` color="${escapeXml(beam.color)}"`;
+  out.push(`${indent}<beam number="${beam.number}"${beamAttrs}>${beam.type}</beam>`);
 }
 function serializeNotations(notations, indent, out) {
   const notationsGroups = /* @__PURE__ */ new Map();
@@ -5430,6 +5942,7 @@ function serializeStandaloneNotation(notation, indent, out) {
     let attrs = ` type="${notation.tiedType}"`;
     if (notation.number !== void 0) attrs += ` number="${notation.number}"`;
     if (notation.orientation) attrs += ` orientation="${notation.orientation}"`;
+    attrs += colorAttr(notation.color);
     out.push(`${indent}  <tied${attrs}/>`);
   } else if (notation.type === "slur") {
     let attrs = "";
@@ -5444,6 +5957,7 @@ function serializeStandaloneNotation(notation, indent, out) {
     if (notation.bezierX2 !== void 0) attrs += ` bezier-x2="${notation.bezierX2}"`;
     if (notation.bezierY2 !== void 0) attrs += ` bezier-y2="${notation.bezierY2}"`;
     if (notation.placement) attrs += ` placement="${notation.placement}"`;
+    attrs += colorAttr(notation.color);
     out.push(`${indent}  <slur${attrs}/>`);
   } else if (notation.type === "tuplet") {
     let attrs = ` type="${notation.tupletType}"`;
@@ -5491,8 +6005,8 @@ function serializeStandaloneNotation(notation, indent, out) {
       out.push(`${indent}  <tuplet${attrs}/>`);
     }
   } else if (notation.type === "dynamics") {
-    const placementAttr = notation.placement ? ` placement="${notation.placement}"` : "";
-    out.push(`${indent}  <dynamics${placementAttr}>`);
+    const dynAttrs = (notation.placement ? ` placement="${notation.placement}"` : "") + colorAttr(notation.color);
+    out.push(`${indent}  <dynamics${dynAttrs}>`);
     for (const dyn of notation.dynamics) {
       out.push(`${indent}    <${dyn}/>`);
     }
@@ -5506,6 +6020,7 @@ function serializeStandaloneNotation(notation, indent, out) {
     if (notation.placement) attrs += ` placement="${notation.placement}"`;
     if (notation.defaultX !== void 0) attrs += ` default-x="${notation.defaultX}"`;
     if (notation.defaultY !== void 0) attrs += ` default-y="${notation.defaultY}"`;
+    attrs += colorAttr(notation.color);
     if (notation.shape) {
       out.push(`${indent}  <fermata${attrs}>${notation.shape}</fermata>`);
     } else {
@@ -5517,20 +6032,24 @@ function serializeStandaloneNotation(notation, indent, out) {
     if (notation.number !== void 0) attrs += ` number="${notation.number}"`;
     if (notation.defaultX !== void 0) attrs += ` default-x="${notation.defaultX}"`;
     if (notation.defaultY !== void 0) attrs += ` default-y="${notation.defaultY}"`;
+    attrs += colorAttr(notation.color);
     out.push(`${indent}  <arpeggiate${attrs}/>`);
   } else if (notation.type === "non-arpeggiate") {
     let attrs = ` type="${notation.nonArpeggiateType}"`;
     if (notation.number !== void 0) attrs += ` number="${notation.number}"`;
     if (notation.placement) attrs += ` placement="${notation.placement}"`;
+    attrs += colorAttr(notation.color);
     out.push(`${indent}  <non-arpeggiate${attrs}/>`);
   } else if (notation.type === "accidental-mark") {
     let attrs = "";
     if (notation.placement) attrs += ` placement="${notation.placement}"`;
+    attrs += colorAttr(notation.color);
     out.push(`${indent}  <accidental-mark${attrs}>${escapeXml(notation.value)}</accidental-mark>`);
   } else if (notation.type === "glissando") {
     let attrs = ` type="${notation.glissandoType}"`;
     if (notation.number !== void 0) attrs += ` number="${notation.number}"`;
     if (notation.lineType) attrs += ` line-type="${notation.lineType}"`;
+    attrs += colorAttr(notation.color);
     if (notation.text) {
       out.push(`${indent}  <glissando${attrs}>${escapeXml(notation.text)}</glissando>`);
     } else {
@@ -5540,6 +6059,7 @@ function serializeStandaloneNotation(notation, indent, out) {
     let attrs = ` type="${notation.slideType}"`;
     if (notation.number !== void 0) attrs += ` number="${notation.number}"`;
     if (notation.lineType) attrs += ` line-type="${notation.lineType}"`;
+    attrs += colorAttr(notation.color);
     if (notation.text) {
       out.push(`${indent}  <slide${attrs}>${escapeXml(notation.text)}</slide>`);
     } else {
@@ -5557,6 +6077,7 @@ function serializeArticulationsGroup(artGroup, indent, out) {
       }
       if (art.defaultX !== void 0) artAttrs += ` default-x="${art.defaultX}"`;
       if (art.defaultY !== void 0) artAttrs += ` default-y="${art.defaultY}"`;
+      artAttrs += colorAttr(art.color);
       out.push(`${indent}    <${art.articulation}${artAttrs}/>`);
     }
   }
@@ -5579,6 +6100,7 @@ function serializeOrnamentsGroup(ornaments, indent, out) {
           if (orn.number !== void 0) wlAttrs += ` number="${orn.number}"`;
           wlAttrs += placementAttr;
           if (orn.defaultY !== void 0) wlAttrs += ` default-y="${orn.defaultY}"`;
+          wlAttrs += colorAttr(orn.color);
           out.push(`${indent}    <wavy-line${wlAttrs}/>`);
         } else if (orn.ornament === "tremolo") {
           let tremAttrs = "";
@@ -5586,6 +6108,7 @@ function serializeOrnamentsGroup(ornaments, indent, out) {
           tremAttrs += placementAttr;
           if (orn.defaultX !== void 0) tremAttrs += ` default-x="${orn.defaultX}"`;
           if (orn.defaultY !== void 0) tremAttrs += ` default-y="${orn.defaultY}"`;
+          tremAttrs += colorAttr(orn.color);
           if (orn.tremoloMarks !== void 0) {
             out.push(`${indent}    <tremolo${tremAttrs}>${orn.tremoloMarks}</tremolo>`);
           } else {
@@ -5594,6 +6117,7 @@ function serializeOrnamentsGroup(ornaments, indent, out) {
         } else {
           let ornAttrs = placementAttr;
           if (orn.defaultY !== void 0) ornAttrs += ` default-y="${orn.defaultY}"`;
+          ornAttrs += colorAttr(orn.color);
           out.push(`${indent}    <${orn.ornament}${ornAttrs}/>`);
         }
         if (orn.accidentalMarks) {
@@ -5602,8 +6126,8 @@ function serializeOrnamentsGroup(ornaments, indent, out) {
       }
     }
     for (const am of allAccidentalMarks) {
-      const amPlacement = am.placement ? ` placement="${am.placement}"` : "";
-      out.push(`${indent}    <accidental-mark${amPlacement}>${am.value}</accidental-mark>`);
+      const amAttrs = (am.placement ? ` placement="${am.placement}"` : "") + colorAttr(am.color);
+      out.push(`${indent}    <accidental-mark${amAttrs}>${am.value}</accidental-mark>`);
     }
     out.push(`${indent}  </ornaments>`);
   }
@@ -5617,6 +6141,7 @@ function serializeTechnicalGroup(technicals, indent, out) {
       if (techNotation.defaultX !== void 0) placementAttr += ` default-x="${techNotation.defaultX}"`;
       if (techNotation.defaultY !== void 0) placementAttr += ` default-y="${techNotation.defaultY}"`;
       if (techNotation.fontSize !== void 0) placementAttr += ` font-size="${techNotation.fontSize}"`;
+      placementAttr += colorAttr(techNotation.color);
       if (tech.technical === "bend" && (techNotation.bendAlter !== void 0 || techNotation.preBend || techNotation.release)) {
         out.push(`${indent}    <bend${placementAttr}>`);
         if (techNotation.bendAlter !== void 0) {
@@ -5689,6 +6214,7 @@ function serializeLyric(lyric, indent, out) {
   if (lyric.relativeX !== void 0) attrs += ` relative-x="${lyric.relativeX}"`;
   if (lyric.justify) attrs += ` justify="${escapeXml(lyric.justify)}"`;
   if (lyric.placement) attrs += ` placement="${lyric.placement}"`;
+  attrs += colorAttr(lyric.color);
   out.push(`${indent}<lyric${attrs}>`);
   if (lyric.textElements && lyric.textElements.length > 1) {
     for (let i = 0; i < lyric.textElements.length; i++) {
@@ -5696,7 +6222,7 @@ function serializeLyric(lyric, indent, out) {
       if (te.syllabic) {
         out.push(`${indent}  <syllabic>${te.syllabic}</syllabic>`);
       }
-      out.push(`${indent}  <text>${escapeXml(te.text)}</text>`);
+      out.push(`${indent}  <text${colorAttr(te.color)}>${escapeXml(te.text)}</text>`);
       if (i < lyric.textElements.length - 1) {
         out.push(`${indent}  <elision/>`);
       }
@@ -5705,11 +6231,13 @@ function serializeLyric(lyric, indent, out) {
     if (lyric.syllabic) {
       out.push(`${indent}  <syllabic>${lyric.syllabic}</syllabic>`);
     }
-    out.push(`${indent}  <text>${escapeXml(lyric.text)}</text>`);
+    const textColor = lyric.textColor ?? lyric.textElements?.[0]?.color;
+    out.push(`${indent}  <text${colorAttr(textColor)}>${escapeXml(lyric.text)}</text>`);
   }
   if (lyric.extend) {
-    if (typeof lyric.extend === "object" && lyric.extend.type) {
-      out.push(`${indent}  <extend type="${lyric.extend.type}"/>`);
+    if (typeof lyric.extend === "object") {
+      const extendAttrs = (lyric.extend.type ? ` type="${lyric.extend.type}"` : "") + colorAttr(lyric.extend.color);
+      out.push(`${indent}  <extend${extendAttrs}/>`);
     } else {
       out.push(`${indent}  <extend/>`);
     }
@@ -5807,6 +6335,7 @@ function serializeDirectionType(dirType, indent, out) {
       if (dirType.defaultY !== void 0) dynAttrs += ` default-y="${dirType.defaultY}"`;
       if (dirType.relativeX !== void 0) dynAttrs += ` relative-x="${dirType.relativeX}"`;
       if (dirType.halign) dynAttrs += ` halign="${dirType.halign}"`;
+      dynAttrs += colorAttr(dirType.color);
       out.push(`${indent}  <dynamics${dynAttrs}>`);
       if (dirType.value) {
         out.push(`${indent}    <${dirType.value}/>`);
@@ -5822,6 +6351,7 @@ function serializeDirectionType(dirType, indent, out) {
       if (dirType.spread !== void 0) wedgeAttrs += ` spread="${dirType.spread}"`;
       if (dirType.defaultY !== void 0) wedgeAttrs += ` default-y="${dirType.defaultY}"`;
       if (dirType.relativeX !== void 0) wedgeAttrs += ` relative-x="${dirType.relativeX}"`;
+      wedgeAttrs += colorAttr(dirType.color);
       out.push(`${indent}  <wedge${wedgeAttrs}/>`);
       break;
     }
@@ -5832,6 +6362,7 @@ function serializeDirectionType(dirType, indent, out) {
       if (dirType.defaultY !== void 0) metAttrs += ` default-y="${dirType.defaultY}"`;
       if (dirType.fontFamily) metAttrs += ` font-family="${escapeXml(dirType.fontFamily)}"`;
       if (dirType.fontSize) metAttrs += ` font-size="${escapeXml(dirType.fontSize)}"`;
+      metAttrs += colorAttr(dirType.color);
       out.push(`${indent}  <metronome${metAttrs}>`);
       out.push(`${indent}    <beat-unit>${dirType.beatUnit}</beat-unit>`);
       if (dirType.beatUnitDot) {
@@ -5874,6 +6405,7 @@ function serializeDirectionType(dirType, indent, out) {
       if (dirType.defaultY !== void 0) rehAttrs += ` default-y="${dirType.defaultY}"`;
       if (dirType.fontSize) rehAttrs += ` font-size="${escapeXml(dirType.fontSize)}"`;
       if (dirType.fontWeight) rehAttrs += ` font-weight="${escapeXml(dirType.fontWeight)}"`;
+      rehAttrs += colorAttr(dirType.color);
       out.push(`${indent}  <rehearsal${rehAttrs}>${escapeXml(dirType.text)}</rehearsal>`);
       break;
     }
@@ -5884,6 +6416,7 @@ function serializeDirectionType(dirType, indent, out) {
       if (dirType.lineType) bracketAttrs += ` line-type="${dirType.lineType}"`;
       if (dirType.defaultY !== void 0) bracketAttrs += ` default-y="${dirType.defaultY}"`;
       if (dirType.relativeX !== void 0) bracketAttrs += ` relative-x="${dirType.relativeX}"`;
+      bracketAttrs += colorAttr(dirType.color);
       out.push(`${indent}  <bracket${bracketAttrs}/>`);
       break;
     }
@@ -5893,11 +6426,12 @@ function serializeDirectionType(dirType, indent, out) {
       if (dirType.dashLength !== void 0) dashAttrs += ` dash-length="${dirType.dashLength}"`;
       if (dirType.defaultY !== void 0) dashAttrs += ` default-y="${dirType.defaultY}"`;
       if (dirType.spaceLength !== void 0) dashAttrs += ` space-length="${dirType.spaceLength}"`;
+      dashAttrs += colorAttr(dirType.color);
       out.push(`${indent}  <dashes${dashAttrs}/>`);
       break;
     }
     case "accordion-registration":
-      out.push(`${indent}  <accordion-registration>`);
+      out.push(`${indent}  <accordion-registration${colorAttr(dirType.color)}>`);
       if (dirType.high) {
         out.push(`${indent}    <accordion-high/>`);
       }
@@ -5920,27 +6454,28 @@ function serializeDirectionType(dirType, indent, out) {
         if (dirType.defaultY !== void 0) otherAttrs += ` default-y="${dirType.defaultY}"`;
         if (dirType.halign) otherAttrs += ` halign="${escapeXml(dirType.halign)}"`;
         if (dirType.printObject === false) otherAttrs += ' print-object="no"';
+        otherAttrs += colorAttr(dirType.color);
         out.push(`${indent}  <other-direction${otherAttrs}>${escapeXml(dirType.text)}</other-direction>`);
       }
       break;
     case "segno":
-      out.push(`${indent}  <segno/>`);
+      out.push(`${indent}  <segno${colorAttr(dirType.color)}/>`);
       break;
     case "coda":
-      out.push(`${indent}  <coda/>`);
+      out.push(`${indent}  <coda${colorAttr(dirType.color)}/>`);
       break;
     case "eyeglasses":
-      out.push(`${indent}  <eyeglasses/>`);
+      out.push(`${indent}  <eyeglasses${colorAttr(dirType.color)}/>`);
       break;
     case "damp":
-      out.push(`${indent}  <damp/>`);
+      out.push(`${indent}  <damp${colorAttr(dirType.color)}/>`);
       break;
     case "damp-all":
-      out.push(`${indent}  <damp-all/>`);
+      out.push(`${indent}  <damp-all${colorAttr(dirType.color)}/>`);
       break;
     case "scordatura":
       if (dirType.accords && dirType.accords.length > 0) {
-        out.push(`${indent}  <scordatura>`);
+        out.push(`${indent}  <scordatura${colorAttr(dirType.color)}>`);
         for (const accord of dirType.accords) {
           out.push(`${indent}    <accord string="${accord.string}">`);
           out.push(`${indent}      <tuning-step>${accord.tuningStep}</tuning-step>`);
@@ -5952,12 +6487,12 @@ function serializeDirectionType(dirType, indent, out) {
         }
         out.push(`${indent}  </scordatura>`);
       } else {
-        out.push(`${indent}  <scordatura/>`);
+        out.push(`${indent}  <scordatura${colorAttr(dirType.color)}/>`);
       }
       break;
     case "harp-pedals":
       if (dirType.pedalTunings && dirType.pedalTunings.length > 0) {
-        out.push(`${indent}  <harp-pedals>`);
+        out.push(`${indent}  <harp-pedals${colorAttr(dirType.color)}>`);
         for (const pt of dirType.pedalTunings) {
           out.push(`${indent}    <pedal-tuning>`);
           out.push(`${indent}      <pedal-step>${pt.pedalStep}</pedal-step>`);
@@ -5966,7 +6501,7 @@ function serializeDirectionType(dirType, indent, out) {
         }
         out.push(`${indent}  </harp-pedals>`);
       } else {
-        out.push(`${indent}  <harp-pedals/>`);
+        out.push(`${indent}  <harp-pedals${colorAttr(dirType.color)}/>`);
       }
       break;
     case "image":
@@ -5981,12 +6516,13 @@ function serializeDirectionType(dirType, indent, out) {
       if (dirType.defaultY !== void 0) pedalAttrs += ` default-y="${dirType.defaultY}"`;
       if (dirType.relativeX !== void 0) pedalAttrs += ` relative-x="${dirType.relativeX}"`;
       if (dirType.halign) pedalAttrs += ` halign="${dirType.halign}"`;
+      pedalAttrs += colorAttr(dirType.color);
       out.push(`${indent}  <pedal${pedalAttrs}/>`);
       break;
     }
     case "octave-shift": {
       const sizeAttr = dirType.size !== void 0 ? ` size="${dirType.size}"` : "";
-      out.push(`${indent}  <octave-shift type="${dirType.type}"${sizeAttr}/>`);
+      out.push(`${indent}  <octave-shift type="${dirType.type}"${sizeAttr}${colorAttr(dirType.color)}/>`);
       break;
     }
     case "swing":
@@ -6014,12 +6550,13 @@ function serializeBarline(barline, indent, out) {
   if (barline._id) attrs += ` id="${escapeXml(barline._id)}"`;
   out.push(`${indent}<barline${attrs}>`);
   if (barline.barStyle) {
-    out.push(`${indent}  <bar-style>${barline.barStyle}</bar-style>`);
+    out.push(`${indent}  <bar-style${colorAttr(barline.barStyleColor)}>${barline.barStyle}</bar-style>`);
   }
   if (barline.ending) {
     let endingAttrs = ` number="${barline.ending.number}" type="${barline.ending.type}"`;
     if (barline.ending.defaultY !== void 0) endingAttrs += ` default-y="${barline.ending.defaultY}"`;
     if (barline.ending.endLength !== void 0) endingAttrs += ` end-length="${barline.ending.endLength}"`;
+    endingAttrs += colorAttr(barline.ending.color);
     if (barline.ending.text) {
       out.push(`${indent}  <ending${endingAttrs}>${escapeXml(barline.ending.text)}</ending>`);
     } else {
@@ -6047,6 +6584,9 @@ function escapeXml(str) {
   if (!XML_ESCAPE_TEST.test(str)) return str;
   return str.replace(XML_ESCAPE_RE, (ch) => XML_ESCAPE_MAP[ch]);
 }
+function colorAttr(color) {
+  return color ? ` color="${escapeXml(color)}"` : "";
+}
 function buildAttrs(attrs) {
   let result = "";
   for (const key in attrs) {
@@ -6095,7 +6635,7 @@ function serializeStaffDetails(sd, indent, out) {
   out.push(`${indent}</staff-details>`);
 }
 function serializeMeasureStyle(ms, indent, out) {
-  out.push(`${indent}<measure-style${buildAttrs({ number: ms.number })}>`);
+  out.push(`${indent}<measure-style${buildAttrs({ number: ms.number, color: ms.color })}>`);
   pushOptionalElement(out, `${indent}  `, "multiple-rest", ms.multipleRest);
   if (ms.measureRepeat) {
     const mrAttrs = buildAttrs({
@@ -6125,7 +6665,8 @@ function serializeHarmony(harmony, indent, out) {
     "print-frame": harmony.printFrame,
     "default-y": harmony.defaultY,
     halign: harmony.halign,
-    "font-size": harmony.fontSize
+    "font-size": harmony.fontSize,
+    color: harmony.color
   });
   out.push(`${indent}<harmony${attrs}>`);
   out.push(`${indent}  <root>`);
@@ -6137,6 +6678,7 @@ function serializeHarmony(harmony, indent, out) {
   let kindAttrs = "";
   if (harmony.kindText !== void 0) kindAttrs += ` text="${escapeXml(harmony.kindText)}"`;
   if (harmony.kindHalign) kindAttrs += ` halign="${escapeXml(harmony.kindHalign)}"`;
+  kindAttrs += colorAttr(harmony.kindColor);
   out.push(`${indent}  <kind${kindAttrs}>${escapeXml(harmony.kind)}</kind>`);
   if (harmony.bass) {
     let bassAttrs = "";
@@ -6163,7 +6705,7 @@ function serializeHarmony(harmony, indent, out) {
     }
   }
   if (harmony.frame) {
-    out.push(`${indent}  <frame>`);
+    out.push(`${indent}  <frame${colorAttr(harmony.frame.color)}>`);
     if (harmony.frame.frameStrings !== void 0) {
       out.push(`${indent}    <frame-strings>${harmony.frame.frameStrings}</frame-strings>`);
     }
@@ -6204,6 +6746,7 @@ function serializeFiguredBass(fb, indent, out) {
   let attrs = "";
   if (fb._id) attrs += ` id="${escapeXml(fb._id)}"`;
   if (fb.parentheses) attrs += ' parentheses="yes"';
+  attrs += colorAttr(fb.color);
   out.push(`${indent}<figured-bass${attrs}>`);
   for (const fig of fb.figures) {
     out.push(`${indent}  <figure>`);
@@ -6217,8 +6760,9 @@ function serializeFiguredBass(fb, indent, out) {
       out.push(`${indent}    <suffix>${escapeXml(fig.suffix)}</suffix>`);
     }
     if (fig.extend) {
-      if (typeof fig.extend === "object" && fig.extend.type) {
-        out.push(`${indent}    <extend type="${fig.extend.type}"/>`);
+      if (typeof fig.extend === "object") {
+        const extendAttrs = (fig.extend.type ? ` type="${fig.extend.type}"` : "") + colorAttr(fig.extend.color);
+        out.push(`${indent}    <extend${extendAttrs}/>`);
       } else {
         out.push(`${indent}    <extend/>`);
       }
@@ -6401,8 +6945,10 @@ function buildMidiTracks(score, options) {
     let program = 1;
     if (partEntry && partEntry.midiInstruments?.[0]) {
       const midiInst = partEntry.midiInstruments[0];
-      channel = midiInst.channel ?? channel;
-      program = midiInst.program ?? program;
+      if (midiInst.channel !== void 0) {
+        channel = Math.min(16, Math.max(1, midiInst.channel)) - 1;
+      }
+      program = Math.min(128, Math.max(1, midiInst.program ?? program));
     }
     const trackData = createPartTrack(
       part,
@@ -6682,6 +7228,8 @@ function buildMidiFile(tracks, ticksPerQuarterNote) {
 var DIVISIONS_PER_QUARTER = 960;
 var useExplicitHalf = false;
 var useIndividualChordDurations = false;
+var openWedge = null;
+var voiceOctaveShift = 0;
 var FIFTHS_TO_KEY_MAJOR = {
   [-7]: "Cb",
   [-6]: "Gb",
@@ -6740,15 +7288,21 @@ var NOTE_TYPE_TO_QUARTER_LENGTH = {
   "128th": 0.03125
 };
 function musicXmlClefToAbc(clef) {
-  if (clef.sign === "G" && (clef.line === 2 || clef.line === void 0)) return "treble";
-  if (clef.sign === "F" && (clef.line === 4 || clef.line === void 0)) return "bass";
-  if (clef.sign === "C" && clef.line === 3) return "alto";
-  if (clef.sign === "C" && clef.line === 4) return "tenor";
-  if (clef.sign === "C" && clef.line === 1) return "soprano";
-  if (clef.sign === "C" && clef.line === 2) return "mezzo-soprano";
-  if (clef.sign === "C" && clef.line === 5) return "baritone";
-  if (clef.sign === "percussion") return "perc";
-  return null;
+  let name = null;
+  if (clef.sign === "G" && (clef.line === 2 || clef.line === void 0)) name = "treble";
+  else if (clef.sign === "F" && clef.line === 3) name = "bass3";
+  else if (clef.sign === "F" && (clef.line === 4 || clef.line === void 0)) name = "bass";
+  else if (clef.sign === "C" && clef.line === 3) name = "alto";
+  else if (clef.sign === "C" && clef.line === 4) name = "tenor";
+  else if (clef.sign === "C" && clef.line === 1) name = "soprano";
+  else if (clef.sign === "C" && clef.line === 2) name = "mezzo-soprano";
+  else if (clef.sign === "C" && clef.line === 5) name = "baritone";
+  else if (clef.sign === "percussion") name = "perc";
+  if (name === null) return null;
+  const shift = clef.clefOctaveChange;
+  if (shift === void 0 || shift === 0) return name;
+  const steps = Math.abs(shift) === 2 ? "15" : "8";
+  return `${name}${shift > 0 ? "+" : "-"}${steps}`;
 }
 function serializeKey2(key) {
   const mode = key.mode || "major";
@@ -6786,17 +7340,18 @@ function modeToAbcString(mode) {
   }
 }
 function serializeTimeSignature(time) {
+  if (time.senzaMisura) return "none";
   if (time.symbol === "common") return "C";
   if (time.symbol === "cut") return "C|";
+  if (time.beats.includes("+")) return `(${time.beats})/${time.beatType}`;
   return `${time.beats}/${time.beatType}`;
 }
 function computeUnitNoteLength(score) {
   const firstMeasure = score.parts[0]?.measures[0];
   const time = firstMeasure?.attributes?.time;
   if (time) {
-    const beats = parseInt(time.beats, 10);
-    const beatType = time.beatType;
-    const ratio = beats / beatType;
+    const beats = time.beats.split("+").reduce((sum, b) => sum + parseInt(b, 10), 0);
+    const ratio = beats / time.beatType;
     if (ratio < 0.75) {
       return { num: 1, den: 16 };
     }
@@ -6826,6 +7381,17 @@ function formatAbcDuration(num, den) {
   }
   return `${num}/${den}`;
 }
+function serializeMicrotone(alter) {
+  const symbol = alter > 0 ? "^" : "_";
+  const magnitude = Math.abs(alter);
+  for (let den = 2; den <= 64; den++) {
+    const num = magnitude * den;
+    if (Math.abs(num - Math.round(num)) < 1e-9) {
+      return `${symbol}${Math.round(num)}/${den}`;
+    }
+  }
+  return magnitude >= 1.5 ? symbol + symbol : symbol;
+}
 function serializePitch2(pitch, explicitNatural) {
   let result = "";
   if (explicitNatural) {
@@ -6835,9 +7401,10 @@ function serializePitch2(pitch, explicitNatural) {
     else if (pitch.alter === 2) result += "^^";
     else if (pitch.alter === -1) result += "_";
     else if (pitch.alter === -2) result += "__";
+    else result += serializeMicrotone(pitch.alter);
   }
   const step = pitch.step;
-  const octave = pitch.octave;
+  const octave = pitch.octave - voiceOctaveShift;
   if (octave >= 5) {
     result += step.toLowerCase();
     for (let o = 6; o <= octave; o++) {
@@ -6912,14 +7479,85 @@ function serializeHarmony2(harmony) {
   }
   return '"' + result + '"';
 }
-function serializeDynamics(direction) {
+function notationToDecoration(notation) {
+  switch (notation.type) {
+    case "articulation":
+      return { kind: "articulation", articulation: notation.articulation };
+    case "ornament":
+      if (notation.ornament === "wavy-line") {
+        if (notation.wavyLineType === "start" || notation.wavyLineType === "stop") {
+          return { kind: "trill-line", wavyLineType: notation.wavyLineType };
+        }
+        return null;
+      }
+      return { kind: "ornament", ornament: notation.ornament };
+    case "technical":
+      if (notation.technical === "fingering") {
+        const digits = notation.text ?? notation.fingering;
+        return digits !== void 0 ? { kind: "fingering", fingering: digits } : null;
+      }
+      return { kind: "technical", technical: notation.technical };
+    case "fermata":
+      return { kind: "fermata", inverted: notation.fermataType === "inverted" };
+    case "arpeggiate":
+      return { kind: "arpeggiate" };
+    default:
+      return null;
+  }
+}
+function serializeNoteDecorations(note) {
+  if (!note.notations) return "";
+  let result = "";
+  for (const notation of note.notations) {
+    const target = notationToDecoration(notation);
+    if (!target) continue;
+    const spelling = abcDecorationFor(target);
+    if (spelling) result += spelling;
+  }
+  return result;
+}
+function serializeDirectionText(direction, opts) {
   for (const dt of direction.directionTypes) {
-    if (dt.kind === "dynamics" && dt.value) {
-      return `!${dt.value}!`;
+    switch (dt.kind) {
+      case "dynamics":
+        return opts.includeDynamics && dt.value ? `!${dt.value}!` : null;
+      case "wedge": {
+        if (dt.type === "stop") {
+          const closing = openWedge ?? "crescendo";
+          openWedge = null;
+          return abcDecorationFor({ kind: "wedge", wedge: closing, stop: true });
+        }
+        openWedge = dt.type;
+        return abcDecorationFor({ kind: "wedge", wedge: dt.type, stop: false });
+      }
+      case "segno":
+        return abcDecorationFor({ kind: "segno" });
+      case "coda":
+        return abcDecorationFor({ kind: "coda" });
+      case "words":
+        return serializeWordsDirection(dt.text, direction);
+      default:
+        break;
     }
   }
   return null;
 }
+function serializeWordsDirection(text, direction) {
+  if (/^![^!]+!$/.test(text)) return text;
+  if (text.length === 1 && ABC_SHORTHAND_DECORATIONS.has(text)) return text;
+  if (/^y\d*$/.test(text)) return text;
+  const asDecoration = abcDecorationFor({ kind: "words", text });
+  if (asDecoration) return asDecoration;
+  if (text === "") return null;
+  const halign = direction.directionTypes.find((d) => d.kind === "words" && d.text === text);
+  let marker = "^";
+  if (direction.placement === "below") marker = "_";
+  else if (direction.placement === "above") marker = "^";
+  else if (halign?.halign === "right") marker = "<";
+  else if (halign?.halign === "left") marker = ">";
+  else if (halign?.halign === "center") marker = "@";
+  return `"${marker}${text}"`;
+}
 function serializeTempo(direction) {
   for (const dt of direction.directionTypes) {
     if (dt.kind === "metronome") {
@@ -6933,6 +7571,13 @@ function serializeTempo(direction) {
   }
   return null;
 }
+function serializeAbcTunes(scores, options) {
+  return scores.map((score, index) => serializeAbc(score, {
+    ...options,
+    // Number the tunes when they carry no reference number of their own
+    referenceNumber: options?.referenceNumber ?? index + 1
+  })).join("\n");
+}
 function serializeAbc(score, options) {
   const opts = {
     referenceNumber: options?.referenceNumber ?? 1,
@@ -6941,6 +7586,8 @@ function serializeAbc(score, options) {
     includeDynamics: options?.includeDynamics ?? true,
     includeLyrics: options?.includeLyrics ?? true
   };
+  openWedge = null;
+  voiceOctaveShift = 0;
   useExplicitHalf = score.metadata.miscellaneous?.find((m) => m.name === "abc-explicit-half")?.value === "true";
   useIndividualChordDurations = score.metadata.miscellaneous?.some((m) => m.name === "abc-chord-individual-durations" && m.value === "true") ?? false;
   const storedUnitNote = score.metadata.miscellaneous?.find((m) => m.name === "abc-unit-note-length")?.value;
@@ -7015,11 +7662,13 @@ function serializeAbc(score, options) {
         lines.push(`Q:${tempoStr}`);
       }
     }
-    if (attrs?.key) {
-      lines.push(`K:${serializeKey2(attrs.key)}`);
-    } else {
-      lines.push("K:C");
+    let clefSuffix = "";
+    if (score.parts.length === 1) {
+      const clef = attrs?.clef?.[0];
+      const clefName = clef ? musicXmlClefToAbc(clef) : null;
+      if (clefName && clefName !== "treble") clefSuffix = ` clef=${clefName}`;
     }
+    lines.push(`K:${attrs?.key ? serializeKey2(attrs.key) : "C"}${clefSuffix}`);
   }
   const lineBreaksStr = score.metadata.miscellaneous?.find((m) => m.name === "abc-line-breaks")?.value;
   const lineBreaks = lineBreaksStr ? JSON.parse(lineBreaksStr) : [];
@@ -7028,6 +7677,8 @@ function serializeAbc(score, options) {
   const lyricsAfterAll = score.metadata.miscellaneous?.find((m) => m.name === "abc-lyrics-after-all")?.value === "true";
   const lyricsLineCountsStr = score.metadata.miscellaneous?.find((m) => m.name === "abc-lyrics-line-counts")?.value;
   const lyricsLineCounts = lyricsLineCountsStr ? JSON.parse(lyricsLineCountsStr) : [];
+  const lyricsLineVersesStr = score.metadata.miscellaneous?.find((m) => m.name === "abc-lyrics-line-verses")?.value;
+  const lyricsLineVerses = lyricsLineVersesStr ? JSON.parse(lyricsLineVersesStr) : [];
   const inlineVoiceMarkersStr = score.metadata.miscellaneous?.find((m) => m.name === "abc-inline-voice-markers")?.value;
   const inlineVoiceMarkers = inlineVoiceMarkersStr ? JSON.parse(inlineVoiceMarkersStr) : {};
   const useInlineVoiceMarkers = Object.keys(inlineVoiceMarkers).length > 0;
@@ -7063,19 +7714,27 @@ function serializeAbc(score, options) {
   const partDivisions = [];
   for (let partIdx = 0; partIdx < score.parts.length; partIdx++) {
     const part = score.parts[partIdx];
+    voiceOctaveShift = readVoiceOctaveShift(score, partIdx);
     const divisions = getPartDivisions(part);
     partDivisions.push(divisions);
     const measStrings = [];
     let currentUnitNote = { ...unitNote };
     let currentKey = part.measures[0]?.attributes?.key;
+    const absorbedMeasures = /* @__PURE__ */ new Set();
     for (let mi = 0; mi < part.measures.length; mi++) {
+      if (absorbedMeasures.has(mi)) {
+        measStrings.push("");
+        continue;
+      }
       const measure = part.measures[mi];
       const measDivisions = measure.attributes?.divisions ?? divisions;
       let measureStr = "";
       if (mi > 0 && measure.attributes?.key) {
         const newKey = measure.attributes.key;
         if (currentKey === void 0 || newKey.fifths !== currentKey.fifths || (newKey.mode || "major") !== (currentKey.mode || "major")) {
-          measureStr += "\nK:" + serializeKey2(newKey) + "\n";
+          if (!hasInlineKeyMarker(measure)) {
+            measureStr += "\nK:" + serializeKey2(newKey) + "\n";
+          }
           currentKey = newKey;
         }
       }
@@ -7085,10 +7744,13 @@ function serializeAbc(score, options) {
       }
       const { noteStr, updatedUnitNote } = serializeMeasureEntries(measure, measDivisions, currentUnitNote, opts);
       if (updatedUnitNote) currentUnitNote = updatedUnitNote;
-      measureStr += noteStr;
+      const collapsed = applyMultiMeasureRest(measure, noteStr);
+      for (let k = 1; k <= collapsed.absorbed; k++) absorbedMeasures.add(mi + k);
+      measureStr += collapsed.text;
       const rightBarline = measure.barlines?.find((b) => b.location === "right");
       if (rightBarline) {
         measureStr += serializeBarline2(rightBarline);
+      } else if (!measureHasNotes(measure)) {
       } else if (mi < part.measures.length - 1) {
         const nextMeasure = part.measures[mi + 1];
         const nextLeftBarline = nextMeasure?.barlines?.find((b) => b.location === "left" && (b.barStyle || b.repeat));
@@ -7177,7 +7839,7 @@ function serializeAbc(score, options) {
           }
         }
         voiceMeasureCursor[voiceId] = endMeasure;
-        lines.push(groupMusic);
+        lines.push(stripLeadingBlankLines(groupMusic));
       }
       if (gi < voiceInterleavePattern.length - 1 && commentIdx < bodyComments.length) {
         lines.push(bodyComments[commentIdx]);
@@ -7204,14 +7866,15 @@ function serializeAbc(score, options) {
         }
       }
       const divisions = partDivisions[partIdx];
-      const bodyResult = serializePartBody(part, divisions, unitNote, opts, lineBreaks, lyricsAfterAll, lyricsLineCounts);
+      voiceOctaveShift = readVoiceOctaveShift(score, partIdx);
+      const bodyResult = serializePartBody(part, divisions, unitNote, opts, lineBreaks, lyricsAfterAll, lyricsLineCounts, lyricsLineVerses);
       let musicLine = bodyResult.music;
       if (multiVoice && useInlineVoiceMarkers) {
         const voiceId = storedVoiceIds[partIdx] || String(partIdx + 1);
         const marker = inlineVoiceMarkers[voiceId] || `[V:${voiceId}]`;
         musicLine = marker + musicLine;
       }
-      lines.push(musicLine);
+      lines.push(stripLeadingBlankLines(musicLine));
       if (opts.includeLyrics && bodyResult.lyrics) {
         lines.push(bodyResult.lyrics);
       }
@@ -7230,6 +7893,16 @@ function serializeAbc(score, options) {
   }
   return lines.join("\n") + "\n";
 }
+function stripLeadingBlankLines(text) {
+  return text.replace(/^\n+/, "");
+}
+function readVoiceOctaveShift(score, partIndex) {
+  const stored = score.metadata.miscellaneous?.find(
+    (m) => m.name === `abc-voice-octave-${partIndex}`
+  )?.value;
+  const shift = stored ? parseInt(stored, 10) : 0;
+  return Number.isFinite(shift) ? shift : 0;
+}
 function findTempoInMeasure(measure) {
   if (!measure) return null;
   for (const entry of measure.entries) {
@@ -7253,18 +7926,22 @@ function getPartDivisions(part) {
   }
   return DIVISIONS_PER_QUARTER;
 }
-function serializePartBody(part, divisions, initialUnitNote, opts, lineBreaks = [], lyricsAfterAll = false, lyricsLineCounts = []) {
+function serializePartBody(part, divisions, initialUnitNote, opts, lineBreaks = [], lyricsAfterAll = false, lyricsLineCounts = [], lyricsLineVerses = []) {
   let unitNote = { ...initialUnitNote };
   const musicParts = [];
   const allLyrics = /* @__PURE__ */ new Map();
   let currentKey = part.measures[0]?.attributes?.key;
+  const absorbedMeasures = /* @__PURE__ */ new Set();
   for (let mi = 0; mi < part.measures.length; mi++) {
+    if (absorbedMeasures.has(mi)) continue;
     const measure = part.measures[mi];
     const measDivisions = measure.attributes?.divisions ?? divisions;
     if (mi > 0 && measure.attributes?.key) {
       const newKey = measure.attributes.key;
       if (currentKey === void 0 || newKey.fifths !== currentKey.fifths || (newKey.mode || "major") !== (currentKey.mode || "major")) {
-        musicParts.push("\nK:" + serializeKey2(newKey) + "\n");
+        if (!hasInlineKeyMarker(measure)) {
+          musicParts.push("\nK:" + serializeKey2(newKey) + "\n");
+        }
         currentKey = newKey;
       }
     }
@@ -7281,13 +7958,16 @@ function serializePartBody(part, divisions, initialUnitNote, opts, lineBreaks =
     if (updatedUnitNote) {
       unitNote = updatedUnitNote;
     }
-    musicParts.push(noteStr);
-    if (lyrics.length > 0) {
+    const collapsed = applyMultiMeasureRest(measure, noteStr);
+    for (let k = 1; k <= collapsed.absorbed; k++) absorbedMeasures.add(mi + k);
+    musicParts.push(collapsed.text);
+    if (lyrics.size > 0) {
       allLyrics.set(mi, lyrics);
     }
     const rightBarline = measure.barlines?.find((b) => b.location === "right");
     if (rightBarline) {
       musicParts.push(serializeBarline2(rightBarline));
+    } else if (!measureHasNotes(measure)) {
     } else if (mi < part.measures.length - 1) {
       const nextMeas = part.measures[mi + 1];
       const nextLeftBar = nextMeas?.barlines?.find((b) => b.location === "left" && (b.barStyle || b.repeat));
@@ -7314,18 +7994,27 @@ function serializePartBody(part, divisions, initialUnitNote, opts, lineBreaks =
   if (allLyrics.size === 0) {
     return { music: musicStr, lyrics: null };
   }
+  const verses = /* @__PURE__ */ new Set();
+  for (const byVerse of allLyrics.values()) {
+    for (const verse of byVerse.keys()) verses.add(verse);
+  }
+  const sortedVerses = Array.from(verses).sort((a, b) => a - b);
+  function syllablesIn(verse, from, to) {
+    const syllables = [];
+    for (let m = from; m <= to; m++) {
+      const forVerse = allLyrics.get(m)?.get(verse);
+      if (forVerse) syllables.push(...forVerse);
+    }
+    return syllables;
+  }
   const lineBreakSet = new Set(lineBreaks.map((v) => Math.abs(v)));
-  const lyricsByLine = [];
+  const lyricLineRanges = [];
   let lineStart = 0;
   for (let mi = 0; mi < part.measures.length; mi++) {
     if (lineBreakSet.has(mi + 1) || mi === part.measures.length - 1) {
-      const syllables = [];
-      for (let m = lineStart; m <= mi; m++) {
-        const ls = allLyrics.get(m);
-        if (ls) syllables.push(...ls);
-      }
-      if (syllables.length > 0) {
-        lyricsByLine.push({ startMeasure: lineStart, endMeasure: mi, syllables });
+      const hasAny = sortedVerses.some((v) => syllablesIn(v, lineStart, mi).length > 0);
+      if (hasAny) {
+        lyricLineRanges.push({ startMeasure: lineStart, endMeasure: mi });
       }
       lineStart = mi + 1;
     }
@@ -7345,57 +8034,60 @@ function serializePartBody(part, divisions, initialUnitNote, opts, lineBreaks =
     }
     return result;
   }
-  if (lyricsAfterAll) {
-    const allSyllables2 = [];
-    const sortedMeasures2 = Array.from(allLyrics.keys()).sort((a, b) => a - b);
-    for (const mi of sortedMeasures2) {
-      allSyllables2.push(...allLyrics.get(mi));
+  function lyricLinesFor(from, to) {
+    const out = [];
+    for (const verse of sortedVerses) {
+      const syllables = syllablesIn(verse, from, to);
+      if (syllables.length > 0) out.push(formatLyrics(syllables));
     }
+    return out;
+  }
+  const lastMeasure = part.measures.length - 1;
+  if (lyricsAfterAll) {
     if (lyricsLineCounts.length > 0) {
       const lyricsLines = [];
-      let offset = 0;
-      for (const count of lyricsLineCounts) {
-        const chunk = allSyllables2.slice(offset, offset + count);
-        if (chunk.length > 0) {
-          lyricsLines.push(formatLyrics(chunk));
-        }
-        offset += count;
-      }
-      if (offset < allSyllables2.length) {
-        lyricsLines.push(formatLyrics(allSyllables2.slice(offset)));
+      const offsets = /* @__PURE__ */ new Map();
+      for (let li = 0; li < lyricsLineCounts.length; li++) {
+        const verse = lyricsLineVerses[li] ?? 1;
+        const all = syllablesIn(verse, 0, lastMeasure);
+        const offset = offsets.get(verse) ?? 0;
+        const chunk = all.slice(offset, offset + lyricsLineCounts[li]);
+        if (chunk.length > 0) lyricsLines.push(formatLyrics(chunk));
+        offsets.set(verse, offset + lyricsLineCounts[li]);
+      }
+      for (const verse of sortedVerses) {
+        const all = syllablesIn(verse, 0, lastMeasure);
+        const offset = offsets.get(verse) ?? 0;
+        if (offset < all.length) lyricsLines.push(formatLyrics(all.slice(offset)));
       }
       return { music: musicStr, lyrics: lyricsLines.join("\n") };
     }
-    return { music: musicStr, lyrics: formatLyrics(allSyllables2) };
+    return { music: musicStr, lyrics: lyricLinesFor(0, lastMeasure).join("\n") };
   }
-  if (lyricsByLine.length > 0 && lineBreaks.length > 0) {
+  if (lyricLineRanges.length > 0 && lineBreaks.length > 0) {
     const musicLines = musicStr.split("\n");
     const resultLines = [];
     let lyricIdx = 0;
     for (let li = 0; li < musicLines.length; li++) {
       resultLines.push(musicLines[li]);
-      if (lyricIdx < lyricsByLine.length) {
-        const lyricGroup = lyricsByLine[lyricIdx];
-        resultLines.push(formatLyrics(lyricGroup.syllables));
+      if (lyricIdx < lyricLineRanges.length) {
+        const range = lyricLineRanges[lyricIdx];
+        resultLines.push(...lyricLinesFor(range.startMeasure, range.endMeasure));
         lyricIdx++;
       }
     }
-    while (lyricIdx < lyricsByLine.length) {
-      resultLines.push(formatLyrics(lyricsByLine[lyricIdx].syllables));
+    while (lyricIdx < lyricLineRanges.length) {
+      const range = lyricLineRanges[lyricIdx];
+      resultLines.push(...lyricLinesFor(range.startMeasure, range.endMeasure));
       lyricIdx++;
     }
     return { music: resultLines.join("\n"), lyrics: null };
   }
-  const allSyllables = [];
-  const sortedMeasures = Array.from(allLyrics.keys()).sort((a, b) => a - b);
-  for (const mi of sortedMeasures) {
-    allSyllables.push(...allLyrics.get(mi));
-  }
-  return { music: musicStr, lyrics: formatLyrics(allSyllables) };
+  return { music: musicStr, lyrics: lyricLinesFor(0, lastMeasure).join("\n") };
 }
 function serializeMeasureEntries(measure, divisions, unitNote, opts) {
   const parts = [];
-  const lyrics = [];
+  const lyrics = /* @__PURE__ */ new Map();
   let currentUnitNote = { ...unitNote };
   let chordPitches = [];
   let chordDurationStr = "";
@@ -7413,17 +8105,28 @@ function serializeMeasureEntries(measure, divisions, unitNote, opts) {
         if (note.grace) {
           const graceNotes = [];
           let gi = ei;
+          let openChord = false;
           while (gi < measure.entries.length) {
             const ge = measure.entries[gi];
             if (ge.type === "note" && ge.grace) {
               const gs = serializeNote2(ge, divisions, currentUnitNote, false);
+              const startsChord = !ge.chord && isChordHead(measure.entries, gi);
+              if (startsChord && !openChord) {
+                graceNotes.push("[");
+                openChord = true;
+              } else if (openChord && !ge.chord) {
+                graceNotes.push("]");
+                openChord = startsChord;
+                if (startsChord) graceNotes.push("[");
+              }
               graceNotes.push(gs.pitch);
               gi++;
             } else {
               break;
             }
           }
-          parts.push("{" + graceNotes.join("") + "}");
+          if (openChord) graceNotes.push("]");
+          parts.push((note.grace.slash ? "{/" : "{") + graceNotes.join("") + "}");
           ei = gi - 1;
           break;
         }
@@ -7453,11 +8156,14 @@ function serializeMeasureEntries(measure, divisions, unitNote, opts) {
           chordSlurEnd = "";
         }
         if (note.lyrics && note.lyrics.length > 0 && opts.includeLyrics) {
-          const lyric = note.lyrics[0];
-          if (lyric.text) {
+          for (const lyric of note.lyrics) {
+            if (!lyric.text) continue;
             const syllabic = lyric.syllabic || "single";
             const suffix = syllabic === "begin" || syllabic === "middle" ? "-" : "";
-            lyrics.push(lyric.text + suffix);
+            const verse = lyric.number ?? 1;
+            const bucket = lyrics.get(verse);
+            if (bucket) bucket.push(lyric.text + suffix);
+            else lyrics.set(verse, [lyric.text + suffix]);
           }
         }
         let tupletPrefix = "";
@@ -7484,18 +8190,20 @@ function serializeMeasureEntries(measure, divisions, unitNote, opts) {
           if (note.notations) {
             for (const notation of note.notations) {
               if (notation.type === "slur") {
-                if (notation.slurType === "start") slurStart += "(";
+                if (notation.slurType === "start") slurStart += notation.lineType === "dotted" ? ".(" : "(";
                 if (notation.slurType === "stop") slurEnd += ")";
               }
             }
           }
+          const decorations = serializeNoteDecorations(note);
           effectiveSerialized = {
-            full: slurStart + pitchStr + baseDurationStr + tieStr + slurEnd,
+            full: slurStart + decorations + pitchStr + baseDurationStr + tieStr + slurEnd,
             pitch: pitchStr,
             duration: baseDurationStr,
             slurStart,
             slurEnd,
-            tieStr
+            tieStr,
+            decorations
           };
         }
         const nextEntry = ei + 1 < measure.entries.length ? measure.entries[ei + 1] : null;
@@ -7529,7 +8237,7 @@ function serializeMeasureEntries(measure, divisions, unitNote, opts) {
             let insertIdx = parts.length;
             for (let pi = parts.length - 1; pi >= 0; pi--) {
               const p = parts[pi];
-              if (/^[vuTM]$/.test(p) || /^![^!]+!$/.test(p) || /^"[^"]*"$/.test(p)) {
+              if (p.length === 1 && ABC_SHORTHAND_DECORATIONS.has(p) || /^![^!]+!$/.test(p) || /^"[^"]*"$/.test(p)) {
                 insertIdx = pi;
               } else {
                 break;
@@ -7537,11 +8245,11 @@ function serializeMeasureEntries(measure, divisions, unitNote, opts) {
             }
             if (insertIdx < parts.length) {
               parts.splice(insertIdx, 0, chordSlurStart);
-              parts.push(tupletPrefix);
+              parts.push(tupletPrefix + effectiveSerialized.decorations);
               break;
             }
           }
-          parts.push(tupletPrefix + chordSlurStart);
+          parts.push(tupletPrefix + chordSlurStart + effectiveSerialized.decorations);
           break;
         }
         if (effectiveSerialized.slurStart) {
@@ -7556,7 +8264,7 @@ function serializeMeasureEntries(measure, divisions, unitNote, opts) {
           }
           if (insertIdx < parts.length) {
             parts.splice(insertIdx, 0, effectiveSerialized.slurStart);
-            const noteOnly = effectiveSerialized.pitch + effectiveSerialized.duration + effectiveSerialized.tieStr + effectiveSerialized.slurEnd;
+            const noteOnly = effectiveSerialized.decorations + effectiveSerialized.pitch + effectiveSerialized.duration + effectiveSerialized.tieStr + effectiveSerialized.slurEnd;
             parts.push(tupletPrefix + noteOnly);
             break;
           }
@@ -7568,9 +8276,9 @@ function serializeMeasureEntries(measure, divisions, unitNote, opts) {
           const tie1 = effectiveSerialized.tieStr;
           const slurS1 = effectiveSerialized.slurStart;
           const slurE1 = effectiveSerialized.slurEnd;
-          parts.push(tupletPrefix + slurS1 + pitchStr1 + baseDurStr1 + tie1 + brokenResult.marker);
+          parts.push(tupletPrefix + slurS1 + effectiveSerialized.decorations + pitchStr1 + baseDurStr1 + tie1 + brokenResult.marker);
           const note2 = brokenResult.nextNote;
-          const pitchStr2 = serializePitch2(note2.pitch, note2.accidental?.value === "natural");
+          const pitchStr2 = serializeNoteDecorations(note2) + serializePitch2(note2.pitch, note2.accidental?.value === "natural");
           let tieStr2 = "";
           if (note2.tie?.type === "start" || note2.ties?.some((t) => t.type === "start")) tieStr2 = "-";
           let slurEnd2 = "";
@@ -7595,42 +8303,40 @@ function serializeMeasureEntries(measure, divisions, unitNote, opts) {
       case "direction": {
         let handledAsSpecial = false;
         for (const dt of entry.directionTypes) {
-          if (dt.kind === "words") {
-            if (dt.text === "__abc_line_cont__") {
-              parts.push("\\\n");
-              handledAsSpecial = true;
-              break;
-            }
-            if (dt.text === "__abc_line_break__") {
-              parts.push("\n");
-              handledAsSpecial = true;
-              break;
-            }
-            const lMatch = dt.text.match(/^\[L:\s*(\d+)\/(\d+)\]$/);
-            if (lMatch) {
-              parts.push(dt.text);
-              currentUnitNote = { num: parseInt(lMatch[1], 10), den: parseInt(lMatch[2], 10) };
-              handledAsSpecial = true;
-              break;
-            }
-            const decoMatch = dt.text.match(/^!([^!]+)!$/);
-            if (decoMatch) {
-              parts.push(dt.text);
-              handledAsSpecial = true;
-              break;
-            }
-            if (dt.text.length === 1 && /^[vuTM]$/.test(dt.text)) {
-              parts.push(dt.text);
-              handledAsSpecial = true;
-              break;
+          if (dt.kind !== "words") continue;
+          if (dt.text === "__abc_line_cont__") {
+            parts.push("\\\n");
+            handledAsSpecial = true;
+            break;
+          }
+          if (dt.text === "__abc_line_break__") {
+            parts.push("\n");
+            handledAsSpecial = true;
+            break;
+          }
+          if (dt.text.startsWith(ABC_BODY_FIELD_MARKER)) {
+            parts.push("\n" + dt.text.slice(ABC_BODY_FIELD_MARKER.length));
+            handledAsSpecial = true;
+            break;
+          }
+          const inlineField = dt.text.match(/^\[([A-Za-z]):([^\]]*)\]$/);
+          if (inlineField) {
+            parts.push(dt.text);
+            if (inlineField[1] === "L") {
+              const lMatch = inlineField[2].trim().match(/^(\d+)\/(\d+)$/);
+              if (lMatch) {
+                currentUnitNote = { num: parseInt(lMatch[1], 10), den: parseInt(lMatch[2], 10) };
+              }
             }
+            handledAsSpecial = true;
+            break;
           }
         }
         if (handledAsSpecial) break;
-        if (opts.includeDynamics) {
-          const dynStr = serializeDynamics(entry);
-          if (dynStr) {
-            parts.push(dynStr);
+        const text = serializeDirectionText(entry, opts);
+        if (text) {
+          if (opts.includeChordSymbols || !text.startsWith('"')) {
+            parts.push(text);
           }
         }
         break;
@@ -7650,6 +8356,29 @@ function serializeMeasureEntries(measure, divisions, unitNote, opts) {
   const unitNoteChanged = currentUnitNote.num !== unitNote.num || currentUnitNote.den !== unitNote.den;
   return { noteStr: parts.join(""), lyrics, updatedUnitNote: unitNoteChanged ? currentUnitNote : void 0 };
 }
+function multipleRestCount(measure) {
+  const styles = measure.attributes?.measureStyle;
+  if (!styles) return 0;
+  for (const style of styles) {
+    if (style.multipleRest && style.multipleRest > 1) return style.multipleRest;
+  }
+  return 0;
+}
+function applyMultiMeasureRest(measure, noteStr) {
+  const count = multipleRestCount(measure);
+  if (count < 2 || noteStr.trim() !== "Z") return { text: noteStr, absorbed: 0 };
+  return { text: `Z${count}`, absorbed: count - 1 };
+}
+function hasInlineKeyMarker(measure) {
+  return measure.entries.some((e) => e.type === "direction" && e.directionTypes.some((dt) => dt.kind === "words" && /^\[K:/.test(dt.text)));
+}
+function measureHasNotes(measure) {
+  return measure.entries.some((e) => e.type === "note");
+}
+function isChordHead(entries, index) {
+  const next = entries[index + 1];
+  return next !== void 0 && next.type === "note" && next.chord === true;
+}
 function detectBrokenRhythm(entries, currentIdx, currentNote, divisions, unitNote) {
   if (currentNote.chord || currentNote.grace || currentNote.rest || currentNote.timeModification) return null;
   let nextIdx = currentIdx + 1;
@@ -7751,13 +8480,14 @@ function serializeNote2(note, divisions, unitNote, _inChord) {
   if (note.notations) {
     for (const notation of note.notations) {
       if (notation.type === "slur") {
-        if (notation.slurType === "start") slurStart += "(";
+        if (notation.slurType === "start") slurStart += notation.lineType === "dotted" ? ".(" : "(";
         if (notation.slurType === "stop") slurEnd += ")";
       }
     }
   }
-  const full = slurStart + pitchStr + durationStr + tieStr + slurEnd;
-  return { full, pitch: pitchStr, duration: durationStr, slurStart, slurEnd, tieStr };
+  const decorations = serializeNoteDecorations(note);
+  const full = slurStart + decorations + pitchStr + durationStr + tieStr + slurEnd;
+  return { full, pitch: pitchStr, duration: durationStr, slurStart, slurEnd, tieStr, decorations };
 }
 function serializeBarline2(barline) {
   const hasRepeatForward = barline.repeat?.direction === "forward";
@@ -7780,6 +8510,13 @@ function serializeBarline2(barline) {
       case "heavy-light":
         result += "[|";
         break;
+      case "none":
+        result += "[|]";
+        break;
+      case "dotted":
+      case "dashed":
+        result += ".|";
+        break;
       default:
         result += "|";
         break;
@@ -7800,10 +8537,12 @@ export {
   parseCompressed,
   isCompressed,
   parseAuto,
+  parseAbcTunes,
   parseAbc,
   serialize,
   serializeCompressed,
   exportMidi,
   exportMidiWithTimingMap,
+  serializeAbcTunes,
   serializeAbc
 };