notations 1.0.1 → 1.0.4

package/lib/cjs/web/utils/sourceSerializer.js

@@ -0,0 +1,162 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serializeCells = serializeCells;
+exports.serializeCell = serializeCell;
+exports.serializeBlockItem = serializeBlockItem;
+exports.updateCellSource = updateCellSource;
+exports.validateCellSource = validateCellSource;
+exports.findCellSourceRange = findCellSourceRange;
+const block_1 = require("../../block");
+const DEFAULT_OPTIONS = {
+    indent: "  ",
+    lineSeparator: "\n",
+    preserveUnmodified: true,
+};
+function serializeCells(cells, options = {}) {
+    const opts = Object.assign(Object.assign({}, DEFAULT_OPTIONS), options);
+    const parts = [];
+    for (const cell of cells) {
+        const serialized = serializeCell(cell, 0, opts);
+        if (serialized) {
+            parts.push(serialized);
+        }
+    }
+    return parts.join(opts.lineSeparator + opts.lineSeparator);
+}
+function serializeCell(cell, depth, options) {
+    const indent = options.indent.repeat(depth);
+    if (options.preserveUnmodified && cell.source && !cell.state.hasError) {
+        if (depth === 0) {
+            return cell.source;
+        }
+        return cell.source
+            .split("\n")
+            .map((line) => indent + line)
+            .join(options.lineSeparator);
+    }
+    return serializeBlockItem(cell.blockItem, depth, options);
+}
+function serializeBlockItem(item, depth, options) {
+    if ((0, block_1.isRawBlock)(item)) {
+        return serializeRawBlock(item, depth, options);
+    }
+    if ((0, block_1.isLine)(item)) {
+        return serializeLine(item, depth, options);
+    }
+    if ((0, block_1.isBlock)(item)) {
+        return serializeBlock(item, depth, options);
+    }
+    return "";
+}
+function serializeRawBlock(rawBlock, depth, options) {
+    const indent = options.indent.repeat(depth);
+    const content = rawBlock.content;
+    if (rawBlock.contentType === "md") {
+        return `${indent}---${options.lineSeparator}${content}${options.lineSeparator}${indent}---`;
+    }
+    if (rawBlock.contentType === "metadata") {
+        return `${indent}@@${content}`;
+    }
+    return content
+        .split("\n")
+        .map((line) => indent + line)
+        .join(options.lineSeparator);
+}
+function serializeLine(line, depth, options) {
+    const indent = options.indent.repeat(depth);
+    return `${indent}; [Line serialization not fully implemented]`;
+}
+function serializeBlock(block, depth, options) {
+    const indent = options.indent.repeat(depth);
+    const childIndent = options.indent.repeat(depth + 1);
+    const parts = [];
+    const header = serializeBlockHeader(block);
+    parts.push(`${indent}${header} {`);
+    for (const child of block.blockItems) {
+        const childSource = serializeBlockItem(child, depth + 1, options);
+        if (childSource) {
+            parts.push(childSource);
+        }
+    }
+    parts.push(`${indent}}`);
+    return parts.join(options.lineSeparator);
+}
+function serializeBlockHeader(block) {
+    var _a;
+    const type = block.blockType;
+    switch (type) {
+        case "section":
+            return `\\section("${block.name || ""}")`;
+        case "repeat": {
+            const repeatCount = (_a = block.repeatCount) !== null && _a !== void 0 ? _a : 1;
+            return `\\repeat(${repeatCount})`;
+        }
+        case "cycle":
+            if (block.localCycle) {
+                return `\\cycle("${block.localCycle.toString()}")`;
+            }
+            return "\\cycle()";
+        case "beatduration":
+            if (block.localAtomsPerBeat !== null) {
+                return `\\beatDuration(${block.localAtomsPerBeat})`;
+            }
+            return "\\beatDuration(1)";
+        case "breaks":
+            if (block.localBreaks) {
+                return `\\breaks(${block.localBreaks.join(", ")})`;
+            }
+            return "\\breaks()";
+        case "role": {
+            const roleName = Array.from(block.localRoles.keys())[0] || "";
+            return `\\role("${roleName}")`;
+        }
+        case "group":
+            if (block.name) {
+                return `\\group("${block.name}")`;
+            }
+            return "\\group()";
+        case "notation":
+            return "";
+        default:
+            return `\\${type}()`;
+    }
+}
+function updateCellSource(cell, newSource) {
+    return Object.assign(Object.assign({}, cell), { source: newSource });
+}
+function validateCellSource(source) {
+    let braceCount = 0;
+    for (const char of source) {
+        if (char === "{")
+            braceCount++;
+        if (char === "}")
+            braceCount--;
+        if (braceCount < 0) {
+            return {
+                isValid: false,
+                error: "Unmatched closing brace",
+            };
+        }
+    }
+    if (braceCount !== 0) {
+        return {
+            isValid: false,
+            error: "Unmatched opening brace",
+        };
+    }
+    return { isValid: true };
+}
+function findCellSourceRange(cell, fullSource) {
+    if ((0, block_1.isRawBlock)(cell.blockItem)) {
+        const rawBlock = cell.blockItem;
+        const start = fullSource.indexOf(rawBlock.content);
+        if (start >= 0) {
+            return {
+                start,
+                end: start + rawBlock.content.length,
+            };
+        }
+    }
+    return null;
+}
+//# sourceMappingURL=sourceSerializer.js.map

package/lib/cjs/web/utils/sourceSerializer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sourceSerializer.js","sourceRoot":"","sources":["../../../../src/web/utils/sourceSerializer.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Source serializer for converting CellModel trees back to notation source.\n *\n * This module handles serializing edited cells back into notation source text,\n * preserving formatting and structure where possible.\n */\n\nimport type { BlockItem, Block, RawBlock } from \"../../block\";\nimport type { Line } from \"../../core\";\nimport { isBlock, isLine, isRawBlock } from \"../../block\";\nimport { CellModel } from \"../types/notebook\";\n\n/**\n * Options for source serialization.\n */\nexport interface SerializerOptions {\n  /**\n   * Indentation string to use for nested blocks.\n   * @default \"  \" (two spaces)\n   */\n  indent?: string;\n\n  /**\n   * Line separator.\n   * @default \"\\n\"\n   */\n  lineSeparator?: string;\n\n  /**\n   * Whether to preserve original source for unmodified cells.\n   * @default true\n   */\n  preserveUnmodified?: boolean;\n}\n\nconst DEFAULT_OPTIONS: SerializerOptions = {\n  indent: \"  \",\n  lineSeparator: \"\\n\",\n  preserveUnmodified: true,\n};\n\n/**\n * Serializes a cell tree back to notation source.\n *\n * @param cells The cell models to serialize\n * @param options Serialization options\n * @returns The serialized notation source\n */\nexport function serializeCells(cells: CellModel[], options: SerializerOptions = {}): string {\n  const opts = { ...DEFAULT_OPTIONS, ...options };\n  const parts: string[] = [];\n\n  for (const cell of cells) {\n    const serialized = serializeCell(cell, 0, opts);\n    if (serialized) {\n      parts.push(serialized);\n    }\n  }\n\n  return parts.join(opts.lineSeparator! + opts.lineSeparator!);\n}\n\n/**\n * Serializes a single cell to source.\n *\n * @param cell The cell to serialize\n * @param depth The current nesting depth\n * @param options Serialization options\n * @returns The serialized source\n */\nexport function serializeCell(cell: CellModel, depth: number, options: SerializerOptions): string {\n  const indent = options.indent!.repeat(depth);\n\n  // If preserving unmodified and cell has source, use it directly\n  if (options.preserveUnmodified && cell.source && !cell.state.hasError) {\n    // For top-level cells, return source as-is\n    if (depth === 0) {\n      return cell.source;\n    }\n    // For nested cells, indent each line\n    return cell.source\n      .split(\"\\n\")\n      .map((line) => indent + line)\n      .join(options.lineSeparator!);\n  }\n\n  // Otherwise, serialize from the block item\n  return serializeBlockItem(cell.blockItem, depth, options);\n}\n\n/**\n * Serializes a BlockItem to source.\n *\n * @param item The block item to serialize\n * @param depth The current nesting depth\n * @param options Serialization options\n * @returns The serialized source\n */\nexport function serializeBlockItem(item: BlockItem, depth: number, options: SerializerOptions): string {\n  if (isRawBlock(item)) {\n    return serializeRawBlock(item as RawBlock, depth, options);\n  }\n\n  if (isLine(item)) {\n    return serializeLine(item as Line, depth, options);\n  }\n\n  if (isBlock(item)) {\n    return serializeBlock(item as Block, depth, options);\n  }\n\n  return \"\";\n}\n\n/**\n * Serializes a RawBlock to source.\n */\nfunction serializeRawBlock(rawBlock: RawBlock, depth: number, options: SerializerOptions): string {\n  const indent = options.indent!.repeat(depth);\n  const content = rawBlock.content;\n\n  // Determine wrapper based on content type\n  if (rawBlock.contentType === \"md\") {\n    // Markdown content uses triple backtick or raw syntax\n    return `${indent}---${options.lineSeparator}${content}${options.lineSeparator}${indent}---`;\n  }\n\n  if (rawBlock.contentType === \"metadata\") {\n    // Metadata reference\n    return `${indent}@@${content}`;\n  }\n\n  // Default: plain text or other content\n  return content\n    .split(\"\\n\")\n    .map((line) => indent + line)\n    .join(options.lineSeparator!);\n}\n\n/**\n * Serializes a Line to source.\n *\n * Note: This is a simplified serialization. Full Line serialization\n * would need to reconstruct atoms, spaces, embellishments, etc.\n */\nfunction serializeLine(line: Line, depth: number, options: SerializerOptions): string {\n  const indent = options.indent!.repeat(depth);\n\n  // For now, return a placeholder\n  // Full implementation would iterate through line.atoms and serialize each\n  // This would require significant work to reconstruct the DSL syntax\n  return `${indent}; [Line serialization not fully implemented]`;\n}\n\n/**\n * Serializes a Block to source.\n */\nfunction serializeBlock(block: Block, depth: number, options: SerializerOptions): string {\n  const indent = options.indent!.repeat(depth);\n  const childIndent = options.indent!.repeat(depth + 1);\n  const parts: string[] = [];\n\n  // Block header\n  const header = serializeBlockHeader(block);\n  parts.push(`${indent}${header} {`);\n\n  // Children\n  for (const child of block.blockItems) {\n    const childSource = serializeBlockItem(child, depth + 1, options);\n    if (childSource) {\n      parts.push(childSource);\n    }\n  }\n\n  // Closing brace\n  parts.push(`${indent}}`);\n\n  return parts.join(options.lineSeparator!);\n}\n\n/**\n * Serializes a block header (command with parameters).\n */\nfunction serializeBlockHeader(block: Block): string {\n  const type = block.blockType;\n\n  switch (type) {\n    case \"section\":\n      return `\\\\section(\"${block.name || \"\"}\")`;\n\n    case \"repeat\": {\n      // RepeatBlock has repeatCount property\n      const repeatCount = (block as any).repeatCount ?? 1;\n      return `\\\\repeat(${repeatCount})`;\n    }\n\n    case \"cycle\":\n      // CycleBlock has localCycle\n      if (block.localCycle) {\n        return `\\\\cycle(\"${block.localCycle.toString()}\")`;\n      }\n      return \"\\\\cycle()\";\n\n    case \"beatduration\":\n      if (block.localAtomsPerBeat !== null) {\n        return `\\\\beatDuration(${block.localAtomsPerBeat})`;\n      }\n      return \"\\\\beatDuration(1)\";\n\n    case \"breaks\":\n      if (block.localBreaks) {\n        return `\\\\breaks(${block.localBreaks.join(\", \")})`;\n      }\n      return \"\\\\breaks()\";\n\n    case \"role\": {\n      // Get first role name from localRoles\n      const roleName = Array.from(block.localRoles.keys())[0] || \"\";\n      return `\\\\role(\"${roleName}\")`;\n    }\n\n    case \"group\":\n      if (block.name) {\n        return `\\\\group(\"${block.name}\")`;\n      }\n      return \"\\\\group()\";\n\n    case \"notation\":\n      // Root notation block has no header\n      return \"\";\n\n    default:\n      return `\\\\${type}()`;\n  }\n}\n\n/**\n * Updates a cell's source and marks it as modified.\n *\n * @param cell The cell to update\n * @param newSource The new source text\n * @returns A new CellModel with updated source\n */\nexport function updateCellSource(cell: CellModel, newSource: string): CellModel {\n  return {\n    ...cell,\n    source: newSource,\n  };\n}\n\n/**\n * Validates cell source by attempting to parse it.\n *\n * @param source The source to validate\n * @returns Object with isValid flag and optional error message\n */\nexport function validateCellSource(source: string): {\n  isValid: boolean;\n  error?: string;\n} {\n  // For now, just check for basic syntax issues\n  // Full validation would require the notation parser\n\n  // Check for balanced braces\n  let braceCount = 0;\n  for (const char of source) {\n    if (char === \"{\") braceCount++;\n    if (char === \"}\") braceCount--;\n    if (braceCount < 0) {\n      return {\n        isValid: false,\n        error: \"Unmatched closing brace\",\n      };\n    }\n  }\n\n  if (braceCount !== 0) {\n    return {\n      isValid: false,\n      error: \"Unmatched opening brace\",\n    };\n  }\n\n  return { isValid: true };\n}\n\n/**\n * Extracts the source range for a cell from full notation source.\n * This is a best-effort function that tries to find the cell's content\n * in the original source.\n *\n * @param cell The cell to find\n * @param fullSource The full notation source\n * @returns Source range or null if not found\n */\nexport function findCellSourceRange(cell: CellModel, fullSource: string): { start: number; end: number } | null {\n  // This is a simplified implementation\n  // Full implementation would need source position tracking in the parser\n\n  if (isRawBlock(cell.blockItem)) {\n    const rawBlock = cell.blockItem as RawBlock;\n    const start = fullSource.indexOf(rawBlock.content);\n    if (start >= 0) {\n      return {\n        start,\n        end: start + rawBlock.content.length,\n      };\n    }\n  }\n\n  return null;\n}\n"]}

package/lib/esm/carnatic/atomviews.d.ts

@@ -16,6 +16,7 @@ export declare abstract class LeafAtomView extends LeafAtomViewBase {
     abstract get glyphLabel(): string;
     protected refreshBBox(): TSU.Geom.Rect;
     protected refreshMinSize(): TSU.Geom.Size;
+    get glyphOffset(): number;
     protected updateBounds(x: null | number, y: null | number, w: null | number, h: null | number): [number | null, number | null, number | null, number | null];
     protected layoutElements(): void;
     refreshLayout(): void;

package/lib/esm/carnatic/atomviews.js

@@ -31,6 +31,9 @@ export class LeafAtomView extends LeafAtomViewBase {
         out.height += totalHeight;
         return out;
     }
+    get glyphOffset() {
+        return (this.leftSlot.reduce((a, b) => a + b.minSize.width, 0) + this.leftSlot.length);
+    }
     updateBounds(x, y, w, h) {
         return [x, y, NaN, NaN];
     }

package/lib/esm/carnatic/atomviews.js.map

@@ -1 +1 @@
-{"version":3,"file":"atomviews.js","sourceRoot":"","sources":["../../../src/carnatic/atomviews.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { Atom, Group, Literal, AtomType, Note, Space, Syllable } from \"../core\";\nimport {\n  LeafAtomView as LeafAtomViewBase,\n  GroupView as GroupViewBase,\n  AtomView,\n  Embelishment,\n  ElementShape,\n} from \"../shapes\";\nimport {\n  OctaveIndicator,\n  Kampitham,\n  Nokku,\n  Spuritham,\n  Prathyagatham,\n  Orikkai,\n  Odukkal,\n  Raavi,\n  Kandippu,\n  Vaali,\n  Jaaru,\n} from \"./embelishments\";\nimport { GamakaType } from \"./gamakas\";\n\nexport class GroupView extends GroupViewBase {\n  createAtomView(atom: Atom): AtomView {\n    return createAtomView(this.groupElement, atom, this.defaultToNotes, 0.7);\n  }\n}\n\nexport abstract class LeafAtomView extends LeafAtomViewBase {\n  leftSlot: Embelishment[] = [];\n  topSlot: Embelishment[] = [];\n  rightSlot: Embelishment[] = [];\n  bottomSlot: Embelishment[] = [];\n  glyph: ElementShape;\n\n  // Spaces required before and after to accomodate for left and right slots\n  protected postSpacingSpan: SVGTSpanElement;\n  // Sometimes this.element may not be the root element if we need spacings\n  // the rootElement is the top of the chain\n  protected rootGroup: ElementShape;\n  protected rootText: ElementShape;\n\n  abstract get glyphLabel(): string;\n\n  protected refreshBBox(): TSU.Geom.Rect {\n    return TSU.DOM.svgBBox(this.rootGroup.element);\n  }\n\n  protected refreshMinSize(): TSU.Geom.Size {\n    const out = { ...this.rootText.minSize };\n    const totalWidth =\n      this.leftSlot.reduce((a, b) => a + b.minSize.width, 0) +\n      this.rightSlot.reduce((a, b) => a + b.minSize.width, 0) +\n      this.leftSlot.length + // Padding of 1\n      this.rightSlot.length; // Padding of 1\n    const totalHeight =\n      this.topSlot.reduce((a, b) => a + b.minSize.height, 0) +\n      this.bottomSlot.reduce((a, b) => a + b.minSize.height, 0);\n    out.width += totalWidth;\n    out.height += totalHeight;\n    // if (this.postSpacingSpan) out.width += this.postSpacingSpan.getBBox().width;\n    return out;\n  }\n\n  protected updateBounds(\n    x: null | number,\n    y: null | number,\n    w: null | number,\n    h: null | number,\n  ): [number | null, number | null, number | null, number | null] {\n    return [x, y, NaN, NaN];\n  }\n\n  protected layoutElements(): void {\n    // Lays out all the child elements locally\n    const textSize = this.rootText.minSize;\n    // assume text is at 0,0 and lay things around it\n\n    // now layout leftSlots\n    let currX = 0;\n    let currY = this.hasY ? this.y : 0;\n    // place left embelishments\n    for (const emb of this.leftSlot) {\n      emb.x = currX;\n      emb.refreshLayout();\n      currX += emb.minSize.width + 1;\n    }\n\n    // now place the text\n    const textX = currX;\n    this.rootText.x = currX;\n    this.rootText.refreshLayout();\n\n    // And right embelishments\n    currX += this.rootText.minSize.width;\n    for (const emb of this.rightSlot) {\n      emb.x = currX;\n      emb.refreshLayout();\n      currX += emb.minSize.width + 1;\n    }\n\n    // layout top and bottom if x or y has changed\n    const gminSize = this.glyph.minSize;\n\n    // top embelishments\n    const glyphX = textX + this.glyph.x;\n    const glyphY = this.glyph.y;\n    currY = glyphY - this.glyph.minSize.height + 5;\n    for (const emb of this.topSlot) {\n      const bb = emb.minSize;\n      emb.setBounds(glyphX + (gminSize.width - bb.width) / 2, currY - bb.height, null, null, true);\n      currY = emb.y;\n    }\n\n    // bottom embelishments\n    currY = glyphY + 7;\n    for (const emb of this.bottomSlot) {\n      const bb = emb.minSize;\n      emb.setBounds(glyphX + (gminSize.width - bb.width) / 2, currY, null, null, true);\n      currY = emb.y + bb.height;\n    }\n    this.invalidateBounds();\n  }\n\n  refreshLayout(): void {\n    // TODO - move this code out to refreshLayout?\n    // set the glyphs Y first so we can layout others\n    this.layoutElements();\n    this.rootGroup.element.setAttribute(\"transform\", \"translate(\" + this.x + \",\" + this.y + \")\");\n  }\n\n  protected addEmbelishment(slot: Embelishment[], emb: Embelishment): void {\n    slot.push(emb);\n    // this.addShape(emb);\n  }\n\n  /**\n   * Orders embelishments and creates their views.\n   */\n  orderEmbelishments(): void {\n    const atom = this.leafAtom;\n    if (atom.TYPE != AtomType.SYLLABLE && atom.TYPE != AtomType.NOTE) {\n      return;\n    }\n    const lit = atom as Literal;\n    if (lit.embelishments.length == 0) return;\n    for (const emb of lit.embelishments) {\n      switch (emb.type) {\n        case GamakaType.Kampitham:\n          this.addEmbelishment(this.topSlot, new Kampitham(this));\n          break;\n        case GamakaType.Nokku:\n          this.addEmbelishment(this.topSlot, new Nokku(this));\n          break;\n        case GamakaType.Spuritham:\n          this.addEmbelishment(this.topSlot, new Spuritham(this));\n          break;\n        case GamakaType.Prathyagatham:\n          this.addEmbelishment(this.topSlot, new Prathyagatham(this));\n          break;\n        case GamakaType.Orikkai:\n          this.addEmbelishment(this.topSlot, new Orikkai(this));\n          break;\n        case GamakaType.Odukkal:\n          this.addEmbelishment(this.topSlot, new Odukkal(this));\n          break;\n        case GamakaType.Aahaatam_Raavi:\n          this.addEmbelishment(this.topSlot, new Raavi(this));\n          break;\n        case GamakaType.Aahaatam_Kandippu:\n          this.addEmbelishment(this.topSlot, new Kandippu(this));\n          break;\n        case GamakaType.Vaali:\n          this.addEmbelishment(this.topSlot, new Vaali(this));\n          break;\n        case GamakaType.Jaaru_Eetra:\n        case GamakaType.Jaaru_Irakka:\n          this.addEmbelishment(this.leftSlot, new Jaaru(emb, this));\n          break;\n      }\n    }\n  }\n\n  embRoot(): SVGGraphicsElement {\n    return this.rootGroup.element;\n  }\n\n  needsRootElement(): boolean {\n    return true; // this.rightSlot.length > 0 || this.leafAtom.beforeRest;\n  }\n\n  createElements(parent: SVGGraphicsElement): void {\n    // Create the glyph element first before anything\n    // this allows embelishments to get early access to this element\n    this.createGlyphRoot(parent);\n    this.createGlyphElement();\n    // Order embelishments (without creating any views)\n    this.orderEmbelishments();\n    this.createPostSpacingElement();\n    this.invalidateBounds();\n  }\n\n  protected createGlyphRoot(parent: SVGGraphicsElement): void {\n    this.rootGroup = new ElementShape(\n      TSU.DOM.createSVGNode(\"g\", {\n        doc: document,\n        parent: parent,\n        attrs: {\n          atomid: this.leafAtom.uuid,\n          class: \"atomViewRootGroup\",\n          id: \"atomViewRootGroup\" + this.leafAtom.uuid,\n        },\n      }),\n    );\n    this.rootText = new ElementShape(\n      TSU.DOM.createSVGNode(\"text\", {\n        doc: document,\n        parent: this.rootGroup.element,\n        attrs: {\n          atomid: this.leafAtom.uuid,\n          class: \"atomViewTextRoot\",\n          id: \"atomViewTextRoot\" + this.leafAtom.uuid,\n        },\n      }),\n    );\n  }\n\n  protected createGlyphElement(): void {\n    const atom = this.leafAtom;\n    this.glyph = new ElementShape(\n      TSU.DOM.createSVGNode(\"tspan\", {\n        doc: document,\n        parent: this.rootText.element,\n        attrs: {\n          atomid: atom.uuid,\n          id: \"atomGlyph\" + atom.uuid,\n        },\n        text: this.glyphLabel, // + (note.beforeRest ? \" - \" : \" \"),\n      }),\n    );\n  }\n\n  protected createPostSpacingElement(): void {\n    if (this.leafAtom.beforeRest) {\n      this.postSpacingSpan = TSU.DOM.createSVGNode(\"tspan\", {\n        doc: document,\n        parent: this.rootText.element,\n        attrs: {\n          atomid: this.leafAtom.uuid,\n          id: \"postSpacing\" + this.leafAtom.uuid,\n        },\n        text: this.leafAtom.beforeRest ? \" - \" : \"  \",\n      });\n    }\n  }\n}\n\nclass SpaceView extends LeafAtomView {\n  get glyphLabel(): string {\n    if (this.space.isSilent) return \" \";\n    if (this.space.duration.isOne) return \",\";\n    if (this.space.duration.cmpNum(2) == 0) return \";\";\n    return \"_\";\n  }\n\n  get space(): Space {\n    return this.leafAtom as Space;\n  }\n}\n\nclass NoteView extends LeafAtomView {\n  protected shiftElement: SVGTSpanElement;\n  get glyphLabel(): string {\n    return this.note.value;\n  }\n\n  needsRootElement(): boolean {\n    return true; // this.note.shift == true || this.note.shift != 0 || super.needsRootElement();\n  }\n\n  protected createGlyphElement(): void {\n    super.createGlyphElement();\n    if (this.note.shift == true || this.note.shift != 0) {\n      this.shiftElement = TSU.DOM.createSVGNode(\"tspan\", {\n        doc: document,\n        parent: this.rootText.element,\n        attrs: {\n          atomid: this.note.uuid,\n          class: \"noteShiftTSpan\",\n          id: \"noteShift\" + this.note.uuid,\n          \"baseline-shift\": \"sub\",\n        },\n        text: (this.note.shift == true ? \"*\" : this.note.shift) + \" \",\n      });\n    }\n  }\n\n  protected moveGlyphToRoot(): void {\n    // super.moveGlyphToRoot();\n    if (this.shiftElement) {\n      this.rootGroup.element.appendChild(this.shiftElement);\n    }\n  }\n\n  orderEmbelishments(): void {\n    const note = this.note;\n    // create the embelishments if needed\n    if (note.octave > 0) {\n      this.topSlot.push(new OctaveIndicator(this, note));\n    } else if (this.note.octave < 0) {\n      this.bottomSlot.push(new OctaveIndicator(this, note));\n    }\n    super.orderEmbelishments();\n  }\n\n  get note(): Note {\n    return this.leafAtom as Note;\n  }\n}\n\nclass SyllableView extends LeafAtomView {\n  get glyphLabel(): string {\n    return this.syllable.value;\n  }\n\n  get syllable(): Syllable {\n    return this.leafAtom as Syllable;\n  }\n}\n\nexport function createAtomView(\n  parent: SVGGraphicsElement,\n  atom: Atom,\n  litDefaultsToNote = false,\n  groupViewScale = 1.0,\n): AtomView {\n  let out: AtomView;\n  switch (atom.TYPE) {\n    // Dealing with leaf atoms\n    case AtomType.SPACE:\n      out = new SpaceView(atom as Space);\n      break;\n    case AtomType.SYLLABLE:\n      out = new SyllableView(atom as Syllable);\n      break;\n    case AtomType.NOTE:\n      out = new NoteView(atom as Note);\n      break;\n    case AtomType.LITERAL:\n      if (litDefaultsToNote) {\n        const lit = Note.fromLit(atom as Note);\n        out = new NoteView(lit);\n      } else {\n        const lit = Syllable.fromLit(atom as Syllable);\n        out = new SyllableView(lit);\n      }\n      break;\n    case AtomType.GROUP:\n      out = new GroupView(atom as Group);\n      (out as GroupView).defaultToNotes = litDefaultsToNote;\n      (out as GroupView).scaleFactor = groupViewScale;\n      break;\n    default:\n      // We should never get a group as we are iterating\n      // at leaf atom levels\n      throw new Error(\"Invalid atom type: \" + atom.TYPE);\n  }\n  out.createElements(parent);\n  return out;\n}\n"]}
+{"version":3,"file":"atomviews.js","sourceRoot":"","sources":["../../../src/carnatic/atomviews.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { Atom, Group, Literal, AtomType, Note, Space, Syllable } from \"../core\";\nimport {\n  LeafAtomView as LeafAtomViewBase,\n  GroupView as GroupViewBase,\n  AtomView,\n  Embelishment,\n  ElementShape,\n} from \"../shapes\";\nimport {\n  OctaveIndicator,\n  Kampitham,\n  Nokku,\n  Spuritham,\n  Prathyagatham,\n  Orikkai,\n  Odukkal,\n  Raavi,\n  Kandippu,\n  Vaali,\n  Jaaru,\n} from \"./embelishments\";\nimport { GamakaType } from \"./gamakas\";\n\nexport class GroupView extends GroupViewBase {\n  createAtomView(atom: Atom): AtomView {\n    return createAtomView(this.groupElement, atom, this.defaultToNotes, 0.7);\n  }\n}\n\nexport abstract class LeafAtomView extends LeafAtomViewBase {\n  leftSlot: Embelishment[] = [];\n  topSlot: Embelishment[] = [];\n  rightSlot: Embelishment[] = [];\n  bottomSlot: Embelishment[] = [];\n  glyph: ElementShape;\n\n  // Spaces required before and after to accomodate for left and right slots\n  protected postSpacingSpan: SVGTSpanElement;\n  // Sometimes this.element may not be the root element if we need spacings\n  // the rootElement is the top of the chain\n  protected rootGroup: ElementShape;\n  protected rootText: ElementShape;\n\n  abstract get glyphLabel(): string;\n\n  protected refreshBBox(): TSU.Geom.Rect {\n    return TSU.DOM.svgBBox(this.rootGroup.element);\n  }\n\n  protected refreshMinSize(): TSU.Geom.Size {\n    const out = { ...this.rootText.minSize };\n    const totalWidth =\n      this.leftSlot.reduce((a, b) => a + b.minSize.width, 0) +\n      this.rightSlot.reduce((a, b) => a + b.minSize.width, 0) +\n      this.leftSlot.length + // Padding of 1\n      this.rightSlot.length; // Padding of 1\n    const totalHeight =\n      this.topSlot.reduce((a, b) => a + b.minSize.height, 0) +\n      this.bottomSlot.reduce((a, b) => a + b.minSize.height, 0);\n    out.width += totalWidth;\n    out.height += totalHeight;\n    // if (this.postSpacingSpan) out.width += this.postSpacingSpan.getBBox().width;\n    return out;\n  }\n\n  /**\n   * Returns the horizontal offset from the atom's origin to where the note glyph starts.\n   * This is the total width of left embellishments (e.g., Jaaru symbols).\n   */\n  get glyphOffset(): number {\n    return (\n      this.leftSlot.reduce((a, b) => a + b.minSize.width, 0) + this.leftSlot.length // Padding of 1 per embellishment\n    );\n  }\n\n  protected updateBounds(\n    x: null | number,\n    y: null | number,\n    w: null | number,\n    h: null | number,\n  ): [number | null, number | null, number | null, number | null] {\n    return [x, y, NaN, NaN];\n  }\n\n  protected layoutElements(): void {\n    // Lays out all the child elements locally\n    const textSize = this.rootText.minSize;\n    // assume text is at 0,0 and lay things around it\n\n    // now layout leftSlots\n    let currX = 0;\n    let currY = this.hasY ? this.y : 0;\n    // place left embelishments\n    for (const emb of this.leftSlot) {\n      emb.x = currX;\n      emb.refreshLayout();\n      currX += emb.minSize.width + 1;\n    }\n\n    // now place the text\n    const textX = currX;\n    this.rootText.x = currX;\n    this.rootText.refreshLayout();\n\n    // And right embelishments\n    currX += this.rootText.minSize.width;\n    for (const emb of this.rightSlot) {\n      emb.x = currX;\n      emb.refreshLayout();\n      currX += emb.minSize.width + 1;\n    }\n\n    // layout top and bottom if x or y has changed\n    const gminSize = this.glyph.minSize;\n\n    // top embelishments\n    const glyphX = textX + this.glyph.x;\n    const glyphY = this.glyph.y;\n    currY = glyphY - this.glyph.minSize.height + 5;\n    for (const emb of this.topSlot) {\n      const bb = emb.minSize;\n      emb.setBounds(glyphX + (gminSize.width - bb.width) / 2, currY - bb.height, null, null, true);\n      currY = emb.y;\n    }\n\n    // bottom embelishments\n    currY = glyphY + 7;\n    for (const emb of this.bottomSlot) {\n      const bb = emb.minSize;\n      emb.setBounds(glyphX + (gminSize.width - bb.width) / 2, currY, null, null, true);\n      currY = emb.y + bb.height;\n    }\n    this.invalidateBounds();\n  }\n\n  refreshLayout(): void {\n    // TODO - move this code out to refreshLayout?\n    // set the glyphs Y first so we can layout others\n    this.layoutElements();\n    this.rootGroup.element.setAttribute(\"transform\", \"translate(\" + this.x + \",\" + this.y + \")\");\n  }\n\n  protected addEmbelishment(slot: Embelishment[], emb: Embelishment): void {\n    slot.push(emb);\n    // this.addShape(emb);\n  }\n\n  /**\n   * Orders embelishments and creates their views.\n   */\n  orderEmbelishments(): void {\n    const atom = this.leafAtom;\n    if (atom.TYPE != AtomType.SYLLABLE && atom.TYPE != AtomType.NOTE) {\n      return;\n    }\n    const lit = atom as Literal;\n    if (lit.embelishments.length == 0) return;\n    for (const emb of lit.embelishments) {\n      switch (emb.type) {\n        case GamakaType.Kampitham:\n          this.addEmbelishment(this.topSlot, new Kampitham(this));\n          break;\n        case GamakaType.Nokku:\n          this.addEmbelishment(this.topSlot, new Nokku(this));\n          break;\n        case GamakaType.Spuritham:\n          this.addEmbelishment(this.topSlot, new Spuritham(this));\n          break;\n        case GamakaType.Prathyagatham:\n          this.addEmbelishment(this.topSlot, new Prathyagatham(this));\n          break;\n        case GamakaType.Orikkai:\n          this.addEmbelishment(this.topSlot, new Orikkai(this));\n          break;\n        case GamakaType.Odukkal:\n          this.addEmbelishment(this.topSlot, new Odukkal(this));\n          break;\n        case GamakaType.Aahaatam_Raavi:\n          this.addEmbelishment(this.topSlot, new Raavi(this));\n          break;\n        case GamakaType.Aahaatam_Kandippu:\n          this.addEmbelishment(this.topSlot, new Kandippu(this));\n          break;\n        case GamakaType.Vaali:\n          this.addEmbelishment(this.topSlot, new Vaali(this));\n          break;\n        case GamakaType.Jaaru_Eetra:\n        case GamakaType.Jaaru_Irakka:\n          this.addEmbelishment(this.leftSlot, new Jaaru(emb, this));\n          break;\n      }\n    }\n  }\n\n  embRoot(): SVGGraphicsElement {\n    return this.rootGroup.element;\n  }\n\n  needsRootElement(): boolean {\n    return true; // this.rightSlot.length > 0 || this.leafAtom.beforeRest;\n  }\n\n  createElements(parent: SVGGraphicsElement): void {\n    // Create the glyph element first before anything\n    // this allows embelishments to get early access to this element\n    this.createGlyphRoot(parent);\n    this.createGlyphElement();\n    // Order embelishments (without creating any views)\n    this.orderEmbelishments();\n    this.createPostSpacingElement();\n    this.invalidateBounds();\n  }\n\n  protected createGlyphRoot(parent: SVGGraphicsElement): void {\n    this.rootGroup = new ElementShape(\n      TSU.DOM.createSVGNode(\"g\", {\n        doc: document,\n        parent: parent,\n        attrs: {\n          atomid: this.leafAtom.uuid,\n          class: \"atomViewRootGroup\",\n          id: \"atomViewRootGroup\" + this.leafAtom.uuid,\n        },\n      }),\n    );\n    this.rootText = new ElementShape(\n      TSU.DOM.createSVGNode(\"text\", {\n        doc: document,\n        parent: this.rootGroup.element,\n        attrs: {\n          atomid: this.leafAtom.uuid,\n          class: \"atomViewTextRoot\",\n          id: \"atomViewTextRoot\" + this.leafAtom.uuid,\n        },\n      }),\n    );\n  }\n\n  protected createGlyphElement(): void {\n    const atom = this.leafAtom;\n    this.glyph = new ElementShape(\n      TSU.DOM.createSVGNode(\"tspan\", {\n        doc: document,\n        parent: this.rootText.element,\n        attrs: {\n          atomid: atom.uuid,\n          id: \"atomGlyph\" + atom.uuid,\n        },\n        text: this.glyphLabel, // + (note.beforeRest ? \" - \" : \" \"),\n      }),\n    );\n  }\n\n  protected createPostSpacingElement(): void {\n    if (this.leafAtom.beforeRest) {\n      this.postSpacingSpan = TSU.DOM.createSVGNode(\"tspan\", {\n        doc: document,\n        parent: this.rootText.element,\n        attrs: {\n          atomid: this.leafAtom.uuid,\n          id: \"postSpacing\" + this.leafAtom.uuid,\n        },\n        text: this.leafAtom.beforeRest ? \" - \" : \"  \",\n      });\n    }\n  }\n}\n\nclass SpaceView extends LeafAtomView {\n  get glyphLabel(): string {\n    if (this.space.isSilent) return \" \";\n    if (this.space.duration.isOne) return \",\";\n    if (this.space.duration.cmpNum(2) == 0) return \";\";\n    return \"_\";\n  }\n\n  get space(): Space {\n    return this.leafAtom as Space;\n  }\n}\n\nclass NoteView extends LeafAtomView {\n  protected shiftElement: SVGTSpanElement;\n  get glyphLabel(): string {\n    return this.note.value;\n  }\n\n  needsRootElement(): boolean {\n    return true; // this.note.shift == true || this.note.shift != 0 || super.needsRootElement();\n  }\n\n  protected createGlyphElement(): void {\n    super.createGlyphElement();\n    if (this.note.shift == true || this.note.shift != 0) {\n      this.shiftElement = TSU.DOM.createSVGNode(\"tspan\", {\n        doc: document,\n        parent: this.rootText.element,\n        attrs: {\n          atomid: this.note.uuid,\n          class: \"noteShiftTSpan\",\n          id: \"noteShift\" + this.note.uuid,\n          \"baseline-shift\": \"sub\",\n        },\n        text: (this.note.shift == true ? \"*\" : this.note.shift) + \" \",\n      });\n    }\n  }\n\n  protected moveGlyphToRoot(): void {\n    // super.moveGlyphToRoot();\n    if (this.shiftElement) {\n      this.rootGroup.element.appendChild(this.shiftElement);\n    }\n  }\n\n  orderEmbelishments(): void {\n    const note = this.note;\n    // create the embelishments if needed\n    if (note.octave > 0) {\n      this.topSlot.push(new OctaveIndicator(this, note));\n    } else if (this.note.octave < 0) {\n      this.bottomSlot.push(new OctaveIndicator(this, note));\n    }\n    super.orderEmbelishments();\n  }\n\n  get note(): Note {\n    return this.leafAtom as Note;\n  }\n}\n\nclass SyllableView extends LeafAtomView {\n  get glyphLabel(): string {\n    return this.syllable.value;\n  }\n\n  get syllable(): Syllable {\n    return this.leafAtom as Syllable;\n  }\n}\n\nexport function createAtomView(\n  parent: SVGGraphicsElement,\n  atom: Atom,\n  litDefaultsToNote = false,\n  groupViewScale = 1.0,\n): AtomView {\n  let out: AtomView;\n  switch (atom.TYPE) {\n    // Dealing with leaf atoms\n    case AtomType.SPACE:\n      out = new SpaceView(atom as Space);\n      break;\n    case AtomType.SYLLABLE:\n      out = new SyllableView(atom as Syllable);\n      break;\n    case AtomType.NOTE:\n      out = new NoteView(atom as Note);\n      break;\n    case AtomType.LITERAL:\n      if (litDefaultsToNote) {\n        const lit = Note.fromLit(atom as Note);\n        out = new NoteView(lit);\n      } else {\n        const lit = Syllable.fromLit(atom as Syllable);\n        out = new SyllableView(lit);\n      }\n      break;\n    case AtomType.GROUP:\n      out = new GroupView(atom as Group);\n      (out as GroupView).defaultToNotes = litDefaultsToNote;\n      (out as GroupView).scaleFactor = groupViewScale;\n      break;\n    default:\n      // We should never get a group as we are iterating\n      // at leaf atom levels\n      throw new Error(\"Invalid atom type: \" + atom.TYPE);\n  }\n  out.createElements(parent);\n  return out;\n}\n"]}

package/lib/esm/carnatic/beatviews.js

@@ -55,6 +55,10 @@ export class BeatView extends BeatViewBase {
         const newX = this.hasX ? this._x : 0;
         const newY = this.hasY ? this._y : 0;
         this.element.setAttribute("transform", "translate(" + newX + "," + newY + ")");
+        if (this.hasWidth && this.atomView) {
+            this.atomView.setBounds(0, 0, this.width, null, false);
+            this.atomView.refreshLayout();
+        }
         this.invalidateBounds();
         for (const e of this.embelishments)
             e.refreshLayout();

package/lib/esm/carnatic/beatviews.js.map

@@ -1 +1 @@
-{"version":3,"file":"beatviews.js","sourceRoot":"","sources":["../../../src/carnatic/beatviews.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { Embelishment } from \"../shapes\";\nimport { GridCell, GridCellView } from \"../grids\";\nimport { ElementShape } from \"../shapes\";\nimport { createAtomView } from \"./atomviews\";\nimport { Marker } from \"../core\";\nimport { Beat } from \"../beats\";\nimport { BeatView as BeatViewBase } from \"../beatview\";\nimport { BeatStartLines, BeatEndLines } from \"./embelishments\";\n\nexport class MarkerView extends ElementShape<SVGGElement> implements GridCellView {\n  needsLayout = true;\n  rootGroup: SVGGElement;\n  textElement: SVGTextElement;\n  constructor(\n    public readonly cell: GridCell,\n    public readonly beat: Beat,\n    public readonly markers: Marker[],\n    public readonly isPreMarker: boolean,\n    public readonly rootElement: SVGGraphicsElement,\n    config?: any,\n  ) {\n    const rootGroup = TSU.DOM.createSVGNode(\"g\", {\n      parent: rootElement,\n      attrs: {\n        class: \"markerView\",\n        pre: isPreMarker,\n        roleName: beat.role.name,\n        beatIndex: \"\" + beat.index,\n        gridRow: cell.rowIndex,\n        gridCol: cell.colIndex,\n      },\n    });\n    super(rootGroup);\n    this.rootGroup = rootGroup as SVGGElement;\n    this.textElement = TSU.DOM.createSVGNode(\"text\", {\n      parent: rootGroup,\n      attrs: {\n        class: \"markerText\",\n        pre: isPreMarker,\n        dx: isPreMarker ? 0 : 15,\n      },\n      text: this.markers[0].text,\n    });\n  }\n\n  protected refreshMinSize(): TSU.Geom.Size {\n    const ts = TSU.DOM.svgBBox(this.textElement);\n    const totalWidth = ts.width;\n    const maxHeight = ts.height;\n    return new TSU.Geom.Size(totalWidth + 5, maxHeight + 5);\n  }\n\n  refreshLayout(): void {\n    // TODO - move this code out to refreshLayout?\n    // set the glyphs Y first so we can layout others\n    this.rootGroup.setAttribute(\"transform\", \"translate(\" + this.x + \",\" + this.y + \")\");\n  }\n\n  protected updateBounds(\n    x: null | number,\n    y: null | number,\n    w: null | number,\n    h: null | number,\n  ): [number | null, number | null, number | null, number | null] {\n    return [x, y, NaN, NaN];\n  }\n}\n\nexport class BeatView extends BeatViewBase {\n  createAtomView() {\n    return createAtomView(this.element, this.beat.atom, this.beat.role.defaultToNotes);\n  }\n\n  refreshLayout(): void {\n    const newX = this.hasX ? this._x : 0;\n    const newY = this.hasY ? this._y : 0;\n    this.element.setAttribute(\"transform\", \"translate(\" + newX + \",\" + newY + \")\");\n    this.invalidateBounds();\n    for (const e of this.embelishments) e.refreshLayout();\n    this.invalidateBounds();\n  }\n\n  protected createEmbelishments(): Embelishment[] {\n    let embelishments: Embelishment[] = [];\n    const beat = this.beat;\n    // TODO - Should this be the group's parent element?\n    const rootElement = this.rootElement;\n    if (beat.beatIndex == 0 && beat.barIndex == 0 && beat.instance == 0) {\n      // first beat in bar - Do a BarStart\n      const emb = new BeatStartLines(this, rootElement);\n      embelishments = [emb];\n    } else {\n      const cycle = this.cycle;\n      const bar = cycle.bars[beat.barIndex];\n      if (beat.beatIndex == bar.beatCount - 1) {\n        // It is important that we are not just looking at the last beat of the bar\n        // but also in the last \"instance\" of the beat in this bar to account for\n        // kalais\n        if (beat.instance == bar.instanceCount(beat.beatIndex) - 1) {\n          if (beat.barIndex == cycle.bars.length - 1) {\n            // last beat in last bar so - do a thalam end (2 lines)\n            const emb = new BeatEndLines(this, rootElement, 2);\n            embelishments = [emb];\n          } else {\n            // end of a bar so single line end\n            const emb = new BeatEndLines(this, rootElement);\n            embelishments = [emb];\n          }\n        }\n      }\n    }\n    return embelishments;\n  }\n}\n"]}
+{"version":3,"file":"beatviews.js","sourceRoot":"","sources":["../../../src/carnatic/beatviews.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { Embelishment } from \"../shapes\";\nimport { GridCell, GridCellView } from \"../grids\";\nimport { ElementShape } from \"../shapes\";\nimport { createAtomView } from \"./atomviews\";\nimport { Marker } from \"../core\";\nimport { Beat } from \"../beats\";\nimport { BeatView as BeatViewBase } from \"../beatview\";\nimport { BeatStartLines, BeatEndLines } from \"./embelishments\";\n\nexport class MarkerView extends ElementShape<SVGGElement> implements GridCellView {\n  needsLayout = true;\n  rootGroup: SVGGElement;\n  textElement: SVGTextElement;\n  constructor(\n    public readonly cell: GridCell,\n    public readonly beat: Beat,\n    public readonly markers: Marker[],\n    public readonly isPreMarker: boolean,\n    public readonly rootElement: SVGGraphicsElement,\n    config?: any,\n  ) {\n    const rootGroup = TSU.DOM.createSVGNode(\"g\", {\n      parent: rootElement,\n      attrs: {\n        class: \"markerView\",\n        pre: isPreMarker,\n        roleName: beat.role.name,\n        beatIndex: \"\" + beat.index,\n        gridRow: cell.rowIndex,\n        gridCol: cell.colIndex,\n      },\n    });\n    super(rootGroup);\n    this.rootGroup = rootGroup as SVGGElement;\n    this.textElement = TSU.DOM.createSVGNode(\"text\", {\n      parent: rootGroup,\n      attrs: {\n        class: \"markerText\",\n        pre: isPreMarker,\n        dx: isPreMarker ? 0 : 15,\n      },\n      text: this.markers[0].text,\n    });\n  }\n\n  protected refreshMinSize(): TSU.Geom.Size {\n    const ts = TSU.DOM.svgBBox(this.textElement);\n    const totalWidth = ts.width;\n    const maxHeight = ts.height;\n    return new TSU.Geom.Size(totalWidth + 5, maxHeight + 5);\n  }\n\n  refreshLayout(): void {\n    // TODO - move this code out to refreshLayout?\n    // set the glyphs Y first so we can layout others\n    this.rootGroup.setAttribute(\"transform\", \"translate(\" + this.x + \",\" + this.y + \")\");\n  }\n\n  protected updateBounds(\n    x: null | number,\n    y: null | number,\n    w: null | number,\n    h: null | number,\n  ): [number | null, number | null, number | null, number | null] {\n    return [x, y, NaN, NaN];\n  }\n}\n\nexport class BeatView extends BeatViewBase {\n  createAtomView() {\n    return createAtomView(this.element, this.beat.atom, this.beat.role.defaultToNotes);\n  }\n\n  /**\n   * Refreshes the layout of this beat view.\n   *\n   * This method propagates the column width from the grid layout system to\n   * the atomView, enabling duration-based positioning within beats to use\n   * consistent widths across the entire column.\n   *\n   * ### Width Propagation Flow:\n   * ```\n   * ColAlign.setOffset() → BeatView.setBounds(width) → atomView.setBounds(width)\n   *                                                  → atomView.refreshLayout()\n   * ```\n   *\n   * This ensures that atoms within different beats of the same column are\n   * aligned based on their time offset, creating a visually consistent grid.\n   */\n  refreshLayout(): void {\n    const newX = this.hasX ? this._x : 0;\n    const newY = this.hasY ? this._y : 0;\n    this.element.setAttribute(\"transform\", \"translate(\" + newX + \",\" + newY + \")\");\n\n    // Propagate column width to atomView for duration-based layout\n    // This enables global alignment across beats in the same column\n    if (this.hasWidth && this.atomView) {\n      this.atomView.setBounds(0, 0, this.width, null, false);\n      this.atomView.refreshLayout();\n    }\n\n    this.invalidateBounds();\n    for (const e of this.embelishments) e.refreshLayout();\n    this.invalidateBounds();\n  }\n\n  protected createEmbelishments(): Embelishment[] {\n    let embelishments: Embelishment[] = [];\n    const beat = this.beat;\n    // TODO - Should this be the group's parent element?\n    const rootElement = this.rootElement;\n    if (beat.beatIndex == 0 && beat.barIndex == 0 && beat.instance == 0) {\n      // first beat in bar - Do a BarStart\n      const emb = new BeatStartLines(this, rootElement);\n      embelishments = [emb];\n    } else {\n      const cycle = this.cycle;\n      const bar = cycle.bars[beat.barIndex];\n      if (beat.beatIndex == bar.beatCount - 1) {\n        // It is important that we are not just looking at the last beat of the bar\n        // but also in the last \"instance\" of the beat in this bar to account for\n        // kalais\n        if (beat.instance == bar.instanceCount(beat.beatIndex) - 1) {\n          if (beat.barIndex == cycle.bars.length - 1) {\n            // last beat in last bar so - do a thalam end (2 lines)\n            const emb = new BeatEndLines(this, rootElement, 2);\n            embelishments = [emb];\n          } else {\n            // end of a bar so single line end\n            const emb = new BeatEndLines(this, rootElement);\n            embelishments = [emb];\n          }\n        }\n      }\n    }\n    return embelishments;\n  }\n}\n"]}

package/lib/esm/carnatic/embelishments.d.ts

@@ -17,7 +17,7 @@ export declare class OctaveIndicator extends LeafAtomViewEmbelishment {
     constructor(noteView: LeafAtomView, note: Note);
     protected refreshBBox(): TSU.Geom.Rect;
     protected refreshMinSize(): TSU.Geom.Size;
-    protected updateBounds(x: null | number, y: null | number, w: null | number, h: null | number): [number | null, number | null, number | null, number | null];
+    protected updateBounds(x: null | number, y: null | number, _w: null | number, _h: null | number): [number | null, number | null, number | null, number | null];
     refreshLayout(): void;
 }
 export declare class LabelEmbelishment extends LeafAtomViewEmbelishment {
@@ -52,7 +52,7 @@ export declare class BeatEndLines extends Embelishment {
     protected updatePosition(x: null | number, y: null | number): [number | null, number | null];
     barSpacing: number;
     refreshLayout(): void;
-    protected updateBounds(x: null | number, y: null | number, w: null | number, h: null | number): [number | null, number | null, number | null, number | null];
+    protected updateBounds(_x: null | number, _y: null | number, _w: null | number, _h: null | number): [number | null, number | null, number | null, number | null];
 }
 export declare class Kampitham extends LabelEmbelishment {
     readonly atomView: LeafAtomView;
@@ -98,6 +98,6 @@ export declare class Jaaru extends LeafAtomViewEmbelishment {
     pathAttribute(x?: number): string;
     protected refreshMinSize(): TSU.Geom.Size;
     protected refreshBBox(): TSU.Geom.Rect;
-    protected updateBounds(x: null | number, y: null | number, w: null | number, h: null | number): [number | null, number | null, number | null, number | null];
+    protected updateBounds(x: null | number, _y: null | number, _w: null | number, _h: null | number): [number | null, number | null, number | null, number | null];
     refreshLayout(): void;
 }

package/lib/esm/carnatic/embelishments.js

@@ -49,7 +49,7 @@ export class OctaveIndicator extends LeafAtomViewEmbelishment {
             height: this.dotRadius * 2,
         };
     }
-    updateBounds(x, y, w, h) {
+    updateBounds(x, y, _w, _h) {
         if (x == null)
             x = this.x;
         if (y == null)
@@ -168,7 +168,7 @@ export class BeatEndLines extends Embelishment {
             line.setAttribute("y2", "" + (y + h));
         }
     }
-    updateBounds(x, y, w, h) {
+    updateBounds(_x, _y, _w, _h) {
         return [null, null, null, null];
     }
 }
@@ -264,7 +264,7 @@ export class Jaaru extends LeafAtomViewEmbelishment {
     refreshBBox() {
         return TSU.DOM.svgBBox(this.pathElem);
     }
-    updateBounds(x, y, w, h) {
+    updateBounds(x, _y, _w, _h) {
         return [x, null, null, null];
     }
     refreshLayout() {

package/lib/esm/carnatic/embelishments.js.map

@@ -1 +1 @@
-{"version":3,"file":"embelishments.js","sourceRoot":"","sources":["../../../src/carnatic/embelishments.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { Note } from \"../core\";\nimport { BeatView } from \"../beatview\";\nimport { Embelishment } from \"../shapes\";\nimport { LeafAtomView } from \"./atomviews\";\nimport { JaaruGamaka } from \"./gamakas\";\n\n/**\n * Embelishments specifically \"around\" a single atom view.\n */\nexport abstract class LeafAtomViewEmbelishment extends Embelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super();\n  }\n}\n\nexport class OctaveIndicator extends LeafAtomViewEmbelishment {\n  dotRadius = 1;\n  dotSpacing = 2.5;\n  dotsElem: SVGGElement;\n\n  constructor(\n    public readonly noteView: LeafAtomView,\n    public readonly note: Note,\n  ) {\n    super(noteView);\n    const rootElem = this.noteView.embRoot();\n    const numDots = Math.abs(note.octave);\n    this.dotsElem = TSU.DOM.createSVGNode(\"g\", {\n      doc: document,\n      parent: rootElem,\n      attrs: {\n        width: this.dotRadius * 2 * numDots + (numDots - 1) * this.dotSpacing,\n        height: this.dotRadius * 2,\n        source: \"atom\" + this.noteView.leafAtom.uuid,\n      },\n    });\n    let cx = 0;\n    for (let i = 0; i < numDots; i++) {\n      TSU.DOM.createSVGNode(\"circle\", {\n        doc: document,\n        parent: this.dotsElem,\n        attrs: {\n          cx: cx,\n          cy: 0,\n          r: this.dotRadius,\n          class: \"notation-octave-dot\",\n        },\n      });\n      cx += this.dotRadius + this.dotRadius + this.dotSpacing;\n    }\n  }\n\n  protected refreshBBox(): TSU.Geom.Rect {\n    return TSU.DOM.svgBBox(this.dotsElem);\n  }\n\n  protected refreshMinSize(): TSU.Geom.Size {\n    const numDots = Math.abs(this.note.octave);\n    return {\n      width: this.dotRadius * 2 * numDots + (numDots - 1) * this.dotSpacing,\n      height: this.dotRadius * 2,\n    };\n  }\n\n  protected updateBounds(\n    x: null | number,\n    y: null | number,\n    w: null | number,\n    h: null | number,\n  ): [number | null, number | null, number | null, number | null] {\n    if (x == null) x = this.x;\n    if (y == null) y = this.y;\n    // cannot set w/h\n    // this.bbox.x = x;\n    // this.bbox.y = y;\n    return [x, y, null, null];\n  }\n\n  refreshLayout(): void {\n    this.dotsElem.setAttribute(\"transform\", \"translate(\" + this.x + \",\" + this.y + \")\");\n  }\n}\n\n////////// Carnatic embelishments\nexport class LabelEmbelishment extends LeafAtomViewEmbelishment {\n  labelElem: SVGTextElement;\n  constructor(\n    public readonly label: string,\n    public readonly atomView: LeafAtomView,\n  ) {\n    super(atomView);\n    const rootElem = this.atomView.embRoot();\n    this.labelElem = TSU.DOM.createSVGNode(\"text\", {\n      doc: document,\n      parent: rootElem,\n      text: label,\n      attrs: {\n        source: \"atom\" + this.atomView.leafAtom.uuid,\n        class: \"notation-embelishment-label\",\n        \"dominant-baseline\": \"hanging\",\n      },\n    });\n  }\n\n  protected refreshBBox(): TSU.Geom.Rect {\n    return TSU.DOM.svgBBox(this.labelElem);\n  }\n\n  protected refreshMinSize(): TSU.Geom.Size {\n    return TSU.DOM.svgBBox(this.labelElem);\n  }\n\n  protected updateBounds(\n    x: null | number,\n    y: null | number,\n    w: null | number,\n    h: null | number,\n  ): [number | null, number | null, number | null, number | null] {\n    return [x, y, w, h];\n  }\n\n  refreshLayout(): void {\n    this.labelElem.setAttribute(\"x\", \"\" + this.x);\n    this.labelElem.setAttribute(\"y\", \"\" + this.y);\n  }\n}\n\nexport class BeatStartLines extends Embelishment {\n  barSpacing = 10;\n  protected line: SVGLineElement;\n\n  constructor(\n    public readonly source: BeatView,\n    public readonly rootElement: SVGGraphicsElement,\n  ) {\n    super();\n    this.line = TSU.DOM.createSVGNode(\"line\", {\n      doc: document,\n      parent: this.rootElement,\n      attrs: {\n        class: \"bar-start-line\",\n      },\n    });\n  }\n\n  protected refreshBBox(): TSU.Geom.Rect {\n    return new TSU.Geom.Rect(0, 0, 0, 0);\n  }\n\n  protected refreshMinSize(): TSU.Geom.Size {\n    return new TSU.Geom.Rect(0, 0, 0, 0);\n  }\n\n  refreshLayout(): void {\n    const line = this.line;\n    const x = this.source.x - this.barSpacing;\n    line.setAttribute(\"x1\", \"\" + x);\n    line.setAttribute(\"x2\", \"\" + x);\n    const y = this.source.y + this.source.bbox.y;\n    const h = this.source.bbox.height;\n    line.setAttribute(\"y1\", \"\" + y);\n    line.setAttribute(\"y2\", \"\" + (y + h));\n  }\n\n  protected updateBounds(\n    x: null | number,\n    y: null | number,\n    w: null | number,\n    h: null | number,\n  ): [number | null, number | null, number | null, number | null] {\n    return [x, y, null, h];\n  }\n}\n\nexport class BeatEndLines extends Embelishment {\n  lineSpacing = 2;\n  protected lines: SVGLineElement[];\n\n  constructor(\n    public readonly source: BeatView,\n    public readonly rootElement: SVGGraphicsElement,\n    nLines = 1,\n  ) {\n    super();\n    this.lines = [];\n    for (let i = 0; i < nLines; i++) {\n      this.lines.push(\n        TSU.DOM.createSVGNode(\"line\", {\n          doc: document,\n          // parent: l2g,\n          parent: this.rootElement,\n          attrs: {\n            class: \"bar-end-line\",\n          },\n        }),\n      );\n    }\n  }\n\n  protected refreshBBox(): TSU.Geom.Rect {\n    return new TSU.Geom.Rect(0, 0, 0, 0);\n  }\n\n  protected refreshMinSize(): TSU.Geom.Size {\n    return new TSU.Geom.Rect(0, 0, 0, 0);\n  }\n\n  protected updatePosition(x: null | number, y: null | number): [number | null, number | null] {\n    return [x, y];\n  }\n\n  barSpacing = 0;\n\n  refreshLayout(): void {\n    // const x = this.source.width + this.barSpacing;\n    // const y = 0;\n    // const h = this.source.height;\n    const x = this.source.x + this.source.width + this.barSpacing;\n    const y = this.source.y + this.source.bbox.y;\n    const h = this.source.bbox.height;\n    let currX = x;\n    for (const line of this.lines) {\n      const lx = \"\" + currX;\n      line.setAttribute(\"x1\", lx);\n      line.setAttribute(\"x2\", lx);\n      currX += 4;\n    }\n    for (const line of this.lines) {\n      line.setAttribute(\"y1\", \"\" + y);\n      line.setAttribute(\"y2\", \"\" + (y + h));\n    }\n  }\n\n  protected updateBounds(\n    x: null | number,\n    y: null | number,\n    w: null | number,\n    h: null | number,\n  ): [number | null, number | null, number | null, number | null] {\n    return [null, null, null, null];\n  }\n}\n\n/// Carnatic Embelishments\nexport class Kampitham extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"~\", atomView);\n  }\n}\n\nexport class Nokku extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"w\", atomView);\n  }\n}\n\nexport class Prathyagatham extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"∵\", atomView);\n  }\n}\nexport class Spuritham extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"∴\", atomView);\n  }\n}\nexport class Raavi extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"^\", atomView);\n  }\n}\nexport class Kandippu extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"✓\", atomView);\n  }\n}\n\nexport class Vaali extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"⌒\", atomView);\n  }\n}\nexport class Odukkal extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"x\", atomView);\n  }\n}\nexport class Orikkai extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"γ\", atomView);\n  }\n}\n\nexport class Jaaru extends LeafAtomViewEmbelishment {\n  pathElem: SVGPathElement;\n  constructor(\n    public readonly jaaru: JaaruGamaka,\n    public readonly atomView: LeafAtomView,\n  ) {\n    super(atomView);\n    // TODO - Create the \"fancier\" view\n    // for now represent this with just a slant line (like a slash)\n    const rootElem = this.atomView.embRoot();\n    this.pathElem = TSU.DOM.createSVGNode(\"path\", {\n      doc: document,\n      parent: rootElem,\n      attrs: {\n        source: \"atom\" + this.atomView.leafAtom.uuid,\n        class: \"notation-jaaru-path\",\n        d: this.pathAttribute(),\n      },\n    });\n  }\n\n  pathAttribute(x = 0): string {\n    const avbbox = this.atomView.glyph.minSize;\n    let y2 = 0;\n    const h2 = avbbox.height / 2;\n    const x2 = x + h2;\n    let y = this.atomView.y;\n    if (this.jaaru.ascending) {\n      y += avbbox.height;\n      y2 = y - h2;\n    } else {\n      y -= h2;\n      y2 = y + h2;\n    }\n    return [`M ${x} ${y}`, `Q ${x2} ${y} ${x2} ${y2}`].join(\" \");\n  }\n\n  protected refreshMinSize(): TSU.Geom.Size {\n    return TSU.DOM.svgBBox(this.pathElem);\n  }\n\n  protected refreshBBox(): TSU.Geom.Rect {\n    return TSU.DOM.svgBBox(this.pathElem);\n  }\n\n  protected updateBounds(\n    x: null | number,\n    y: null | number,\n    w: null | number,\n    h: null | number,\n  ): [number | null, number | null, number | null, number | null] {\n    return [x, null, null, null];\n  }\n\n  refreshLayout(): void {\n    this.pathElem.setAttribute(\"d\", this.pathAttribute(this.x));\n  }\n}\n"]}
+{"version":3,"file":"embelishments.js","sourceRoot":"","sources":["../../../src/carnatic/embelishments.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { Note } from \"../core\";\nimport { BeatView } from \"../beatview\";\nimport { Embelishment } from \"../shapes\";\nimport { LeafAtomView } from \"./atomviews\";\nimport { JaaruGamaka } from \"./gamakas\";\n\n/**\n * Embelishments specifically \"around\" a single atom view.\n */\nexport abstract class LeafAtomViewEmbelishment extends Embelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super();\n  }\n}\n\nexport class OctaveIndicator extends LeafAtomViewEmbelishment {\n  dotRadius = 1;\n  dotSpacing = 2.5;\n  dotsElem: SVGGElement;\n\n  constructor(\n    public readonly noteView: LeafAtomView,\n    public readonly note: Note,\n  ) {\n    super(noteView);\n    const rootElem = this.noteView.embRoot();\n    const numDots = Math.abs(note.octave);\n    this.dotsElem = TSU.DOM.createSVGNode(\"g\", {\n      doc: document,\n      parent: rootElem,\n      attrs: {\n        width: this.dotRadius * 2 * numDots + (numDots - 1) * this.dotSpacing,\n        height: this.dotRadius * 2,\n        source: \"atom\" + this.noteView.leafAtom.uuid,\n      },\n    });\n    let cx = 0;\n    for (let i = 0; i < numDots; i++) {\n      TSU.DOM.createSVGNode(\"circle\", {\n        doc: document,\n        parent: this.dotsElem,\n        attrs: {\n          cx: cx,\n          cy: 0,\n          r: this.dotRadius,\n          class: \"notation-octave-dot\",\n        },\n      });\n      cx += this.dotRadius + this.dotRadius + this.dotSpacing;\n    }\n  }\n\n  protected refreshBBox(): TSU.Geom.Rect {\n    return TSU.DOM.svgBBox(this.dotsElem);\n  }\n\n  protected refreshMinSize(): TSU.Geom.Size {\n    const numDots = Math.abs(this.note.octave);\n    return {\n      width: this.dotRadius * 2 * numDots + (numDots - 1) * this.dotSpacing,\n      height: this.dotRadius * 2,\n    };\n  }\n\n  protected updateBounds(\n    x: null | number,\n    y: null | number,\n    _w: null | number,\n    _h: null | number,\n  ): [number | null, number | null, number | null, number | null] {\n    if (x == null) x = this.x;\n    if (y == null) y = this.y;\n    // cannot set w/h\n    // this.bbox.x = x;\n    // this.bbox.y = y;\n    return [x, y, null, null];\n  }\n\n  refreshLayout(): void {\n    this.dotsElem.setAttribute(\"transform\", \"translate(\" + this.x + \",\" + this.y + \")\");\n  }\n}\n\n////////// Carnatic embelishments\nexport class LabelEmbelishment extends LeafAtomViewEmbelishment {\n  labelElem: SVGTextElement;\n  constructor(\n    public readonly label: string,\n    public readonly atomView: LeafAtomView,\n  ) {\n    super(atomView);\n    const rootElem = this.atomView.embRoot();\n    this.labelElem = TSU.DOM.createSVGNode(\"text\", {\n      doc: document,\n      parent: rootElem,\n      text: label,\n      attrs: {\n        source: \"atom\" + this.atomView.leafAtom.uuid,\n        class: \"notation-embelishment-label\",\n        \"dominant-baseline\": \"hanging\",\n      },\n    });\n  }\n\n  protected refreshBBox(): TSU.Geom.Rect {\n    return TSU.DOM.svgBBox(this.labelElem);\n  }\n\n  protected refreshMinSize(): TSU.Geom.Size {\n    return TSU.DOM.svgBBox(this.labelElem);\n  }\n\n  protected updateBounds(\n    x: null | number,\n    y: null | number,\n    w: null | number,\n    h: null | number,\n  ): [number | null, number | null, number | null, number | null] {\n    return [x, y, w, h];\n  }\n\n  refreshLayout(): void {\n    this.labelElem.setAttribute(\"x\", \"\" + this.x);\n    this.labelElem.setAttribute(\"y\", \"\" + this.y);\n  }\n}\n\nexport class BeatStartLines extends Embelishment {\n  barSpacing = 10;\n  protected line: SVGLineElement;\n\n  constructor(\n    public readonly source: BeatView,\n    public readonly rootElement: SVGGraphicsElement,\n  ) {\n    super();\n    this.line = TSU.DOM.createSVGNode(\"line\", {\n      doc: document,\n      parent: this.rootElement,\n      attrs: {\n        class: \"bar-start-line\",\n      },\n    });\n  }\n\n  protected refreshBBox(): TSU.Geom.Rect {\n    return new TSU.Geom.Rect(0, 0, 0, 0);\n  }\n\n  protected refreshMinSize(): TSU.Geom.Size {\n    return new TSU.Geom.Rect(0, 0, 0, 0);\n  }\n\n  refreshLayout(): void {\n    const line = this.line;\n    const x = this.source.x - this.barSpacing;\n    line.setAttribute(\"x1\", \"\" + x);\n    line.setAttribute(\"x2\", \"\" + x);\n    const y = this.source.y + this.source.bbox.y;\n    const h = this.source.bbox.height;\n    line.setAttribute(\"y1\", \"\" + y);\n    line.setAttribute(\"y2\", \"\" + (y + h));\n  }\n\n  protected updateBounds(\n    x: null | number,\n    y: null | number,\n    w: null | number,\n    h: null | number,\n  ): [number | null, number | null, number | null, number | null] {\n    return [x, y, null, h];\n  }\n}\n\nexport class BeatEndLines extends Embelishment {\n  lineSpacing = 2;\n  protected lines: SVGLineElement[];\n\n  constructor(\n    public readonly source: BeatView,\n    public readonly rootElement: SVGGraphicsElement,\n    nLines = 1,\n  ) {\n    super();\n    this.lines = [];\n    for (let i = 0; i < nLines; i++) {\n      this.lines.push(\n        TSU.DOM.createSVGNode(\"line\", {\n          doc: document,\n          // parent: l2g,\n          parent: this.rootElement,\n          attrs: {\n            class: \"bar-end-line\",\n          },\n        }),\n      );\n    }\n  }\n\n  protected refreshBBox(): TSU.Geom.Rect {\n    return new TSU.Geom.Rect(0, 0, 0, 0);\n  }\n\n  protected refreshMinSize(): TSU.Geom.Size {\n    return new TSU.Geom.Rect(0, 0, 0, 0);\n  }\n\n  protected updatePosition(x: null | number, y: null | number): [number | null, number | null] {\n    return [x, y];\n  }\n\n  barSpacing = 0;\n\n  refreshLayout(): void {\n    // const x = this.source.width + this.barSpacing;\n    // const y = 0;\n    // const h = this.source.height;\n    const x = this.source.x + this.source.width + this.barSpacing;\n    const y = this.source.y + this.source.bbox.y;\n    const h = this.source.bbox.height;\n    let currX = x;\n    for (const line of this.lines) {\n      const lx = \"\" + currX;\n      line.setAttribute(\"x1\", lx);\n      line.setAttribute(\"x2\", lx);\n      currX += 4;\n    }\n    for (const line of this.lines) {\n      line.setAttribute(\"y1\", \"\" + y);\n      line.setAttribute(\"y2\", \"\" + (y + h));\n    }\n  }\n\n  protected updateBounds(\n    _x: null | number,\n    _y: null | number,\n    _w: null | number,\n    _h: null | number,\n  ): [number | null, number | null, number | null, number | null] {\n    return [null, null, null, null];\n  }\n}\n\n/// Carnatic Embelishments\nexport class Kampitham extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"~\", atomView);\n  }\n}\n\nexport class Nokku extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"w\", atomView);\n  }\n}\n\nexport class Prathyagatham extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"∵\", atomView);\n  }\n}\nexport class Spuritham extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"∴\", atomView);\n  }\n}\nexport class Raavi extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"^\", atomView);\n  }\n}\nexport class Kandippu extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"✓\", atomView);\n  }\n}\n\nexport class Vaali extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"⌒\", atomView);\n  }\n}\nexport class Odukkal extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"x\", atomView);\n  }\n}\nexport class Orikkai extends LabelEmbelishment {\n  constructor(public readonly atomView: LeafAtomView) {\n    super(\"γ\", atomView);\n  }\n}\n\nexport class Jaaru extends LeafAtomViewEmbelishment {\n  pathElem: SVGPathElement;\n  constructor(\n    public readonly jaaru: JaaruGamaka,\n    public readonly atomView: LeafAtomView,\n  ) {\n    super(atomView);\n    // TODO - Create the \"fancier\" view\n    // for now represent this with just a slant line (like a slash)\n    const rootElem = this.atomView.embRoot();\n    this.pathElem = TSU.DOM.createSVGNode(\"path\", {\n      doc: document,\n      parent: rootElem,\n      attrs: {\n        source: \"atom\" + this.atomView.leafAtom.uuid,\n        class: \"notation-jaaru-path\",\n        d: this.pathAttribute(),\n      },\n    });\n  }\n\n  pathAttribute(x = 0): string {\n    const avbbox = this.atomView.glyph.minSize;\n    let y2 = 0;\n    const h2 = avbbox.height / 2;\n    const x2 = x + h2;\n    let y = this.atomView.y;\n    if (this.jaaru.ascending) {\n      y += avbbox.height;\n      y2 = y - h2;\n    } else {\n      y -= h2;\n      y2 = y + h2;\n    }\n    return [`M ${x} ${y}`, `Q ${x2} ${y} ${x2} ${y2}`].join(\" \");\n  }\n\n  protected refreshMinSize(): TSU.Geom.Size {\n    return TSU.DOM.svgBBox(this.pathElem);\n  }\n\n  protected refreshBBox(): TSU.Geom.Rect {\n    return TSU.DOM.svgBBox(this.pathElem);\n  }\n\n  protected updateBounds(\n    x: null | number,\n    _y: null | number,\n    _w: null | number,\n    _h: null | number,\n  ): [number | null, number | null, number | null, number | null] {\n    return [x, null, null, null];\n  }\n\n  refreshLayout(): void {\n    this.pathElem.setAttribute(\"d\", this.pathAttribute(this.x));\n  }\n}\n"]}

package/lib/esm/parser.js

@@ -123,9 +123,9 @@ const [parser] = G.newParser(String.raw `
     Duration -> Fraction | NUMBER;
     Fraction -> NUMBER SLASH NUMBER { newFraction } ;
     `, {
-    allowLeftRecursion: true,
     debug: "",
     type: "lalr",
+    leftRecursive: true,
     tokenHandlers: {
         toEmbelishment: (token, tape, owner) => {
             const [emb, pre] = owner.parseEmbelishment(token.value);