From da6a7f9ff0f279db97493224fb4b1fe7eb5a02d3 Mon Sep 17 00:00:00 2001 From: JulieBlanc Date: Thu, 22 Nov 2018 11:31:05 +0100 Subject: [PATCH] rename and clean baseline script --- .../js/{baseline.js => snap-text-baseline.js} | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) rename baseline/js/{baseline.js => snap-text-baseline.js} (95%) diff --git a/baseline/js/baseline.js b/baseline/js/snap-text-baseline.js similarity index 95% rename from baseline/js/baseline.js rename to baseline/js/snap-text-baseline.js index 63a016f..80a4376 100644 --- a/baseline/js/baseline.js +++ b/baseline/js/snap-text-baseline.js @@ -1,10 +1,7 @@ - function snapBaseline(config){ const baselineDoc = config.baseline; const strict = config.strict; - // 'true' = all the text elements snap strictly on the baseline (by default) - // 'false' = If the element have padding, it's not snap on the baseline const showBaseline = config.showBaseline; const elementBaseline = config.element; @@ -26,7 +23,6 @@ function snapBaseline(config){ /* baseline position + vertical Rythm of paragraphs */ const paragraph = 'p'; - // verticalRythm(paragraph, '', '', baselineDoc, strict); let baselinePosition = verticalRythm(paragraph, '', '', baselineDoc, strict); let baselinePositionCSS = ':root{ --pagedjs-baseline-position : -' + baselinePosition + 'px; }' addcss(baselinePositionCSS); @@ -51,7 +47,6 @@ function snapTextElement(elementSelector, baselinePosition, baselineDoc, strict) // do calculation on each tag element - // verticalRythm(elementSelector, '', '', baselineDoc, configStrict); let gapBaselineElem = verticalRythm(elementSelector, '', '', baselineDoc, configStrict); let newgapBaselineElem = gapBaselineElem - baselinePosition; @@ -65,7 +60,6 @@ function snapTextElement(elementSelector, baselinePosition, baselineDoc, strict) let allClasses = elem[i].classList; let elemId = elem[i].id; if(allClasses.length != 0 || elemId != ""){ - // verticalRythm(elementSelector, allClasses, elemId, baselineDoc, configStrict); let gapBaselineThisElem = verticalRythm(elementSelector, allClasses, elemId, baselineDoc, configStrict); let newgapBaselineThisElem = gapBaselineThisElem - baselinePosition; elem[i].style.top = newgapBaselineThisElem + "px"; @@ -122,8 +116,6 @@ ________________________________________________________________________________ function verticalRythm(elem, elemClass, elemId, base, strict){ let baseline = base; let configStrict = strict; - // let elemClass = elemClass; - // let elemId = elemId; /* render element */ let element = document.createElement(elem); @@ -134,7 +126,7 @@ function verticalRythm(elem, elemClass, elemId, base, strict){ /* get styles of the font */ let styles = getStyle(element); - /* get font metrics */ + /* get font metrics (unsing FontMetrics.js) */ const metrics = FontMetrics({ fontFamily: styles.fontFamily, fontWeight: styles.fontWeight, @@ -235,10 +227,7 @@ function verticalRythm(elem, elemClass, elemId, base, strict){ elementSpecificId.style.marginBottom = newMarginBottom + "px"; } - - - - + /* distance between baseline font and baseline document */ let gapBaseline = ((computedLineHeight + baseline*ceilLineHeight)/2) - (metrics.top * -1 * styles.fontSize); return gapBaseline; -- 2.22.0