From b422029aa52e36555d64d16e379f9358db22c710 Mon Sep 17 00:00:00 2001
From: Michael Scott Asato Cuthbert <michael.asato.cuthbert@gmail.com>
Date: Fri, 8 Mar 2024 13:21:05 -1000
Subject: [PATCH 1/2] Fix ties w/ lyrics

Also fix right justification (=text-anchor end)

Tried some fixes for estimate stream length, but could not get it to work.
---
 src/stream.ts  |  2 ++
 src/vfShims.ts | 54 ++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/src/stream.ts b/src/stream.ts
index 35b61bc7..69c9eb20 100644
--- a/src/stream.ts
+++ b/src/stream.ts
@@ -55,6 +55,8 @@ export { filters };
 export { iterator };
 export { makeNotation };
 
+const MIN_DIST_BETWEEN_NOTES = 10;
+
 export class StreamException extends Music21Exception {}
 
 declare interface Constructable<T> {
diff --git a/src/vfShims.ts b/src/vfShims.ts
index f18307f5..a206424b 100644
--- a/src/vfShims.ts
+++ b/src/vfShims.ts
@@ -10,8 +10,10 @@ import {
     Annotation,
     AnnotationHorizontalJustify,
     log,
+    ModifierContext,
     type ModifierContextState,
     ModifierPosition,
+    StaveNote,
     SVGContext,
 } from 'vexflow';
 
@@ -22,6 +24,49 @@ function L(...args: any[]) {
     }
 }
 
+function getLyricWidthDifference(sn: StaveNote): {left: number, right: number} {
+    const myModifierContext = sn.getModifierContext();
+    myModifierContext.preFormat();  // just in case it hasn't been done yet.
+    const myLeft = myModifierContext.getState().left_shift;
+    const myRight = myModifierContext.getState().right_shift;
+
+    const modifierContext2 = new ModifierContext();
+    for (const cat of Object.keys((myModifierContext as any).members)) {
+        if (cat === Annotation.CATEGORY) {
+            continue;
+        }
+        for (const member of myModifierContext.getMembers(cat)) {
+            modifierContext2.addMember(member);
+        }
+    }
+    modifierContext2.preFormat();
+    const noLyricLeft = modifierContext2.getState().left_shift;
+    const noLyricRight = modifierContext2.getState().right_shift;
+    const out = {
+        left: myLeft - noLyricLeft,
+        right: myRight - noLyricRight,
+    };
+    // if (out.left || out.right) {
+    //     console.log(out);
+    // }
+    return out;
+}
+
+const original_StaveNote_getTieRightX = StaveNote.prototype.getTieRightX;
+StaveNote.prototype.getTieRightX = function getTieRightX(): number {
+    const originalRight = original_StaveNote_getTieRightX.bind(this)();
+    return originalRight - getLyricWidthDifference(this).right;
+};
+
+// this is not needed because StaveNote.getTieLeftX() ignores width of note all together.
+// const original_StaveNote_getTieLeftX = StaveNote.prototype.getTieLeftX;
+// StaveNote.prototype.getTieLeftX = function getTieLeftX(): number {
+//     const originalLeft = original_StaveNote_getTieLeftX.bind(this)();
+//     return originalLeft + getLyricWidthDifference(this).left;
+// };
+
+
+
 const original_Annotation_format = Annotation.format;
 Annotation.format = function format(annotations: Annotation[], state: ModifierContextState): boolean {
     if (!annotations || annotations.length === 0) {
@@ -93,7 +138,10 @@ export class VFLyricAnnotation extends Annotation {
         let x = note.getModifierStartXY(ModifierPosition.ABOVE, this.index).x;
         if (this.horizontalJustification === AnnotationHorizontalJustify.LEFT) {
             x -= note.getGlyphWidth() / 2;
+        } else if (this.horizontalJustification === AnnotationHorizontalJustify.RIGHT) {
+            x += note.getGlyphWidth() / 2;
         }
+
         if (this.getXShift()) {
             x += this.getXShift();
         }
@@ -119,9 +167,9 @@ export class VFLyricAnnotation extends Annotation {
         ctx.fillText(this.text, x, y);
         const svg_text = g.lastElementChild as SVGTextElement;
         if (this.horizontalJustification === AnnotationHorizontalJustify.LEFT) {
-            // left is default;
+            svg_text.setAttribute('text-anchor', 'start');  // left = start is also default;
         } else if (this.horizontalJustification === AnnotationHorizontalJustify.RIGHT) {
-            svg_text.setAttribute('text-anchor', 'right');
+            svg_text.setAttribute('text-anchor', 'end');
         } else if (this.horizontalJustification === AnnotationHorizontalJustify.CENTER) {
             svg_text.setAttribute('text-anchor', 'middle');
         } /* CENTER_STEM */ else {
@@ -135,3 +183,5 @@ export class VFLyricAnnotation extends Annotation {
         ctx.restore();
     }
 }
+
+

From 5b5c37f9e69f9313827f7de6b770198425f40580 Mon Sep 17 00:00:00 2001
From: Michael Scott Asato Cuthbert <michael.asato.cuthbert@gmail.com>
Date: Fri, 8 Mar 2024 13:30:03 -1000
Subject: [PATCH 2/2] remove unused constant

---
 src/stream.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/stream.ts b/src/stream.ts
index 69c9eb20..35b61bc7 100644
--- a/src/stream.ts
+++ b/src/stream.ts
@@ -55,8 +55,6 @@ export { filters };
 export { iterator };
 export { makeNotation };
 
-const MIN_DIST_BETWEEN_NOTES = 10;
-
 export class StreamException extends Music21Exception {}
 
 declare interface Constructable<T> {