notations 0.0.49 → 0.0.52

package/lib/cjs/beats.d.ts

@@ -1,5 +1,5 @@
 import * as TSU from "@panyam/tsutils";
-import { Line, Atom, Role } from "./";
+import { Marker, Line, Atom, Role } from "./";
 import { CycleIterator } from "./cycle";
 import { WindowIterator } from "./iterators";
 import { LayoutParams } from "./layouts";
@@ -17,8 +17,6 @@ export declare class Beat {
     nextBeat: null | Beat;
     private static idCounter;
     readonly uuid: number;
-    layoutLine: number;
-    layoutColumn: number;
     atom: Atom;
     protected atomIsPlaceholder: boolean;
     constructor(index: number, role: Role, offset: Fraction, duration: Fraction, barIndex: number, beatIndex: number, instance: number, prevBeat: null | Beat, nextBeat: null | Beat);
@@ -27,6 +25,8 @@ export declare class Beat {
     get filled(): boolean;
     get remaining(): Fraction;
     add(atom: Atom): boolean;
+    get preMarkers(): Marker[];
+    get postMarkers(): Marker[];
 }
 export declare class BeatsBuilder {
     readonly role: Role;

package/lib/cjs/beats.js

@@ -42,8 +42,6 @@ class Beat {
         this.prevBeat = prevBeat;
         this.nextBeat = nextBeat;
         this.uuid = Beat.idCounter++;
-        this.layoutLine = -1;
-        this.layoutColumn = -1;
         this.atomIsPlaceholder = false;
     }
     debugValue() {
@@ -83,6 +81,36 @@ class Beat {
         }
         return true;
     }
+    get preMarkers() {
+        const out = [];
+        let curr = this.atom;
+        while (curr != null) {
+            for (const marker of curr.markersBefore || []) {
+                out.push(marker);
+            }
+            if (curr.type == _1.AtomType.GROUP) {
+                curr = curr.atoms.first;
+            }
+            else {
+                curr = null;
+            }
+        }
+        return out;
+    }
+    get postMarkers() {
+        const out = [];
+        let curr = this.atom;
+        while (curr != null) {
+            out.splice(0, 0, ...(curr.markersAfter || []));
+            if (curr.type == _1.AtomType.GROUP) {
+                curr = curr.atoms.last;
+            }
+            else {
+                curr = null;
+            }
+        }
+        return out;
+    }
 }
 exports.Beat = Beat;
 Beat.idCounter = 0;
@@ -254,7 +282,33 @@ class GlobalBeatLayout {
         const bcol = beatColDAG.getBeatColumn(rowOffset, colEnd, 0);
         const roleIndex = beat.role.line.indexOfRole(beat.role.name);
         const realRow = line.roles.length * (layoutLine + Math.floor(beat.index / lp.totalBeats)) + roleIndex;
-        const realCol = layoutColumn * 3;
+        const realCol = 1 + layoutColumn * 3;
+        const preMarkers = beat.preMarkers;
+        if (preMarkers.length > 0) {
+            const val = {
+                beat: beat,
+                markers: preMarkers,
+            };
+            const precol = beatColDAG.getBeatColumn(rowOffset, colEnd, -1);
+            gridModel.setValue(realRow, realCol - 1, val, (gridRow, col) => {
+                const cell = new grids_1.GridCell(gridRow, col);
+                cell.colAlign = precol;
+                return cell;
+            });
+        }
+        const postMarkers = beat.postMarkers;
+        if (postMarkers.length > 0) {
+            const val = {
+                beat: beat,
+                markers: postMarkers,
+            };
+            const postcol = beatColDAG.getBeatColumn(rowOffset, colEnd, 1);
+            gridModel.setValue(realRow, realCol + 1, val, (gridRow, col) => {
+                const cell = new grids_1.GridCell(gridRow, col);
+                cell.colAlign = postcol;
+                return cell;
+            });
+        }
         return gridModel.setValue(realRow, realCol, beat, (gridRow, col) => {
             const cell = new grids_1.GridCell(gridRow, col);
             cell.colAlign = bcol;

package/lib/cjs/beats.js.map

@@ -1 +1 @@
-{"version":3,"file":"beats.js","sourceRoot":"","sources":["../../src/beats.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { Group, Line, Atom, Space, Role } from \"./\";\nimport { CycleIterator, CyclePosition } from \"./cycle\";\nimport { WindowIterator } from \"./iterators\";\nimport { LayoutParams } from \"./layouts\";\nimport { GridModel, GridRow, GridCell, ColAlign, GridLayoutGroup } from \"./grids\";\n\ntype Fraction = TSU.Num.Fraction;\nconst ZERO = TSU.Num.Fraction.ZERO;\nconst ONE = TSU.Num.Fraction.ONE;\n\nexport class Beat {\n  private static idCounter = 0;\n  readonly uuid = Beat.idCounter++;\n  layoutLine = -1;\n  layoutColumn = -1;\n  // Should this be as flat Atoms or should we keep it as atoms and breakdown\n  // later?\n  atom: Atom;\n  protected atomIsPlaceholder = false;\n  constructor(\n    public readonly index: number,\n    public readonly role: Role,\n    public readonly offset: Fraction,\n    public readonly duration: Fraction,\n    public readonly barIndex: number,\n    public readonly beatIndex: number,\n    public readonly instance: number,\n    public readonly prevBeat: null | Beat,\n    public nextBeat: null | Beat,\n  ) {}\n\n  debugValue(): any {\n    return {\n      index: this.index,\n      role: this.role.name,\n      offset: this.offset.toString(),\n      duration: this.duration.toString(),\n      barIndex: this.barIndex,\n      beatIndex: this.beatIndex,\n      instance: this.instance,\n      atom: this.atom.debugValue(),\n    };\n  }\n\n  get endOffset(): Fraction {\n    return this.offset.plus(this.duration);\n  }\n  get filled(): boolean {\n    return this.remaining.isZero;\n  }\n\n  get remaining(): Fraction {\n    return this.atom ? this.duration.minus(this.atom.duration, true) : this.duration;\n  }\n\n  add(atom: Atom): boolean {\n    if (this.remaining.cmp(atom.duration) < 0) {\n      return false;\n    }\n    if (!this.atom) {\n      this.atom = atom;\n    } else {\n      if (!this.atomIsPlaceholder) {\n        this.atomIsPlaceholder = true;\n        this.atom = new Group(this.atom).setDuration(ONE, true);\n      }\n      (this.atom as Group).addAtoms(true, atom);\n    }\n    return true;\n  }\n}\n\nexport class BeatsBuilder {\n  // All atoms divided into beats\n  readonly beats: Beat[] = [];\n  readonly startIndex: number;\n  readonly beatOffset: Fraction;\n  cycleIter: CycleIterator;\n  windowIter: WindowIterator;\n\n  // Callback for when an atom is added to this role.\n  onAtomAdded: (atom: Atom, beat: Beat) => void;\n\n  // Callback for when a new beat is added\n  onBeatAdded: (beat: Beat) => void;\n  // Callback for when a beat has been filled\n  onBeatFilled: (beat: Beat) => void;\n\n  constructor(\n    public readonly role: Role,\n    public readonly layoutParams: LayoutParams,\n    public readonly startOffset: Fraction = ZERO,\n    ...atoms: Atom[]\n  ) {\n    const [, [bar, beat, instance], beatOffset, index] = layoutParams.cycle.getPosition(startOffset);\n    this.cycleIter = layoutParams.cycle.iterateBeats(bar, beat, instance);\n    this.windowIter = new WindowIterator();\n    this.beatOffset = beatOffset;\n\n    // evaluate the start beatindex - typically it would be 0 if things start\n    // at beginning of a cycle.  But if the start offset is < 0 then the\n    // startIndex should also shift accordingly\n    this.startIndex = index;\n    this.addAtoms(...atoms);\n  }\n\n  addAtoms(...atoms: Atom[]): void {\n    // First add all atoms to the atom Iterator so we can\n    // fetch them as FlatAtoms.  This is needed because atoms\n    // passed here could be unflatted (via groups) or much larger\n    // than what can fit in the given role/bar etc.  So this\n    // flattening and windowing is needed before we add them\n    // to the views - and this is done by the durationIterators.\n    this.windowIter.push(...atoms);\n    while (this.windowIter.hasMore) {\n      // get the last/current row and add a new one if it is full\n      let currBeat = this.beats[this.beats.length - 1];\n\n      // First add a row if last row is filled\n      if (this.beats.length == 0 || currBeat.filled) {\n        // what should be the beatlengths be here?\n        currBeat = this.addBeat();\n      }\n\n      // For this beat get symbols in all roles\n      const [remAtoms, filled] = this.windowIter.get(currBeat.remaining);\n      TSU.assert(remAtoms.length > 0, \"Atleast one element should have been available here\");\n      // render the atoms now\n      for (const atom of remAtoms) {\n        // console.log(\"Adding FA: \", flatAtom.debugValue(), flatAtom.atom);\n        TSU.assert(currBeat.add(atom), \"Should return true as we are already using a duration iterator here\");\n        if (this.onAtomAdded) this.onAtomAdded(atom, currBeat);\n      }\n      if (currBeat.filled) {\n        if (this.onBeatFilled) this.onBeatFilled(currBeat);\n      }\n    }\n  }\n\n  protected addBeat(): Beat {\n    const numBeats = this.beats.length;\n    const lastBeat = numBeats == 0 ? null : this.beats[numBeats - 1];\n    const nextCP: [CyclePosition, Fraction] = this.cycleIter.next().value;\n    const apb = this.layoutParams.beatDuration;\n    const newBeat = new Beat(\n      lastBeat == null ? this.startIndex : lastBeat.index + 1,\n      this.role,\n      lastBeat == null ? this.startOffset.minus(this.beatOffset).timesNum(apb, true) : lastBeat.endOffset,\n      nextCP[1].timesNum(apb),\n      nextCP[0][0],\n      nextCP[0][1],\n      nextCP[0][2],\n      lastBeat,\n      null,\n    );\n    if (lastBeat == null && this.beatOffset.isGT(ZERO)) {\n      // Add spaces to fill up empty beats\n      newBeat.add(new Space(this.beatOffset.timesNum(apb)));\n    }\n    if (lastBeat) lastBeat.nextBeat = newBeat;\n    this.beats.push(newBeat);\n    if (this.onBeatAdded) this.onBeatAdded(newBeat);\n    return newBeat;\n  }\n}\n\nexport class BeatColumn extends ColAlign {\n  atomSpacing = 5;\n  readonly key: string;\n  constructor(\n    public readonly offset: Fraction,\n    public readonly endOffset: Fraction,\n    public readonly markerType: number,\n  ) {\n    super();\n    offset = offset.factorized;\n    endOffset = endOffset.factorized;\n    this.key = BeatColumn.keyFor(offset, endOffset, markerType);\n  }\n\n  static keyFor(offset: Fraction, endOffset: Fraction, markerType = 0): string {\n    offset = offset.factorized;\n    endOffset = endOffset.factorized;\n    if (markerType < 0) {\n      // return the column for the marker \"before\" this col\n      // int his case only the \"start offset\" is needed and length doesnt matter\n      return \":\" + offset.toString();\n    } else if (markerType > 0) {\n      // return the column for the marker \"after\" this col\n      // in this case only thd end offset matters\n      return endOffset.toString() + \":\";\n    } else {\n      return offset.toString() + \":\" + endOffset.toString();\n    }\n  }\n}\n\n/**\n * Grouping of beats by their column based on the layout params.\n * The confusion is we have beats broken up and saved in columns\n * but we are loosing how a line is supposed to access it in its own way\n * we have beatsByRole for getting all beats for a role (in a line)\n * sequentially we have beatColumns for getting all beats in a particular\n * column across all lines and roles globally.\n *\n * What we want here is for a given line get all roles, their beats\n * in zipped way.  eg for a Line with 3 roles and say 10 beats each\n * (with the breaks of 4, 1) we need:\n *\n * R1 B1 R1 B2 R1 B3 R1 B4\n * R2 B1 R2 B2 R2 B3 R2 B4\n * R3 B1 R3 B2 R3 B3 R3 B4\n *\n * R1 B5\n * R2 B5\n * R3 B5\n *\n * R1 B6 R1 B7 R1 B8 R1 B9\n * R2 B6 R2 B7 R2 B8 R2 B9\n * R3 B6 R3 B7 R3 B8 R3 B9\n *\n * R1 B10\n * R2 B10\n * R3 B10\n *\n *\n * Here we have 5 distinct beat columns:\n *\n * 1: R1B1, R2B1, R3B1, R1B6, R2B6, R3B6,\n * 2: R1B2, R2B2, R3B2, R1B7, R2B7, R3B7,\n * 3: R1B3, R2B3, R3B3, R1B8, R2B8, R3B8,\n * 4: R1B4, R2B4, R3B4, R1B9, R2B9, R3B9,\n * 5: R1B5, R2B5, R3B5, R1B10, R2B10, R3B10,\n *\n */\nexport class BeatColDAG {\n  beatColumns = new Map<string, BeatColumn>();\n\n  constructor(public readonly layoutGroup: GridLayoutGroup) {\n    //\n  }\n\n  /**\n   * Gets the beat column of a given duration at the given offset.\n   */\n  getBeatColumn(offset: Fraction, endOffset: Fraction, markerType = 0): BeatColumn {\n    const [bcol, newcreated] = this.ensureBeatColumn(offset, endOffset, markerType);\n    if (newcreated) {\n      if (markerType == 0) {\n        const [prevcol] = this.ensureBeatColumn(offset, endOffset, -1);\n        const [nextcol] = this.ensureBeatColumn(offset, endOffset, 1);\n        prevcol.addSuccessor(bcol);\n        bcol.addSuccessor(nextcol);\n        for (const other of this.beatColumns.values()) {\n          // only join the \"marker\" columns\n          if (other.markerType == -1 && endOffset.equals(other.offset)) {\n            // our next col is a preecessor of other\n            nextcol.addSuccessor(other);\n          } else if (other.markerType == 1 && other.endOffset.equals(offset)) {\n            // our prev col is a predecessor of other\n            other.addSuccessor(prevcol);\n          }\n        }\n      }\n    }\n    return bcol;\n  }\n\n  protected ensureBeatColumn(offset: Fraction, endOffset: Fraction, markerType = 0): [BeatColumn, boolean] {\n    const key = BeatColumn.keyFor(offset, endOffset, markerType);\n    let bcol = this.beatColumns.get(key) || null;\n    const newcreated = bcol == null;\n    if (!bcol) {\n      bcol = new BeatColumn(offset, endOffset, markerType);\n      this.beatColumns.set(key, bcol);\n    }\n    return [bcol, newcreated];\n  }\n}\n\n/**\n * Manages the beat layouts for *all* lines in a notation.\n */\ntype LineId = number;\ntype LPID = number;\nexport class GlobalBeatLayout {\n  gridModelsForLine = new Map<LineId, GridModel>();\n  roleBeatsForLine = new Map<LineId, Beat[][]>();\n  beatColDAGsByLP = new Map<LPID, BeatColDAG>();\n  readonly gridLayoutGroup = new GridLayoutGroup();\n\n  /**\n   * Get the GridView associated with a particular line.\n   */\n  getGridModelForLine(lineid: LineId): GridModel {\n    let out = this.gridModelsForLine.get(lineid) || null;\n    if (!out) {\n      out = new GridModel();\n      this.gridLayoutGroup.addGridModel(out);\n      this.gridModelsForLine.set(lineid, out);\n    }\n    return out;\n  }\n\n  protected beatColDAGForLP(lpid: LPID): BeatColDAG {\n    let out = this.beatColDAGsByLP.get(lpid) || null;\n    if (!out) {\n      out = new BeatColDAG(this.gridLayoutGroup);\n      this.beatColDAGsByLP.set(lpid, out);\n    }\n    return out;\n  }\n\n  /**\n   * First lines are added to the BeatLayout object.\n   * This ensures that a line is broken down into beats and added\n   * into a dedicated GridModel per line.\n   *\n   * A line must also be given the layout params by which the beat\n   * break down will happen.  This LayoutParams object does not have\n   * to be unique per line (this non-constraint allows to align\n   * beats across lines!).\n   */\n  addLine(line: Line): void {\n    const gridModel = this.getGridModelForLine(line.uuid) as GridModel;\n    gridModel.eventHub?.startBatchMode();\n    this.lineToRoleBeats(line, gridModel);\n    gridModel.eventHub?.commitBatch();\n  }\n\n  protected lineToRoleBeats(line: Line, gridModel: GridModel): Beat[][] {\n    const lp = line.layoutParams;\n    const roleBeats = [] as Beat[][];\n    this.roleBeatsForLine.set(line.uuid, roleBeats);\n    const lineOffset = line.offset.divbyNum(lp.beatDuration);\n    for (const role of line.roles) {\n      const bb = new BeatsBuilder(role, lp, lineOffset, ...role.atoms);\n      roleBeats.push(bb.beats);\n\n      // Add these to the beat layout too\n      for (const beat of bb.beats) {\n        // beat.ensureUniformSpaces(layoutParams.beatDuration);\n        this.addBeat(beat, gridModel);\n      }\n    }\n    return roleBeats;\n  }\n\n  /**\n   * Adds the beat to this layout and returns the BeatColumn to which\n   * this beat was added.\n   */\n  protected addBeat(beat: Beat, gridModel: GridModel): GridCell {\n    // Get the beat column at this index (and line) and add to it.\n    const line = beat.role.line;\n    const lp = line.layoutParams;\n    const beatColDAG = this.beatColDAGForLP(lp.uuid);\n    const [layoutLine, layoutColumn, rowOffset] = lp.getBeatLocation(beat);\n    const colEnd = rowOffset.plus(beat.duration, true);\n    const bcol = beatColDAG.getBeatColumn(rowOffset, colEnd, 0);\n\n    // Since a beat's column has a \"pre\" and \"post\" col to, each\n    // beat has 3 columns for it\n    const roleIndex = beat.role.line.indexOfRole(beat.role.name);\n    const realRow = line.roles.length * (layoutLine + Math.floor(beat.index / lp.totalBeats)) + roleIndex;\n    const realCol = layoutColumn * 3;\n    return gridModel.setValue(realRow, realCol, beat, (gridRow: GridRow, col: number) => {\n      const cell = new GridCell(gridRow, col);\n      cell.colAlign = bcol;\n      return cell;\n    });\n  }\n}\n"]}
+{"version":3,"file":"beats.js","sourceRoot":"","sources":["../../src/beats.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { AtomType, Marker, Group, Line, Atom, Space, Role } from \"./\";\nimport { CycleIterator, CyclePosition } from \"./cycle\";\nimport { WindowIterator } from \"./iterators\";\nimport { LayoutParams } from \"./layouts\";\nimport { GridModel, GridRow, GridCell, ColAlign, GridLayoutGroup } from \"./grids\";\n\ntype Fraction = TSU.Num.Fraction;\nconst ZERO = TSU.Num.Fraction.ZERO;\nconst ONE = TSU.Num.Fraction.ONE;\n\nexport class Beat {\n  private static idCounter = 0;\n  readonly uuid = Beat.idCounter++;\n  // Should this be as flat Atoms or should we keep it as atoms and breakdown\n  // later?\n  atom: Atom;\n  protected atomIsPlaceholder = false;\n  constructor(\n    public readonly index: number,\n    public readonly role: Role,\n    public readonly offset: Fraction,\n    public readonly duration: Fraction,\n    public readonly barIndex: number,\n    public readonly beatIndex: number,\n    public readonly instance: number,\n    public readonly prevBeat: null | Beat,\n    public nextBeat: null | Beat,\n  ) {}\n\n  debugValue(): any {\n    return {\n      index: this.index,\n      role: this.role.name,\n      offset: this.offset.toString(),\n      duration: this.duration.toString(),\n      barIndex: this.barIndex,\n      beatIndex: this.beatIndex,\n      instance: this.instance,\n      atom: this.atom.debugValue(),\n    };\n  }\n\n  get endOffset(): Fraction {\n    return this.offset.plus(this.duration);\n  }\n  get filled(): boolean {\n    return this.remaining.isZero;\n  }\n\n  get remaining(): Fraction {\n    return this.atom ? this.duration.minus(this.atom.duration, true) : this.duration;\n  }\n\n  add(atom: Atom): boolean {\n    if (this.remaining.cmp(atom.duration) < 0) {\n      return false;\n    }\n    if (!this.atom) {\n      this.atom = atom;\n    } else {\n      if (!this.atomIsPlaceholder) {\n        this.atomIsPlaceholder = true;\n        this.atom = new Group(this.atom).setDuration(ONE, true);\n      }\n      (this.atom as Group).addAtoms(true, atom);\n    }\n    return true;\n  }\n\n  get preMarkers(): Marker[] {\n    const out = [] as Marker[];\n    let curr: Atom | null = this.atom;\n    while (curr != null) {\n      for (const marker of curr.markersBefore || []) {\n        out.push(marker);\n      }\n      if (curr.type == AtomType.GROUP) {\n        curr = (curr as Group).atoms.first;\n      } else {\n        curr = null;\n      }\n    }\n    return out;\n  }\n\n  get postMarkers(): Marker[] {\n    const out = [] as Marker[];\n    let curr: Atom | null = this.atom;\n    while (curr != null) {\n      out.splice(0, 0, ...(curr.markersAfter || []));\n      if (curr.type == AtomType.GROUP) {\n        curr = (curr as Group).atoms.last;\n      } else {\n        curr = null;\n      }\n    }\n    return out;\n  }\n}\n\nexport class BeatsBuilder {\n  // All atoms divided into beats\n  readonly beats: Beat[] = [];\n  readonly startIndex: number;\n  readonly beatOffset: Fraction;\n  cycleIter: CycleIterator;\n  windowIter: WindowIterator;\n\n  // Callback for when an atom is added to this role.\n  onAtomAdded: (atom: Atom, beat: Beat) => void;\n\n  // Callback for when a new beat is added\n  onBeatAdded: (beat: Beat) => void;\n  // Callback for when a beat has been filled\n  onBeatFilled: (beat: Beat) => void;\n\n  constructor(\n    public readonly role: Role,\n    public readonly layoutParams: LayoutParams,\n    public readonly startOffset: Fraction = ZERO,\n    ...atoms: Atom[]\n  ) {\n    const [, [bar, beat, instance], beatOffset, index] = layoutParams.cycle.getPosition(startOffset);\n    this.cycleIter = layoutParams.cycle.iterateBeats(bar, beat, instance);\n    this.windowIter = new WindowIterator();\n    this.beatOffset = beatOffset;\n\n    // evaluate the start beatindex - typically it would be 0 if things start\n    // at beginning of a cycle.  But if the start offset is < 0 then the\n    // startIndex should also shift accordingly\n    this.startIndex = index;\n    this.addAtoms(...atoms);\n  }\n\n  addAtoms(...atoms: Atom[]): void {\n    // First add all atoms to the atom Iterator so we can\n    // fetch them as FlatAtoms.  This is needed because atoms\n    // passed here could be unflatted (via groups) or much larger\n    // than what can fit in the given role/bar etc.  So this\n    // flattening and windowing is needed before we add them\n    // to the views - and this is done by the durationIterators.\n    this.windowIter.push(...atoms);\n    while (this.windowIter.hasMore) {\n      // get the last/current row and add a new one if it is full\n      let currBeat = this.beats[this.beats.length - 1];\n\n      // First add a row if last row is filled\n      if (this.beats.length == 0 || currBeat.filled) {\n        // what should be the beatlengths be here?\n        currBeat = this.addBeat();\n      }\n\n      // For this beat get symbols in all roles\n      const [remAtoms, filled] = this.windowIter.get(currBeat.remaining);\n      TSU.assert(remAtoms.length > 0, \"Atleast one element should have been available here\");\n      // render the atoms now\n      for (const atom of remAtoms) {\n        // console.log(\"Adding FA: \", flatAtom.debugValue(), flatAtom.atom);\n        TSU.assert(currBeat.add(atom), \"Should return true as we are already using a duration iterator here\");\n        if (this.onAtomAdded) this.onAtomAdded(atom, currBeat);\n      }\n      if (currBeat.filled) {\n        if (this.onBeatFilled) this.onBeatFilled(currBeat);\n      }\n    }\n  }\n\n  protected addBeat(): Beat {\n    const numBeats = this.beats.length;\n    const lastBeat = numBeats == 0 ? null : this.beats[numBeats - 1];\n    const nextCP: [CyclePosition, Fraction] = this.cycleIter.next().value;\n    const apb = this.layoutParams.beatDuration;\n    const newBeat = new Beat(\n      lastBeat == null ? this.startIndex : lastBeat.index + 1,\n      this.role,\n      lastBeat == null ? this.startOffset.minus(this.beatOffset).timesNum(apb, true) : lastBeat.endOffset,\n      nextCP[1].timesNum(apb),\n      nextCP[0][0],\n      nextCP[0][1],\n      nextCP[0][2],\n      lastBeat,\n      null,\n    );\n    if (lastBeat == null && this.beatOffset.isGT(ZERO)) {\n      // Add spaces to fill up empty beats\n      newBeat.add(new Space(this.beatOffset.timesNum(apb)));\n    }\n    if (lastBeat) lastBeat.nextBeat = newBeat;\n    this.beats.push(newBeat);\n    if (this.onBeatAdded) this.onBeatAdded(newBeat);\n    return newBeat;\n  }\n}\n\nexport class BeatColumn extends ColAlign {\n  atomSpacing = 5;\n  readonly key: string;\n  constructor(\n    public readonly offset: Fraction,\n    public readonly endOffset: Fraction,\n    public readonly markerType: number,\n  ) {\n    super();\n    offset = offset.factorized;\n    endOffset = endOffset.factorized;\n    this.key = BeatColumn.keyFor(offset, endOffset, markerType);\n  }\n\n  static keyFor(offset: Fraction, endOffset: Fraction, markerType = 0): string {\n    offset = offset.factorized;\n    endOffset = endOffset.factorized;\n    if (markerType < 0) {\n      // return the column for the marker \"before\" this col\n      // int his case only the \"start offset\" is needed and length doesnt matter\n      return \":\" + offset.toString();\n    } else if (markerType > 0) {\n      // return the column for the marker \"after\" this col\n      // in this case only thd end offset matters\n      return endOffset.toString() + \":\";\n    } else {\n      return offset.toString() + \":\" + endOffset.toString();\n    }\n  }\n}\n\n/**\n * Grouping of beats by their column based on the layout params.\n * The confusion is we have beats broken up and saved in columns\n * but we are loosing how a line is supposed to access it in its own way\n * we have beatsByRole for getting all beats for a role (in a line)\n * sequentially we have beatColumns for getting all beats in a particular\n * column across all lines and roles globally.\n *\n * What we want here is for a given line get all roles, their beats\n * in zipped way.  eg for a Line with 3 roles and say 10 beats each\n * (with the breaks of 4, 1) we need:\n *\n * R1 B1 R1 B2 R1 B3 R1 B4\n * R2 B1 R2 B2 R2 B3 R2 B4\n * R3 B1 R3 B2 R3 B3 R3 B4\n *\n * R1 B5\n * R2 B5\n * R3 B5\n *\n * R1 B6 R1 B7 R1 B8 R1 B9\n * R2 B6 R2 B7 R2 B8 R2 B9\n * R3 B6 R3 B7 R3 B8 R3 B9\n *\n * R1 B10\n * R2 B10\n * R3 B10\n *\n *\n * Here we have 5 distinct beat columns:\n *\n * 1: R1B1, R2B1, R3B1, R1B6, R2B6, R3B6,\n * 2: R1B2, R2B2, R3B2, R1B7, R2B7, R3B7,\n * 3: R1B3, R2B3, R3B3, R1B8, R2B8, R3B8,\n * 4: R1B4, R2B4, R3B4, R1B9, R2B9, R3B9,\n * 5: R1B5, R2B5, R3B5, R1B10, R2B10, R3B10,\n *\n */\nexport class BeatColDAG {\n  beatColumns = new Map<string, BeatColumn>();\n\n  constructor(public readonly layoutGroup: GridLayoutGroup) {\n    //\n  }\n\n  /**\n   * Gets the beat column of a given duration at the given offset.\n   */\n  getBeatColumn(offset: Fraction, endOffset: Fraction, markerType = 0): BeatColumn {\n    const [bcol, newcreated] = this.ensureBeatColumn(offset, endOffset, markerType);\n    if (newcreated) {\n      if (markerType == 0) {\n        const [prevcol] = this.ensureBeatColumn(offset, endOffset, -1);\n        const [nextcol] = this.ensureBeatColumn(offset, endOffset, 1);\n        prevcol.addSuccessor(bcol);\n        bcol.addSuccessor(nextcol);\n        for (const other of this.beatColumns.values()) {\n          // only join the \"marker\" columns\n          if (other.markerType == -1 && endOffset.equals(other.offset)) {\n            // our next col is a preecessor of other\n            nextcol.addSuccessor(other);\n          } else if (other.markerType == 1 && other.endOffset.equals(offset)) {\n            // our prev col is a predecessor of other\n            other.addSuccessor(prevcol);\n          }\n        }\n      }\n    }\n    return bcol;\n  }\n\n  protected ensureBeatColumn(offset: Fraction, endOffset: Fraction, markerType = 0): [BeatColumn, boolean] {\n    const key = BeatColumn.keyFor(offset, endOffset, markerType);\n    let bcol = this.beatColumns.get(key) || null;\n    const newcreated = bcol == null;\n    if (!bcol) {\n      bcol = new BeatColumn(offset, endOffset, markerType);\n      this.beatColumns.set(key, bcol);\n    }\n    return [bcol, newcreated];\n  }\n}\n\n/**\n * Manages the beat layouts for *all* lines in a notation.\n */\ntype LineId = number;\ntype LPID = number;\nexport class GlobalBeatLayout {\n  gridModelsForLine = new Map<LineId, GridModel>();\n  roleBeatsForLine = new Map<LineId, Beat[][]>();\n  beatColDAGsByLP = new Map<LPID, BeatColDAG>();\n  readonly gridLayoutGroup = new GridLayoutGroup();\n\n  /**\n   * Get the GridView associated with a particular line.\n   */\n  getGridModelForLine(lineid: LineId): GridModel {\n    let out = this.gridModelsForLine.get(lineid) || null;\n    if (!out) {\n      out = new GridModel();\n      this.gridLayoutGroup.addGridModel(out);\n      this.gridModelsForLine.set(lineid, out);\n    }\n    return out;\n  }\n\n  protected beatColDAGForLP(lpid: LPID): BeatColDAG {\n    let out = this.beatColDAGsByLP.get(lpid) || null;\n    if (!out) {\n      out = new BeatColDAG(this.gridLayoutGroup);\n      this.beatColDAGsByLP.set(lpid, out);\n    }\n    return out;\n  }\n\n  /**\n   * First lines are added to the BeatLayout object.\n   * This ensures that a line is broken down into beats and added\n   * into a dedicated GridModel per line.\n   *\n   * A line must also be given the layout params by which the beat\n   * break down will happen.  This LayoutParams object does not have\n   * to be unique per line (this non-constraint allows to align\n   * beats across lines!).\n   */\n  addLine(line: Line): void {\n    const gridModel = this.getGridModelForLine(line.uuid) as GridModel;\n    gridModel.eventHub?.startBatchMode();\n    this.lineToRoleBeats(line, gridModel);\n    gridModel.eventHub?.commitBatch();\n  }\n\n  protected lineToRoleBeats(line: Line, gridModel: GridModel): Beat[][] {\n    const lp = line.layoutParams;\n    const roleBeats = [] as Beat[][];\n    this.roleBeatsForLine.set(line.uuid, roleBeats);\n    const lineOffset = line.offset.divbyNum(lp.beatDuration);\n    for (const role of line.roles) {\n      const bb = new BeatsBuilder(role, lp, lineOffset, ...role.atoms);\n      roleBeats.push(bb.beats);\n\n      // Add these to the beat layout too\n      for (const beat of bb.beats) {\n        // beat.ensureUniformSpaces(layoutParams.beatDuration);\n        this.addBeat(beat, gridModel);\n      }\n    }\n    return roleBeats;\n  }\n\n  /**\n   * Adds the beat to this layout and returns the BeatColumn to which\n   * this beat was added.\n   */\n  protected addBeat(beat: Beat, gridModel: GridModel): GridCell {\n    // Get the beat column at this index (and line) and add to it.\n    const line = beat.role.line;\n    const lp = line.layoutParams;\n    const beatColDAG = this.beatColDAGForLP(lp.uuid);\n    const [layoutLine, layoutColumn, rowOffset] = lp.getBeatLocation(beat);\n    const colEnd = rowOffset.plus(beat.duration, true);\n    const bcol = beatColDAG.getBeatColumn(rowOffset, colEnd, 0);\n\n    // Since a beat's column has a \"pre\" and \"post\" col to, each\n    // beat has 3 columns for it\n    const roleIndex = beat.role.line.indexOfRole(beat.role.name);\n    const realRow = line.roles.length * (layoutLine + Math.floor(beat.index / lp.totalBeats)) + roleIndex;\n    // pre marker goes on realCol - 1, post marker goes on realCol + 1\n    const realCol = 1 + layoutColumn * 3;\n    const preMarkers = beat.preMarkers;\n    if (preMarkers.length > 0) {\n      const val = {\n        beat: beat,\n        markers: preMarkers,\n      };\n      const precol = beatColDAG.getBeatColumn(rowOffset, colEnd, -1);\n      gridModel.setValue(realRow, realCol - 1, val, (gridRow: GridRow, col: number) => {\n        const cell = new GridCell(gridRow, col);\n        cell.colAlign = precol;\n        return cell;\n      });\n    }\n    const postMarkers = beat.postMarkers;\n    if (postMarkers.length > 0) {\n      const val = {\n        beat: beat,\n        markers: postMarkers,\n      };\n      const postcol = beatColDAG.getBeatColumn(rowOffset, colEnd, 1);\n      gridModel.setValue(realRow, realCol + 1, val, (gridRow: GridRow, col: number) => {\n        const cell = new GridCell(gridRow, col);\n        cell.colAlign = postcol;\n        return cell;\n      });\n    }\n    return gridModel.setValue(realRow, realCol, beat, (gridRow: GridRow, col: number) => {\n      const cell = new GridCell(gridRow, col);\n      cell.colAlign = bcol;\n      return cell;\n    });\n  }\n}\n"]}

package/lib/cjs/beatview.js

@@ -35,9 +35,9 @@ class BeatView extends shapes_1.ElementShape {
                 beatId: "" + beat.uuid,
                 id: "" + beat.uuid,
                 roleName: beat.role.name,
-                layoutLine: "" + beat.layoutLine,
-                layoutColumn: "" + beat.layoutColumn,
                 beatIndex: "" + beat.index,
+                gridRow: cell.rowIndex,
+                gridCol: cell.colIndex,
             },
         }));
         this.cell = cell;

package/lib/cjs/beatview.js.map

@@ -1 +1 @@
-{"version":3,"file":"beatview.js","sourceRoot":"","sources":["../../src/beatview.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAuC;AACvC,qCAAgE;AAKhE,MAAsB,QAAS,SAAQ,qBAAyB;IAI9D,YACkB,IAAc,EACd,IAAU,EACV,WAA+B,EAC/B,KAAY,EAC5B,MAAY;QAEZ,KAAK,CACH,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE;YACzB,MAAM,EAAE,WAAW;YACnB,KAAK,EAAE;gBACL,KAAK,EAAE,UAAU;gBACjB,MAAM,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI;gBACtB,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI;gBAClB,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;gBACxB,UAAU,EAAE,EAAE,GAAG,IAAI,CAAC,UAAU;gBAChC,YAAY,EAAE,EAAE,GAAG,IAAI,CAAC,YAAY;gBACpC,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK;aAC3B;SACF,CAAC,CACH,CAAC;QAnBc,SAAI,GAAJ,IAAI,CAAU;QACd,SAAI,GAAJ,IAAI,CAAM;QACV,gBAAW,GAAX,WAAW,CAAoB;QAC/B,UAAK,GAAL,KAAK,CAAO;QAL9B,gBAAW,GAAG,IAAI,CAAC;QAsBjB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACtC,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,aAAa;QACf,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;SAClD;QACD,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,SAAS,CAAC,MAAW;QACnB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;CAIF;AA1CD,4BA0CC","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { AtomView, Embelishment, ElementShape } from \"./shapes\";\nimport { GridCell, GridCellView } from \"./grids\";\nimport { Cycle } from \"./cycle\";\nimport { Beat } from \"./beats\";\n\nexport abstract class BeatView extends ElementShape<SVGGElement> implements GridCellView {\n  private _embelishments: Embelishment[];\n  atomView: AtomView;\n  needsLayout = true;\n  constructor(\n    public readonly cell: GridCell,\n    public readonly beat: Beat,\n    public readonly rootElement: SVGGraphicsElement,\n    public readonly cycle: Cycle,\n    config?: any,\n  ) {\n    super(\n      TSU.DOM.createSVGNode(\"g\", {\n        parent: rootElement,\n        attrs: {\n          class: \"beatView\",\n          beatId: \"\" + beat.uuid,\n          id: \"\" + beat.uuid,\n          roleName: beat.role.name,\n          layoutLine: \"\" + beat.layoutLine,\n          layoutColumn: \"\" + beat.layoutColumn,\n          beatIndex: \"\" + beat.index,\n        },\n      }),\n    );\n    this.atomView = this.createAtomView();\n    this.atomView.refreshLayout();\n  }\n\n  get embelishments(): Embelishment[] {\n    if (!this._embelishments) {\n      this._embelishments = this.createEmbelishments();\n    }\n    return this._embelishments;\n  }\n\n  setStyles(config: any): void {\n    this.needsLayout = true;\n  }\n\n  protected abstract createEmbelishments(): Embelishment[];\n  protected abstract createAtomView(): AtomView;\n}\n"]}
+{"version":3,"file":"beatview.js","sourceRoot":"","sources":["../../src/beatview.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAuC;AACvC,qCAAgE;AAKhE,MAAsB,QAAS,SAAQ,qBAAyB;IAI9D,YACkB,IAAc,EACd,IAAU,EACV,WAA+B,EAC/B,KAAY,EAC5B,MAAY;QAEZ,KAAK,CACH,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE;YACzB,MAAM,EAAE,WAAW;YACnB,KAAK,EAAE;gBACL,KAAK,EAAE,UAAU;gBACjB,MAAM,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI;gBACtB,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI;gBAClB,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;gBACxB,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK;gBAC1B,OAAO,EAAE,IAAI,CAAC,QAAQ;gBACtB,OAAO,EAAE,IAAI,CAAC,QAAQ;aACvB;SACF,CAAC,CACH,CAAC;QAnBc,SAAI,GAAJ,IAAI,CAAU;QACd,SAAI,GAAJ,IAAI,CAAM;QACV,gBAAW,GAAX,WAAW,CAAoB;QAC/B,UAAK,GAAL,KAAK,CAAO;QAL9B,gBAAW,GAAG,IAAI,CAAC;QAsBjB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACtC,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,aAAa;QACf,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;SAClD;QACD,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,SAAS,CAAC,MAAW;QACnB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;CAIF;AA1CD,4BA0CC","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { AtomView, Embelishment, ElementShape } from \"./shapes\";\nimport { GridCell, GridCellView } from \"./grids\";\nimport { Cycle } from \"./cycle\";\nimport { Beat } from \"./beats\";\n\nexport abstract class BeatView extends ElementShape<SVGGElement> implements GridCellView {\n  private _embelishments: Embelishment[];\n  atomView: AtomView;\n  needsLayout = true;\n  constructor(\n    public readonly cell: GridCell,\n    public readonly beat: Beat,\n    public readonly rootElement: SVGGraphicsElement,\n    public readonly cycle: Cycle,\n    config?: any,\n  ) {\n    super(\n      TSU.DOM.createSVGNode(\"g\", {\n        parent: rootElement,\n        attrs: {\n          class: \"beatView\",\n          beatId: \"\" + beat.uuid,\n          id: \"\" + beat.uuid,\n          roleName: beat.role.name,\n          beatIndex: \"\" + beat.index,\n          gridRow: cell.rowIndex,\n          gridCol: cell.colIndex,\n        },\n      }),\n    );\n    this.atomView = this.createAtomView();\n    this.atomView.refreshLayout();\n  }\n\n  get embelishments(): Embelishment[] {\n    if (!this._embelishments) {\n      this._embelishments = this.createEmbelishments();\n    }\n    return this._embelishments;\n  }\n\n  setStyles(config: any): void {\n    this.needsLayout = true;\n  }\n\n  protected abstract createEmbelishments(): Embelishment[];\n  protected abstract createAtomView(): AtomView;\n}\n"]}

package/lib/cjs/carnatic/NotationView.d.ts

@@ -2,9 +2,9 @@ import * as TSU from "@panyam/tsutils";
 import { LineView } from "./LineView";
 import { Notation, RawBlock } from "../notation";
 import { GlobalBeatLayout } from "../beats";
-import { GridCell } from "../grids";
+import { GridCell, GridCellView } from "../grids";
 import { Line } from "../core";
-import { BeatView } from "./beatviews";
+import { BeatView, MarkerView } from "./beatviews";
 export declare class NotationView {
     readonly rootElement: HTMLElement;
     readonly config?: any;
@@ -28,5 +28,6 @@ export declare class NotationView {
     refreshLayout(): void;
     renderBlock(raw: RawBlock): void;
     beatViews: Map<number, BeatView>;
-    viewForBeat(cell: GridCell): BeatView;
+    markerViews: Map<string, MarkerView>;
+    viewForBeat(cell: GridCell): GridCellView;
 }

package/lib/cjs/carnatic/NotationView.js

@@ -34,6 +34,7 @@ class NotationView {
         this.lineViews = [];
         this.currentSVGElement = null;
         this.beatViews = new Map();
+        this.markerViews = new Map();
         this.loadChildViews();
     }
     get beatLayout() {
@@ -161,16 +162,32 @@ class NotationView {
         this.currentSVGElement = null;
     }
     viewForBeat(cell) {
-        const beat = cell.value;
-        let curr = this.beatViews.get(beat.uuid) || null;
-        if (curr == null) {
-            const line = beat.role.line;
-            const lineView = this.ensureLineView(line);
-            const lp = line.layoutParams;
-            curr = new beatviews_1.BeatView(cell, beat, lineView.gElem, lp.cycle);
-            this.beatViews.set(beat.uuid, curr);
+        if (cell.colIndex % 3 == 1) {
+            const beat = cell.value;
+            let curr = this.beatViews.get(beat.uuid) || null;
+            if (curr == null) {
+                const line = beat.role.line;
+                const lineView = this.ensureLineView(line);
+                const lp = line.layoutParams;
+                curr = new beatviews_1.BeatView(cell, beat, lineView.gElem, lp.cycle);
+                this.beatViews.set(beat.uuid, curr);
+            }
+            return curr;
+        }
+        else {
+            const marker = cell.value;
+            const beat = marker.beat;
+            let curr = this.markerViews.get("pre:" + beat.uuid) || null;
+            if (curr == null) {
+                const line = beat.role.line;
+                const lineView = this.ensureLineView(line);
+                const lp = line.layoutParams;
+                const isPreMarker = cell.colIndex % 3 == 0;
+                curr = new beatviews_1.MarkerView(cell, beat, marker.markers, isPreMarker, lineView.gElem);
+                this.markerViews.set("pre:" + beat.uuid, curr);
+            }
+            return curr;
         }
-        return curr;
     }
 }
 exports.NotationView = NotationView;

package/lib/cjs/carnatic/NotationView.js.map

@@ -1 +1 @@
-{"version":3,"file":"NotationView.js","sourceRoot":"","sources":["../../../src/carnatic/NotationView.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { LineView } from \"./LineView\";\nimport { Notation, RawBlock } from \"../notation\";\nimport { GlobalBeatLayout } from \"../beats\";\nimport { GridCell } from \"../grids\";\nimport { Line } from \"../core\";\nimport { BeatView } from \"./beatviews\";\n\nexport class NotationView {\n  headerElement: HTMLDivElement;\n  notation: Notation;\n  lineViews: LineView[] = [];\n  // Mapping from line id -> list of beats in each of its roles\n  currentSVGElement: SVGSVGElement | null = null;\n  tableElement: HTMLTableElement;\n  markdownParser: (contents: string) => string;\n  _beatLayout: GlobalBeatLayout;\n\n  constructor(public readonly rootElement: HTMLElement, public readonly config?: any) {\n    this.loadChildViews();\n  }\n\n  get beatLayout(): GlobalBeatLayout {\n    return this._beatLayout;\n  }\n\n  set beatLayout(beatLayout: GlobalBeatLayout) {\n    this._beatLayout = beatLayout;\n    beatLayout.gridLayoutGroup.getCellView = (cell) => this.viewForBeat(cell);\n  }\n\n  loadChildViews(): void {\n    this.tableElement = TSU.DOM.createNode(\"table\", {\n      parent: this.rootElement,\n      attrs: {\n        class: \"notationsContentRootTable\",\n      },\n    }) as HTMLTableElement;\n  }\n\n  public addNewRow(id: string, prefix: string, withAnnotation = true): [HTMLElement, HTMLElement] {\n    const tr = TSU.DOM.createNode(\"tr\", {\n      parent: this.tableElement, // parent,\n      attrs: {\n        class: prefix + \"Row\",\n        id: prefix + \"Row\" + id,\n      },\n    });\n    let td1: HTMLElement | null = null;\n    if (withAnnotation) {\n      td1 = TSU.DOM.createNode(\"td\", {\n        parent: tr,\n        attrs: {\n          class: prefix + \"AnnotationCell\",\n          id: prefix + \"Annotation\" + id,\n        },\n      }) as HTMLElement;\n    }\n    const td2 = TSU.DOM.createNode(\"td\", {\n      parent: tr,\n      attrs: {\n        class: prefix + \"ContentCell\",\n        id: prefix + \"Content\" + id,\n        colspan: withAnnotation ? 1 : 2,\n      },\n    }) as HTMLElement;\n    return [td1!, td2];\n  }\n\n  public newLineRoot(parent: Element, line: Line): SVGSVGElement {\n    const [td1, td2] = this.addNewRow(line.uuid + \"\", \"line\");\n    // Hacky solution to \"line headings\"\n    if (line.marginText) {\n      td1.innerHTML = line.marginText;\n    }\n    return TSU.DOM.createSVGNode(\"svg\", {\n      parent: td2, // parent\n      attrs: {\n        style: \"margin-bottom: 10px\",\n        class: \"lineRootSVG\",\n      },\n    }) as SVGSVGElement;\n  }\n\n  ensureLineView(line: Line): LineView {\n    let lineView = this.getLineView(line);\n    if (lineView == null) {\n      const layoutParams = line.layoutParams || null;\n      const svgElem = this.newLineRoot(this.tableElement, line);\n      lineView = new LineView(svgElem, line, {\n        layoutParams: layoutParams,\n      } as any);\n      if (!line.isEmpty) {\n        // Probably because this is an empty line and AddAtoms was not called\n        TSU.assert(layoutParams != null, \"Layout params for a non empty line *should* exist\");\n        lineView.gridModel = this.beatLayout!.getGridModelForLine(line.uuid);\n      }\n      this.lineViews.push(lineView);\n    }\n    return lineView;\n  }\n\n  getLineView(line: Line): TSU.Nullable<LineView> {\n    return this.lineViews.find((l) => l.line == line) || null;\n  }\n\n  get currentLineView(): LineView {\n    return this.lineViews[this.lineViews.length - 1];\n  }\n\n  clear(): void {\n    this.lineViews = [];\n    // Mapping from line id -> list of beats in each of its roles\n    this.currentSVGElement = null;\n    this.tableElement.innerHTML = \"\";\n    this.beatViews = new Map<number, BeatView>();\n  }\n\n  /**\n   * Layout all the blocks in the Notation along with their corresponding blocks.\n   * Key thing is here is an opportunity to perform any batch rendering as needed.\n   */\n  refreshLayout(): void {\n    const lines = [] as Line[];\n    const lineViews = [] as LineView[];\n    for (const block of this.notation.blocks) {\n      if (block.type == \"RawBlock\") {\n        // Add the markdown here\n        this.renderBlock(block as RawBlock);\n      } else {\n        lines.push(block as Line);\n        const lineView = this.ensureLineView(block as Line);\n        lineViews.push(lineView);\n      }\n    }\n\n    const now = performance.now();\n    for (const lineView of lineViews) {\n      lineView.gridModel.lastUpdatedAt = now;\n    }\n\n    this.beatLayout.gridLayoutGroup.refreshLayout();\n\n    for (const lineView of lineViews) {\n      lineView.wrapToSize();\n    }\n\n    // now that all spacing has been calculated\n    // go through all\n    // for (const beatView of this.beatViews.values()) { beatView.refreshLayout(); }\n  }\n\n  renderBlock(raw: RawBlock): void {\n    const [, td2] = this.addNewRow(raw.uuid + \"\", \"rawBlock\", false);\n    if (raw.contentType == \"metadata\") {\n      // we have a metadata block\n      const meta = this.notation.metadata.get(raw.content);\n      if (meta) {\n        // For now ignore metadata with \":\" in the key\n        if (meta.key.toLowerCase().indexOf(\":\") < 0) {\n          const div = td2.appendChild(TSU.DOM.createNode(\"div\"));\n          const html = `<span class = \"${meta.key.toLowerCase()}\"><strong>${meta.key}</strong>: ${meta.value}</span>`;\n          div.innerHTML = html;\n        }\n      }\n    } else {\n      const div = td2.appendChild(TSU.DOM.createNode(\"div\"));\n      div.innerHTML = this.markdownParser(raw.content.trim());\n    }\n    this.currentSVGElement = null;\n  }\n\n  beatViews = new Map<number, BeatView>();\n  viewForBeat(cell: GridCell): BeatView {\n    const beat = cell.value;\n    let curr = this.beatViews.get(beat.uuid) || null;\n    if (curr == null) {\n      const line = beat.role.line;\n      // how to get the bar and beat index for a given beat in a given row?\n      const lineView = this.ensureLineView(line);\n      const lp = line.layoutParams;\n      curr = new BeatView(cell, beat, lineView.gElem, lp.cycle);\n      this.beatViews.set(beat.uuid, curr);\n    }\n    return curr;\n  }\n}\n"]}
+{"version":3,"file":"NotationView.js","sourceRoot":"","sources":["../../../src/carnatic/NotationView.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { LineView } from \"./LineView\";\nimport { Notation, RawBlock } from \"../notation\";\nimport { Beat, GlobalBeatLayout } from \"../beats\";\nimport { GridCell, GridCellView } from \"../grids\";\nimport { Line } from \"../core\";\nimport { BeatView, MarkerView } from \"./beatviews\";\n\nexport class NotationView {\n  headerElement: HTMLDivElement;\n  notation: Notation;\n  lineViews: LineView[] = [];\n  // Mapping from line id -> list of beats in each of its roles\n  currentSVGElement: SVGSVGElement | null = null;\n  tableElement: HTMLTableElement;\n  markdownParser: (contents: string) => string;\n  _beatLayout: GlobalBeatLayout;\n\n  constructor(public readonly rootElement: HTMLElement, public readonly config?: any) {\n    this.loadChildViews();\n  }\n\n  get beatLayout(): GlobalBeatLayout {\n    return this._beatLayout;\n  }\n\n  set beatLayout(beatLayout: GlobalBeatLayout) {\n    this._beatLayout = beatLayout;\n    beatLayout.gridLayoutGroup.getCellView = (cell) => this.viewForBeat(cell);\n  }\n\n  loadChildViews(): void {\n    this.tableElement = TSU.DOM.createNode(\"table\", {\n      parent: this.rootElement,\n      attrs: {\n        class: \"notationsContentRootTable\",\n      },\n    }) as HTMLTableElement;\n  }\n\n  public addNewRow(id: string, prefix: string, withAnnotation = true): [HTMLElement, HTMLElement] {\n    const tr = TSU.DOM.createNode(\"tr\", {\n      parent: this.tableElement, // parent,\n      attrs: {\n        class: prefix + \"Row\",\n        id: prefix + \"Row\" + id,\n      },\n    });\n    let td1: HTMLElement | null = null;\n    if (withAnnotation) {\n      td1 = TSU.DOM.createNode(\"td\", {\n        parent: tr,\n        attrs: {\n          class: prefix + \"AnnotationCell\",\n          id: prefix + \"Annotation\" + id,\n        },\n      }) as HTMLElement;\n    }\n    const td2 = TSU.DOM.createNode(\"td\", {\n      parent: tr,\n      attrs: {\n        class: prefix + \"ContentCell\",\n        id: prefix + \"Content\" + id,\n        colspan: withAnnotation ? 1 : 2,\n      },\n    }) as HTMLElement;\n    return [td1!, td2];\n  }\n\n  public newLineRoot(parent: Element, line: Line): SVGSVGElement {\n    const [td1, td2] = this.addNewRow(line.uuid + \"\", \"line\");\n    // Hacky solution to \"line headings\"\n    if (line.marginText) {\n      td1.innerHTML = line.marginText;\n    }\n    return TSU.DOM.createSVGNode(\"svg\", {\n      parent: td2, // parent\n      attrs: {\n        style: \"margin-bottom: 10px\",\n        class: \"lineRootSVG\",\n      },\n    }) as SVGSVGElement;\n  }\n\n  ensureLineView(line: Line): LineView {\n    let lineView = this.getLineView(line);\n    if (lineView == null) {\n      const layoutParams = line.layoutParams || null;\n      const svgElem = this.newLineRoot(this.tableElement, line);\n      lineView = new LineView(svgElem, line, {\n        layoutParams: layoutParams,\n      } as any);\n      if (!line.isEmpty) {\n        // Probably because this is an empty line and AddAtoms was not called\n        TSU.assert(layoutParams != null, \"Layout params for a non empty line *should* exist\");\n        lineView.gridModel = this.beatLayout!.getGridModelForLine(line.uuid);\n      }\n      this.lineViews.push(lineView);\n    }\n    return lineView;\n  }\n\n  getLineView(line: Line): TSU.Nullable<LineView> {\n    return this.lineViews.find((l) => l.line == line) || null;\n  }\n\n  get currentLineView(): LineView {\n    return this.lineViews[this.lineViews.length - 1];\n  }\n\n  clear(): void {\n    this.lineViews = [];\n    // Mapping from line id -> list of beats in each of its roles\n    this.currentSVGElement = null;\n    this.tableElement.innerHTML = \"\";\n    this.beatViews = new Map<number, BeatView>();\n  }\n\n  /**\n   * Layout all the blocks in the Notation along with their corresponding blocks.\n   * Key thing is here is an opportunity to perform any batch rendering as needed.\n   */\n  refreshLayout(): void {\n    const lines = [] as Line[];\n    const lineViews = [] as LineView[];\n    for (const block of this.notation.blocks) {\n      if (block.type == \"RawBlock\") {\n        // Add the markdown here\n        this.renderBlock(block as RawBlock);\n      } else {\n        lines.push(block as Line);\n        const lineView = this.ensureLineView(block as Line);\n        lineViews.push(lineView);\n      }\n    }\n\n    const now = performance.now();\n    for (const lineView of lineViews) {\n      lineView.gridModel.lastUpdatedAt = now;\n    }\n\n    this.beatLayout.gridLayoutGroup.refreshLayout();\n\n    for (const lineView of lineViews) {\n      lineView.wrapToSize();\n    }\n\n    // now that all spacing has been calculated\n    // go through all\n    // for (const beatView of this.beatViews.values()) { beatView.refreshLayout(); }\n  }\n\n  renderBlock(raw: RawBlock): void {\n    const [, td2] = this.addNewRow(raw.uuid + \"\", \"rawBlock\", false);\n    if (raw.contentType == \"metadata\") {\n      // we have a metadata block\n      const meta = this.notation.metadata.get(raw.content);\n      if (meta) {\n        // For now ignore metadata with \":\" in the key\n        if (meta.key.toLowerCase().indexOf(\":\") < 0) {\n          const div = td2.appendChild(TSU.DOM.createNode(\"div\"));\n          const html = `<span class = \"${meta.key.toLowerCase()}\"><strong>${meta.key}</strong>: ${meta.value}</span>`;\n          div.innerHTML = html;\n        }\n      }\n    } else {\n      const div = td2.appendChild(TSU.DOM.createNode(\"div\"));\n      div.innerHTML = this.markdownParser(raw.content.trim());\n    }\n    this.currentSVGElement = null;\n  }\n\n  beatViews = new Map<number, BeatView>();\n  markerViews = new Map<string, MarkerView>();\n  viewForBeat(cell: GridCell): GridCellView {\n    if (cell.colIndex % 3 == 1) {\n      // beat view needed\n      const beat = cell.value;\n      let curr = this.beatViews.get(beat.uuid) || null;\n      if (curr == null) {\n        const line = beat.role.line;\n        // how to get the bar and beat index for a given beat in a given row?\n        const lineView = this.ensureLineView(line);\n        const lp = line.layoutParams;\n        curr = new BeatView(cell, beat, lineView.gElem, lp.cycle);\n        this.beatViews.set(beat.uuid, curr);\n      }\n      return curr;\n    } else {\n      // markers view\n      const marker = cell.value;\n      const beat = marker.beat as Beat;\n      let curr = this.markerViews.get(\"pre:\" + beat.uuid) || null;\n      if (curr == null) {\n        const line = beat.role.line;\n        const lineView = this.ensureLineView(line);\n        const lp = line.layoutParams;\n        const isPreMarker = cell.colIndex % 3 == 0;\n        curr = new MarkerView(cell, beat, marker.markers, isPreMarker, lineView.gElem);\n        this.markerViews.set(\"pre:\" + beat.uuid, curr);\n      }\n      return curr;\n    }\n  }\n}\n"]}

package/lib/cjs/carnatic/beatviews.d.ts

@@ -1,5 +1,24 @@
+import * as TSU from "@panyam/tsutils";
 import { Embelishment } from "../shapes";
+import { GridCell, GridCellView } from "../grids";
+import { ElementShape } from "../shapes";
+import { Marker } from "../core";
+import { Beat } from "../beats";
 import { BeatView as BeatViewBase } from "../beatview";
+export declare class MarkerView extends ElementShape<SVGGElement> implements GridCellView {
+    readonly cell: GridCell;
+    readonly beat: Beat;
+    readonly markers: Marker[];
+    readonly isPreMarker: boolean;
+    readonly rootElement: SVGGraphicsElement;
+    needsLayout: boolean;
+    rootGroup: SVGGElement;
+    textElement: SVGTextElement;
+    constructor(cell: GridCell, beat: Beat, markers: Marker[], isPreMarker: boolean, rootElement: SVGGraphicsElement, config?: any);
+    protected refreshMinSize(): TSU.Geom.Size;
+    refreshLayout(): void;
+    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 BeatView extends BeatViewBase {
     createAtomView(): import("../shapes").AtomView;
     refreshLayout(): void;

package/lib/cjs/carnatic/beatviews.js

@@ -1,9 +1,79 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BeatView = void 0;
+exports.BeatView = exports.MarkerView = void 0;
+const TSU = __importStar(require("@panyam/tsutils"));
+const shapes_1 = require("../shapes");
 const atomviews_1 = require("./atomviews");
 const beatview_1 = require("../beatview");
 const embelishments_1 = require("./embelishments");
+class MarkerView extends shapes_1.ElementShape {
+    constructor(cell, beat, markers, isPreMarker, rootElement, config) {
+        const rootGroup = TSU.DOM.createSVGNode("g", {
+            parent: rootElement,
+            attrs: {
+                class: "markerView",
+                pre: isPreMarker,
+                roleName: beat.role.name,
+                beatIndex: "" + beat.index,
+                gridRow: cell.rowIndex,
+                gridCol: cell.colIndex,
+            },
+        });
+        super(rootGroup);
+        this.cell = cell;
+        this.beat = beat;
+        this.markers = markers;
+        this.isPreMarker = isPreMarker;
+        this.rootElement = rootElement;
+        this.needsLayout = true;
+        this.rootGroup = rootGroup;
+        this.textElement = TSU.DOM.createSVGNode("text", {
+            parent: rootGroup,
+            attrs: {
+                class: "markerText",
+                pre: isPreMarker,
+                dx: isPreMarker ? 0 : 15,
+            },
+            text: this.markers[0].text,
+        });
+    }
+    refreshMinSize() {
+        const ts = TSU.DOM.svgBBox(this.textElement);
+        const totalWidth = ts.width;
+        const maxHeight = ts.height;
+        return new TSU.Geom.Size(totalWidth + 5, maxHeight + 5);
+    }
+    refreshLayout() {
+        this.rootGroup.setAttribute("transform", "translate(" + this.x + "," + this.y + ")");
+    }
+    updateBounds(x, y, w, h) {
+        return [x, y, NaN, NaN];
+    }
+}
+exports.MarkerView = MarkerView;
 class BeatView extends beatview_1.BeatView {
     createAtomView() {
         return (0, atomviews_1.createAtomView)(this.element, this.beat.atom, this.beat.role.defaultToNotes);

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

@@ -1 +1 @@
-{"version":3,"file":"beatviews.js","sourceRoot":"","sources":["../../../src/carnatic/beatviews.ts"],"names":[],"mappings":";;;AAEA,2CAA6C;AAC7C,0CAAuD;AACvD,mDAA+D;AAE/D,MAAa,QAAS,SAAQ,mBAAY;IACxC,cAAc;QACZ,OAAO,IAAA,0BAAc,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACrF,CAAC;IAED,aAAa;QACX,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,YAAY,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC;QAC/E,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,aAAa;YAAE,CAAC,CAAC,aAAa,EAAE,CAAC;QACtD,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAES,mBAAmB;QAC3B,IAAI,aAAa,GAAmB,EAAE,CAAC;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAEvB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,EAAE;YAEnE,MAAM,GAAG,GAAG,IAAI,8BAAc,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAClD,aAAa,GAAG,CAAC,GAAG,CAAC,CAAC;SACvB;aAAM;YACL,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YACzB,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACtC,IAAI,IAAI,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,GAAG,CAAC,EAAE;gBAIvC,IAAI,IAAI,CAAC,QAAQ,IAAI,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;oBAC1D,IAAI,IAAI,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;wBAE1C,MAAM,GAAG,GAAG,IAAI,4BAAY,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;wBACnD,aAAa,GAAG,CAAC,GAAG,CAAC,CAAC;qBACvB;yBAAM;wBAEL,MAAM,GAAG,GAAG,IAAI,4BAAY,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;wBAChD,aAAa,GAAG,CAAC,GAAG,CAAC,CAAC;qBACvB;iBACF;aACF;SACF;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AA7CD,4BA6CC","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { Embelishment } from \"../shapes\";\nimport { createAtomView } from \"./atomviews\";\nimport { BeatView as BeatViewBase } from \"../beatview\";\nimport { BeatStartLines, BeatEndLines } from \"./embelishments\";\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  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"]}

package/lib/cjs/carnatic/embelishments.js

@@ -163,7 +163,7 @@ class BeatEndLines extends shapes_1.Embelishment {
         this.source = source;
         this.rootElement = rootElement;
         this.lineSpacing = 2;
-        this.barSpacing = 15;
+        this.barSpacing = 0;
         this.lines = [];
         for (let i = 0; i < nLines; i++) {
             this.lines.push(TSU.DOM.createSVGNode("line", {

package/lib/cjs/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(public readonly noteView: LeafAtomView, public readonly note: Note) {\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          stroke: \"black\",\n          \"stroke-width\": \"1\",\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(public readonly label: string, public readonly atomView: LeafAtomView) {\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        \"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(public readonly source: BeatView, public readonly rootElement: SVGGraphicsElement) {\n    super();\n    this.line = TSU.DOM.createSVGNode(\"line\", {\n      doc: document,\n      parent: this.rootElement,\n      attrs: {\n        stroke: \"black\",\n        \"stroke-width\": \"1\",\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(public readonly source: BeatView, public readonly rootElement: SVGGraphicsElement, nLines = 1) {\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            stroke: \"black\",\n            \"stroke-width\": \"1\",\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 = 15;\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(public readonly jaaru: JaaruGamaka, public readonly atomView: LeafAtomView) {\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        stroke: \"black\",\n        fill: \"transparent\",\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(public readonly noteView: LeafAtomView, public readonly note: Note) {\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          stroke: \"black\",\n          \"stroke-width\": \"1\",\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(public readonly label: string, public readonly atomView: LeafAtomView) {\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        \"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(public readonly source: BeatView, public readonly rootElement: SVGGraphicsElement) {\n    super();\n    this.line = TSU.DOM.createSVGNode(\"line\", {\n      doc: document,\n      parent: this.rootElement,\n      attrs: {\n        stroke: \"black\",\n        \"stroke-width\": \"1\",\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(public readonly source: BeatView, public readonly rootElement: SVGGraphicsElement, nLines = 1) {\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            stroke: \"black\",\n            \"stroke-width\": \"1\",\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(public readonly jaaru: JaaruGamaka, public readonly atomView: LeafAtomView) {\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        stroke: \"black\",\n        fill: \"transparent\",\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"]}