mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-26 10:08:06 +02:00
Code Activity

Merge pull request #14428 from calixteman/typo

Browse source 
Use the correct dimension to know if we have to add an EOL in vertical mode
This commit is contained in:
calixteman 2022-01-15 12:47:10 -08:00 • committed by GitHub
commit da953f4b64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/core/evaluator.js
View file

@ -2175,7 +2175,6 @@ class PartialEvaluator {
stateManager = stateManager || new StateManager(new TextState());
const WhitespaceRegexp = /\s/g;
const DiacriticRegExp = new RegExp("^\\p{Mn}$", "u");
const NormalizedUnicodes = getNormalizedUnicodes();
const textContent = {
@ -2480,7 +2479,7 @@ class PartialEvaluator {
return;
}
if (Math.abs(advanceX) > textContentItem.height) {
if (Math.abs(advanceX) > textContentItem.width) {
appendEOL();
return;
}
@ -2576,6 +2575,7 @@ class PartialEvaluator {
const glyphs = font.charsToGlyphs(chars);
const scale = textState.fontMatrix[0] * textState.fontSize;
for (let i = 0, ii = glyphs.length; i < ii; i++) {
const glyph = glyphs[i];
let charSpacing =
@ -2587,13 +2587,12 @@ class PartialEvaluator {
}
let scaledDim = glyphWidth * scale;
let glyphUnicode = glyph.unicode;
if (
glyphUnicode === " " &&
glyph.isWhitespace &&
(i === 0 ||
i + 1 === ii ||
glyphs[i - 1].unicode === " " ||
glyphs[i + 1].unicode === " " ||
glyphs[i - 1].isWhitespace ||
glyphs[i + 1].isWhitespace ||
extraSpacing)
) {
// Don't push a " " in the textContentItem
@ -2616,10 +2615,12 @@ class PartialEvaluator {
compareWithLastPosition();
let glyphUnicode = glyph.unicode;
// Must be called after compareWithLastPosition because
// the textContentItem could have been flushed.
const textChunk = ensureTextContentItem();
if (DiacriticRegExp.test(glyph.unicode)) {
if (glyph.isDiacritic) {
scaledDim = 0;
}