123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960 |
- import { MusicSheetCalculator } from "../MusicSheetCalculator";
- import { VexFlowGraphicalSymbolFactory } from "./VexFlowGraphicalSymbolFactory";
- import { GraphicalMeasure } from "../GraphicalMeasure";
- import { StaffLine } from "../StaffLine";
- import { VoiceEntry } from "../../VoiceData/VoiceEntry";
- import { GraphicalNote } from "../GraphicalNote";
- import { GraphicalStaffEntry } from "../GraphicalStaffEntry";
- import { GraphicalTie } from "../GraphicalTie";
- import { Tie } from "../../VoiceData/Tie";
- import { SourceMeasure } from "../../VoiceData/SourceMeasure";
- import { MultiExpression } from "../../VoiceData/Expressions/MultiExpression";
- import { RepetitionInstruction } from "../../VoiceData/Instructions/RepetitionInstruction";
- import { Beam } from "../../VoiceData/Beam";
- import { ClefInstruction } from "../../VoiceData/Instructions/ClefInstruction";
- import { OctaveEnum, OctaveShift } from "../../VoiceData/Expressions/ContinuousExpressions/OctaveShift";
- import { Fraction } from "../../../Common/DataObjects/Fraction";
- import { LyricWord } from "../../VoiceData/Lyrics/LyricsWord";
- import { OrnamentContainer } from "../../VoiceData/OrnamentContainer";
- import { ArticulationEnum } from "../../VoiceData/VoiceEntry";
- import { Tuplet } from "../../VoiceData/Tuplet";
- import { VexFlowMeasure } from "./VexFlowMeasure";
- import { VexFlowTextMeasurer } from "./VexFlowTextMeasurer";
- import Vex = require("vexflow");
- import * as log from "loglevel";
- import { unitInPixels } from "./VexFlowMusicSheetDrawer";
- import { VexFlowGraphicalNote } from "./VexFlowGraphicalNote";
- import { TechnicalInstruction } from "../../VoiceData/Instructions/TechnicalInstruction";
- import { GraphicalLyricEntry } from "../GraphicalLyricEntry";
- import { GraphicalLabel } from "../GraphicalLabel";
- import { LyricsEntry } from "../../VoiceData/Lyrics/LyricsEntry";
- import { GraphicalLyricWord } from "../GraphicalLyricWord";
- import { VexFlowStaffEntry } from "./VexFlowStaffEntry";
- import { VexFlowOctaveShift } from "./VexFlowOctaveShift";
- import { VexFlowInstantaneousDynamicExpression } from "./VexFlowInstantaneousDynamicExpression";
- import { Slur } from "../../VoiceData/Expressions/ContinuousExpressions/Slur";
- /* VexFlow Version - for later use
- // import { VexFlowSlur } from "./VexFlowSlur";
- // import { VexFlowStaffLine } from "./VexFlowStaffLine";
- // import { VexFlowVoiceEntry } from "./VexFlowVoiceEntry";
- */
- import { EngravingRules } from "../EngravingRules";
- import { PointF2D } from "../../../Common/DataObjects/PointF2D";
- import { TextAlignmentEnum, TextAlignment } from "../../../Common/Enums/TextAlignment";
- import { GraphicalSlur } from "../GraphicalSlur";
- import { BoundingBox } from "../BoundingBox";
- import { ContinuousDynamicExpression } from "../../VoiceData/Expressions/ContinuousExpressions/ContinuousDynamicExpression";
- import { VexFlowContinuousDynamicExpression } from "./VexFlowContinuousDynamicExpression";
- import { InstantaneousTempoExpression } from "../../VoiceData/Expressions";
- import { AlignRestOption } from "../../../OpenSheetMusicDisplay";
- import { VexFlowStaffLine } from "./VexFlowStaffLine";
- export class VexFlowMusicSheetCalculator extends MusicSheetCalculator {
- /** space needed for a dash for lyrics spacing, calculated once */
- private dashSpace: number;
- constructor() {
- super();
- MusicSheetCalculator.symbolFactory = new VexFlowGraphicalSymbolFactory();
- MusicSheetCalculator.TextMeasurer = new VexFlowTextMeasurer();
- }
- protected clearRecreatedObjects(): void {
- super.clearRecreatedObjects();
- for (const graphicalMeasures of this.graphicalMusicSheet.MeasureList) {
- for (const graphicalMeasure of graphicalMeasures) {
- (<VexFlowMeasure>graphicalMeasure).clean();
- }
- }
- }
- protected formatMeasures(): void {
- for (const verticalMeasureList of this.graphicalMusicSheet.MeasureList) {
- const firstMeasure: VexFlowMeasure = verticalMeasureList[0] as VexFlowMeasure;
- // first measure has formatting method as lambda function object, but formats all measures. TODO this could be refactored
- firstMeasure.format();
- for (const measure of verticalMeasureList) {
- for (const staffEntry of measure.staffEntries) {
- (<VexFlowStaffEntry>staffEntry).calculateXPosition();
- }
- }
- }
- }
- //protected clearSystemsAndMeasures(): void {
- // for (let measure of measures) {
- //
- // }
- //}
- /**
- * Calculates the x layout of the staff entries within the staff measures belonging to one source measure.
- * All staff entries are x-aligned throughout all vertically aligned staff measures.
- * This method is called within calculateXLayout.
- * The staff entries are aligned with minimum needed x distances.
- * The MinimumStaffEntriesWidth of every measure will be set - needed for system building.
- * Prepares the VexFlow formatter for later formatting
- * Does not calculate measure width from lyrics (which is called from MusicSheetCalculator)
- * @param measures
- * @returns the minimum required x width of the source measure (=list of staff measures)
- */
- protected calculateMeasureXLayout(measures: GraphicalMeasure[]): number {
- // Finalize beams
- /*for (let measure of measures) {
- (measure as VexFlowMeasure).finalizeBeams();
- (measure as VexFlowMeasure).finalizeTuplets();
- }*/
- // Format the voices
- const allVoices: Vex.Flow.Voice[] = [];
- const formatter: Vex.Flow.Formatter = new Vex.Flow.Formatter();
- for (const measure of measures) {
- const mvoices: { [voiceID: number]: Vex.Flow.Voice; } = (measure as VexFlowMeasure).vfVoices;
- const voices: Vex.Flow.Voice[] = [];
- for (const voiceID in mvoices) {
- if (mvoices.hasOwnProperty(voiceID)) {
- voices.push(mvoices[voiceID]);
- allVoices.push(mvoices[voiceID]);
- }
- }
- if (voices.length === 0) {
- log.debug("Found a measure with no voices. Continuing anyway.", mvoices);
- // no need to log this, measures with no voices/notes are fine. see OSMDOptions.fillEmptyMeasuresWithWholeRest
- continue;
- }
- // all voices that belong to one stave are collectively added to create a common context in VexFlow.
- formatter.joinVoices(voices);
- }
- let minStaffEntriesWidth: number = 200;
- if (allVoices.length > 0) {
- // FIXME: The following ``+ 5.0'' is temporary: it was added as a workaround for
- // FIXME: a more relaxed formatting of voices
- minStaffEntriesWidth = formatter.preCalculateMinTotalWidth(allVoices) / unitInPixels + 5.0;
- // firstMeasure.formatVoices = (w: number) => {
- // formatter.format(allVoices, w);
- // };
- MusicSheetCalculator.setMeasuresMinStaffEntriesWidth(measures, minStaffEntriesWidth);
- const formatVoicesDefault: (w: number) => void = (w) => {
- formatter.format(allVoices, w);
- };
- const formatVoicesAlignRests: (w: number) => void = (w) => {
- formatter.format(allVoices, w, {
- align_rests: true,
- context: undefined
- });
- };
- for (const measure of measures) {
- // determine whether to align rests
- if (EngravingRules.Rules.AlignRests === AlignRestOption.Never) {
- (measure as VexFlowMeasure).formatVoices = formatVoicesDefault;
- } else if (EngravingRules.Rules.AlignRests === AlignRestOption.Always) {
- (measure as VexFlowMeasure).formatVoices = formatVoicesAlignRests;
- } else if (EngravingRules.Rules.AlignRests === AlignRestOption.Auto) {
- let alignRests: boolean = false;
- for (const staffEntry of measure.staffEntries) {
- let collidableVoiceEntries: number = 0;
- let numberOfRests: number = 0;
- for (const voiceEntry of staffEntry.graphicalVoiceEntries) {
- if (!voiceEntry.parentVoiceEntry.IsGrace) {
- if (voiceEntry && voiceEntry.notes && voiceEntry.notes[0] && voiceEntry.notes[0].sourceNote) {// TODO null chaining, TS 3.7
- if (voiceEntry.notes[0].sourceNote.PrintObject) { // only respect collision when not invisible
- collidableVoiceEntries++;
- }
- }
- }
- if (voiceEntry && voiceEntry.notes && voiceEntry.notes[0] && voiceEntry.notes[0].sourceNote) {// TODO null chaining, TS 3.7
- if (voiceEntry.notes[0].sourceNote.isRest() && voiceEntry.notes[0].sourceNote.PrintObject) {
- numberOfRests++; // only align rests if there is actually a rest (which could collide)
- }
- }
- if (collidableVoiceEntries > 1 && numberOfRests >= 1) {
- // TODO could add further checks like if any of the already checked voice entries actually collide
- alignRests = true;
- break;
- }
- }
- if (alignRests) {
- break;
- }
- }
- // set measure's format function
- if (alignRests) {
- (measure as VexFlowMeasure).formatVoices = formatVoicesAlignRests;
- } else {
- (measure as VexFlowMeasure).formatVoices = formatVoicesDefault;
- }
- }
- // format first measure with minimum width
- if (measure === measures[0]) {
- const vexflowMeasure: VexFlowMeasure = (measure as VexFlowMeasure);
- // prepare format function for voices, will be called later for formatting measure again
- //vexflowMeasure.formatVoices = formatVoicesDefault;
- // format now for minimum width, calculateMeasureWidthFromLyrics later
- vexflowMeasure.formatVoices(minStaffEntriesWidth * unitInPixels);
- } else {
- //(measure as VexFlowMeasure).formatVoices = undefined;
- // TODO why was the formatVoices function disabled for other measures? would now disable the new align rests option.
- }
- }
- }
- for (const graphicalMeasure of measures) {
- for (const staffEntry of graphicalMeasure.staffEntries) {
- // here the measure modifiers are not yet set, therefore the begin instruction width will be empty
- (<VexFlowStaffEntry>staffEntry).calculateXPosition();
- }
- }
- // calculateMeasureWidthFromLyrics() will be called from MusicSheetCalculator after this
- return minStaffEntriesWidth;
- }
- public calculateMeasureWidthFromLyrics(measuresVertical: GraphicalMeasure[], oldMinimumStaffEntriesWidth: number): number {
- let elongationFactorForMeasureWidth: number = 1;
- // information we need for the previous lyricsEntries to space the current one
- interface LyricEntryInfo {
- extend: boolean;
- labelWidth: number;
- lyricsXPosition: number;
- sourceNoteDuration: Fraction;
- text: string;
- measureNumber: number;
- }
- // holds lyrics entries for verses i
- interface LyricEntryDict {
- [i: number]: LyricEntryInfo;
- }
- for (const measure of measuresVertical) {
- const lastLyricEntryDict: LyricEntryDict = {}; // holds info about last lyrics entries for all verses j
- // for all staffEntries i, each containing the lyric entry for all verses at that timestamp in the measure
- for (let i: number = 0; i < measure.staffEntries.length; i++) {
- const staffEntry: GraphicalStaffEntry = measure.staffEntries[i];
- if (staffEntry.LyricsEntries.length === 0) {
- continue;
- }
- // for all verses j
- for (let j: number = 0; j < staffEntry.LyricsEntries.length; j++) {
- const lyricsEntry: GraphicalLyricEntry = staffEntry.LyricsEntries[j];
- // const lyricsEntryText = lyricsEntry.LyricsEntry.Text; // for easier debugging
- const lyricAlignment: TextAlignmentEnum = lyricsEntry.GraphicalLabel.Label.textAlignment;
- let minLyricsSpacing: number = EngravingRules.Rules.HorizontalBetweenLyricsDistance;
- // for quarter note in Vexflow, where spacing is halfed for each smaller note duration.
- let lyricOverlapAllowedIntoNextMeasure: number =
- EngravingRules.Rules.LyricOverlapAllowedIntoNextMeasure;
- // TODO allow more overlap if there are no lyrics in next measure
- // spacing for multi-syllable words
- if (lyricsEntry.ParentLyricWord) {
- if (lyricsEntry.LyricsEntry.SyllableIndex > 0) { // syllables after first
- // give a little more spacing for dash between syllables
- minLyricsSpacing = EngravingRules.Rules.BetweenSyllableMinimumDistance;
- if (TextAlignment.IsCenterAligned(lyricsEntry.GraphicalLabel.Label.textAlignment)) {
- minLyricsSpacing += 1.0; // TODO check for previous lyric alignment too. though center is not standard
- // without this, there's not enough space for dashes between long syllables on eigth notes
- }
- }
- const syllables: LyricsEntry[] = lyricsEntry.ParentLyricWord.GetLyricWord.Syllables;
- if (syllables.length > 1) {
- if (lyricsEntry.LyricsEntry.SyllableIndex < syllables.length - 1) {
- // if a middle syllable of a word, give less measure overlap into next measure, to give room for dash
- if (this.dashSpace === undefined) {
- this.dashSpace = 1.5;
- // better method, doesn't work:
- // this.dashLength = new GraphicalLabel(new Label("-"), this.rules.LyricsHeight, TextAlignmentEnum.CenterBottom)
- // .PositionAndShape.Size.width; // always returns 0
- }
- lyricOverlapAllowedIntoNextMeasure -= this.dashSpace;
- }
- }
- }
- const lyricsBbox: BoundingBox = lyricsEntry.GraphicalLabel.PositionAndShape;
- const lyricsLabelWidth: number = lyricsBbox.Size.width;
- const staffEntryXPosition: number = (staffEntry as VexFlowStaffEntry).PositionAndShape.RelativePosition.x;
- const lyricsXPosition: number = staffEntryXPosition + lyricsBbox.BorderMarginLeft;
- if (lastLyricEntryDict[j] !== undefined) {
- if (lastLyricEntryDict[j].extend) {
- // TODO handle extend of last entry (extend is stored in lyrics entry of preceding syllable)
- // only necessary for center alignment
- }
- }
- let spacingNeededToLastLyric: number;
- let currentSpacingToLastLyric: number; // undefined for first lyric in measure
- if (lastLyricEntryDict[j]) {
- currentSpacingToLastLyric = lyricsXPosition - lastLyricEntryDict[j].lyricsXPosition;
- }
- let currentSpacingToMeasureEnd: number;
- let spacingNeededToMeasureEnd: number;
- const maxXInMeasure: number = oldMinimumStaffEntriesWidth * elongationFactorForMeasureWidth;
- // when the lyrics are centered, we need to consider spacing differently than when they are left-aligned:
- if (TextAlignment.IsCenterAligned(lyricAlignment)) {
- lyricOverlapAllowedIntoNextMeasure /= 4; // reserve space for overlap from next measure. its first note can't be spaced.
- currentSpacingToMeasureEnd = maxXInMeasure - lyricsXPosition;
- spacingNeededToMeasureEnd = (lyricsLabelWidth / 2) - lyricOverlapAllowedIntoNextMeasure;
- // spacing to last lyric only done if not first lyric in measure:
- if (lastLyricEntryDict[j]) {
- spacingNeededToLastLyric =
- lastLyricEntryDict[j].labelWidth / 2 + lyricsLabelWidth / 2 + minLyricsSpacing;
- }
- } else if (TextAlignment.IsLeft(lyricAlignment)) {
- currentSpacingToMeasureEnd = maxXInMeasure - lyricsXPosition;
- spacingNeededToMeasureEnd = lyricsLabelWidth - lyricOverlapAllowedIntoNextMeasure;
- if (lastLyricEntryDict[j]) {
- spacingNeededToLastLyric = lastLyricEntryDict[j].labelWidth + minLyricsSpacing;
- }
- }
- // get factor of how much we need to stretch the measure to space the current lyric
- let elongationFactorForMeasureWidthForCurrentLyric: number = 1;
- const elongationFactorNeededForMeasureEnd: number =
- spacingNeededToMeasureEnd / currentSpacingToMeasureEnd;
- let elongationFactorNeededForLastLyric: number = 1;
- if (lastLyricEntryDict[j]) { // if previous lyric needs more spacing than measure end, take that spacing
- const lastNoteDuration: Fraction = lastLyricEntryDict[j].sourceNoteDuration;
- elongationFactorNeededForLastLyric = spacingNeededToLastLyric / currentSpacingToLastLyric;
- if (lastNoteDuration.Denominator > 4) {
- elongationFactorNeededForLastLyric *= 1.1; // from 1.2 upwards, this unnecessarily bloats shorter measures
- // spacing in Vexflow depends on note duration, our minSpacing is calibrated for quarter notes
- // if we double the measure length, the distance between eigth notes only gets half of the added length
- // compared to a quarter note.
- }
- }
- elongationFactorForMeasureWidthForCurrentLyric = Math.max(
- elongationFactorNeededForMeasureEnd,
- elongationFactorNeededForLastLyric
- );
- elongationFactorForMeasureWidth = Math.max(
- elongationFactorForMeasureWidth,
- elongationFactorForMeasureWidthForCurrentLyric
- );
- // set up information about this lyric entry of verse j for next lyric entry of verse j
- lastLyricEntryDict[j] = {
- extend: lyricsEntry.LyricsEntry.extend,
- labelWidth: lyricsLabelWidth,
- lyricsXPosition: lyricsXPosition,
- measureNumber: measure.MeasureNumber,
- sourceNoteDuration: lyricsEntry.LyricsEntry.Parent.Notes[0].Length,
- text: lyricsEntry.LyricsEntry.Text,
- };
- }
- }
- }
- return oldMinimumStaffEntriesWidth * elongationFactorForMeasureWidth;
- }
- protected createGraphicalTie(tie: Tie, startGse: GraphicalStaffEntry, endGse: GraphicalStaffEntry,
- startNote: GraphicalNote, endNote: GraphicalNote): GraphicalTie {
- return new GraphicalTie(tie, startNote, endNote);
- }
- protected updateStaffLineBorders(staffLine: StaffLine): void {
- staffLine.SkyBottomLineCalculator.updateStaffLineBorders();
- }
- protected graphicalMeasureCreatedCalculations(measure: GraphicalMeasure): void {
- (measure as VexFlowMeasure).graphicalMeasureCreatedCalculations();
- }
- /**
- * Can be used to calculate articulations, stem directions, helper(ledger) lines, and overlapping note x-displacement.
- * Is Excecuted per voice entry of a staff entry.
- * After that layoutStaffEntry is called.
- * @param voiceEntry
- * @param graphicalNotes
- * @param graphicalStaffEntry
- * @param hasPitchedNote
- */
- protected layoutVoiceEntry(voiceEntry: VoiceEntry, graphicalNotes: GraphicalNote[], graphicalStaffEntry: GraphicalStaffEntry,
- hasPitchedNote: boolean): void {
- return;
- }
- /**
- * Do all layout calculations that have to be done per staff entry, like dots, ornaments, arpeggios....
- * This method is called after the voice entries are handled by layoutVoiceEntry().
- * @param graphicalStaffEntry
- */
- protected layoutStaffEntry(graphicalStaffEntry: GraphicalStaffEntry): void {
- (graphicalStaffEntry.parentMeasure as VexFlowMeasure).layoutStaffEntry(graphicalStaffEntry);
- }
- /**
- * Is called at the begin of the method for creating the vertically aligned staff measures belonging to one source measure.
- */
- protected initGraphicalMeasuresCreation(): void {
- return;
- }
- /**
- * add here all given articulations to the VexFlowGraphicalStaffEntry and prepare them for rendering.
- * @param articulations
- * @param voiceEntry
- * @param graphicalStaffEntry
- */
- protected layoutArticulationMarks(articulations: ArticulationEnum[], voiceEntry: VoiceEntry, graphicalStaffEntry: GraphicalStaffEntry): void {
- // uncomment this when implementing:
- // let vfse: VexFlowStaffEntry = (graphicalStaffEntry as VexFlowStaffEntry);
- return;
- }
- /**
- * Calculate the shape (Bezier curve) for this tie.
- * @param tie
- * @param tieIsAtSystemBreak
- */
- protected layoutGraphicalTie(tie: GraphicalTie, tieIsAtSystemBreak: boolean): void {
- const startNote: VexFlowGraphicalNote = (tie.StartNote as VexFlowGraphicalNote);
- const endNote: VexFlowGraphicalNote = (tie.EndNote as VexFlowGraphicalNote);
- let vfStartNote: Vex.Flow.StaveNote = undefined;
- let startNoteIndexInTie: number = 0;
- if (startNote !== undefined && startNote.vfnote !== undefined && startNote.vfnote.length >= 2) {
- vfStartNote = startNote.vfnote[0];
- startNoteIndexInTie = startNote.vfnote[1];
- }
- let vfEndNote: Vex.Flow.StaveNote = undefined;
- let endNoteIndexInTie: number = 0;
- if (endNote !== undefined && endNote.vfnote !== undefined && endNote.vfnote.length >= 2) {
- vfEndNote = endNote.vfnote[0];
- endNoteIndexInTie = endNote.vfnote[1];
- }
- if (tieIsAtSystemBreak) {
- // split tie into two ties:
- const vfTie1: Vex.Flow.StaveTie = new Vex.Flow.StaveTie({
- first_indices: [startNoteIndexInTie],
- first_note: vfStartNote
- });
- const measure1: VexFlowMeasure = (startNote.parentVoiceEntry.parentStaffEntry.parentMeasure as VexFlowMeasure);
- measure1.vfTies.push(vfTie1);
- const vfTie2: Vex.Flow.StaveTie = new Vex.Flow.StaveTie({
- last_indices: [endNoteIndexInTie],
- last_note: vfEndNote
- });
- const measure2: VexFlowMeasure = (endNote.parentVoiceEntry.parentStaffEntry.parentMeasure as VexFlowMeasure);
- measure2.vfTies.push(vfTie2);
- } else {
- // normal case
- const vfTie: Vex.Flow.StaveTie = new Vex.Flow.StaveTie({
- first_indices: [startNoteIndexInTie],
- first_note: vfStartNote,
- last_indices: [endNoteIndexInTie],
- last_note: vfEndNote
- });
- const measure: VexFlowMeasure = (endNote.parentVoiceEntry.parentStaffEntry.parentMeasure as VexFlowMeasure);
- measure.vfTies.push(vfTie);
- }
- }
- protected calculateDynamicExpressionsForMultiExpression(multiExpression: MultiExpression, measureIndex: number, staffIndex: number): void {
- if (measureIndex < EngravingRules.Rules.MinMeasureToDrawIndex || measureIndex > EngravingRules.Rules.MaxMeasureToDrawIndex) {
- return;
- // we do already use the min/max in MusicSheetCalculator.calculateDynamicsExpressions,
- // but this may be necessary for StaffLinkedExpressions, not tested.
- }
- // calculate absolute Timestamp
- const absoluteTimestamp: Fraction = multiExpression.AbsoluteTimestamp;
- const measures: GraphicalMeasure[] = this.graphicalMusicSheet.MeasureList[measureIndex];
- const staffLine: StaffLine = measures[staffIndex].ParentStaffLine;
- const startMeasure: GraphicalMeasure = measures[staffIndex];
- const startPosInStaffline: PointF2D = this.getRelativePositionInStaffLineFromTimestamp(
- absoluteTimestamp,
- staffIndex,
- staffLine,
- staffLine.isPartOfMultiStaffInstrument());
- const dynamicStartPosition: PointF2D = startPosInStaffline;
- if (startPosInStaffline.x <= 0) {
- dynamicStartPosition.x = startMeasure.beginInstructionsWidth + this.rules.RhythmRightMargin;
- }
- if (multiExpression.InstantaneousDynamic) {
- const graphicalInstantaneousDynamic: VexFlowInstantaneousDynamicExpression = new VexFlowInstantaneousDynamicExpression(
- multiExpression.InstantaneousDynamic,
- staffLine,
- startMeasure);
- this.calculateGraphicalInstantaneousDynamicExpression(graphicalInstantaneousDynamic, dynamicStartPosition);
- }
- if (multiExpression.StartingContinuousDynamic) {
- const continuousDynamic: ContinuousDynamicExpression = multiExpression.StartingContinuousDynamic;
- const graphicalContinuousDynamic: VexFlowContinuousDynamicExpression = new VexFlowContinuousDynamicExpression(
- multiExpression.StartingContinuousDynamic,
- staffLine);
- graphicalContinuousDynamic.StartMeasure = startMeasure;
- if (!graphicalContinuousDynamic.IsVerbal && continuousDynamic.EndMultiExpression) {
- try {
- this.calculateGraphicalContinuousDynamic(graphicalContinuousDynamic, dynamicStartPosition);
- } catch (e) {
- // TODO this sometimes fails when the measure range to draw doesn't include all the dynamic's measures, method needs to be adjusted
- // see calculateGraphicalContinuousDynamic(), also in MusicSheetCalculator.
- }
- } else if (graphicalContinuousDynamic.IsVerbal) {
- this.calculateGraphicalVerbalContinuousDynamic(graphicalContinuousDynamic, dynamicStartPosition);
- } else {
- log.warn("This continuous dynamic is not covered");
- }
- }
- }
- protected createMetronomeMark(metronomeExpression: InstantaneousTempoExpression): void {
- const vfStave: Vex.Flow.Stave = (this.graphicalMusicSheet.MeasureList[0][0] as VexFlowMeasure).getVFStave();
- //vfStave.addModifier(new Vex.Flow.StaveTempo( // needs Vexflow PR
- vfStave.setTempo(
- {
- bpm: metronomeExpression.TempoInBpm,
- dots: metronomeExpression.dotted,
- //duration: metronomeExpression.beatUnit
- duration: "q"
- },
- EngravingRules.Rules.MetronomeMarkYShift * unitInPixels);
- // -50, -30), 0); //needs Vexflow PR
- //.setShiftX(-50);
- (<any>vfStave.getModifiers()[vfStave.getModifiers().length - 1]).setShiftX(
- EngravingRules.Rules.MetronomeMarkXShift * unitInPixels
- );
- // TODO calculate bounding box of metronome mark instead of hacking skyline to fix lyricist collision
- const skyline: number[] = this.graphicalMusicSheet.MeasureList[0][0].ParentStaffLine.SkyLine;
- skyline[0] = Math.min(skyline[0], -4.5 + EngravingRules.Rules.MetronomeMarkYShift);
- // somehow this is called repeatedly in Clementi, so skyline[0] = Math.min instead of -=
- }
- /**
- * Calculate a single OctaveShift for a [[MultiExpression]].
- * @param sourceMeasure
- * @param multiExpression
- * @param measureIndex
- * @param staffIndex
- */
- protected calculateSingleOctaveShift(sourceMeasure: SourceMeasure, multiExpression: MultiExpression, measureIndex: number, staffIndex: number): void {
- // calculate absolute Timestamp and startStaffLine (and EndStaffLine if needed)
- const octaveShift: OctaveShift = multiExpression.OctaveShiftStart;
- const startTimeStamp: Fraction = octaveShift.ParentStartMultiExpression.Timestamp;
- const endTimeStamp: Fraction = octaveShift.ParentEndMultiExpression.Timestamp;
- const minMeasureToDrawIndex: number = EngravingRules.Rules.MinMeasureToDrawIndex;
- const maxMeasureToDrawIndex: number = EngravingRules.Rules.MaxMeasureToDrawIndex;
- let startStaffLine: StaffLine = this.graphicalMusicSheet.MeasureList[measureIndex][staffIndex].ParentStaffLine;
- if (startStaffLine === undefined) { // fix for rendering range set. all of these can probably done cleaner.
- startStaffLine = this.graphicalMusicSheet.MeasureList[minMeasureToDrawIndex][staffIndex].ParentStaffLine;
- }
- let endMeasure: GraphicalMeasure = undefined;
- if (octaveShift.ParentEndMultiExpression !== undefined) {
- endMeasure = this.graphicalMusicSheet.getGraphicalMeasureFromSourceMeasureAndIndex(octaveShift.ParentEndMultiExpression.SourceMeasureParent,
- staffIndex);
- } else {
- endMeasure = this.graphicalMusicSheet.getLastGraphicalMeasureFromIndex(staffIndex, true); // get last rendered measure
- }
- if (endMeasure.MeasureNumber > maxMeasureToDrawIndex + 1) { // octaveshift ends in measure not rendered
- endMeasure = this.graphicalMusicSheet.getLastGraphicalMeasureFromIndex(staffIndex, true);
- }
- let startMeasure: GraphicalMeasure = undefined;
- if (octaveShift.ParentEndMultiExpression !== undefined) {
- startMeasure = this.graphicalMusicSheet.getGraphicalMeasureFromSourceMeasureAndIndex(octaveShift.ParentStartMultiExpression.SourceMeasureParent,
- staffIndex);
- } else {
- startMeasure = this.graphicalMusicSheet.MeasureList[minMeasureToDrawIndex][staffIndex]; // first rendered measure
- }
- if (startMeasure.MeasureNumber < minMeasureToDrawIndex + 1) { // octaveshift starts before range of measures selected to render
- startMeasure = this.graphicalMusicSheet.MeasureList[minMeasureToDrawIndex][staffIndex]; // first rendered measure
- }
- if (startMeasure.MeasureNumber < minMeasureToDrawIndex + 1 ||
- startMeasure.MeasureNumber > maxMeasureToDrawIndex + 1 ||
- endMeasure.MeasureNumber < minMeasureToDrawIndex + 1 ||
- endMeasure.MeasureNumber > maxMeasureToDrawIndex + 1) {
- // octave shift completely out of drawing range, don't draw anything
- return;
- }
- let endStaffLine: StaffLine = endMeasure.ParentStaffLine;
- if (endStaffLine === undefined) {
- endStaffLine = startStaffLine;
- }
- if (endMeasure !== undefined && startStaffLine !== undefined && endStaffLine !== undefined) {
- // calculate GraphicalOctaveShift and RelativePositions
- const graphicalOctaveShift: VexFlowOctaveShift = new VexFlowOctaveShift(octaveShift, startStaffLine.PositionAndShape);
- if (graphicalOctaveShift.getStartNote() === undefined) { // fix for rendering range set
- graphicalOctaveShift.setStartNote(startMeasure.staffEntries[0]);
- }
- if (graphicalOctaveShift.getStartNote() === undefined) { // fix for rendering range set
- graphicalOctaveShift.setEndNote(endMeasure.staffEntries.last());
- }
- startStaffLine.OctaveShifts.push(graphicalOctaveShift);
- // calculate RelativePosition and Dashes
- let startStaffEntry: GraphicalStaffEntry = startMeasure.findGraphicalStaffEntryFromTimestamp(startTimeStamp);
- if (startStaffEntry === undefined) { // fix for rendering range set
- startStaffEntry = startMeasure.staffEntries[0];
- }
- let endStaffEntry: GraphicalStaffEntry = endMeasure.findGraphicalStaffEntryFromTimestamp(endTimeStamp);
- if (endStaffEntry === undefined) { // fix for rendering range set
- endStaffEntry = endMeasure.staffEntries[endMeasure.staffEntries.length - 1];
- }
- graphicalOctaveShift.setStartNote(startStaffEntry);
- if (endStaffLine !== startStaffLine) {
- graphicalOctaveShift.endsOnDifferentStaffLine = true;
- let lastMeasure: GraphicalMeasure = startStaffLine.Measures[startStaffLine.Measures.length - 1];
- if (lastMeasure === undefined) { // TODO handle this case correctly (when drawUpToMeasureNumber etc set)
- lastMeasure = endMeasure;
- }
- const lastNote: GraphicalStaffEntry = lastMeasure.staffEntries[lastMeasure.staffEntries.length - 1];
- graphicalOctaveShift.setEndNote(lastNote);
- // Now finish the shift on the next line
- const remainingOctaveShift: VexFlowOctaveShift = new VexFlowOctaveShift(octaveShift, endMeasure.PositionAndShape);
- endStaffLine.OctaveShifts.push(remainingOctaveShift);
- let firstMeasure: GraphicalMeasure = endStaffLine.Measures[0];
- if (firstMeasure === undefined) { // TODO handle this case correctly (when drawUpToMeasureNumber etc set)
- firstMeasure = startMeasure;
- }
- const firstNote: GraphicalStaffEntry = firstMeasure.staffEntries[0];
- remainingOctaveShift.setStartNote(firstNote);
- remainingOctaveShift.setEndNote(endStaffEntry);
- } else {
- graphicalOctaveShift.setEndNote(endStaffEntry);
- }
- } else {
- log.warn("End measure or staffLines for octave shift are undefined! This should not happen!");
- }
- }
- /**
- * Calculate all the textual and symbolic [[RepetitionInstruction]]s (e.g. dal segno) for a single [[SourceMeasure]].
- * @param repetitionInstruction
- * @param measureIndex
- */
- protected calculateWordRepetitionInstruction(repetitionInstruction: RepetitionInstruction, measureIndex: number): void {
- // find first visible StaffLine
- let uppermostMeasure: VexFlowMeasure = undefined;
- const measures: VexFlowMeasure[] = <VexFlowMeasure[]>this.graphicalMusicSheet.MeasureList[measureIndex];
- for (let idx: number = 0, len: number = measures.length; idx < len; ++idx) {
- const graphicalMeasure: VexFlowMeasure = measures[idx];
- if (graphicalMeasure.ParentStaffLine !== undefined && graphicalMeasure.ParentStaff.ParentInstrument.Visible) {
- uppermostMeasure = <VexFlowMeasure>graphicalMeasure;
- break;
- }
- }
- // ToDo: feature/Repetitions
- // now create corresponding graphical symbol or Text in VexFlow:
- // use top measure and staffline for positioning.
- if (uppermostMeasure !== undefined) {
- uppermostMeasure.addWordRepetition(repetitionInstruction);
- }
- }
- protected calculateMoodAndUnknownExpression(multiExpression: MultiExpression, measureIndex: number, staffIndex: number): void {
- return;
- }
- /**
- * Re-adjust the x positioning of expressions. Update the skyline afterwards
- */
- protected calculateExpressionAlignements(): void {
- for (const musicSystem of this.musicSystems) {
- for (const staffLine of musicSystem.StaffLines) {
- try {
- (<VexFlowStaffLine>staffLine).AlignmentManager.alignDynamicExpressions();
- staffLine.AbstractExpressions.forEach(ae => ae.updateSkyBottomLine());
- } catch (e) {
- // TODO still necessary when calculation of expression fails, see calculateDynamicExpressionsForMultiExpression()
- // see calculateGraphicalContinuousDynamic(), also in MusicSheetCalculator.
- }
- }
- }
- }
- /**
- * Check if the tied graphical note belongs to any beams or tuplets and react accordingly.
- * @param tiedGraphicalNote
- * @param beams
- * @param activeClef
- * @param octaveShiftValue
- * @param graphicalStaffEntry
- * @param duration
- * @param openTie
- * @param isLastTieNote
- */
- protected handleTiedGraphicalNote(tiedGraphicalNote: GraphicalNote, beams: Beam[], activeClef: ClefInstruction,
- octaveShiftValue: OctaveEnum, graphicalStaffEntry: GraphicalStaffEntry, duration: Fraction,
- openTie: Tie, isLastTieNote: boolean): void {
- return;
- }
- /**
- * Is called if a note is part of a beam.
- * @param graphicalNote
- * @param beam
- * @param openBeams a list of all currently open beams
- */
- protected handleBeam(graphicalNote: GraphicalNote, beam: Beam, openBeams: Beam[]): void {
- (graphicalNote.parentVoiceEntry.parentStaffEntry.parentMeasure as VexFlowMeasure).handleBeam(graphicalNote, beam);
- }
- protected handleVoiceEntryLyrics(voiceEntry: VoiceEntry, graphicalStaffEntry: GraphicalStaffEntry, lyricWords: LyricWord[]): void {
- voiceEntry.LyricsEntries.forEach((key: number, lyricsEntry: LyricsEntry) => {
- const graphicalLyricEntry: GraphicalLyricEntry = new GraphicalLyricEntry(lyricsEntry,
- graphicalStaffEntry,
- this.rules.LyricsHeight,
- this.rules.StaffHeight);
- graphicalStaffEntry.LyricsEntries.push(graphicalLyricEntry);
- // create corresponding GraphicalLabel
- const graphicalLabel: GraphicalLabel = graphicalLyricEntry.GraphicalLabel;
- graphicalLabel.setLabelPositionAndShapeBorders();
- if (lyricsEntry.Word !== undefined) {
- const lyricsEntryIndex: number = lyricsEntry.Word.Syllables.indexOf(lyricsEntry);
- let index: number = lyricWords.indexOf(lyricsEntry.Word);
- if (index === -1) {
- lyricWords.push(lyricsEntry.Word);
- index = lyricWords.indexOf(lyricsEntry.Word);
- }
- if (this.graphicalLyricWords.length === 0 || index > this.graphicalLyricWords.length - 1) {
- const graphicalLyricWord: GraphicalLyricWord = new GraphicalLyricWord(lyricsEntry.Word);
- graphicalLyricEntry.ParentLyricWord = graphicalLyricWord;
- graphicalLyricWord.GraphicalLyricsEntries[lyricsEntryIndex] = graphicalLyricEntry;
- this.graphicalLyricWords.push(graphicalLyricWord);
- } else {
- const graphicalLyricWord: GraphicalLyricWord = this.graphicalLyricWords[index];
- graphicalLyricEntry.ParentLyricWord = graphicalLyricWord;
- graphicalLyricWord.GraphicalLyricsEntries[lyricsEntryIndex] = graphicalLyricEntry;
- if (graphicalLyricWord.isFilled()) {
- lyricWords.splice(index, 1);
- this.graphicalLyricWords.splice(this.graphicalLyricWords.indexOf(graphicalLyricWord), 1);
- }
- }
- }
- });
- }
- protected handleVoiceEntryOrnaments(ornamentContainer: OrnamentContainer, voiceEntry: VoiceEntry, graphicalStaffEntry: GraphicalStaffEntry): void {
- return;
- }
- /**
- * Add articulations to the given vexflow staff entry.
- * @param articulations
- * @param voiceEntry
- * @param graphicalStaffEntry
- */
- protected handleVoiceEntryArticulations(articulations: ArticulationEnum[],
- voiceEntry: VoiceEntry, staffEntry: GraphicalStaffEntry): void {
- // uncomment this when implementing:
- // let vfse: VexFlowStaffEntry = (graphicalStaffEntry as VexFlowStaffEntry);
- return;
- }
- /**
- * Add technical instructions to the given vexflow staff entry.
- * @param technicalInstructions
- * @param voiceEntry
- * @param staffEntry
- */
- protected handleVoiceEntryTechnicalInstructions(technicalInstructions: TechnicalInstruction[],
- voiceEntry: VoiceEntry, staffEntry: GraphicalStaffEntry): void {
- // uncomment this when implementing:
- // let vfse: VexFlowStaffEntry = (graphicalStaffEntry as VexFlowStaffEntry);
- return;
- }
- /**
- * Is called if a note is part of a tuplet.
- * @param graphicalNote
- * @param tuplet
- * @param openTuplets a list of all currently open tuplets
- */
- protected handleTuplet(graphicalNote: GraphicalNote, tuplet: Tuplet, openTuplets: Tuplet[]): void {
- (graphicalNote.parentVoiceEntry.parentStaffEntry.parentMeasure as VexFlowMeasure).handleTuplet(graphicalNote, tuplet);
- }
- /**
- * Find the Index of the item of the array of all VexFlow Slurs that holds a specified slur
- * @param gSlurs
- * @param slur
- */
- public findIndexGraphicalSlurFromSlur(gSlurs: GraphicalSlur[], slur: Slur): number {
- for (let slurIndex: number = 0; slurIndex < gSlurs.length; slurIndex++) {
- if (gSlurs[slurIndex].slur === slur) {
- return slurIndex;
- }
- }
- return -1;
- }
- /* VexFlow Version - for later use
- public findIndexVFSlurFromSlur(vfSlurs: VexFlowSlur[], slur: Slur): number {
- for (let slurIndex: number = 0; slurIndex < vfSlurs.length; slurIndex++) {
- if (vfSlurs[slurIndex].vfSlur === slur) {
- return slurIndex;
- }
- }
- }
- */
- // Generate all Graphical Slurs and attach them to the staffline
- protected calculateSlurs(): void {
- const openSlursDict: { [staffId: number]: GraphicalSlur[]; } = {};
- for (const graphicalMeasure of this.graphicalMusicSheet.MeasureList[0]) { //let i: number = 0; i < this.graphicalMusicSheet.MeasureList[0].length; i++) {
- openSlursDict[graphicalMeasure.ParentStaff.idInMusicSheet] = [];
- }
- /* VexFlow Version - for later use
- // Generate an empty dictonary to index an array of VexFlowSlur classes
- const vfOpenSlursDict: { [staffId: number]: VexFlowSlur[]; } = {}; //VexFlowSlur[]; } = {};
- // use first SourceMeasure to get all graphical measures to know how many staves are currently visible in this musicsheet
- // foreach stave: create an empty array. It can later hold open slurs.
- // Measure how many staves are visible and reserve space for them.
- for (const graphicalMeasure of this.graphicalMusicSheet.MeasureList[0]) { //let i: number = 0; i < this.graphicalMusicSheet.MeasureList[0].length; i++) {
- vfOpenSlursDict[graphicalMeasure.ParentStaff.idInMusicSheet] = [];
- }
- */
- for (const musicSystem of this.musicSystems) {
- for (const staffLine of musicSystem.StaffLines) {
- // if a graphical slur reaches out of the last musicsystem, we have to create another graphical slur reaching into this musicsystem
- // (one slur needs 2 graphical slurs)
- const openGraphicalSlurs: GraphicalSlur[] = openSlursDict[staffLine.ParentStaff.idInMusicSheet];
- for (let slurIndex: number = 0; slurIndex < openGraphicalSlurs.length; slurIndex++) {
- const oldGSlur: GraphicalSlur = openGraphicalSlurs[slurIndex];
- const newGSlur: GraphicalSlur = new GraphicalSlur(oldGSlur.slur); //Graphicalslur.createFromSlur(oldSlur);
- staffLine.addSlurToStaffline(newGSlur); // every VFSlur is added to the array in the VFStaffline!
- openGraphicalSlurs[slurIndex] = newGSlur;
- }
- /* VexFlow Version - for later use
- const vfOpenSlurs: VexFlowSlur[] = vfOpenSlursDict[staffLine.ParentStaff.idInMusicSheet];
- const vfStaffLine: VexFlowStaffLine = <VexFlowStaffLine> staffLine;
- for (let slurIndex: number = 0; slurIndex < vfOpenSlurs.length; slurIndex++) {
- const oldVFSlur: VexFlowSlur = vfOpenSlurs[slurIndex];
- const newVFSlur: VexFlowSlur = VexFlowSlur.createFromVexflowSlur(oldVFSlur);
- newVFSlur.vfStartNote = undefined;
- vfStaffLine.addVFSlurToVFStaffline(newVFSlur); // every VFSlur is added to the array in the VFStaffline!
- vfOpenSlurs[slurIndex] = newVFSlur;
- }
- */
- // add reference of slur array to the VexFlowStaffline class
- for (const graphicalMeasure of staffLine.Measures) {
- for (const graphicalStaffEntry of graphicalMeasure.staffEntries) {
- // loop over "normal" notes (= no gracenotes)
- for (const graphicalVoiceEntry of graphicalStaffEntry.graphicalVoiceEntries) {
- for (const graphicalNote of graphicalVoiceEntry.notes) {
- for (const slur of graphicalNote.sourceNote.NoteSlurs) {
- // extra check for some MusicSheets that have openSlurs (because only the first Page is available -> Recordare files)
- if (slur.EndNote === undefined || slur.StartNote === undefined) {
- continue;
- }
- // add new VexFlowSlur to List
- if (slur.StartNote === graphicalNote.sourceNote) {
- if (graphicalNote.sourceNote.NoteTie !== undefined) {
- if (graphicalNote.parentVoiceEntry.parentStaffEntry.getAbsoluteTimestamp() !==
- graphicalNote.sourceNote.NoteTie.StartNote.getAbsoluteTimestamp()) {
- break;
- }
- }
- // Add a Graphical Slur to the staffline, if the recent note is the Startnote of a slur
- const gSlur: GraphicalSlur = new GraphicalSlur(slur);
- openGraphicalSlurs.push(gSlur);
- staffLine.addSlurToStaffline(gSlur);
- /* VexFlow Version - for later use
- const vfSlur: VexFlowSlur = new VexFlowSlur(slur);
- vfOpenSlurs.push(vfSlur); //add open... adding / removing is JUST DONE in the open... array
- vfSlur.vfStartNote = (graphicalVoiceEntry as VexFlowVoiceEntry).vfStaveNote;
- vfStaffLine.addVFSlurToVFStaffline(vfSlur); // every VFSlur is added to the array in the VFStaffline!
- */
- }
- if (slur.EndNote === graphicalNote.sourceNote) {
- // Remove the Graphical Slur from the staffline if the note is the Endnote of a slur
- const index: number = this.findIndexGraphicalSlurFromSlur(openGraphicalSlurs, slur);
- if (index >= 0) {
- // save Voice Entry in VFSlur and then remove it from array of open VFSlurs
- const gSlur: GraphicalSlur = openGraphicalSlurs[index];
- if (gSlur.staffEntries.indexOf(graphicalStaffEntry) === -1) {
- gSlur.staffEntries.push(graphicalStaffEntry);
- }
- openGraphicalSlurs.splice(index, 1);
- }
- /* VexFlow Version - for later use
- const vfIndex: number = this.findIndexVFSlurFromSlur(vfOpenSlurs, slur);
- if (vfIndex !== undefined) {
- // save Voice Entry in VFSlur and then remove it from array of open VFSlurs
- const vfSlur: VexFlowSlur = vfOpenSlurs[vfIndex];
- vfSlur.vfEndNote = (graphicalVoiceEntry as VexFlowVoiceEntry).vfStaveNote;
- vfSlur.createVexFlowCurve();
- vfOpenSlurs.splice(vfIndex, 1);
- }
- */
- }
- }
- }
- }
- //add the present Staffentry to all open slurs that don't contain this Staffentry already
- for (const gSlur of openGraphicalSlurs) {
- if (gSlur.staffEntries.indexOf(graphicalStaffEntry) === -1) {
- gSlur.staffEntries.push(graphicalStaffEntry);
- }
- }
- } // loop over StaffEntries
- } // loop over Measures
- } // loop over StaffLines
- // Attach vfSlur array to the vfStaffline to be drawn
- //vfStaffLine.SlursInVFStaffLine = vfSlurs;
- } // loop over MusicSystems
- // order slurs that were saved to the Staffline
- for (const musicSystem of this.musicSystems) {
- for (const staffLine of musicSystem.StaffLines) {
- // Sort all gSlurs in the staffline using the Compare function in class GraphicalSlurSorter
- const sortedGSlurs: GraphicalSlur[] = staffLine.GraphicalSlurs.sort(GraphicalSlur.Compare);
- for (const gSlur of sortedGSlurs) {
- // crossed slurs will be handled later:
- if (gSlur.slur.isCrossed()) {
- continue;
- }
- gSlur.calculateCurve(this.rules);
- }
- }
- }
- }
- }
|