Add platformID/platformSpecificID/languageID support to getNameTableString

Author: lslqtz

src/FontLib/AdobeFontMetrics.php

@@ -54,7 +54,8 @@ function write($file, $encoding = null) {
     $this->addPair("EncodingScheme", $encoding_scheme);
 
     $records = $font->getData("name", "records");
-    foreach ($records as $id => $record) {
+    foreach ($records as $uniqueIdentifier => $record) {
+      $id = end(explode(',', $uniqueIdentifier));
       if (!isset(name::$nameIdCodes[$id]) || preg_match("/[\r\n]/", $record->string)) {
         continue;
       }

src/FontLib/Table/Type/name.php

@@ -160,8 +160,16 @@ protected function _parse() {
 
       $encoding = null;
       switch ($record->platformID) {
+        case 1:
+          $encoding = mb_detect_encoding($record->stringRaw, array('UTF-8', 'ASCII', 'GB2312', 'GB18030', 'GBK', 'SJIS', 'BIG-5'));
+          break;
         case 3:
           switch ($record->platformSpecificID) {
+            case 1:
+              if (\array_key_exists("GBK", $system_encodings)) {
+                $encoding = "GBK";
+              }
+              break;
             case 2:
               if (\array_key_exists("SJIS", $system_encodings)) {
                 $encoding = "SJIS";
@@ -185,19 +193,19 @@ protected function _parse() {
           }
           break;
       }
-      if ($encoding === null) {
+      if ($encoding === null || $encoding === false) {
         $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;
+      $names["{$record->platformID},{$record->platformSpecificID},{$record->languageID},{$record->nameID}"] = $record;
     }
 
     $data["records"] = $names;
-
     $this->data = $data;
   }
 

src/FontLib/TrueType/File.php

@@ -169,7 +169,6 @@ private function uniord (string $c, string $encoding = null) {
 
   function getTable() {
     $this->parseTableEntries();
-
     return $this->directory;
   }
 
@@ -392,7 +391,6 @@ function parseTableEntries() {
     if (!empty($this->directory)) {
       return;
     }
-
     if (empty($this->header->data["numTables"])) {
       return;
     }
@@ -504,53 +502,53 @@ function getNameTableString($nameID) {
    *
    * @return string|null
    */
-  function getFontCopyright() {
-    return $this->getNameTableString(name::NAME_COPYRIGHT);
+  function getFontCopyright($platformID, $platformSpecificID, $languageID) {
+    return $this->getNameTableString("{$platformID},{$platformSpecificID},{$languageID}," . name::NAME_COPYRIGHT);
   }
 
   /**
    * Get font name
    *
    * @return string|null
    */
-  function getFontName() {
-    return $this->getNameTableString(name::NAME_NAME);
+  function getFontName($platformID, $platformSpecificID, $languageID) {
+    return $this->getNameTableString("{$platformID},{$platformSpecificID},{$languageID}," . name::NAME_NAME);
   }
 
   /**
    * Get font subfamily
    *
    * @return string|null
    */
-  function getFontSubfamily() {
-    return $this->getNameTableString(name::NAME_SUBFAMILY);
+  function getFontSubfamily($platformID, $platformSpecificID, $languageID) {
+    return $this->getNameTableString("{$platformID},{$platformSpecificID},{$languageID}," . name::NAME_SUBFAMILY);
   }
 
   /**
    * Get font subfamily ID
    *
    * @return string|null
    */
-  function getFontSubfamilyID() {
-    return $this->getNameTableString(name::NAME_SUBFAMILY_ID);
+  function getFontSubfamilyID($platformID, $platformSpecificID, $languageID) {
+    return $this->getNameTableString("{$platformID},{$platformSpecificID},{$languageID}," . name::NAME_SUBFAMILY_ID);
   }
 
   /**
    * Get font full name
    *
    * @return string|null
    */
-  function getFontFullName() {
-    return $this->getNameTableString(name::NAME_FULL_NAME);
+  function getFontFullName($platformID, $platformSpecificID, $languageID) {
+    return $this->getNameTableString("{$platformID},{$platformSpecificID},{$languageID}," . name::NAME_FULL_NAME);
   }
 
   /**
    * Get font version
    *
    * @return string|null
    */
-  function getFontVersion() {
-    return $this->getNameTableString(name::NAME_VERSION);
+  function getFontVersion($platformID, $platformSpecificID, $languageID) {
+    return $this->getNameTableString("{$platformID},{$platformSpecificID},{$languageID}," . name::NAME_VERSION);
   }
 
   /**
@@ -567,8 +565,8 @@ function getFontWeight() {
    *
    * @return string|null
    */
-  function getFontPostscriptName() {
-    return $this->getNameTableString(name::NAME_POSTSCRIPT_NAME);
+  function getFontPostscriptName($platformID, $platformSpecificID, $languageID) {
+    return $this->getNameTableString("{$platformID},{$platformSpecificID},{$languageID}," . name::NAME_POSTSCRIPT_NAME);
   }
 
   function reduce() {