musicxml-io 0.3.0 → 0.3.1

package/dist/index.mjs

@@ -19,11 +19,22 @@ var xmlParser = new XMLParser({
 });
 function parse(xmlString) {
   const parsed = xmlParser.parse(xmlString);
-  const scorePartwise = findElement(parsed, "score-partwise");
+  let scorePartwiseVersion;
+  let scorePartwise;
+  for (const el of parsed) {
+    if (el["score-partwise"]) {
+      scorePartwise = el["score-partwise"];
+      const attrs = getAttributes(el);
+      if (attrs["version"]) scorePartwiseVersion = attrs["version"];
+      break;
+    }
+  }
   if (!scorePartwise) {
     throw new Error("Unsupported MusicXML format: only score-partwise is supported");
   }
-  return parseScorePartwise(scorePartwise);
+  const score = parseScorePartwise(scorePartwise);
+  if (scorePartwiseVersion) score.version = scorePartwiseVersion;
+  return score;
 }
 function findElement(elements, tagName) {
   for (const el of elements) {
@@ -3478,7 +3489,7 @@ function validateSlursAcrossMeasures(part) {
 
 // src/exporters/musicxml.ts
 function serialize(score, options = {}) {
-  const version = options.version || "4.0";
+  const version = options.version || score.version || "4.0";
   const indent = options.indent ?? "  ";
   if (options.validate) {
     const result = validate(score, options.validateOptions);
@@ -3493,11 +3504,7 @@ ${errorMessages}`);
   }
   const lines = [];
   lines.push('<?xml version="1.0" encoding="UTF-8"?>');
-  if (version === "4.0") {
-    lines.push('<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 4.0 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">');
-  } else {
-    lines.push('<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 3.1 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">');
-  }
+  lines.push(`<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML ${version} Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">`);
   lines.push(`<score-partwise version="${version}">`);
   lines.push(...serializeMetadata(score.metadata, indent));
   if (score.defaults) {
@@ -4371,283 +4378,309 @@ function serializeNotations(notations, indent) {
 function serializeNotationsGroup(notations, indent) {
   const lines = [];
   lines.push(`${indent}<notations>`);
-  const articulationsGroups = /* @__PURE__ */ new Map();
-  const ornaments = [];
-  const technicals = [];
-  const others = [];
+  const chunks = [];
   for (const notation of notations) {
     if (notation.type === "articulation") {
       const artIdx = notation.articulationsIndex ?? 0;
-      if (!articulationsGroups.has(artIdx)) {
-        articulationsGroups.set(artIdx, []);
+      const last = chunks[chunks.length - 1];
+      if (last && last.kind === "articulations" && last.articulationsIndex === artIdx) {
+        last.items.push(notation);
+      } else {
+        chunks.push({ kind: "articulations", items: [notation], articulationsIndex: artIdx });
       }
-      articulationsGroups.get(artIdx).push(notation);
     } else if (notation.type === "ornament") {
-      ornaments.push(notation);
+      const last = chunks[chunks.length - 1];
+      if (last && last.kind === "ornaments") {
+        last.items.push(notation);
+      } else {
+        chunks.push({ kind: "ornaments", items: [notation] });
+      }
     } else if (notation.type === "technical") {
-      technicals.push(notation);
+      const last = chunks[chunks.length - 1];
+      if (last && last.kind === "technical") {
+        last.items.push(notation);
+      } else {
+        chunks.push({ kind: "technical", items: [notation] });
+      }
     } else {
-      others.push(notation);
+      chunks.push({ kind: "standalone", notation });
     }
   }
-  for (const notation of others) {
-    if (notation.type === "tied") {
-      let attrs = ` type="${notation.tiedType}"`;
-      if (notation.number !== void 0) attrs += ` number="${notation.number}"`;
-      if (notation.orientation) attrs += ` orientation="${notation.orientation}"`;
-      lines.push(`${indent}  <tied${attrs}/>`);
-    } else if (notation.type === "slur") {
-      let attrs = "";
-      if (notation.number !== void 0) attrs += ` number="${notation.number}"`;
-      attrs += ` type="${notation.slurType}"`;
-      if (notation.lineType) attrs += ` line-type="${notation.lineType}"`;
-      if (notation.orientation) attrs += ` orientation="${notation.orientation}"`;
-      if (notation.defaultX !== void 0) attrs += ` default-x="${notation.defaultX}"`;
-      if (notation.defaultY !== void 0) attrs += ` default-y="${notation.defaultY}"`;
-      if (notation.bezierX !== void 0) attrs += ` bezier-x="${notation.bezierX}"`;
-      if (notation.bezierY !== void 0) attrs += ` bezier-y="${notation.bezierY}"`;
-      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}"`;
-      lines.push(`${indent}  <slur${attrs}/>`);
-    } else if (notation.type === "tuplet") {
-      let attrs = ` type="${notation.tupletType}"`;
-      if (notation.number !== void 0) attrs += ` number="${notation.number}"`;
-      if (notation.bracket !== void 0) attrs += ` bracket="${notation.bracket ? "yes" : "no"}"`;
-      if (notation.showNumber) attrs += ` show-number="${notation.showNumber}"`;
-      if (notation.showType) attrs += ` show-type="${notation.showType}"`;
-      if (notation.lineShape) attrs += ` line-shape="${notation.lineShape}"`;
-      if (notation.placement) attrs += ` placement="${notation.placement}"`;
-      const tup = notation;
-      if (tup.tupletActual || tup.tupletNormal) {
-        lines.push(`${indent}  <tuplet${attrs}>`);
-        if (tup.tupletActual) {
-          lines.push(`${indent}    <tuplet-actual>`);
-          if (tup.tupletActual.tupletNumber !== void 0) {
-            lines.push(`${indent}      <tuplet-number>${tup.tupletActual.tupletNumber}</tuplet-number>`);
-          }
-          if (tup.tupletActual.tupletType) {
-            lines.push(`${indent}      <tuplet-type>${tup.tupletActual.tupletType}</tuplet-type>`);
-          }
-          if (tup.tupletActual.tupletDots) {
-            for (let i = 0; i < tup.tupletActual.tupletDots; i++) {
-              lines.push(`${indent}      <tuplet-dot/>`);
-            }
+  for (const chunk of chunks) {
+    if (chunk.kind === "standalone") {
+      lines.push(...serializeStandaloneNotation(chunk.notation, indent));
+    } else if (chunk.kind === "articulations") {
+      lines.push(...serializeArticulationsGroup(chunk.items, indent));
+    } else if (chunk.kind === "ornaments") {
+      lines.push(...serializeOrnamentsGroup(chunk.items, indent));
+    } else if (chunk.kind === "technical") {
+      lines.push(...serializeTechnicalGroup(chunk.items, indent));
+    }
+  }
+  lines.push(`${indent}</notations>`);
+  return lines;
+}
+function serializeStandaloneNotation(notation, indent) {
+  const lines = [];
+  if (notation.type === "tied") {
+    let attrs = ` type="${notation.tiedType}"`;
+    if (notation.number !== void 0) attrs += ` number="${notation.number}"`;
+    if (notation.orientation) attrs += ` orientation="${notation.orientation}"`;
+    lines.push(`${indent}  <tied${attrs}/>`);
+  } else if (notation.type === "slur") {
+    let attrs = "";
+    if (notation.number !== void 0) attrs += ` number="${notation.number}"`;
+    attrs += ` type="${notation.slurType}"`;
+    if (notation.lineType) attrs += ` line-type="${notation.lineType}"`;
+    if (notation.orientation) attrs += ` orientation="${notation.orientation}"`;
+    if (notation.defaultX !== void 0) attrs += ` default-x="${notation.defaultX}"`;
+    if (notation.defaultY !== void 0) attrs += ` default-y="${notation.defaultY}"`;
+    if (notation.bezierX !== void 0) attrs += ` bezier-x="${notation.bezierX}"`;
+    if (notation.bezierY !== void 0) attrs += ` bezier-y="${notation.bezierY}"`;
+    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}"`;
+    lines.push(`${indent}  <slur${attrs}/>`);
+  } else if (notation.type === "tuplet") {
+    let attrs = ` type="${notation.tupletType}"`;
+    if (notation.number !== void 0) attrs += ` number="${notation.number}"`;
+    if (notation.bracket !== void 0) attrs += ` bracket="${notation.bracket ? "yes" : "no"}"`;
+    if (notation.showNumber) attrs += ` show-number="${notation.showNumber}"`;
+    if (notation.showType) attrs += ` show-type="${notation.showType}"`;
+    if (notation.lineShape) attrs += ` line-shape="${notation.lineShape}"`;
+    if (notation.placement) attrs += ` placement="${notation.placement}"`;
+    const tup = notation;
+    if (tup.tupletActual || tup.tupletNormal) {
+      lines.push(`${indent}  <tuplet${attrs}>`);
+      if (tup.tupletActual) {
+        lines.push(`${indent}    <tuplet-actual>`);
+        if (tup.tupletActual.tupletNumber !== void 0) {
+          lines.push(`${indent}      <tuplet-number>${tup.tupletActual.tupletNumber}</tuplet-number>`);
+        }
+        if (tup.tupletActual.tupletType) {
+          lines.push(`${indent}      <tuplet-type>${tup.tupletActual.tupletType}</tuplet-type>`);
+        }
+        if (tup.tupletActual.tupletDots) {
+          for (let i = 0; i < tup.tupletActual.tupletDots; i++) {
+            lines.push(`${indent}      <tuplet-dot/>`);
           }
-          lines.push(`${indent}    </tuplet-actual>`);
         }
-        if (tup.tupletNormal) {
-          lines.push(`${indent}    <tuplet-normal>`);
-          if (tup.tupletNormal.tupletNumber !== void 0) {
-            lines.push(`${indent}      <tuplet-number>${tup.tupletNormal.tupletNumber}</tuplet-number>`);
-          }
-          if (tup.tupletNormal.tupletType) {
-            lines.push(`${indent}      <tuplet-type>${tup.tupletNormal.tupletType}</tuplet-type>`);
-          }
-          if (tup.tupletNormal.tupletDots) {
-            for (let i = 0; i < tup.tupletNormal.tupletDots; i++) {
-              lines.push(`${indent}      <tuplet-dot/>`);
-            }
+        lines.push(`${indent}    </tuplet-actual>`);
+      }
+      if (tup.tupletNormal) {
+        lines.push(`${indent}    <tuplet-normal>`);
+        if (tup.tupletNormal.tupletNumber !== void 0) {
+          lines.push(`${indent}      <tuplet-number>${tup.tupletNormal.tupletNumber}</tuplet-number>`);
+        }
+        if (tup.tupletNormal.tupletType) {
+          lines.push(`${indent}      <tuplet-type>${tup.tupletNormal.tupletType}</tuplet-type>`);
+        }
+        if (tup.tupletNormal.tupletDots) {
+          for (let i = 0; i < tup.tupletNormal.tupletDots; i++) {
+            lines.push(`${indent}      <tuplet-dot/>`);
           }
-          lines.push(`${indent}    </tuplet-normal>`);
         }
-        lines.push(`${indent}  </tuplet>`);
-      } else {
-        lines.push(`${indent}  <tuplet${attrs}/>`);
-      }
-    } else if (notation.type === "dynamics") {
-      const placementAttr = notation.placement ? ` placement="${notation.placement}"` : "";
-      lines.push(`${indent}  <dynamics${placementAttr}>`);
-      for (const dyn of notation.dynamics) {
-        lines.push(`${indent}    <${dyn}/>`);
-      }
-      if (notation.otherDynamics) {
-        lines.push(`${indent}    <other-dynamics>${escapeXml(notation.otherDynamics)}</other-dynamics>`);
-      }
-      lines.push(`${indent}  </dynamics>`);
-    } else if (notation.type === "fermata") {
-      let attrs = "";
-      if (notation.fermataType) attrs += ` type="${notation.fermataType}"`;
-      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}"`;
-      if (notation.shape) {
-        lines.push(`${indent}  <fermata${attrs}>${notation.shape}</fermata>`);
-      } else {
-        lines.push(`${indent}  <fermata${attrs}/>`);
-      }
-    } else if (notation.type === "arpeggiate") {
-      let attrs = "";
-      if (notation.direction) attrs += ` direction="${notation.direction}"`;
-      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}"`;
-      lines.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}"`;
-      lines.push(`${indent}  <non-arpeggiate${attrs}/>`);
-    } else if (notation.type === "accidental-mark") {
-      let attrs = "";
-      if (notation.placement) attrs += ` placement="${notation.placement}"`;
-      lines.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}"`;
-      if (notation.text) {
-        lines.push(`${indent}  <glissando${attrs}>${escapeXml(notation.text)}</glissando>`);
-      } else {
-        lines.push(`${indent}  <glissando${attrs}/>`);
-      }
-    } else if (notation.type === "slide") {
-      let attrs = ` type="${notation.slideType}"`;
-      if (notation.number !== void 0) attrs += ` number="${notation.number}"`;
-      if (notation.lineType) attrs += ` line-type="${notation.lineType}"`;
-      if (notation.text) {
-        lines.push(`${indent}  <slide${attrs}>${escapeXml(notation.text)}</slide>`);
-      } else {
-        lines.push(`${indent}  <slide${attrs}/>`);
+        lines.push(`${indent}    </tuplet-normal>`);
       }
+      lines.push(`${indent}  </tuplet>`);
+    } else {
+      lines.push(`${indent}  <tuplet${attrs}/>`);
+    }
+  } else if (notation.type === "dynamics") {
+    const placementAttr = notation.placement ? ` placement="${notation.placement}"` : "";
+    lines.push(`${indent}  <dynamics${placementAttr}>`);
+    for (const dyn of notation.dynamics) {
+      lines.push(`${indent}    <${dyn}/>`);
+    }
+    if (notation.otherDynamics) {
+      lines.push(`${indent}    <other-dynamics>${escapeXml(notation.otherDynamics)}</other-dynamics>`);
+    }
+    lines.push(`${indent}  </dynamics>`);
+  } else if (notation.type === "fermata") {
+    let attrs = "";
+    if (notation.fermataType) attrs += ` type="${notation.fermataType}"`;
+    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}"`;
+    if (notation.shape) {
+      lines.push(`${indent}  <fermata${attrs}>${notation.shape}</fermata>`);
+    } else {
+      lines.push(`${indent}  <fermata${attrs}/>`);
+    }
+  } else if (notation.type === "arpeggiate") {
+    let attrs = "";
+    if (notation.direction) attrs += ` direction="${notation.direction}"`;
+    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}"`;
+    lines.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}"`;
+    lines.push(`${indent}  <non-arpeggiate${attrs}/>`);
+  } else if (notation.type === "accidental-mark") {
+    let attrs = "";
+    if (notation.placement) attrs += ` placement="${notation.placement}"`;
+    lines.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}"`;
+    if (notation.text) {
+      lines.push(`${indent}  <glissando${attrs}>${escapeXml(notation.text)}</glissando>`);
+    } else {
+      lines.push(`${indent}  <glissando${attrs}/>`);
+    }
+  } else if (notation.type === "slide") {
+    let attrs = ` type="${notation.slideType}"`;
+    if (notation.number !== void 0) attrs += ` number="${notation.number}"`;
+    if (notation.lineType) attrs += ` line-type="${notation.lineType}"`;
+    if (notation.text) {
+      lines.push(`${indent}  <slide${attrs}>${escapeXml(notation.text)}</slide>`);
+    } else {
+      lines.push(`${indent}  <slide${attrs}/>`);
     }
   }
-  const sortedArtIndices = Array.from(articulationsGroups.keys()).sort((a, b) => a - b);
-  for (const artIdx of sortedArtIndices) {
-    const artGroup = articulationsGroups.get(artIdx);
-    lines.push(`${indent}  <articulations>`);
-    for (const art of artGroup) {
-      if (art.type === "articulation") {
-        let artAttrs = art.placement ? ` placement="${art.placement}"` : "";
-        if (art.articulation === "strong-accent" && art.strongAccentType) {
-          artAttrs += ` type="${art.strongAccentType}"`;
-        }
-        if (art.defaultX !== void 0) artAttrs += ` default-x="${art.defaultX}"`;
-        if (art.defaultY !== void 0) artAttrs += ` default-y="${art.defaultY}"`;
-        lines.push(`${indent}    <${art.articulation}${artAttrs}/>`);
+  return lines;
+}
+function serializeArticulationsGroup(artGroup, indent) {
+  const lines = [];
+  lines.push(`${indent}  <articulations>`);
+  for (const art of artGroup) {
+    if (art.type === "articulation") {
+      let artAttrs = art.placement ? ` placement="${art.placement}"` : "";
+      if (art.articulation === "strong-accent" && art.strongAccentType) {
+        artAttrs += ` type="${art.strongAccentType}"`;
       }
+      if (art.defaultX !== void 0) artAttrs += ` default-x="${art.defaultX}"`;
+      if (art.defaultY !== void 0) artAttrs += ` default-y="${art.defaultY}"`;
+      lines.push(`${indent}    <${art.articulation}${artAttrs}/>`);
     }
-    lines.push(`${indent}  </articulations>`);
   }
-  if (ornaments.length > 0) {
-    const hasOnlyEmptyMarker = ornaments.length === 1 && ornaments[0].type === "ornament" && ornaments[0].ornament === "empty";
-    if (hasOnlyEmptyMarker) {
-      lines.push(`${indent}  <ornaments/>`);
-    } else {
-      lines.push(`${indent}  <ornaments>`);
-      const allAccidentalMarks = [];
-      for (const orn of ornaments) {
-        if (orn.type === "ornament") {
-          if (orn.ornament === "empty") continue;
-          const placementAttr = orn.placement ? ` placement="${orn.placement}"` : "";
-          if (orn.ornament === "wavy-line") {
-            let wlAttrs = "";
-            if (orn.wavyLineType) wlAttrs += ` type="${orn.wavyLineType}"`;
-            if (orn.number !== void 0) wlAttrs += ` number="${orn.number}"`;
-            wlAttrs += placementAttr;
-            if (orn.defaultY !== void 0) wlAttrs += ` default-y="${orn.defaultY}"`;
-            lines.push(`${indent}    <wavy-line${wlAttrs}/>`);
-          } else if (orn.ornament === "tremolo") {
-            let tremAttrs = "";
-            if (orn.tremoloType) tremAttrs += ` type="${orn.tremoloType}"`;
-            tremAttrs += placementAttr;
-            if (orn.defaultX !== void 0) tremAttrs += ` default-x="${orn.defaultX}"`;
-            if (orn.defaultY !== void 0) tremAttrs += ` default-y="${orn.defaultY}"`;
-            if (orn.tremoloMarks !== void 0) {
-              lines.push(`${indent}    <tremolo${tremAttrs}>${orn.tremoloMarks}</tremolo>`);
-            } else {
-              lines.push(`${indent}    <tremolo${tremAttrs}/>`);
-            }
+  lines.push(`${indent}  </articulations>`);
+  return lines;
+}
+function serializeOrnamentsGroup(ornaments, indent) {
+  const lines = [];
+  const hasOnlyEmptyMarker = ornaments.length === 1 && ornaments[0].type === "ornament" && ornaments[0].ornament === "empty";
+  if (hasOnlyEmptyMarker) {
+    lines.push(`${indent}  <ornaments/>`);
+  } else {
+    lines.push(`${indent}  <ornaments>`);
+    const allAccidentalMarks = [];
+    for (const orn of ornaments) {
+      if (orn.type === "ornament") {
+        if (orn.ornament === "empty") continue;
+        const placementAttr = orn.placement ? ` placement="${orn.placement}"` : "";
+        if (orn.ornament === "wavy-line") {
+          let wlAttrs = "";
+          if (orn.wavyLineType) wlAttrs += ` type="${orn.wavyLineType}"`;
+          if (orn.number !== void 0) wlAttrs += ` number="${orn.number}"`;
+          wlAttrs += placementAttr;
+          if (orn.defaultY !== void 0) wlAttrs += ` default-y="${orn.defaultY}"`;
+          lines.push(`${indent}    <wavy-line${wlAttrs}/>`);
+        } else if (orn.ornament === "tremolo") {
+          let tremAttrs = "";
+          if (orn.tremoloType) tremAttrs += ` type="${orn.tremoloType}"`;
+          tremAttrs += placementAttr;
+          if (orn.defaultX !== void 0) tremAttrs += ` default-x="${orn.defaultX}"`;
+          if (orn.defaultY !== void 0) tremAttrs += ` default-y="${orn.defaultY}"`;
+          if (orn.tremoloMarks !== void 0) {
+            lines.push(`${indent}    <tremolo${tremAttrs}>${orn.tremoloMarks}</tremolo>`);
           } else {
-            let ornAttrs = placementAttr;
-            if (orn.defaultY !== void 0) ornAttrs += ` default-y="${orn.defaultY}"`;
-            lines.push(`${indent}    <${orn.ornament}${ornAttrs}/>`);
-          }
-          if (orn.accidentalMarks) {
-            allAccidentalMarks.push(...orn.accidentalMarks);
+            lines.push(`${indent}    <tremolo${tremAttrs}/>`);
           }
+        } else {
+          let ornAttrs = placementAttr;
+          if (orn.defaultY !== void 0) ornAttrs += ` default-y="${orn.defaultY}"`;
+          lines.push(`${indent}    <${orn.ornament}${ornAttrs}/>`);
+        }
+        if (orn.accidentalMarks) {
+          allAccidentalMarks.push(...orn.accidentalMarks);
         }
       }
-      for (const am of allAccidentalMarks) {
-        const amPlacement = am.placement ? ` placement="${am.placement}"` : "";
-        lines.push(`${indent}    <accidental-mark${amPlacement}>${am.value}</accidental-mark>`);
-      }
-      lines.push(`${indent}  </ornaments>`);
     }
+    for (const am of allAccidentalMarks) {
+      const amPlacement = am.placement ? ` placement="${am.placement}"` : "";
+      lines.push(`${indent}    <accidental-mark${amPlacement}>${am.value}</accidental-mark>`);
+    }
+    lines.push(`${indent}  </ornaments>`);
   }
-  if (technicals.length > 0) {
-    lines.push(`${indent}  <technical>`);
-    for (const tech of technicals) {
-      if (tech.type === "technical") {
-        let placementAttr = tech.placement ? ` placement="${tech.placement}"` : "";
-        const techNotation = tech;
-        if (techNotation.defaultX !== void 0) placementAttr += ` default-x="${techNotation.defaultX}"`;
-        if (techNotation.defaultY !== void 0) placementAttr += ` default-y="${techNotation.defaultY}"`;
-        if (tech.technical === "bend" && (techNotation.bendAlter !== void 0 || techNotation.preBend || techNotation.release)) {
-          lines.push(`${indent}    <bend${placementAttr}>`);
-          if (techNotation.bendAlter !== void 0) {
-            lines.push(`${indent}      <bend-alter>${techNotation.bendAlter}</bend-alter>`);
-          }
-          if (techNotation.preBend) {
-            lines.push(`${indent}      <pre-bend/>`);
-          }
-          if (techNotation.release) {
-            lines.push(`${indent}      <release/>`);
-          }
-          if (techNotation.withBar) {
-            lines.push(`${indent}      <with-bar/>`);
-          }
-          lines.push(`${indent}    </bend>`);
-        } else if (tech.technical === "harmonic") {
-          const hasChildren = techNotation.harmonicNatural || techNotation.harmonicArtificial || techNotation.basePitch || techNotation.touchingPitch || techNotation.soundingPitch;
-          if (hasChildren) {
-            lines.push(`${indent}    <harmonic${placementAttr}>`);
-            if (techNotation.harmonicNatural) lines.push(`${indent}      <natural/>`);
-            if (techNotation.harmonicArtificial) lines.push(`${indent}      <artificial/>`);
-            if (techNotation.basePitch) lines.push(`${indent}      <base-pitch/>`);
-            if (techNotation.touchingPitch) lines.push(`${indent}      <touching-pitch/>`);
-            if (techNotation.soundingPitch) lines.push(`${indent}      <sounding-pitch/>`);
-            lines.push(`${indent}    </harmonic>`);
-          } else {
-            lines.push(`${indent}    <harmonic${placementAttr}/>`);
-          }
-        } else if (tech.technical === "hammer-on" || tech.technical === "pull-off") {
-          let attrs = "";
-          if (techNotation.number !== void 0) attrs += ` number="${techNotation.number}"`;
-          if (techNotation.startStop) attrs += ` type="${techNotation.startStop}"`;
-          attrs += placementAttr;
-          if (techNotation.text !== void 0) {
-            lines.push(`${indent}    <${tech.technical}${attrs}>${escapeXml(techNotation.text)}</${tech.technical}>`);
-          } else {
-            lines.push(`${indent}    <${tech.technical}${attrs}/>`);
-          }
-        } else if (tech.technical === "string" && techNotation.string !== void 0) {
-          lines.push(`${indent}    <string${placementAttr}>${techNotation.string}</string>`);
-        } else if (tech.technical === "fret" && techNotation.fret !== void 0) {
-          lines.push(`${indent}    <fret${placementAttr}>${techNotation.fret}</fret>`);
-        } else if (tech.technical === "fingering") {
-          let fAttrs = placementAttr;
-          if (techNotation.fingeringSubstitution) fAttrs += ' substitution="yes"';
-          if (techNotation.fingeringAlternate) fAttrs += ' alternate="yes"';
-          if (techNotation.text !== void 0) {
-            lines.push(`${indent}    <fingering${fAttrs}>${escapeXml(techNotation.text)}</fingering>`);
-          } else {
-            lines.push(`${indent}    <fingering${fAttrs}/>`);
-          }
-        } else if (tech.technical === "heel" || tech.technical === "toe") {
-          let htAttrs = placementAttr;
-          if (techNotation.substitution) htAttrs += ' substitution="yes"';
-          lines.push(`${indent}    <${tech.technical}${htAttrs}/>`);
-        } else if (techNotation.text !== void 0) {
-          lines.push(`${indent}    <${tech.technical}${placementAttr}>${escapeXml(techNotation.text)}</${tech.technical}>`);
+  return lines;
+}
+function serializeTechnicalGroup(technicals, indent) {
+  const lines = [];
+  lines.push(`${indent}  <technical>`);
+  for (const tech of technicals) {
+    if (tech.type === "technical") {
+      let placementAttr = tech.placement ? ` placement="${tech.placement}"` : "";
+      const techNotation = tech;
+      if (techNotation.defaultX !== void 0) placementAttr += ` default-x="${techNotation.defaultX}"`;
+      if (techNotation.defaultY !== void 0) placementAttr += ` default-y="${techNotation.defaultY}"`;
+      if (tech.technical === "bend" && (techNotation.bendAlter !== void 0 || techNotation.preBend || techNotation.release)) {
+        lines.push(`${indent}    <bend${placementAttr}>`);
+        if (techNotation.bendAlter !== void 0) {
+          lines.push(`${indent}      <bend-alter>${techNotation.bendAlter}</bend-alter>`);
+        }
+        if (techNotation.preBend) {
+          lines.push(`${indent}      <pre-bend/>`);
+        }
+        if (techNotation.release) {
+          lines.push(`${indent}      <release/>`);
+        }
+        if (techNotation.withBar) {
+          lines.push(`${indent}      <with-bar/>`);
+        }
+        lines.push(`${indent}    </bend>`);
+      } else if (tech.technical === "harmonic") {
+        const hasChildren = techNotation.harmonicNatural || techNotation.harmonicArtificial || techNotation.basePitch || techNotation.touchingPitch || techNotation.soundingPitch;
+        if (hasChildren) {
+          lines.push(`${indent}    <harmonic${placementAttr}>`);
+          if (techNotation.harmonicNatural) lines.push(`${indent}      <natural/>`);
+          if (techNotation.harmonicArtificial) lines.push(`${indent}      <artificial/>`);
+          if (techNotation.basePitch) lines.push(`${indent}      <base-pitch/>`);
+          if (techNotation.touchingPitch) lines.push(`${indent}      <touching-pitch/>`);
+          if (techNotation.soundingPitch) lines.push(`${indent}      <sounding-pitch/>`);
+          lines.push(`${indent}    </harmonic>`);
         } else {
-          lines.push(`${indent}    <${tech.technical}${placementAttr}/>`);
-        }
+          lines.push(`${indent}    <harmonic${placementAttr}/>`);
+        }
+      } else if (tech.technical === "hammer-on" || tech.technical === "pull-off") {
+        let attrs = "";
+        if (techNotation.number !== void 0) attrs += ` number="${techNotation.number}"`;
+        if (techNotation.startStop) attrs += ` type="${techNotation.startStop}"`;
+        attrs += placementAttr;
+        if (techNotation.text !== void 0) {
+          lines.push(`${indent}    <${tech.technical}${attrs}>${escapeXml(techNotation.text)}</${tech.technical}>`);
+        } else {
+          lines.push(`${indent}    <${tech.technical}${attrs}/>`);
+        }
+      } else if (tech.technical === "string" && techNotation.string !== void 0) {
+        lines.push(`${indent}    <string${placementAttr}>${techNotation.string}</string>`);
+      } else if (tech.technical === "fret" && techNotation.fret !== void 0) {
+        lines.push(`${indent}    <fret${placementAttr}>${techNotation.fret}</fret>`);
+      } else if (tech.technical === "fingering") {
+        let fAttrs = placementAttr;
+        if (techNotation.fingeringSubstitution) fAttrs += ' substitution="yes"';
+        if (techNotation.fingeringAlternate) fAttrs += ' alternate="yes"';
+        if (techNotation.text !== void 0) {
+          lines.push(`${indent}    <fingering${fAttrs}>${escapeXml(techNotation.text)}</fingering>`);
+        } else {
+          lines.push(`${indent}    <fingering${fAttrs}/>`);
+        }
+      } else if (tech.technical === "heel" || tech.technical === "toe") {
+        let htAttrs = placementAttr;
+        if (techNotation.substitution) htAttrs += ' substitution="yes"';
+        lines.push(`${indent}    <${tech.technical}${htAttrs}/>`);
+      } else if (techNotation.text !== void 0) {
+        lines.push(`${indent}    <${tech.technical}${placementAttr}>${escapeXml(techNotation.text)}</${tech.technical}>`);
+      } else {
+        lines.push(`${indent}    <${tech.technical}${placementAttr}/>`);
       }
     }
-    lines.push(`${indent}  </technical>`);
   }
-  lines.push(`${indent}</notations>`);
+  lines.push(`${indent}  </technical>`);
   return lines;
 }
 function serializeLyric(lyric, indent) {