XFA - Fix auto-sized fields (bug 1722030)

  - In order to better compute text fields size, use line height with no gaps (and consequently guessed height for text are slightly better in general).
  - Fix default background color in fields.

Author: calixteman

src/core/calibri_factors.js

@@ -81,7 +81,7 @@ const CalibriBoldFactors = [
   0.95794, 0.95794, 0.82616, 0.86513, 0.85162, 0.85162, 0.85162, 0.85162,
   0.91133, 0.85162, 0.79492, 0.79492, 0.79492, 0.79492, 0.91133, 0.79109,
 ];
-const CalibriBoldLineHeight = 1.2207;
+const CalibriBoldMetrics = { lineHeight: 1.2207, lineGap: 0.2207 };
 
 // Factors to rescale LiberationSans-BoldItalic.ttf to have the same
 // metrics as calibriz.ttf.
@@ -153,7 +153,7 @@ const CalibriBoldItalicFactors = [
   0.84548, 0.84548, 0.91133, 0.84548, 0.79492, 0.79492, 0.79492, 0.79492,
   0.91133, 0.74081,
 ];
-const CalibriBoldItalicLineHeight = 1.2207;
+const CalibriBoldItalicMetrics = { lineHeight: 1.2207, lineGap: 0.2207 };
 
 // Factors to rescale LiberationSans-Italic.ttf to have the same
 // metrics as calibrii.ttf.
@@ -223,7 +223,7 @@ const CalibriItalicFactors = [
   0.84153, 0.89453, 0.89453, 0.89453, 0.89453, 0.91133, 0.89453, 0.79004,
   0.79004, 0.79004, 0.79004, 0.91133, 0.75026,
 ];
-const CalibriItalicLineHeight = 1.2207;
+const CalibriItalicMetrics = { lineHeight: 1.2207, lineGap: 0.2207 };
 
 // Factors to rescale LiberationSans-Regular.ttf to have the same
 // metrics as calibri.ttf.
@@ -294,15 +294,15 @@ const CalibriRegularFactors = [
   0.83969, 0.90527, 0.90527, 0.90527, 0.90527, 0.91133, 0.90527, 0.79004,
   0.79004, 0.79004, 0.79004, 0.91133, 0.78848,
 ];
-const CalibriRegularLineHeight = 1.2207;
+const CalibriRegularMetrics = { lineHeight: 1.2207, lineGap: 0.2207 };
 
 export {
   CalibriBoldFactors,
   CalibriBoldItalicFactors,
-  CalibriBoldItalicLineHeight,
-  CalibriBoldLineHeight,
+  CalibriBoldItalicMetrics,
+  CalibriBoldMetrics,
   CalibriItalicFactors,
-  CalibriItalicLineHeight,
+  CalibriItalicMetrics,
   CalibriRegularFactors,
-  CalibriRegularLineHeight,
+  CalibriRegularMetrics,
 };

src/core/evaluator.js

@@ -3924,7 +3924,7 @@ class PartialEvaluator {
       const standardFontName = getXfaFontName(fontName.name);
       if (standardFontName) {
         cssFontInfo.fontFamily = `${cssFontInfo.fontFamily}-PdfJS-XFA`;
-        cssFontInfo.lineHeight = standardFontName.lineHeight || null;
+        cssFontInfo.metrics = standardFontName.metrics || null;
         glyphScaleFactors = standardFontName.factors || null;
         fontFile = await this.fetchStandardFontData(standardFontName.name);
         isInternalFont = !!fontFile;

src/core/fonts.js

@@ -2550,7 +2550,8 @@ class Font {
     this.lineGap = metricsOverride.lineGap / metricsOverride.unitsPerEm;
 
     if (this.cssFontInfo && this.cssFontInfo.lineHeight) {
-      this.lineHeight = this.cssFontInfo.lineHeight;
+      this.lineHeight = this.cssFontInfo.metrics.lineHeight;
+      this.lineGap = this.cssFontInfo.metrics.lineGap;
     } else {
       this.lineHeight = this.ascent - this.descent + this.lineGap;
     }

src/core/helvetica_factors.js

@@ -94,7 +94,7 @@ const HelveticaBoldFactors = [
   1.00022, 1.00022, 0.99973, 0.9993, 0.99973, 0.99973, 0.99973, 0.99973,
   0.99973, 0.99973, 1, 1, 1, 1, 0.99973, 0.99902,
 ];
-const HelveticaBoldLineHeight = 1.2;
+const HelveticaBoldMetrics = { lineHeight: 1.2, lineGap: 0.2 };
 
 // Factors to rescale LiberationSans-BoldItalic.ttf to have the same
 // metrics as NimbusSans-BoldItalic.otf.
@@ -177,7 +177,7 @@ const HelveticaBoldItalicFactors = [
   0.99973, 1.00065, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 0.99973, 1, 1,
   1, 1, 0.99973, 1.00061,
 ];
-const HelveticaBoldItalicLineHeight = 1.35;
+const HelveticaBoldItalicMetrics = { lineHeight: 1.35, lineGap: 0.2 };
 
 // Factors to rescale LiberationSans-Italic.ttf to have the same
 // metrics as NimbusSans-Italic.otf.
@@ -258,7 +258,7 @@ const HelveticaItalicFactors = [
   0.99973, 0.99973, 1, 0.99977, 0.99977, 0.99977, 0.99977, 0.99977, 1, 1.0005,
   1, 1, 1, 1, 0.99973, 1, 1, 1, 1, 1, 0.99973, 0.99918,
 ];
-const HelveticaItalicLineHeight = 1.35;
+const HelveticaItalicMetrics = { lineHeight: 1.35, lineGap: 0.2 };
 
 // Factors to rescale LiberationSans-Regular.ttf to have the same
 // metrics as NimbusSans-Regular.otf.
@@ -339,15 +339,15 @@ const HelveticaRegularFactors = [
   0.99977, 0.99977, 0.99977, 1, 1.00055, 1, 1, 1, 1, 0.99973, 1, 1, 1, 1, 1,
   0.99973, 1.00019,
 ];
-const HelveticaRegularLineHeight = 1.2;
+const HelveticaRegularMetrics = { lineHeight: 1.2, lineGap: 0.2 };
 
 export {
   HelveticaBoldFactors,
   HelveticaBoldItalicFactors,
-  HelveticaBoldItalicLineHeight,
-  HelveticaBoldLineHeight,
+  HelveticaBoldItalicMetrics,
+  HelveticaBoldMetrics,
   HelveticaItalicFactors,
-  HelveticaItalicLineHeight,
+  HelveticaItalicMetrics,
   HelveticaRegularFactors,
-  HelveticaRegularLineHeight,
+  HelveticaRegularMetrics,
 };

src/core/myriadpro_factors.js

@@ -77,7 +77,7 @@ const MyriadProBoldFactors = [
   0.97579, 0.97579, 0.97579, 0.9332, 1.05993, 0.94039, 0.94039, 0.94039,
   0.94039, 0.99793, 0.94039, 0.938, 0.938, 0.938, 0.938, 0.99793, 0.95776,
 ];
-const MyriadProBoldLineHeight = 1.2;
+const MyriadProBoldMetrics = { lineHeight: 1.2, lineGap: 0.2 };
 
 // Factors to rescale LiberationSans-BoldItalic.ttf to have the same
 // metrics as MyriadPro-BoldIt.otf.
@@ -144,7 +144,7 @@ const MyriadProBoldItalicFactors = [
   0.89544, 1.0051, 0.89364, 0.89364, 0.89364, 0.89364, 0.97276, 0.89364, 0.9,
   0.9, 0.9, 0.9, 0.97276, 0.86842,
 ];
-const MyriadProBoldItalicLineHeight = 1.2;
+const MyriadProBoldItalicMetrics = { lineHeight: 1.2, lineGap: 0.2 };
 
 // Factors to rescale LiberationSans-Italic.ttf to have the same
 // metrics as MyriadPro-It.otf.
@@ -210,7 +210,7 @@ const MyriadProItalicFactors = [
   0.979, 0.979, 0.979, 0.979, 0.882, 0.93559, 0.882, 0.882, 0.882, 0.882,
   0.88465, 0.882, 0.83, 0.83, 0.83, 0.83, 0.88465, 0.84596,
 ];
-const MyriadProItalicLineHeight = 1.2;
+const MyriadProItalicMetrics = { lineHeight: 1.2, lineGap: 0.2 };
 
 // Factors to rescale LiberationSans-Regular.ttf to have the same
 // metrics as MyriadPro-Regular.otf.
@@ -276,15 +276,15 @@ const MyriadProRegularFactors = [
   1.01915, 0.926, 0.96705, 0.942, 0.942, 0.942, 0.942, 0.92241, 0.942, 0.856,
   0.856, 0.856, 0.856, 0.92241, 0.92761,
 ];
-const MyriadProRegularLineHeight = 1.2;
+const MyriadProRegularMetrics = { lineHeight: 1.2, lineGap: 0.2 };
 
 export {
   MyriadProBoldFactors,
   MyriadProBoldItalicFactors,
-  MyriadProBoldItalicLineHeight,
-  MyriadProBoldLineHeight,
+  MyriadProBoldItalicMetrics,
+  MyriadProBoldMetrics,
   MyriadProItalicFactors,
-  MyriadProItalicLineHeight,
+  MyriadProItalicMetrics,
   MyriadProRegularFactors,
-  MyriadProRegularLineHeight,
+  MyriadProRegularMetrics,
 };

src/core/segoeui_factors.js

@@ -81,7 +81,7 @@ const SegoeuiBoldFactors = [
   1.02511, 0.99298, 1.07237, 0.96752, 0.96752, 0.96752, 0.96752, 1.03424,
   0.96752, 0.95801, 0.95801, 0.95801, 0.95801, 1.03424, 1.0106,
 ];
-const SegoeuiBoldLineHeight = 1.33008;
+const SegoeuiBoldMetrics = { lineHeight: 1.33008, lineGap: 0 };
 
 // Factors to rescale LiberationSans-BoldItalic.ttf to have the same
 // metrics as segoeuiz.ttf.
@@ -152,7 +152,7 @@ const SegoeuiBoldItalicFactors = [
   0.96752, 0.96752, 1.036, 0.96752, 0.97168, 0.97168, 0.97168, 0.97168, 1.036,
   0.95134,
 ];
-const SegoeuiBoldItalicLineHeight = 1.33008;
+const SegoeuiBoldItalicMetrics = { lineHeight: 1.33008, lineGap: 0 };
 
 // Factors to rescale LiberationSans-Italic.ttf to have the same
 // metrics as segoeuii.ttf.
@@ -223,7 +223,7 @@ const SegoeuiItalicFactors = [
   0.96777, 0.96777, 0.96777, 0.96927, 0.96777, 0.9043, 0.9043, 0.9043, 0.9043,
   0.96927, 0.95364,
 ];
-const SegoeuiItalicLineHeight = 1.33008;
+const SegoeuiItalicMetrics = { lineHeight: 1.33008, lineGap: 0 };
 
 // Factors to rescale LiberationSans-Regular.ttf to have the same
 // metrics as segoeui.ttf.
@@ -294,15 +294,15 @@ const SegoeuiRegularFactors = [
   1.00068, 0.91797, 0.99346, 0.96777, 0.96777, 0.96777, 0.96777, 0.96927,
   0.96777, 0.9043, 0.9043, 0.9043, 0.9043, 0.96927, 1.00221,
 ];
-const SegoeuiRegularLineHeight = 1.33008;
+const SegoeuiRegularMetrics = { lineHeight: 1.33008, lineGap: 0 };
 
 export {
   SegoeuiBoldFactors,
   SegoeuiBoldItalicFactors,
-  SegoeuiBoldItalicLineHeight,
-  SegoeuiBoldLineHeight,
+  SegoeuiBoldItalicMetrics,
+  SegoeuiBoldMetrics,
   SegoeuiItalicFactors,
-  SegoeuiItalicLineHeight,
+  SegoeuiItalicMetrics,
   SegoeuiRegularFactors,
-  SegoeuiRegularLineHeight,
+  SegoeuiRegularMetrics,
 };

src/core/xfa/fonts.js

@@ -13,6 +13,8 @@
  * limitations under the License.
  */
 
+import { $globalData } from "./xfa_object.js";
+import { stripQuotes } from "./utils.js";
 import { warn } from "../../shared/util.js";
 
 class FontFinder {
@@ -178,4 +180,32 @@ function selectFont(xfaFont, typeface) {
   return typeface.regular;
 }
 
-export { FontFinder, selectFont };
+function getMetrics(xfaFont, real = false) {
+  let pdfFont = null;
+  if (xfaFont) {
+    const name = stripQuotes(xfaFont.typeface);
+    const typeface = xfaFont[$globalData].fontFinder.find(name);
+    pdfFont = selectFont(xfaFont, typeface);
+  }
+
+  if (!pdfFont) {
+    return {
+      lineHeight: 12,
+      lineGap: 2,
+      lineNoGap: 10,
+    };
+  }
+
+  const size = xfaFont.size || 10;
+  const lineHeight = pdfFont.lineHeight
+    ? Math.max(real ? 0 : 1.2, pdfFont.lineHeight)
+    : 1.2;
+  const lineGap = pdfFont.lineGap === undefined ? 0.2 : pdfFont.lineGap;
+  return {
+    lineHeight: lineHeight * size,
+    lineGap: lineGap * size,
+    lineNoGap: Math.max(1, lineHeight - lineGap) * size,
+  };
+}
+
+export { FontFinder, getMetrics, selectFont };

src/core/xfa/html_utils.js

@@ -247,7 +247,7 @@ function layoutNode(node, availableSpace) {
       }
     }
 
-    const maxWidth = !node.w ? availableSpace.width : node.w;
+    const maxWidth = (!node.w ? availableSpace.width : node.w) - marginH;
     const fontFinder = node[$globalData].fontFinder;
     if (
       node.value.exData &&
@@ -614,10 +614,8 @@ function setFontFamily(xfaFont, fontFinder, style) {
     }
 
     const pdfFont = selectFont(xfaFont, typeface);
-    if (pdfFont && pdfFont.lineHeight > 0) {
+    if (pdfFont) {
       style.lineHeight = Math.max(1.2, pdfFont.lineHeight);
-    } else {
-      style.lineHeight = 1.2;
     }
   }
 }