feat: support bold-italic standard fonts (#1841)

diegomura · May 31, 2022 · 25a80eb · 25a80eb
1 parent 434df31
commit 25a80eb
Show file tree

Hide file tree

Showing 24 changed files with 129 additions and 2,471 deletions.
diff --git a/.changeset/wild-deers-kiss.md b/.changeset/wild-deers-kiss.md
@@ -0,0 +1,7 @@
+---
+'@react-pdf/font': minor
+'@react-pdf/layout': minor
+'@react-pdf/pdfkit': minor
+---
+
+feat: support bold-italic standard fonts
diff --git a/packages/font/src/standard.js b/packages/font/src/standard.js
@@ -2,10 +2,13 @@ export default [
   'Courier',
   'Courier-Bold',
   'Courier-Oblique',
+  'Courier-BoldOblique',
   'Helvetica',
   'Helvetica-Bold',
   'Helvetica-Oblique',
+  'Helvetica-BoldOblique',
   'Times-Roman',
   'Times-Bold',
   'Times-Italic',
+  'Times-BoldItalic',
 ];
diff --git a/packages/layout/src/text/standardFont.js b/packages/layout/src/text/standardFont.js
@@ -57,10 +57,12 @@ class StandardFont {
       case 'Times-Roman':
       case 'Times-Bold':
       case 'Times-Italic':
+      case 'Times-BoldItalic':
         return 650;
       case 'Courier':
       case 'Courier-Bold':
       case 'Courier-Oblique':
+      case 'Courier-BoldOblique':
         return 550;
       default:
         return 690;
@@ -73,10 +75,12 @@ class StandardFont {
       case 'Times-Roman':
       case 'Times-Bold':
       case 'Times-Italic':
+      case 'Times-BoldItalic':
         return 440;
       case 'Courier':
       case 'Courier-Bold':
       case 'Courier-Oblique':
+      case 'Courier-BoldOblique':
         return 390;
       default:
         return 490;
@@ -89,10 +93,12 @@ class StandardFont {
       case 'Times-Roman':
       case 'Times-Bold':
       case 'Times-Italic':
+      case 'Times-BoldItalic':
         return -220;
       case 'Courier':
       case 'Courier-Bold':
       case 'Courier-Oblique':
+      case 'Courier-BoldOblique':
         return -230;
       default:
         return -200;

diff --git a/packages/pdfkit/src/font/afm.js b/packages/pdfkit/src/font/afm.js
@@ -151,7 +151,7 @@ function parse(contents) {
       case 'KernPairs':
         match = line.match(/^KPX\s+(\.?\w+)\s+(\.?\w+)\s+(-?\d+)/);
         if (match) {
-          obj.kernPairs[match[1] + '\0' + match[2]] = parseInt(match[3]);
+          obj.kernPairs[match[1] + match[2]] = parseInt(match[3]);
         }
         break;
     }
@@ -241,7 +241,7 @@ class AFMFont {
   }
 
   getKernPair(left, right) {
-    return this.kernPairs[left + '\0' + right] || 0;
+    return this.kernPairs[left + right] || 0;
   }
 
   advancesForGlyphs(glyphs) {

diff --git a/packages/pdfkit/src/font/data/Courier-Bold.b64.afm b/packages/pdfkit/src/font/data/Courier-Bold.b64.afm
diff --git a/packages/pdfkit/src/font/data/Courier-BoldOblique.afm b/packages/pdfkit/src/font/data/Courier-BoldOblique.afm
@@ -10,7 +10,7 @@ Weight Bold
 ItalicAngle -12
 IsFixedPitch true
 CharacterSet ExtendedRoman
-FontBBox -57 -250 869 801 
+FontBBox -57 -250 869 801
 UnderlinePosition -100
 UnderlineThickness 50
 Version 003.000

diff --git a/packages/pdfkit/src/font/data/Courier-BoldOblique.b64.afm b/packages/pdfkit/src/font/data/Courier-BoldOblique.b64.afm