Move curves code to separate function

Author: MatthewDorner

lib/main/generate-vex-objects.js

@@ -13,7 +13,7 @@ import Bar from '../models/bar';
 import Part from '../models/part';
 import Tune from '../models/tune';
 
-import { getKeys, getVexDuration, addDecorations, getTabPosition, generateBeamsCompound } from '../utils';
+import { getKeys, getVexDuration, addDecorations, getTabPosition, generateBeamsCompound, getCurves } from '../utils';
 import { VEX_ACCIDENTAL_FROM_ABCJS } from '../constants';
 
 /**
@@ -120,6 +120,8 @@ export default function generateVexObjects(partRegions, tuneAttrs, renderOptions
  if (accidental) { noteToAdd.addAccidental(i, new Vex.Flow.Accidental(accidental)); }
  });
 
+ currentPart.curves = getCurves(currentPart.curves, obj, noteToAdd);
+
  // this is mostly duplicated with below. maybe can be put in a separate function
  if (obj.gracenotes) {
  const graceNotesArray = [];
@@ -162,65 +164,6 @@ export default function generateVexObjects(partRegions, tuneAttrs, renderOptions
  const tabGraceNoteGroup = new GraceNoteGroup(tabGraceNotesArray, false);
  tabNoteToAdd.addModifier(tabGraceNoteGroup);
  }
-
- if (obj.startSlur) {
- obj.startSlur.forEach(() => {
- currentPart.curves.push({
- startNote: noteToAdd
- });
- });
- }
- if (obj.endSlur) {
- obj.endSlur.forEach(() => {
- let i = currentPart.curves.length - 1;
- while (i >= 0) {
- if (!currentPart.curves[i].endNote) {
- currentPart.curves[i].endNote = noteToAdd;
- break;
- }
- i -= 1;
- }
- });
- }
-
- obj.pitches.forEach((pitch) => {
- if (pitch.startTie) {
- currentPart.curves.push({
- startNote: noteToAdd
- });
- }
- if (pitch.endTie) {
- currentPart.curves[currentPart.curves.length - 1].endNote = noteToAdd;
- let i = currentPart.curves.length - 1;
- while (i >= 0) {
- if (!currentPart.curves[i].endNote) {
- currentPart.curves[i].endNote = noteToAdd;
- break;
- }
- i -= 1;
- }
- }
- if (pitch.startSlur) {
- pitch.startSlur.forEach(() => {
- currentPart.curves.push({
- startNote: noteToAdd
- });
- });
- }
- if (pitch.endSlur) {
- pitch.endSlur.forEach(() => {
- let i = currentPart.curves.length - 1;
- while (i >= 0) {
- if (!currentPart.curves[i].endNote) {
- currentPart.curves[i].endNote = noteToAdd;
- break;
- }
- i -= 1;
- }
- });
- }
- });
-
  currentBar.tabNotes.push(tabNoteToAdd);
  } else { // IS a rest
  noteToAdd = new StaveNote({

lib/utils/get-curves.js

@@ -0,0 +1,78 @@
+/**
+ * Takes an ABCJS parser output obj to extract the start/end curve (tie/slur)
+ * markers that are attached to the obj or individual pitches in the obj. The .curves[] array
+ * will be used later on to create the VexFlow Curve objects. Can't create them here because we
+ * need to position the bars first before we can create the Curves, in order to be able to handle curves
+ * that go across line breaks.
+ *
+ * @param {Array} curves the Part.curves[] array as it exists so far
+ * @param {object} obj the obj element from the abcjs parser output array
+ * @param {StaveNote} noteToAdd the VexFlow note that was created earlier in the GenerateVexObjects loop iteration
+ *
+ * @returns {Array} updated curves[] with the relevant curve markers added with a reference to noteToAdd
+ */
+export function getCurves(curves, obj, noteToAdd) {
+ const newCurves = [...curves];
+
+ // handle curves on obj
+ if (obj.startSlur) {
+ obj.startSlur.forEach(() => {
+ newCurves.push({
+ startNote: noteToAdd
+ });
+ });
+ }
+ if (obj.endSlur) {
+ obj.endSlur.forEach(() => {
+ let i = newCurves.length - 1;
+ while (i >= 0) {
+ if (!newCurves[i].endNote) {
+ newCurves[i].endNote = noteToAdd;
+ break;
+ }
+ i -= 1;
+ }
+ });
+ }
+
+ // handle curves on pitch
+ obj.pitches.forEach((pitch) => {
+ if (pitch.startTie) {
+ newCurves.push({
+ startNote: noteToAdd
+ });
+ }
+ if (pitch.endTie) {
+ newCurves[newCurves.length - 1].endNote = noteToAdd;
+ let i = newCurves.length - 1;
+ while (i >= 0) {
+ if (!newCurves[i].endNote) {
+ newCurves[i].endNote = noteToAdd;
+ break;
+ }
+ i -= 1;
+ }
+ }
+ if (pitch.startSlur) {
+ pitch.startSlur.forEach(() => {
+ newCurves.push({
+ startNote: noteToAdd
+ });
+ });
+ }
+ if (pitch.endSlur) {
+ pitch.endSlur.forEach(() => {
+ let i = newCurves.length - 1;
+ while (i >= 0) {
+ if (!newCurves[i].endNote) {
+ newCurves[i].endNote = noteToAdd;
+ break;
+ }
+ i -= 1;
+ }
+ });
+ }
+ });
+
+ return newCurves;
+}

lib/utils/index.js

@@ -2,4 +2,5 @@ export * from './generate-beams-compound';
 export * from './get-tab-position';
 export * from './get-keys';
 export * from './add-decorations';
+export * from './get-curves';
 export * from './utils';