Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed problem with multiple morae (issue #71) #72

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Fixed problem with multiple morae (issue #71) #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7b18766
Fixed problem with multiple morae (issue #71)
Jun 1, 2016
241cd66
changed == to ===
Jun 1, 2016
e2bb282
Merge remote-tracking branch 'origin/master' into feature/fix-double-…
Jun 3, 2016
d548d55
Fixed horizontal offset when the second note of the clivis is more th…
Jun 3, 2016
b20e117
Merge remote-tracking branch 'origin/master' into feature/fix-double-…
Jun 30, 2016
b479265
Merge remote-tracking branch 'origin/master' into feature/fix-double-…
Jul 10, 2016
2f77e0a
fixed single mora after clivis
Jul 25, 2016
e0853ad
Fixed double mora at the end of a Porrectus Flexus, Salicus Flexus, a…
Jan 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Exsurge.Chant.Markings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ export class Mora extends GlyphVisualizer {
super(ctxt, GlyphCode.Mora);
this.note = note;
this.positionHint = MarkingPositionHint.Default;
this.horizontalOffset = 0;
}

performLayout(ctxt) {
Expand All @@ -243,7 +244,7 @@ export class Mora extends GlyphVisualizer {
verticalOffset -= ctxt.staffInterval * .75;
}

this.bounds.x += this.note.bounds.right() + ctxt.staffInterval / 4.0;
this.bounds.x += this.horizontalOffset + this.note.bounds.right() + ctxt.staffInterval / 4.0;
this.bounds.y += verticalOffset;
}
}
Expand Down
191 changes: 75 additions & 116 deletions src/Exsurge.Chant.Neumes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,57 @@ export class Neume extends ChantNotationElement {
return new NeumeBuilder(ctxt, this);
}

// for any subclasses that basically end with a clivis, they can call this from their positionMarkings()
positionClivisMarkings() {
var mark, i, hasTopEpisema = false;

// 1. morae need to be lined up if both notes have morae
// 2. like the podatus, mora on lower note needs to below
// under certain circumstances
var lastNote = this.notes[this.notes.length - 1];
var penultimateNote = this.notes[this.notes.length - 2];
var antepenult = this.notes[this.notes.length - 3]; // may not exist
if (lastNote.morae.length) {
var morae = lastNote.morae;
if(morae.length > 1) morae[0].horizontalOffset += lastNote.bounds.right() - penultimateNote.bounds.right();
if(penultimateNote.staffPosition - lastNote.staffPosition === 1 &&
Math.abs(lastNote.staffPosition % 2) === 1) {
morae.slice(-1)[0].positionHint = MarkingPositionHint.Below;
}
}


// first do the penultimate (highest) note to see if we should try to move
// episemata on the other lower note(s)
for (i = 0; i < penultimateNote.epismata.length; i++) {
mark = penultimateNote.epismata[i];

if (mark.positionHint === MarkingPositionHint.Default) {
mark.positionHint = MarkingPositionHint.Above;
hasTopEpisema = true;
}
}

// 1. episema on lower notes should be below, upper note above
// 2. like the podatus, mora on lower note needs to below
// under certain circumstances
for (i = 0; i < lastNote.epismata.length; i++) {
mark = lastNote.epismata[i];

if (mark.positionHint === MarkingPositionHint.Default)
mark.positionHint = hasTopEpisema ? MarkingPositionHint.Above : MarkingPositionHint.Below;
}

if(antepenult) {
for (i = 0; i < antepenult.epismata.length; i++) {
mark = antepenult.epismata[i];

if (mark.positionHint === MarkingPositionHint.Default)
mark.positionHint = hasTopEpisema ? MarkingPositionHint.Above : MarkingPositionHint.Below;
}
}
}

// subclasses can override this in order to correctly place markings in a neume specific way
positionMarkings() {

Expand Down Expand Up @@ -560,43 +611,7 @@ export class Climacus extends Neume {
export class Clivis extends Neume {

positionMarkings() {

var hasLowerMora = false;
var mark, i;

// 1. morae need to be lined up if both notes have morae
// 2. like the podatus, mora on lower note needs to below
// under certain circumstances
for (i = 0; i < this.notes[1].morae.length; i++) {
mark = this.notes[1].morae[i];

if (this.notes[0].staffPosition - this.notes[1].staffPosition === 1 &&
Math.abs(this.notes[1].staffPosition % 2) === 1)
mark.positionHint = MarkingPositionHint.Below;
}

for (i = 0; i < this.notes[0].morae.length; i++) {

if (hasLowerMora) {
mark = this.notes[0].morae[i];
mark.positionHint = MarkingPositionHint.Above;
mark.horizontalOffset += this.notes[1].bounds.right() - this.notes[0].bounds.right();
}
}

for (i = 0; i < this.notes[0].epismata.length; i++) {
mark = this.notes[0].epismata[i];

if (mark.positionHint === MarkingPositionHint.Default)
mark.positionHint = MarkingPositionHint.Above;
}

for (i = 0; i < this.notes[1].epismata.length; i++) {
mark = this.notes[1].epismata[i];

if (mark.positionHint === MarkingPositionHint.Default)
mark.positionHint = MarkingPositionHint.Above;
}
this.positionClivisMarkings();
}

performLayout(ctxt) {
Expand Down Expand Up @@ -795,16 +810,16 @@ export class Podatus extends Neume {
if (this.notes[0].epismata[i].positionHint === MarkingPositionHint.Default)
this.notes[0].epismata[i].positionHint = MarkingPositionHint.Below;

// if this note has two or more (!?) morae then we just leave them be
// since they have already been assigned position hints.
if (this.notes[0].morae.length < 2) {
for (i = 0; i < this.notes[0].morae.length; i++) {
marking = this.notes[0].morae[i];

if ((this.notes[1].staffPosition - this.notes[0].staffPosition) === 1 &&
Math.abs(this.notes[0].staffPosition % 2) === 1)
marking.positionHint = MarkingPositionHint.Below;
// The mora on the first (lower) note needs to be below it, if the second note
// is only one pitch above, and the first note is on a line.
if (this.notes[1].staffPosition - this.notes[0].staffPosition === 1 &&
Math.abs(this.notes[0].staffPosition % 2) === 1) {
if (this.notes[0].morae.length === 1) {
marking = this.notes[0].morae[0];
} else if (this.notes[1].morae.length > 1) {
marking = this.notes[1].morae[0];
}
if(marking) marking.positionHint = MarkingPositionHint.Below;
}

for (i = 0; i < this.notes[1].epismata.length; i++)
Expand Down Expand Up @@ -856,6 +871,10 @@ export class Porrectus extends Neume {
*/
export class PorrectusFlexus extends Neume {

positionMarkings() {
this.positionClivisMarkings();
}

performLayout(ctxt) {
super.performLayout(ctxt);

Expand Down Expand Up @@ -1010,14 +1029,7 @@ export class Salicus extends Neume {
export class SalicusFlexus extends Neume {

positionMarkings() {
var marking, i, j;

// by default place episema below
// fixme: is this correct?
for (i = 0; i < this.notes.length; i++)
for (j = 0; j < this.notes[i].epismata.length; j++)
if (this.notes[i].epismata[j].positionHint === MarkingPositionHint.Default)
this.notes[i].epismata[j].positionHint = MarkingPositionHint.Below;
this.positionClivisMarkings();
}

performLayout(ctxt) {
Expand Down Expand Up @@ -1176,35 +1188,7 @@ export class ScandicusFlexus extends Neume {
export class Torculus extends Neume {

positionMarkings() {
var marking, i;
var hasMiddleEpisema = false;

// first do the middle note to see if we should try to move
// epismata on the other two lower notes
for (i = 0; i < this.notes[1].epismata.length; i++) {
marking = this.notes[1].epismata[i];

if (marking.positionHint === MarkingPositionHint.Default) {
marking.positionHint = MarkingPositionHint.Above;
hasMiddleEpisema = true;
}
}

// 1. episema on lower notes should be below, upper note above
// 2. morae: fixme: implement
for (i = 0; i < this.notes[0].epismata.length; i++) {
marking = this.notes[0].epismata[i];

if (marking.positionHint === MarkingPositionHint.Default)
marking.positionHint = hasMiddleEpisema ? MarkingPositionHint.Above : MarkingPositionHint.Below;
}

for (i = 0; i < this.notes[2].epismata.length; i++) {
marking = this.notes[2].epismata[i];

if (marking.positionHint === MarkingPositionHint.Default)
marking.positionHint = hasMiddleEpisema ? MarkingPositionHint.Above : MarkingPositionHint.Below;
}
this.positionClivisMarkings();
}

performLayout(ctxt) {
Expand Down Expand Up @@ -1322,49 +1306,24 @@ export class TorculusResupinus extends Neume {
export class TorculusResupinusFlexus extends Neume {

positionMarkings() {
var marking, i;
var hasMiddleEpisema = false;

// first do the middle note to see if we should try to move
// epismata on the other two lower notes
for (i = 0; i < this.notes[1].epismata.length; i++) {
marking = this.notes[1].epismata[i];

if (marking.positionHint === MarkingPositionHint.Default) {
marking.positionHint = MarkingPositionHint.Above;
hasMiddleEpisema = true;
}
}

var mark, i;

this.positionClivisMarkings();

// 1. episema on lower notes should be below, upper note above
// 2. morae: fixme: implement
for (i = 0; i < this.notes[0].epismata.length; i++) {
marking = this.notes[0].epismata[i];

if (marking.positionHint === MarkingPositionHint.Default)
marking.positionHint = hasMiddleEpisema ? MarkingPositionHint.Above : MarkingPositionHint.Below;
marking.positionHint = MarkingPositionHint.Below;
}

for (i = 0; i < this.notes[2].epismata.length; i++) {
marking = this.notes[2].epismata[i];

if (marking.positionHint === MarkingPositionHint.Default)
marking.positionHint = hasMiddleEpisema ? MarkingPositionHint.Above : MarkingPositionHint.Below;
}

for (i = 0; i < this.notes[3].epismata.length; i++) {
marking = this.notes[3].epismata[i];

if (marking.positionHint === MarkingPositionHint.Default)
marking.positionHint = MarkingPositionHint.Above;
}

for (i = 0; i < this.notes[4].epismata.length; i++) {
marking = this.notes[4].epismata[i];
for (i = 0; i < this.notes[1].epismata.length; i++) {
marking = this.notes[1].epismata[i];

if (marking.positionHint === MarkingPositionHint.Default)
marking.positionHint = MarkingPositionHint.Above;
}
}
}

performLayout(ctxt) {
Expand Down
12 changes: 4 additions & 8 deletions src/Exsurge.Gabc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,14 +969,10 @@ export class Gabc {
// position hint. if a user decides to try to put position indicators
// on the double morae (such as 1 or 2), then really the behavior is
// not defined by gabc, so it's on the user to figure it out.
if (note.morae.length > 0) {
// if we already have one mora, then create another but force a
// an alternative positionHint
haveLookahead = true;
if (Math.abs(note.staffPosition) % 2 === 0)
lookahead = '1';
else
lookahead = '0';
if (note.morae.length > 0 && notes.length) {
var previousNote = notes.slice(-1)[0];
var previousMora = note.morae.slice(-1)[0];
previousMora.note = previousNote;
}

mark = new Markings.Mora(ctxt, note);
Expand Down