Bug fixes, add support for change

Fix some issues with bottom line calculation. Read and render change type pedal lines

src/MusicalScore/Graphical/VexFlow/VexFlowMusicSheetCalculator.ts

@@ -1404,37 +1404,33 @@ export class VexFlowMusicSheetCalculator extends MusicSheetCalculator {
           const otherPedalStartX: number = vfOtherPedal.startVfVoiceEntry.PositionAndShape.AbsolutePosition.x - otherPedalMarkingMarginXOffset;
           let otherPedalStopX: number = undefined;
           vfOtherPedal.setLine(footroom - 3 - (parentStaffline.StaffLines.length - 1));
-
+          let otherPedalEndBBox: BoundingBox = vfOtherPedal.endVfVoiceEntry?.PositionAndShape;
+          if (!otherPedalEndBBox) {
+            otherPedalEndBBox = vfOtherPedal.endMeasure.PositionAndShape;
+          }
           if (vfOtherPedal.EndSymbolPositionAndShape) {
             const otherSymbolHalfHeight: number = pedalMarking.render_options.glyph_point_size / 20;
             //Width of the Ped. symbol
             otherPedalStopX = otherPedalStartX + 3.4;
-            const otherPedalStartX2: number = endBbox.AbsolutePosition.x - pedalMarkingMarginXOffset;
+            const otherPedalStartX2: number = otherPedalEndBBox.AbsolutePosition.x - otherPedalMarkingMarginXOffset;
             //Width of * symbol
             const otherPedalStopX2: number = otherPedalStartX2 + 1.5;
-            parentStaffline.SkyBottomLineCalculator.updateBottomLineInRange(startX, stopX, footroom + otherSymbolHalfHeight);
+            parentStaffline.SkyBottomLineCalculator.updateBottomLineInRange(otherPedalStartX, otherPedalStopX, footroom + otherSymbolHalfHeight);
             parentStaffline.SkyBottomLineCalculator.updateBottomLineInRange(otherPedalStartX2, otherPedalStopX2, footroom + otherSymbolHalfHeight);
           } else {
-            const otherPedalBracketHeight: number = pedalMarking.render_options.bracket_height / 10;
-
-            if(pedalMarking.EndsStave){
-              if(vfOtherPedal.endVfVoiceEntry){
-                otherPedalStopX = vfOtherPedal.endVfVoiceEntry.parentStaffEntry.parentMeasure.PositionAndShape.AbsolutePosition.x +
-                  vfOtherPedal.endVfVoiceEntry.parentStaffEntry.parentMeasure.PositionAndShape.Size.width - pedalMarkingMarginXOffset;
-              } else {
-                otherPedalStopX = vfOtherPedal.endMeasure.PositionAndShape.AbsolutePosition.x + vfOtherPedal.endMeasure.PositionAndShape.Size.width;
-              }
+            const otherPedalBracketHeight: number = otherPedalMarking.render_options.bracket_height / 10;
+
+            if(otherPedalMarking.EndsStave){
+                otherPedalStopX = otherPedalEndBBox.AbsolutePosition.x + otherPedalEndBBox.Size.width - otherPedalMarkingMarginXOffset;
             } else {
               switch (pedalMarking.style) {
                 case PEDAL_STYLES_ENUM.BRACKET_OPEN_END:
                 case PEDAL_STYLES_ENUM.BRACKET_OPEN_BOTH:
                 case PEDAL_STYLES_ENUM.MIXED_OPEN_END:
-                  otherPedalStopX = vfOtherPedal.endVfVoiceEntry.PositionAndShape.AbsolutePosition.x +
-                    vfOtherPedal.endVfVoiceEntry.PositionAndShape.BorderRight - pedalMarkingMarginXOffset;
+                  otherPedalStopX = otherPedalEndBBox.AbsolutePosition.x + otherPedalEndBBox.BorderRight - otherPedalMarkingMarginXOffset;
                 break;
                 default:
-                  otherPedalStopX = vfOtherPedal.endVfVoiceEntry.PositionAndShape.AbsolutePosition.x +
-                    vfOtherPedal.endVfVoiceEntry.PositionAndShape.BorderLeft - pedalMarkingMarginXOffset;
+                  otherPedalStopX = otherPedalEndBBox.AbsolutePosition.x + otherPedalEndBBox.BorderLeft - otherPedalMarkingMarginXOffset;
                 break;
               }
             }

src/MusicalScore/Graphical/VexFlow/VexFlowPedal.ts

@@ -126,6 +126,8 @@ export class VexFlowPedal extends GraphicalPedal {
         this.endVfVoiceEntry?.parentVoiceEntry?.ParentSourceStaffEntry?.VerticalContainerParent){
                 (pedalMarking as any).EndsStave = true;
         }
+        (pedalMarking as any).ChangeBegin = this.getPedal.ChangeBegin;
+        (pedalMarking as any).ChangeEnd = this.getPedal.ChangeEnd;
         return pedalMarking;
     }
 }

src/MusicalScore/ScoreIO/MusicSymbolModules/ExpressionReader.ts

@@ -345,7 +345,19 @@ export class ExpressionReader {
                             }
                         break;
                         case "change":
-                            //VF doesn't seem to support this V marking
+                            //Ignore non-line pedals
+                            if (this.openPedal && this.openPedal.IsLine) {
+                                this.openPedal.ChangeEnd = true;
+                                this.createNewMultiExpressionIfNeeded(currentMeasure);
+                                this.getMultiExpression.PedalEnd = this.openPedal;
+                                this.openPedal.ParentEndMultiExpression = this.getMultiExpression;
+
+                                this.createNewMultiExpressionIfNeeded(currentMeasure);
+                                this.openPedal = new Pedal(line, sign);
+                                this.openPedal.ChangeBegin = true;
+                                this.getMultiExpression.PedalStart = this.openPedal;
+                                this.openPedal.ParentStartMultiExpression = this.getMultiExpression;
+                            }
                         break;
                         case "continue":
                         break;

src/MusicalScore/VoiceData/Expressions/ContinuousExpressions/Pedal.ts

@@ -11,6 +11,8 @@ export class Pedal {
     public StaffNumber: number;
     public ParentStartMultiExpression: MultiExpression;
     public ParentEndMultiExpression: MultiExpression;
+    public ChangeEnd: boolean = false;
+    public ChangeBegin: boolean = false;
 
     public get IsLine(): boolean {
         return this.line;

src/VexFlowPatch/src/pedalmarking.js

@@ -94,6 +94,8 @@ export class PedalMarking extends Element {
     super();
     this.setAttribute('type', 'PedalMarking');
     this.EndsStave = false;
+    this.ChangeBegin = false;
+    this.ChangeEnd = false;
     this.notes = notes;
     this.style = PedalMarking.TEXT;
     this.line = 0;
@@ -175,31 +177,47 @@ export class PedalMarking extends Element {
 
       //If this pedal doesn't end a stave...
       if(!this.EndsStave){
-        //pedal across a single note or just the end note
-        if(!is_pedal_depressed && note){
-          switch(pedal.style) {
-            case PedalMarking.Styles.BRACKET_OPEN_END:
-            case PedalMarking.Styles.BRACKET_OPEN_BOTH:
-            case PedalMarking.Styles.MIXED_OPEN_END:
-              x = note.getNoteHeadEndX();
-            break;
-            default:
-              x = note.getNoteHeadBeginX() - pedal.render_options.text_margin_right;
-              this.startMargin = -pedal.render_options.text_margin_right;
-            break;
+        if(note){
+          //pedal across a single note or just the end note
+          if(!is_pedal_depressed){
+            switch(pedal.style) {
+              case PedalMarking.Styles.BRACKET_OPEN_END:
+              case PedalMarking.Styles.BRACKET_OPEN_BOTH:
+              case PedalMarking.Styles.MIXED_OPEN_END:
+                x = note.getNoteHeadEndX();
+              break;
+              default:
+                if(this.ChangeEnd){
+                  //Start in the middle of the note
+                  x = note.getAbsoluteX();
+                } else {
+                  x = note.getNoteHeadBeginX() - pedal.render_options.text_margin_right;
+                  this.startMargin = -pedal.render_options.text_margin_right;
+                }
+              break;
+            }
+          } else if(this.ChangeBegin){
+            x = note.getAbsoluteX();
           }
         }
       } else {
-        //pedal across a single note or just the end note
+        //Ends stave and we are at the end...
         if(!is_pedal_depressed){
           //IF we are the end, set the end to the stave end
           if(note){
-            x = note.getStave().end_x + this.endStaveAddedWidth - pedal.render_options.text_margin_right;
+            if(this.ChangeEnd){
+              //Start in the middle of the note
+              x = note.getAbsoluteX();
+            }  else {
+              x = note.getStave().end_x + this.endStaveAddedWidth - pedal.render_options.text_margin_right;
+            }
           } else {
             x = this.endStave.end_x + this.endStaveAddedWidth - pedal.render_options.text_margin_right;
           }
           
           this.endMargin = -pedal.render_options.text_margin_right;
+        } else if (this.ChangeBegin){
+          x = note.getAbsoluteX();
         }
       }
 
@@ -251,7 +269,13 @@ export class PedalMarking extends Element {
           if (pedal.style === PedalMarking.Styles.BRACKET_OPEN_BEGIN || pedal.style === PedalMarking.Styles.BRACKET_OPEN_BOTH) {
             ctx.moveTo(x + x_shift, y);
           } else {
+            if(this.ChangeBegin){
+              x += 5;
+            }
             ctx.moveTo(x, y - pedal.render_options.bracket_height);
+            if(this.ChangeBegin){
+              x += 5;
+            }
             ctx.lineTo(x + x_shift, y);
           }
           ctx.stroke();
@@ -267,6 +291,9 @@ export class PedalMarking extends Element {
         ctx.lineTo(x + x_shift, y);
         if (pedal.style !== PedalMarking.Styles.BRACKET_OPEN_END && pedal.style !== PedalMarking.Styles.MIXED_OPEN_END &&
             pedal.style !== PedalMarking.Styles.BRACKET_OPEN_BOTH) {
+            if(this.ChangeEnd){
+              x += 5;
+            }
             ctx.lineTo(x, y - pedal.render_options.bracket_height);
         }
         ctx.stroke();