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

Fix petaluma support #32

Merged
merged 3 commits into from
Apr 16, 2020
Merged

Fix petaluma support #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb942a5
fix undefined ref error (no arrowheadBlackRight bbox).
h-sug1no Apr 13, 2020
ae54c80
add cutOutOrigin_BBL checkbox to toggle cutOut anchors are relative t…
h-sug1no Apr 14, 2020
381fa3b
infodialog: save/restore scrollTop.
h-sug1no Apr 16, 2020
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
5 changes: 5 additions & 0 deletions docs/app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,11 @@
type="checkbox" />cutOutSW<span class="val"></span></label>
<label title="The Cartesian coordinates in staff spaces of the top left corner of a nominal rectangle that intersects the bottom right corner of the glyph's bounding box."><input
type="checkbox" />cutOutSE<span class="val"></span></label>
<label title="cutOut anchor points are relative to the:
unchecked: glyph origin.
checked: bottom left-hand corner of the glyph bounding box(old spec).
"><input
type="checkbox" />cutOutOrigin_BBL<span class="val"></span></label>
<label title="The Cartesian coordinates in staff spaces of the position at which the glyph graceNoteSlashStemUp should be positioned relative to the stem-up flag of an unbeamed grace note; alternatively, the bottom left corner of a diagonal line drawn instead of using the above glyph."><input
type="checkbox" />graceNoteSlashSW<span class="val"></span></label>
<label title="The Cartesian coordinates in staff spaces of the top right corner of a diagonal line drawn instead of using the glyph graceNoteSlashStemUp for a stem-up flag of an unbeamed grace note."><input
Expand Down
4 changes: 4 additions & 0 deletions docs/ssrenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ class SSRenderer {
const ast = dCtx.toScreenCSX(that.engravingDefaults.arrowShaftThickness);
const glyphData = util._getGlyphData('arrowheadBlackRight');
const m = util._measureGlyph(glyphData, 0, 0, dCtx.sbl);
if (!m.scaledBBox) {
console.warn('no arrowheadBlackRight bbox.');
return;
}
ctx.save();
ctx.lineWidth = ast;
ctx.beginPath();
Expand Down
42 changes: 34 additions & 8 deletions docs/viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,10 @@ class SMuFLFontViewer {
const hintLabel = hintLabels[li];
hintLabel.id = toHintlabelIdStr(hintLabel.textContent);
const inputElm = hintLabel.firstElementChild;
inputElm.checked = true;

if (!hintLabel.textContent.startsWith('cutOutOrigin_BBL')) {
inputElm.checked = true;
}

const isIndeterminate = hintLabel.textContent.startsWith('stem') ||
hintLabel.textContent.startsWith('splitStem') ||
Expand All @@ -187,6 +190,9 @@ class SMuFLFontViewer {
const $smuflGlyphHints_repatOffset3StateBox =
$smuflGlyphHints.find('#' + toHintlabelIdStr('repeatOffset') + ' input');

const $smuflGlyphHints_cutOutOrigin_BBL =
$smuflGlyphHints.find('#' + toHintlabelIdStr('cutOutOrigin_BBL') + ' input');

var c = document.getElementById('smuflGlyphCanvas');
var ctx = c.getContext('2d');

Expand Down Expand Up @@ -287,8 +293,10 @@ class SMuFLFontViewer {
$body.addClass('fakeDialogVisible');
$dialogTitle.text(title);
$contentContainer.prop('title', description);
$body.scrollTop($contentContainer.$contentDom.prevScrollTop||0);
};
infoDialogElm.close = function() {
$contentContainer.$contentDom.prevScrollTop = $body.scrollTop();
$body.removeClass('fakeDialogVisible');
$contentContainer.prop('title', '');
document.body.scrollIntoView(); // reset vertical scroll position.
Expand Down Expand Up @@ -504,12 +512,13 @@ class SMuFLFontViewer {
function _$infoDialog_showModal(key, func) {
let $contentDom = _$infoDialog_contentDoms[key];
if (!$contentDom) {
$contentDom = _$infoDialog_contentDoms[key] = $('<div></div>');
$contentDom = _$infoDialog_contentDoms[key] = $('<div class="infoDialogContents"></div>');
func($contentDom);
}
const contentDomElm = $contentDom.get(0);
$contentContainer.empty();
$contentContainer.append($contentDom);
$contentContainer.$contentDom = $contentDom;
$infoDialog.get(0).showModal(key);

if (contentDomElm.dlRepaint) {
Expand Down Expand Up @@ -855,10 +864,10 @@ class SMuFLFontViewer {
return val * sbl;
}

function _anchorCsToScreenCs(scaledBBox, anchor, sbl) {
function _anchorCsToScreenCs(scaledBBox, anchor, sbl, relativeToBBL) {
return {
x: scaledBBox.x + anchorCsToScreenCsX(Number(anchor[0]), sbl),
y: scaledBBox.y + anchorCsToScreenCsY(Number(anchor[1]), sbl)
x: (relativeToBBL ? scaledBBox.W : scaledBBox.x) + anchorCsToScreenCsX(Number(anchor[0]), sbl),
y: (relativeToBBL ? scaledBBox.S : scaledBBox.y) + anchorCsToScreenCsY(Number(anchor[1]), sbl)
};
}

Expand All @@ -872,7 +881,10 @@ class SMuFLFontViewer {
let w;
let h;
const sbl = scaledBBox.sbl;
let vals = _anchorCsToScreenCs(scaledBBox, anchor, sbl);
const isCutOut = akey.startsWith('cutOut');
const isCutOutOriginBBL = $smuflGlyphHints_cutOutOrigin_BBL.prop('checked');
let vals = _anchorCsToScreenCs(scaledBBox, anchor, sbl,
isCutOut && isCutOutOriginBBL);

// eslint-disable-next-line no-unused-vars
let halign = 'L';
Expand Down Expand Up @@ -911,9 +923,16 @@ class SMuFLFontViewer {
});
bbs[akey].vals = vals;
ctx.save();
if (akey.startsWith('cutOut')) {
ctx.fillStyle = '#cccccccc';
if (isCutOut) {
if (isCutOutOriginBBL) {
ctx.fillStyle = '#ccccd5cc';
}
else {
ctx.fillStyle = '#cccccccc';
}
ctx.fillRect(x, y, w, h);
ctx.fillStyle = '#44aaffcc';
_renderCross(vals.x, vals.y);
}
else if (akey.startsWith('splitStem') || akey.startsWith('stem') ||
akey.startsWith('numeral') || akey.startsWith('graceNoteSlash') || akey === 'repeatOffset' ||
Expand Down Expand Up @@ -1422,12 +1441,19 @@ class SMuFLFontViewer {
const anchors = sMuFLMetadata.fontMetadata().glyphsWithAnchors;
const anchor = anchors ? anchors[glyphname] : undefined;
hintLabels.hide();

let hasCutOut = false;
if (anchor) {
for (const key in anchor) {
hasCutOut |= key.startsWith('cutOut');
$smuflGlyphHints.children(`#${toHintlabelIdStr(key)}`).show();
}
}

if (hasCutOut) {
$smuflGlyphHints.children(`#${toHintlabelIdStr('cutOutOrigin_BBL')}`).show();
}

currentGlyphData = {
codepoint: codepoint,
glyphname: glyphname,
Expand Down