Improve name table encoding support

Most name strings should be encoded with UTF-16BE per the spec, but there are situations where other encodings are required or acceptable. This change only addresses a subset of potential encodings. fixes #70
dompdf · Jan 6, 2024 · 618a7c5 · 618a7c5
1 parent eceea73
commit 618a7c5
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 9 deletions.
diff --git a/src/FontLib/Table/Type/name.php b/src/FontLib/Table/Type/name.php
@@ -150,11 +150,49 @@ protected function _parse() {
       $records[] = $record;
     }
 
+    $system_encodings = mb_list_encodings();
+    $system_encodings = array_change_key_case(array_fill_keys($system_encodings, true), CASE_UPPER);
+
     $names = array();
     foreach ($records as $record) {
       $font->seek($tableOffset + $data["stringOffset"] + $record->offset);
-      $s                      = $font->read($record->length);
-      $record->string         = Font::UTF16ToUTF8($s);
+      $record->stringRaw = $font->read($record->length);
+
+      $encoding = null;
+      switch ($record->platformID) {
+        case 3:
+          switch ($record->platformSpecificID) {
+            case 2:
+              if (\array_key_exists("SJIS", $system_encodings)) {
+                $encoding = "SJIS";
+              }
+              break;
+            case 3:
+              if (\array_key_exists("GB18030", $system_encodings)) {
+                $encoding = "GB18030";
+              }
+              break;
+            case 4:
+              if (\array_key_exists("BIG-5", $system_encodings)) {
+                $encoding = "BIG-5";
+              }
+              break;
+            case 5:
+              if (\array_key_exists("UHC", $system_encodings)) {
+                $encoding = "UHC";
+              }
+              break;
+          }
+          break;
+      }
+      if ($encoding === null) {
+        $encoding = "UTF-16";
+      }
+
+      $record->string = mb_convert_encoding($record->stringRaw, "UTF-8", $encoding);
+      if (strpos($record->string, "\0") !== false) {
+        $record->string = str_replace("\0", "", $record->string);
+      }
       $names[$record->nameID] = $record;
     }
 
@@ -168,22 +206,33 @@ protected function _encode() {
 
     /** @var nameRecord[] $records */
     $records       = $this->data["records"];
-    $count_records = count($records);
+    $count_records = \count($records);
 
     $this->data["count"]        = $count_records;
-    $this->data["stringOffset"] = 6 + $count_records * 12; // 6 => uint16 * 3, 12 => sizeof self::$record_format
+    $this->data["stringOffset"] = 6 + ($count_records * 12); // 6 => uint16 * 3, 12 => sizeof self::$record_format
 
     $length = $font->pack(self::$header_format, $this->data);
 
     $offset = 0;
+
+    /** @var nameRecord[] $records_to_encode */
+    $records_to_encode = array();
     foreach ($records as $record) {
-      $record->length = mb_strlen($record->getUTF16(), "8bit");
-      $record->offset = $offset;
-      $offset += $record->length;
-      $length += $font->pack(nameRecord::$format, (array)$record);
+      $encoded_record = new nameRecord();
+      $encoded_record->platformID = 3;
+      $encoded_record->platformSpecificID = 1;
+      $encoded_record->languageID = $record->languageID;
+      $encoded_record->nameID = $record->nameID;
+      $encoded_record->offset = $offset;
+      $encoded_record->string = $record->string;
+      $encoded_record->length = mb_strlen($encoded_record->getUTF16(), "8bit");
+      $records_to_encode[] = $encoded_record;
+
+      $offset += $encoded_record->length;
+      $length += $font->pack(nameRecord::$format, (array)$encoded_record);
     }
 
-    foreach ($records as $record) {
+    foreach ($records_to_encode as $record) {
       $str = $record->getUTF16();
       $length += $font->write($str, mb_strlen($str, "8bit"));
     }

diff --git a/src/FontLib/Table/Type/nameRecord.php b/src/FontLib/Table/Type/nameRecord.php
@@ -23,6 +23,7 @@ class nameRecord extends BinaryStream {
   public $length;
   public $offset;
   public $string;
+  public $stringRaw;
 
   public static $format = array(
     "platformID"         => self::uint16,