Fix font type functions

tecnickcom · Mar 25, 2024 · 97b635e · 97b635e
1 parent 2c3d167
commit 97b635e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.2.1
+2.2.2
diff --git a/src/Stack.php b/src/Stack.php
@@ -242,7 +242,7 @@ public function getOutCurrentFont(): string
     public function isCurrentByteFont(): bool
     {
         $currentFontType = $this->getCurrentFontType();
-        return ! (($currentFontType == 'Core') || ($currentFontType == 'TrueType') || ($currentFontType == 'Type1'));
+        return (($currentFontType == 'Core') || ($currentFontType == 'TrueType') || ($currentFontType == 'Type1'));
     }
 
     /**
@@ -251,7 +251,7 @@ public function isCurrentByteFont(): bool
     public function isCurrentUnicodeFont(): bool
     {
         $currentFontType = $this->getCurrentFontType();
-        return $currentFontType != 'TrueTypeUnicode' && $currentFontType != 'cidfont0';
+        return (($currentFontType == 'TrueTypeUnicode') || ($currentFontType == 'cidfont0'));
     }
 
     /**

diff --git a/test/StackTest.php b/test/StackTest.php
@@ -111,10 +111,10 @@ public function testStack(): void
         $this->assertEquals('Type1', $type);
 
         $ftype = $stack->isCurrentUnicodeFont();
-        $this->assertTrue($ftype);
+        $this->assertFalse($ftype);
 
         $ftype = $stack->isCurrentByteFont();
-        $this->assertFalse($ftype);
+        $this->assertTrue($ftype);
 
         $uniarr = [65, 173, 300, 32, 65, 173, 300, 32, 65, 173, 300];
         $widths = $stack->getOrdArrDims($uniarr);