@barmark/render 0.9.0 → 0.10.0

package/CHANGELOG.md

@@ -6,6 +6,25 @@ package uses [semantic versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [0.10.0] - 2026-11-03
+
+### Added
+
+- **The part** a chart names (`part: Electric Guitar 1`) leads the
+  header line: "Electric Guitar 1 · G major". The model gains `part`.
+
+## [0.9.1] - 2026-11-03
+
+### Fixed
+
+- **Bar numbers count the bars as written** (issue #92), each once, as a
+  band counts them and as `PlayedBar.written` gives them. Before, the
+  margin counted played bars, so a second ending or anything after a
+  repeat or a jump numbered past the printed score. A replayed section
+  now shows the numbers it was written with; the coda after a
+  `D.S. al Coda`, and bars after an open repeat, are numbered instead
+  of left blank. Screen readers hear the same numbers.
+
 ## [0.9.0] - 2026-11-03
 
 ### Added
@@ -256,7 +275,9 @@ that needs no script or as the `<barmark-chart>` web component. Requires
   zoom without sideways scrolling, the element renders and re-renders, and
   a screen reader hears "bar 9: D". Run them with `bun run test:browser`.
 
-[Unreleased]: https://github.com/kevinpeckham/barmark/compare/render-v0.9.0...HEAD
+[Unreleased]: https://github.com/kevinpeckham/barmark/compare/render-v0.10.0...HEAD
+[0.10.0]: https://github.com/kevinpeckham/barmark/compare/render-v0.9.1...render-v0.10.0
+[0.9.1]: https://github.com/kevinpeckham/barmark/compare/render-v0.9.0...render-v0.9.1
 [0.9.0]: https://github.com/kevinpeckham/barmark/compare/render-v0.8.0...render-v0.9.0
 [0.8.0]: https://github.com/kevinpeckham/barmark/compare/render-v0.7.3...render-v0.8.0
 [0.7.3]: https://github.com/kevinpeckham/barmark/compare/render-v0.7.2...render-v0.7.3

package/README.md

@@ -178,8 +178,10 @@ At the default size chords are 16px and no label is under 12px.
 
 Chords appear in their canonical form whatever the author typed (`Cø`
 shows as Cm⁷(♭5)). `%` is drawn as the bar it copies; a replayed section
-is drawn in full with its own bar numbers, and its own lyrics replace the
-written section's. A line with an error shows as written, underlined,
+is drawn in full, and its own lyrics replace the written section's. Bar
+numbers count the bars as written, each once, as a band counts them: a
+repeat, an ending, a jump or a replay doesn't move them, so a replayed
+section shows the numbers it was written with. A line with an error shows as written, underlined,
 with its message. `layoutChart(text)` returns all of this as data, if
 you want to draw it yourself.
 

package/dist/html.js

@@ -48,7 +48,9 @@ function headerHtml(model) {
     const title = model.title
         ? `<h2 class="bm-title" part="title">${escapeHtml(model.title)}</h2>`
         : "";
-    const meta = metaText(model.header);
+    const meta = [model.part ? escapeHtml(model.part.name) : "", metaText(model.header)]
+        .filter(Boolean)
+        .join(" · ");
     if (!title && !meta)
         return "";
     return `<header class="bm-header">${title}${meta ? `<p class="bm-meta" part="meta">${meta}</p>` : ""}</header>`;

package/dist/model.js

@@ -13,13 +13,12 @@ export function layoutChart(text, options = {}) {
         parse,
         source: text.split(/\r?\n/),
         errors: errorsByLine(parse),
-        lastKnownBar: lastKnownBar(parse.events),
         written: new Map(groups.flatMap((g) => (g.heading ? [[g.heading.line, g]] : []))),
     };
     const blocks = groups.map((g) => layoutGroup(g, ctx));
     if (options.rehearsalLetters)
         letterBlocks(blocks);
-    return { title: parse.title, header, blocks, diagnostics: parse.diagnostics };
+    return { title: parse.title, part: parse.part, header, blocks, diagnostics: parse.diagnostics };
 }
 /** Rehearsal letters mark position: every section occurrence, and leading bars, in play order. */
 function letterBlocks(blocks) {
@@ -44,34 +43,13 @@ function errorsByLine(parse) {
     }
     return errors;
 }
-/** The count of bars up to the end of the first open repeat (all of them if there is none). */
-function lastKnownBar(events) {
-    let count = 0;
-    const countBars = (es) => {
-        for (const e of es) {
-            if (e.kind === "bar")
-                count++;
-            else if (e.kind === "open")
-                countBars(e.events);
-        }
-    };
-    for (const e of events) {
-        if (e.kind === "open") {
-            countBars(e.events);
-            return count;
-        }
-        if (e.kind === "bar")
-            count++;
-    }
-    return Number.POSITIVE_INFINITY;
-}
 /** The title line, and the directives before any other content, form the header. */
 function splitHeader(lines) {
     const header = {};
     let i = 0;
     for (; i < lines.length; i++) {
         const l = lines[i];
-        if (l?.kind === "title")
+        if (l?.kind === "title" || l?.kind === "part")
             continue;
         if (l?.kind !== "directive")
             break;
@@ -80,7 +58,7 @@ function splitHeader(lines) {
             delete header.swingPercent;
         Object.assign(header, l.set);
     }
-    return { header, body: lines.slice(i).filter((l) => l.kind !== "title") };
+    return { header, body: lines.slice(i).filter((l) => l.kind !== "title" && l.kind !== "part") };
 }
 function groupLines(lines) {
     const groups = [];
@@ -226,11 +204,11 @@ function layoutRow(l, played, previous, ctx) {
             prev = model;
         cells.push(model);
     }
-    const firstIndex = played[0]?.index;
     return {
         kind: "row",
         line: l.line,
-        barNumber: firstIndex !== undefined && firstIndex <= ctx.lastKnownBar ? firstIndex : null,
+        // Numbered as written, as a band counts (issue #92): repeats, endings, jumps and replays don't move it.
+        barNumber: (played[0] ?? written[0])?.written ?? null,
         opens: l.opens,
         closes: l.closes,
         repeat: l.repeat,

package/dist/types.d.ts

@@ -1,10 +1,12 @@
-import type { ChartDiagnostic, Direction, Directives, Key, Meter, Repeat, Slot, Words } from "barmark";
+import type { ChartDiagnostic, Direction, Directives, Key, Meter, Part, Repeat, Slot, Words } from "barmark";
 export type LayoutOptions = {
     rehearsalLetters?: boolean;
 };
 /** What to draw, with every musical decision already made. */
 export type ChartModel = {
     title: string | null;
+    /** What `part:` names; null when the chart names none. */
+    part: Part | null;
     /** Directives before the first heading, bar line or text line. */
     header: Directives;
     blocks: SectionBlock[];
@@ -25,7 +27,7 @@ export type SectionBlock = {
 export type BlockItem = {
     kind: "row";
     line: number;
-    /** The play-order number of the row's first bar on its first pass. */
+    /** The written number of the row's first bar (`PlayedBar.written`); a replay shows its section's numbers. Null for a row with no bar. */
     barNumber: number | null;
     opens: boolean;
     closes: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@barmark/render",
-	"version": "0.9.0",
+	"version": "0.10.0",
 	"description": "Render barmark chord charts as a clean, accessible bar grid: HTML with Declarative Shadow DOM, or the <barmark-chart> web component.",
 	"type": "module",
 	"exports": {
@@ -47,7 +47,7 @@
 		"url": "https://github.com/kevinpeckham/barmark/issues"
 	},
 	"dependencies": {
-		"barmark": "^0.12.0"
+		"barmark": "^0.13.0"
 	},
 	"scripts": {
 		"build": "rm -rf dist && tsc -p tsconfig.build.json",