mirror of
https://github.com/mozilla/pdf.js.git
synced 2025-04-28 23:28:16 +02:00
XFA - Fix text positions (bug 1718741)
- font line height is taken into account by acrobat when it isn't with masterpdfeditor: I extracted a font from a pdf, modified some ascent/descent properties thanks to ttx and the reinjected the font in the pdf: only Acrobat is taken it into account. So in this patch, line heights for some substituted fonts are added. - it seems that Acrobat is using a line height of 1.2 when the line height in the font is not enough (it's the only way I found to fix correctly bug 1718741). - don't use flex in wrapper container (which was causing an horizontal overflow in the above bug). - consequently, the above fixes introduced a lot of small regressions, so in order to see real improvements on reftests, I fixed the regressions in this patch: - replace margin by padding in some case where padding is a part of a container dimensions; - remove some flex display: some containers are wrongly sized when rendered; - set letter-spacing to 0.01px: it helps to be sure that text is not broken because of not enough width in Firefox.
This commit is contained in:
parent
0afc785c7d
commit
58e1f51688
15 changed files with 220 additions and 103 deletions
|
@ -84,7 +84,13 @@ const StyleMapping = new Map([
|
|||
],
|
||||
["xfa-spacerun", ""],
|
||||
["xfa-tab-stops", ""],
|
||||
["font-size", value => measureToString(getMeasurement(value))],
|
||||
[
|
||||
"font-size",
|
||||
(value, original) => {
|
||||
value = original.fontSize = getMeasurement(value);
|
||||
return measureToString(0.99 * value);
|
||||
},
|
||||
],
|
||||
["letter-spacing", value => measureToString(getMeasurement(value))],
|
||||
["line-height", value => measureToString(getMeasurement(value))],
|
||||
["margin", value => measureToString(getMeasurement(value))],
|
||||
|
@ -104,6 +110,7 @@ function mapStyle(styleStr, fontFinder) {
|
|||
if (!styleStr) {
|
||||
return style;
|
||||
}
|
||||
const original = Object.create(null);
|
||||
for (const [key, value] of styleStr.split(";").map(s => s.split(":", 2))) {
|
||||
const mapping = StyleMapping.get(key);
|
||||
if (mapping === "") {
|
||||
|
@ -114,7 +121,7 @@ function mapStyle(styleStr, fontFinder) {
|
|||
if (typeof mapping === "string") {
|
||||
newValue = mapping;
|
||||
} else {
|
||||
newValue = mapping(value, fontFinder);
|
||||
newValue = mapping(value, original);
|
||||
}
|
||||
}
|
||||
if (key.endsWith("scale")) {
|
||||
|
@ -135,6 +142,7 @@ function mapStyle(styleStr, fontFinder) {
|
|||
typeface: style.fontFamily,
|
||||
weight: style.fontWeight || "normal",
|
||||
posture: style.fontStyle || "normal",
|
||||
size: original.fontSize || 0,
|
||||
},
|
||||
fontFinder,
|
||||
style
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue