notations 1.0.0 → 1.0.2

package/lib/cjs/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/cjs/carnatic/atomviews.js

@@ -69,6 +69,9 @@ class LeafAtomView extends shapes_1.LeafAtomView {
         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/cjs/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/cjs/carnatic/beatviews.js

@@ -92,6 +92,10 @@ class BeatView extends beatview_1.BeatView {
         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/cjs/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/cjs/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/cjs/carnatic/embelishments.js

@@ -86,7 +86,7 @@ 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)
@@ -208,7 +208,7 @@ class BeatEndLines extends shapes_1.Embelishment {
             line.setAttribute("y2", "" + (y + h));
         }
     }
-    updateBounds(x, y, w, h) {
+    updateBounds(_x, _y, _w, _h) {
         return [null, null, null, null];
     }
 }
@@ -314,7 +314,7 @@ 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/cjs/carnatic/embelishments.js.map

@@ -1 +1 @@
-{"version":3,"file":"embelishments.js","sourceRoot":"","sources":["../../../src/carnatic/embelishments.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAuC;AAGvC,sCAAyC;AAOzC,MAAsB,wBAAyB,SAAQ,qBAAY;IACjE,YAA4B,QAAsB;QAChD,KAAK,EAAE,CAAC;QADkB,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,4DAIC;AAED,MAAa,eAAgB,SAAQ,wBAAwB;IAK3D,YACkB,QAAsB,EACtB,IAAU;QAE1B,KAAK,CAAC,QAAQ,CAAC,CAAC;QAHA,aAAQ,GAAR,QAAQ,CAAc;QACtB,SAAI,GAAJ,IAAI,CAAM;QAN5B,cAAS,GAAG,CAAC,CAAC;QACd,eAAU,GAAG,GAAG,CAAC;QAQf,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE;YACzC,GAAG,EAAE,QAAQ;YACb,MAAM,EAAE,QAAQ;YAChB,KAAK,EAAE;gBACL,KAAK,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,OAAO,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU;gBACrE,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC;gBAC1B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI;aAC7C;SACF,CAAC,CAAC;QACH,IAAI,EAAE,GAAG,CAAC,CAAC;QACX,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;YACjC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,EAAE;gBAC9B,GAAG,EAAE,QAAQ;gBACb,MAAM,EAAE,IAAI,CAAC,QAAQ;gBACrB,KAAK,EAAE;oBACL,EAAE,EAAE,EAAE;oBACN,EAAE,EAAE,CAAC;oBACL,CAAC,EAAE,IAAI,CAAC,SAAS;oBACjB,KAAK,EAAE,qBAAqB;iBAC7B;aACF,CAAC,CAAC;YACH,EAAE,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAC1D,CAAC;IACH,CAAC;IAES,WAAW;QACnB,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAES,cAAc;QACtB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3C,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,OAAO,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU;YACrE,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC;SAC3B,CAAC;IACJ,CAAC;IAES,YAAY,CACpB,CAAgB,EAChB,CAAgB,EAChB,CAAgB,EAChB,CAAgB;QAEhB,IAAI,CAAC,IAAI,IAAI;YAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,IAAI,IAAI;YAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QAI1B,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,aAAa;QACX,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,YAAY,GAAG,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;IACtF,CAAC;CACF;AAlED,0CAkEC;AAGD,MAAa,iBAAkB,SAAQ,wBAAwB;IAE7D,YACkB,KAAa,EACb,QAAsB;QAEtC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAHA,UAAK,GAAL,KAAK,CAAQ;QACb,aAAQ,GAAR,QAAQ,CAAc;QAGtC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE;YAC7C,GAAG,EAAE,QAAQ;YACb,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,KAAK;YACX,KAAK,EAAE;gBACL,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI;gBAC5C,KAAK,EAAE,6BAA6B;gBACpC,mBAAmB,EAAE,SAAS;aAC/B;SACF,CAAC,CAAC;IACL,CAAC;IAES,WAAW;QACnB,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAES,cAAc;QACtB,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAES,YAAY,CACpB,CAAgB,EAChB,CAAgB,EAChB,CAAgB,EAChB,CAAgB;QAEhB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACtB,CAAC;IAED,aAAa;QACX,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9C,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;CACF;AAzCD,8CAyCC;AAED,MAAa,cAAe,SAAQ,qBAAY;IAI9C,YACkB,MAAgB,EAChB,WAA+B;QAE/C,KAAK,EAAE,CAAC;QAHQ,WAAM,GAAN,MAAM,CAAU;QAChB,gBAAW,GAAX,WAAW,CAAoB;QALjD,eAAU,GAAG,EAAE,CAAC;QAQd,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE;YACxC,GAAG,EAAE,QAAQ;YACb,MAAM,EAAE,IAAI,CAAC,WAAW;YACxB,KAAK,EAAE;gBACL,KAAK,EAAE,gBAAgB;aACxB;SACF,CAAC,CAAC;IACL,CAAC;IAES,WAAW;QACnB,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAES,cAAc;QACtB,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,aAAa;QACX,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAC1C,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;QAClC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC;IAES,YAAY,CACpB,CAAgB,EAChB,CAAgB,EAChB,CAAgB,EAChB,CAAgB;QAEhB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACzB,CAAC;CACF;AA7CD,wCA6CC;AAED,MAAa,YAAa,SAAQ,qBAAY;IAI5C,YACkB,MAAgB,EAChB,WAA+B,EAC/C,MAAM,GAAG,CAAC;QAEV,KAAK,EAAE,CAAC;QAJQ,WAAM,GAAN,MAAM,CAAU;QAChB,gBAAW,GAAX,WAAW,CAAoB;QALjD,gBAAW,GAAG,CAAC,CAAC;QAoChB,eAAU,GAAG,CAAC,CAAC;QA3Bb,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,IAAI,CACb,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE;gBAC5B,GAAG,EAAE,QAAQ;gBAEb,MAAM,EAAE,IAAI,CAAC,WAAW;gBACxB,KAAK,EAAE;oBACL,KAAK,EAAE,cAAc;iBACtB;aACF,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IAES,WAAW;QACnB,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAES,cAAc;QACtB,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAES,cAAc,CAAC,CAAgB,EAAE,CAAgB;QACzD,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAChB,CAAC;IAID,aAAa;QAIX,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC;QAC9D,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;QAClC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;YACtB,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5B,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5B,KAAK,IAAI,CAAC,CAAC;QACb,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;YAChC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAES,YAAY,CACpB,CAAgB,EAChB,CAAgB,EAChB,CAAgB,EAChB,CAAgB;QAEhB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;CACF;AAnED,oCAmEC;AAGD,MAAa,SAAU,SAAQ,iBAAiB;IAC9C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,8BAIC;AAED,MAAa,KAAM,SAAQ,iBAAiB;IAC1C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,sBAIC;AAED,MAAa,aAAc,SAAQ,iBAAiB;IAClD,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,sCAIC;AACD,MAAa,SAAU,SAAQ,iBAAiB;IAC9C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,8BAIC;AACD,MAAa,KAAM,SAAQ,iBAAiB;IAC1C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,sBAIC;AACD,MAAa,QAAS,SAAQ,iBAAiB;IAC7C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,4BAIC;AAED,MAAa,KAAM,SAAQ,iBAAiB;IAC1C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,sBAIC;AACD,MAAa,OAAQ,SAAQ,iBAAiB;IAC5C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,0BAIC;AACD,MAAa,OAAQ,SAAQ,iBAAiB;IAC5C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,0BAIC;AAED,MAAa,KAAM,SAAQ,wBAAwB;IAEjD,YACkB,KAAkB,EAClB,QAAsB;QAEtC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAHA,UAAK,GAAL,KAAK,CAAa;QAClB,aAAQ,GAAR,QAAQ,CAAc;QAKtC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE;YAC5C,GAAG,EAAE,QAAQ;YACb,MAAM,EAAE,QAAQ;YAChB,KAAK,EAAE;gBACL,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI;gBAC5C,KAAK,EAAE,qBAAqB;gBAC5B,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE;aACxB;SACF,CAAC,CAAC;IACL,CAAC;IAED,aAAa,CAAC,CAAC,GAAG,CAAC;QACjB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC;QAC3C,IAAI,EAAE,GAAG,CAAC,CAAC;QACX,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAC7B,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QACxB,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YACzB,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC;YACnB,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;QACd,CAAC;aAAM,CAAC;YACN,CAAC,IAAI,EAAE,CAAC;YACR,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;QACd,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/D,CAAC;IAES,cAAc;QACtB,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAES,WAAW;QACnB,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAES,YAAY,CACpB,CAAgB,EAChB,CAAgB,EAChB,CAAgB,EAChB,CAAgB;QAEhB,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,aAAa;QACX,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;CACF;AAzDD,sBAyDC","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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAuC;AAGvC,sCAAyC;AAOzC,MAAsB,wBAAyB,SAAQ,qBAAY;IACjE,YAA4B,QAAsB;QAChD,KAAK,EAAE,CAAC;QADkB,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,4DAIC;AAED,MAAa,eAAgB,SAAQ,wBAAwB;IAK3D,YACkB,QAAsB,EACtB,IAAU;QAE1B,KAAK,CAAC,QAAQ,CAAC,CAAC;QAHA,aAAQ,GAAR,QAAQ,CAAc;QACtB,SAAI,GAAJ,IAAI,CAAM;QAN5B,cAAS,GAAG,CAAC,CAAC;QACd,eAAU,GAAG,GAAG,CAAC;QAQf,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE;YACzC,GAAG,EAAE,QAAQ;YACb,MAAM,EAAE,QAAQ;YAChB,KAAK,EAAE;gBACL,KAAK,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,OAAO,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU;gBACrE,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC;gBAC1B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI;aAC7C;SACF,CAAC,CAAC;QACH,IAAI,EAAE,GAAG,CAAC,CAAC;QACX,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;YACjC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,EAAE;gBAC9B,GAAG,EAAE,QAAQ;gBACb,MAAM,EAAE,IAAI,CAAC,QAAQ;gBACrB,KAAK,EAAE;oBACL,EAAE,EAAE,EAAE;oBACN,EAAE,EAAE,CAAC;oBACL,CAAC,EAAE,IAAI,CAAC,SAAS;oBACjB,KAAK,EAAE,qBAAqB;iBAC7B;aACF,CAAC,CAAC;YACH,EAAE,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAC1D,CAAC;IACH,CAAC;IAES,WAAW;QACnB,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAES,cAAc;QACtB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3C,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,OAAO,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU;YACrE,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC;SAC3B,CAAC;IACJ,CAAC;IAES,YAAY,CACpB,CAAgB,EAChB,CAAgB,EAChB,EAAiB,EACjB,EAAiB;QAEjB,IAAI,CAAC,IAAI,IAAI;YAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,IAAI,IAAI;YAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QAI1B,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,aAAa;QACX,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,YAAY,GAAG,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;IACtF,CAAC;CACF;AAlED,0CAkEC;AAGD,MAAa,iBAAkB,SAAQ,wBAAwB;IAE7D,YACkB,KAAa,EACb,QAAsB;QAEtC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAHA,UAAK,GAAL,KAAK,CAAQ;QACb,aAAQ,GAAR,QAAQ,CAAc;QAGtC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE;YAC7C,GAAG,EAAE,QAAQ;YACb,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,KAAK;YACX,KAAK,EAAE;gBACL,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI;gBAC5C,KAAK,EAAE,6BAA6B;gBACpC,mBAAmB,EAAE,SAAS;aAC/B;SACF,CAAC,CAAC;IACL,CAAC;IAES,WAAW;QACnB,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAES,cAAc;QACtB,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAES,YAAY,CACpB,CAAgB,EAChB,CAAgB,EAChB,CAAgB,EAChB,CAAgB;QAEhB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACtB,CAAC;IAED,aAAa;QACX,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9C,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;CACF;AAzCD,8CAyCC;AAED,MAAa,cAAe,SAAQ,qBAAY;IAI9C,YACkB,MAAgB,EAChB,WAA+B;QAE/C,KAAK,EAAE,CAAC;QAHQ,WAAM,GAAN,MAAM,CAAU;QAChB,gBAAW,GAAX,WAAW,CAAoB;QALjD,eAAU,GAAG,EAAE,CAAC;QAQd,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE;YACxC,GAAG,EAAE,QAAQ;YACb,MAAM,EAAE,IAAI,CAAC,WAAW;YACxB,KAAK,EAAE;gBACL,KAAK,EAAE,gBAAgB;aACxB;SACF,CAAC,CAAC;IACL,CAAC;IAES,WAAW;QACnB,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAES,cAAc;QACtB,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,aAAa;QACX,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAC1C,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;QAClC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC;IAES,YAAY,CACpB,CAAgB,EAChB,CAAgB,EAChB,CAAgB,EAChB,CAAgB;QAEhB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACzB,CAAC;CACF;AA7CD,wCA6CC;AAED,MAAa,YAAa,SAAQ,qBAAY;IAI5C,YACkB,MAAgB,EAChB,WAA+B,EAC/C,MAAM,GAAG,CAAC;QAEV,KAAK,EAAE,CAAC;QAJQ,WAAM,GAAN,MAAM,CAAU;QAChB,gBAAW,GAAX,WAAW,CAAoB;QALjD,gBAAW,GAAG,CAAC,CAAC;QAoChB,eAAU,GAAG,CAAC,CAAC;QA3Bb,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,IAAI,CACb,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE;gBAC5B,GAAG,EAAE,QAAQ;gBAEb,MAAM,EAAE,IAAI,CAAC,WAAW;gBACxB,KAAK,EAAE;oBACL,KAAK,EAAE,cAAc;iBACtB;aACF,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IAES,WAAW;QACnB,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAES,cAAc;QACtB,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAES,cAAc,CAAC,CAAgB,EAAE,CAAgB;QACzD,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAChB,CAAC;IAID,aAAa;QAIX,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC;QAC9D,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;QAClC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;YACtB,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5B,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5B,KAAK,IAAI,CAAC,CAAC;QACb,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;YAChC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAES,YAAY,CACpB,EAAiB,EACjB,EAAiB,EACjB,EAAiB,EACjB,EAAiB;QAEjB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;CACF;AAnED,oCAmEC;AAGD,MAAa,SAAU,SAAQ,iBAAiB;IAC9C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,8BAIC;AAED,MAAa,KAAM,SAAQ,iBAAiB;IAC1C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,sBAIC;AAED,MAAa,aAAc,SAAQ,iBAAiB;IAClD,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,sCAIC;AACD,MAAa,SAAU,SAAQ,iBAAiB;IAC9C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,8BAIC;AACD,MAAa,KAAM,SAAQ,iBAAiB;IAC1C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,sBAIC;AACD,MAAa,QAAS,SAAQ,iBAAiB;IAC7C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,4BAIC;AAED,MAAa,KAAM,SAAQ,iBAAiB;IAC1C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,sBAIC;AACD,MAAa,OAAQ,SAAQ,iBAAiB;IAC5C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,0BAIC;AACD,MAAa,OAAQ,SAAQ,iBAAiB;IAC5C,YAA4B,QAAsB;QAChD,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QADK,aAAQ,GAAR,QAAQ,CAAc;IAElD,CAAC;CACF;AAJD,0BAIC;AAED,MAAa,KAAM,SAAQ,wBAAwB;IAEjD,YACkB,KAAkB,EAClB,QAAsB;QAEtC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAHA,UAAK,GAAL,KAAK,CAAa;QAClB,aAAQ,GAAR,QAAQ,CAAc;QAKtC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE;YAC5C,GAAG,EAAE,QAAQ;YACb,MAAM,EAAE,QAAQ;YAChB,KAAK,EAAE;gBACL,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI;gBAC5C,KAAK,EAAE,qBAAqB;gBAC5B,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE;aACxB;SACF,CAAC,CAAC;IACL,CAAC;IAED,aAAa,CAAC,CAAC,GAAG,CAAC;QACjB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC;QAC3C,IAAI,EAAE,GAAG,CAAC,CAAC;QACX,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAC7B,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QACxB,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YACzB,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC;YACnB,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;QACd,CAAC;aAAM,CAAC;YACN,CAAC,IAAI,EAAE,CAAC;YACR,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;QACd,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/D,CAAC;IAES,cAAc;QACtB,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAES,WAAW;QACnB,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAES,YAAY,CACpB,CAAgB,EAChB,EAAiB,EACjB,EAAiB,EACjB,EAAiB;QAEjB,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,aAAa;QACX,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;CACF;AAzDD,sBAyDC","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/cjs/shapes.d.ts

@@ -52,6 +52,7 @@ export declare abstract class AtomView extends Shape {
     leading: number;
     abstract isLeaf(): boolean;
     abstract get totalDuration(): TSU.Num.Fraction;
+    get glyphOffset(): number;
     abstract createElements(parent: SVGGraphicsElement): void;
 }
 export declare abstract class LeafAtomView extends AtomView {
@@ -70,6 +71,8 @@ export declare abstract class GroupView extends AtomView {
     defaultToNotes: boolean;
     needsLayout: boolean;
     scaleFactor: number;
+    showContinuationMarkers: boolean;
+    protected continuationMarkerElements: SVGTextElement[];
     constructor(group: Group, config?: any);
     get totalDuration(): TSU.Num.Fraction;
     createElements(parent: SVGGraphicsElement): void;
@@ -79,6 +82,8 @@ export declare abstract class GroupView extends AtomView {
     abstract createAtomView(atom: Atom): AtomView;
     protected updateBounds(x: null | number, y: null | number, w: null | number, h: null | number): [number | null, number | null, number | null, number | null];
     refreshLayout(): void;
+    protected clearContinuationMarkers(): void;
+    protected renderContinuationMarker(x: number, y: number): void;
     get embelishments(): Embelishment[];
     protected createEmbelishments(): Embelishment[];
     setStyles(config: any): void;

package/lib/cjs/shapes.js

@@ -210,6 +210,9 @@ class AtomView extends Shape {
         this.depth = 0;
         this.roleIndex = 0;
     }
+    get glyphOffset() {
+        return 0;
+    }
 }
 exports.AtomView = AtomView;
 class LeafAtomView extends AtomView {
@@ -236,6 +239,8 @@ class GroupView extends AtomView {
         this.defaultToNotes = true;
         this.needsLayout = true;
         this.scaleFactor = 1.0;
+        this.showContinuationMarkers = true;
+        this.continuationMarkerElements = [];
         this.atomSpacing = 5;
         this.setStyles(config || {});
     }
@@ -263,13 +268,21 @@ class GroupView extends AtomView {
         return TSU.DOM.svgBBox(this.groupElement);
     }
     refreshMinSize() {
-        let totalWidth = 0;
         let maxHeight = 0;
-        this.atomViews.forEach((av, index) => {
+        let minWidthPerDuration = 0;
+        this.atomViews.forEach((av) => {
             const ms = av.minSize;
-            totalWidth += ms.width + this.atomSpacing;
+            const dur = av.totalDuration;
+            if (!dur.isZero) {
+                const durValue = dur.num / dur.den;
+                const widthPerDur = (ms.width + this.atomSpacing) / durValue;
+                minWidthPerDuration = Math.max(minWidthPerDuration, widthPerDur);
+            }
             maxHeight = Math.max(maxHeight, ms.height);
         });
+        const totalDuration = this.group.totalChildDuration;
+        const totalDurValue = totalDuration.num / totalDuration.den;
+        const totalWidth = minWidthPerDuration * totalDurValue;
         return new TSU.Geom.Size(totalWidth * this.scaleFactor, maxHeight * this.scaleFactor);
     }
     updateBounds(x, y, w, h) {
@@ -281,32 +294,53 @@ class GroupView extends AtomView {
             transform += " scale(" + this.scaleFactor + ")";
         }
         this.groupElement.setAttribute("transform", transform);
-        let currX = 0;
         const currY = 0;
-        if (true) {
-            this.atomViews.forEach((av, index) => {
-                av.setBounds(currX, currY, null, null, true);
-                currX += this.atomSpacing + av.minSize.width;
-            });
-        }
-        else {
-            const totalDur = this.group.totalChildDuration;
-            let currTime = core_1.ZERO;
-            this.atomViews.forEach((av, index) => {
-                const newX = currTime.timesNum(this.minSize.width).divby(this.group.duration).floor;
-                if (newX >= currX) {
-                    currX = newX;
+        const totalDur = this.group.totalChildDuration;
+        const unscaledMinWidth = this.minSize.width / this.scaleFactor;
+        const groupWidth = this.hasWidth ? this.width / this.scaleFactor : unscaledMinWidth;
+        this.clearContinuationMarkers();
+        let currTime = core_1.ZERO;
+        this.atomViews.forEach((av, index) => {
+            const glyphX = totalDur.isZero ? 0 : currTime.timesNum(groupWidth).divby(totalDur).floor;
+            const xPos = Math.max(0, glyphX - av.glyphOffset);
+            av.setBounds(xPos, currY, null, null, true);
+            if (this.showContinuationMarkers && !totalDur.isZero) {
+                const atomDur = av.totalDuration;
+                const durValue = atomDur.num / atomDur.den;
+                if (durValue > 1) {
+                    const numMarkers = Math.floor(durValue) - 1;
+                    for (let i = 1; i <= numMarkers; i++) {
+                        const markerTime = currTime.plus(atomDur.timesNum(i).divbyNum(Math.floor(durValue)));
+                        const markerX = markerTime.timesNum(groupWidth).divby(totalDur).floor;
+                        this.renderContinuationMarker(markerX, currY);
+                    }
                 }
-                av.setBounds(currX, currY, null, null, true);
-                currX += this.atomSpacing + av.minSize.width;
-                currTime = currTime.plus(av.totalDuration);
-            });
-        }
+            }
+            currTime = currTime.plus(av.totalDuration);
+        });
         this.invalidateBounds();
         for (const e of this.embelishments)
             e.refreshLayout();
         this.invalidateBounds();
     }
+    clearContinuationMarkers() {
+        for (const el of this.continuationMarkerElements) {
+            el.remove();
+        }
+        this.continuationMarkerElements = [];
+    }
+    renderContinuationMarker(x, y) {
+        const marker = TSU.DOM.createSVGNode("text", {
+            parent: this.groupElement,
+            attrs: {
+                class: "continuationMarker",
+                x: x.toString(),
+                y: y.toString(),
+            },
+            text: ",",
+        });
+        this.continuationMarkerElements.push(marker);
+    }
     get embelishments() {
         if (!this._embelishments) {
             this._embelishments = this.createEmbelishments();
@@ -319,6 +353,8 @@ class GroupView extends AtomView {
     setStyles(config) {
         if ("atomSpacing" in config)
             this.atomSpacing = config.atomSpacing;
+        if ("showContinuationMarkers" in config)
+            this.showContinuationMarkers = config.showContinuationMarkers;
         this.needsLayout = true;
     }
 }