From 24ac4ef654db8e2b8416a17dce5d7740ac37fc4f Mon Sep 17 00:00:00 2001 From: lslqtz Date: Mon, 12 Feb 2024 00:03:33 +0800 Subject: [PATCH 1/5] Add platformID/platformSpecificID/languageID support to getNameTableString --- src/FontLib/AdobeFontMetrics.php | 3 ++- src/FontLib/Table/Type/name.php | 14 +++++++++++--- src/FontLib/TrueType/File.php | 30 ++++++++++++++---------------- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/src/FontLib/AdobeFontMetrics.php b/src/FontLib/AdobeFontMetrics.php index 613117d..75c6065 100644 --- a/src/FontLib/AdobeFontMetrics.php +++ b/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; } diff --git a/src/FontLib/Table/Type/name.php b/src/FontLib/Table/Type/name.php index acdda7a..659a9c9 100644 --- a/src/FontLib/Table/Type/name.php +++ b/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; } diff --git a/src/FontLib/TrueType/File.php b/src/FontLib/TrueType/File.php index b1c7cd8..14e0181 100644 --- a/src/FontLib/TrueType/File.php +++ b/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,8 +502,8 @@ 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); } /** @@ -513,8 +511,8 @@ function getFontCopyright() { * * @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); } /** @@ -522,8 +520,8 @@ function getFontName() { * * @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); } /** @@ -531,8 +529,8 @@ function getFontSubfamily() { * * @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); } /** @@ -540,8 +538,8 @@ function getFontSubfamilyID() { * * @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); } /** @@ -549,8 +547,8 @@ function getFontFullName() { * * @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() { From 0de9ccedf54d523c5212c2e5ecca992bb5bf58fe Mon Sep 17 00:00:00 2001 From: lslqtz Date: Wed, 14 Feb 2024 12:47:23 +0800 Subject: [PATCH 2/5] Drop incorrect change --- src/FontLib/Table/Type/name.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/FontLib/Table/Type/name.php b/src/FontLib/Table/Type/name.php index 659a9c9..0067116 100644 --- a/src/FontLib/Table/Type/name.php +++ b/src/FontLib/Table/Type/name.php @@ -165,11 +165,6 @@ protected function _parse() { 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"; From 19ed8a1acee6ef60e48ae3c2df05e606cf2a39a1 Mon Sep 17 00:00:00 2001 From: lslqtz Date: Wed, 14 Feb 2024 12:23:53 +0800 Subject: [PATCH 3/5] Add setData function --- src/FontLib/EOT/File.php | 9 +++++++++ src/FontLib/TrueType/File.php | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/src/FontLib/EOT/File.php b/src/FontLib/EOT/File.php index 55933eb..c9b4518 100644 --- a/src/FontLib/EOT/File.php +++ b/src/FontLib/EOT/File.php @@ -85,6 +85,15 @@ public function readUInt32() { return $uint32 >> 16 & 0x0000FFFF | $uint32 << 16 & 0xFFFF0000; } + + function setData($name, $key, $value) { + if (!$key) { + $this->header->data = $value; + } else { + $this->header->data[$key] = $value; + } + } + /** * Get font copyright * diff --git a/src/FontLib/TrueType/File.php b/src/FontLib/TrueType/File.php index 14e0181..4bf80e1 100644 --- a/src/FontLib/TrueType/File.php +++ b/src/FontLib/TrueType/File.php @@ -470,6 +470,14 @@ public function getData($name, $key = null) { } } + public function setData($name, $key, $value) { + if (!$key) { + $this->data[$name]->data = $value; + } else { + $this->data[$name]->data[$key] = $value; + } + } + function addDirectoryEntry(DirectoryEntry $entry) { $this->directory[$entry->tag] = $entry; } From 8d1a6bcd0e3c8e499d3a96836c724dc548426302 Mon Sep 17 00:00:00 2001 From: lslqtz Date: Thu, 15 Feb 2024 06:07:08 +0800 Subject: [PATCH 4/5] Add revert method --- src/FontLib/BinaryStream.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/FontLib/BinaryStream.php b/src/FontLib/BinaryStream.php index 5e170c6..bfaedfa 100644 --- a/src/FontLib/BinaryStream.php +++ b/src/FontLib/BinaryStream.php @@ -18,6 +18,7 @@ class BinaryStream { * @var resource The file pointer */ protected $f; + protected $f2; const uint8 = 1; const int8 = 2; @@ -66,6 +67,12 @@ public function open($filename, $mode = self::modeRead) { throw new \Exception("Unknown file open mode"); } + if ($this->f !== null && $this->f !== false) { + if ($this->f2 !== null && $this->f2 !== false) { + fclose($this->f2); + } + $this->f2 = $this->f; + } $this->f = fopen($filename, $mode); return $this->f != false; @@ -75,9 +82,20 @@ public function open($filename, $mode = self::modeRead) { * Close the internal file pointer */ public function close() { + if ($this->f2 !== null && $this->f2 !== false) { + fclose($this->f2); + } return fclose($this->f) != false; } + public function revert() { + if ($this->f2 !== null) { + fclose($this->f); + $this->f = $this->f2; + $this->f2 = null; + } + } + /** * Change the internal file pointer * From cfa4043d8665cbf27a2d9cdb04337d934220ba72 Mon Sep 17 00:00:00 2001 From: lslqtz Date: Fri, 23 Feb 2024 12:11:38 +0800 Subject: [PATCH 5/5] Bug fix --- src/FontLib/Table/Type/name.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/FontLib/Table/Type/name.php b/src/FontLib/Table/Type/name.php index 0067116..69ae1ae 100644 --- a/src/FontLib/Table/Type/name.php +++ b/src/FontLib/Table/Type/name.php @@ -161,28 +161,28 @@ 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')); + $encoding = mb_detect_encoding($record->stringRaw, array("UTF-8", "ASCII", "GB2312", "GB18030", "GBK", "SJIS", "BIG-5")); break; case 3: switch ($record->platformSpecificID) { case 2: if (\array_key_exists("SJIS", $system_encodings)) { - $encoding = "SJIS"; + $encoding = mb_detect_encoding($record->stringRaw, array("SJIS", "UTF-16", "UTF-8", "ASCII")); } break; case 3: if (\array_key_exists("GB18030", $system_encodings)) { - $encoding = "GB18030"; + $encoding = mb_detect_encoding($record->stringRaw, array("GB18030", "UTF-16", "UTF-8", "ASCII")); } break; case 4: if (\array_key_exists("BIG-5", $system_encodings)) { - $encoding = "BIG-5"; + $encoding = mb_detect_encoding($record->stringRaw, array("BIG-5", "UTF-16", "UTF-8", "ASCII")); } break; case 5: if (\array_key_exists("UHC", $system_encodings)) { - $encoding = "UHC"; + $encoding = mb_detect_encoding($record->stringRaw, array("UHC", "UTF-16", "UTF-8", "ASCII")); } break; }