Initial implementation

cybercog · Oct 16, 2023 · b4eae24 · b4eae24
1 parent 8d3e9d2
commit b4eae24
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 25 deletions.
diff --git a/src/Font.php b/src/Font.php
@@ -4,7 +4,7 @@
 
 namespace Cog\SvgFont;
 
-use Cog\Unicode\CompositeCharacter;
+use Cog\Unicode\Character;
 
 final class Font
 {
@@ -48,13 +48,13 @@ public function id(): string
     }
 
     public function computeWidth(
-        CompositeCharacter $compositeCharacter,
+        Character $character,
         int $size,
         float $letterSpacing = 0.0
     ): float {
         $size = $size / $this->fontFace->unitsPerEm();
 
-        $glyphHorizontalAdvance = $this->getGlyphHorizontalAdvance($compositeCharacter);
+        $glyphHorizontalAdvance = $this->getGlyphHorizontalAdvance($character);
 
         $glyphWidth = $glyphHorizontalAdvance * $size;
         $letterSpacingWidth = $this->fontFace->unitsPerEm() * $letterSpacing * $size;
@@ -63,14 +63,14 @@ public function computeWidth(
     }
 
     private function getGlyphHorizontalAdvance(
-        CompositeCharacter $compositeCharacter
+        Character $character
     ): int {
-        if (!isset($this->glyphs[$compositeCharacter->toChars()])) {
+        if (!isset($this->glyphs[strval($character)])) {
             return $this->missingGlyph->horizontalAdvance()
                 ?? $this->horizontalAdvance;
         }
 
-        return $this->glyphs[$compositeCharacter->toChars()]->horizontalAdvance()
+        return $this->glyphs[strval($character)]->horizontalAdvance()
             ?? $this->horizontalAdvance;
     }
 }
diff --git a/src/Glyph.php b/src/Glyph.php
@@ -4,18 +4,18 @@
 
 namespace Cog\SvgFont;
 
-use Cog\Unicode\CompositeCharacter;
+use Cog\Unicode\Character;
 
 final class Glyph
 {
-    private CompositeCharacter $compositeCharacter;
+    private Character $character;
 
     private ?string $name;
 
     private ?int $horizontalAdvance;
 
     public function __construct(
-        CompositeCharacter $compositeCharacter,
+        Character $character,
         ?string $name = null,
         ?int $horizontalAdvance = null
     ) {
@@ -24,15 +24,15 @@ public function __construct(
 
         if ($horizontalAdvance !== null && $horizontalAdvance < 0) {
             throw new \InvalidArgumentException(
-                "Glyph with unicode `{$compositeCharacter->toChars()}` has negative horizontal advance",
+                "Glyph with unicode `$character` has negative horizontal advance",
             );
         }
-        $this->compositeCharacter = $compositeCharacter;
+        $this->character = $character;
     }
 
-    public function compositeCharacter(): CompositeCharacter
+    public function character(): Character
     {
-        return $this->compositeCharacter;
+        return $this->character;
     }
 
     public function name(): ?string

diff --git a/src/Parser/SimpleXmlSvgFontFileParser.php b/src/Parser/SimpleXmlSvgFontFileParser.php
@@ -9,7 +9,7 @@
 use Cog\SvgFont\Glyph;
 use Cog\SvgFont\MissingGlyph;
 use Cog\SvgFont\FontList;
-use Cog\Unicode\CompositeCharacter;
+use Cog\Unicode\Character;
 
 final class SimpleXmlSvgFontFileParser implements
     SvgFontFileParser
@@ -71,8 +71,8 @@ private function initFont(
                     $unicode = strval($fontChildElement[self::ATTRIBUTE_UNICODE]);
 
                     if ($unicode !== '') {
-                        $compositeCharacter = CompositeCharacter::ofChars($unicode);
-                        $glyphs[$unicode] = $this->initGlyph($fontChildElement, $compositeCharacter);
+                        $character = Character::of($unicode);
+                        $glyphs[$unicode] = $this->initGlyph($fontChildElement, $character);
                     }
                     break;
             }
@@ -115,7 +115,7 @@ private function initFontFace(
 
     private function initGlyph(
         \SimpleXMLElement $glyphElement,
-        CompositeCharacter $compositeCharacter
+        Character $character
     ): Glyph {
         $name = strval($glyphElement[self::ATTRIBUTE_GLYPH_NAME]);
 
@@ -130,7 +130,7 @@ private function initGlyph(
         }
 
         return new Glyph(
-            $compositeCharacter,
+            $character,
             $name,
             $glyphHorizontalAdvance,
         );

diff --git a/src/Parser/XmlReaderSvgFontFileParser.php b/src/Parser/XmlReaderSvgFontFileParser.php
@@ -9,7 +9,7 @@
 use Cog\SvgFont\Glyph;
 use Cog\SvgFont\MissingGlyph;
 use Cog\SvgFont\FontList;
-use Cog\Unicode\CompositeCharacter;
+use Cog\Unicode\Character;
 
 final class XmlReaderSvgFontFileParser implements
     SvgFontFileParser
@@ -85,8 +85,8 @@ public function parseFile(
                 $unicode = strval($xml->getAttribute(self::ATTRIBUTE_UNICODE));
 
                 if ($unicode !== '') {
-                    $compositeCharacter = CompositeCharacter::ofChars($unicode);
-                    $glyphs[$unicode] = $this->initGlyph($xml, $compositeCharacter);
+                    $character = Character::of($unicode);
+                    $glyphs[$unicode] = $this->initGlyph($xml, $character);
                 }
             }
         }
@@ -114,7 +114,7 @@ private function initFontFace(
 
     private function initGlyph(
         \XMLReader $glyphElement,
-        CompositeCharacter $compositeCharacter
+        Character $character
     ): Glyph {
         $name = $glyphElement->getAttribute(self::ATTRIBUTE_GLYPH_NAME);
 
@@ -127,7 +127,7 @@ private function initGlyph(
         //$glyph->pathData = $xml->getAttribute('d');
 
         return new Glyph(
-            $compositeCharacter,
+            $character,
             $name,
             $glyphHorizontalAdvance,
         );

diff --git a/test/Unit/SvgFontTest.php b/test/Unit/SvgFontTest.php
@@ -6,7 +6,7 @@
 
 use Cog\SvgFont\Font;
 use Cog\SvgFont\Parser\SimpleXmlSvgFontFileParser;
-use Cog\Unicode\CompositeCharacter;
+use Cog\Unicode\Character;
 use PHPUnit\Framework\TestCase;
 
 final class SvgFontTest extends TestCase
@@ -23,7 +23,7 @@ public function testItCanComputeTextWidth(
         $this->assertSame(
             $expectedWidth,
             $font->computeWidth(
-                CompositeCharacter::ofChars($characters),
+                Character::of($characters),
                 $fontSize,
                 $letterSpacing,
             ),