Initial implementation

cybercog · Oct 15, 2023 · 8d3e9d2 · 8d3e9d2
1 parent 0c9b54d
commit 8d3e9d2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/Font.php b/src/Font.php
@@ -65,12 +65,12 @@ public function computeWidth(
     private function getGlyphHorizontalAdvance(
         CompositeCharacter $compositeCharacter
     ): int {
-        if (!isset($this->glyphs[$compositeCharacter->toCharacters()])) {
+        if (!isset($this->glyphs[$compositeCharacter->toChars()])) {
             return $this->missingGlyph->horizontalAdvance()
                 ?? $this->horizontalAdvance;
         }
 
-        return $this->glyphs[$compositeCharacter->toCharacters()]->horizontalAdvance()
+        return $this->glyphs[$compositeCharacter->toChars()]->horizontalAdvance()
             ?? $this->horizontalAdvance;
     }
 }
diff --git a/src/Glyph.php b/src/Glyph.php
@@ -24,7 +24,7 @@ public function __construct(
 
         if ($horizontalAdvance !== null && $horizontalAdvance < 0) {
             throw new \InvalidArgumentException(
-                "Glyph with unicode `{$compositeCharacter->toCharacters()}` has negative horizontal advance",
+                "Glyph with unicode `{$compositeCharacter->toChars()}` has negative horizontal advance",
             );
         }
         $this->compositeCharacter = $compositeCharacter;

diff --git a/src/Parser/SimpleXmlSvgFontFileParser.php b/src/Parser/SimpleXmlSvgFontFileParser.php
@@ -71,7 +71,7 @@ private function initFont(
                     $unicode = strval($fontChildElement[self::ATTRIBUTE_UNICODE]);
 
                     if ($unicode !== '') {
-                        $compositeCharacter = CompositeCharacter::ofCharacters($unicode);
+                        $compositeCharacter = CompositeCharacter::ofChars($unicode);
                         $glyphs[$unicode] = $this->initGlyph($fontChildElement, $compositeCharacter);
                     }
                     break;

diff --git a/src/Parser/XmlReaderSvgFontFileParser.php b/src/Parser/XmlReaderSvgFontFileParser.php
@@ -85,7 +85,7 @@ public function parseFile(
                 $unicode = strval($xml->getAttribute(self::ATTRIBUTE_UNICODE));
 
                 if ($unicode !== '') {
-                    $compositeCharacter = CompositeCharacter::ofCharacters($unicode);
+                    $compositeCharacter = CompositeCharacter::ofChars($unicode);
                     $glyphs[$unicode] = $this->initGlyph($xml, $compositeCharacter);
                 }
             }

diff --git a/test/Unit/SvgFontTest.php b/test/Unit/SvgFontTest.php
@@ -23,7 +23,7 @@ public function testItCanComputeTextWidth(
         $this->assertSame(
             $expectedWidth,
             $font->computeWidth(
-                CompositeCharacter::ofCharacters($characters),
+                CompositeCharacter::ofChars($characters),
                 $fontSize,
                 $letterSpacing,
             ),