Add separator type in getOrdArrWidth

tecnickcom · Mar 21, 2024 · af272b8 · af272b8
1 parent 9cd9925
commit af272b8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1.1
+2.2.0
diff --git a/src/Stack.php b/src/Stack.php
@@ -35,18 +35,19 @@
  * @phpstan-type TTextSplit array{
  *     'pos': int,
  *     'ord': int,
- *     'wordwidth': float,
  *     'spaces': int,
+ *     'septype': string,
+ *     'wordwidth': float,
  *     'totwidth': float,
  *     'totspacewidth': float,
  * }
  *
  * @phpstan-type TTextDims array{
  *     'chars': int,
  *     'spaces': int,
+ *     'words': int,
  *     'totwidth': float,
  *     'totspacewidth': float,
- *     'words': int,
  *     'split': array<int, TTextSplit>,
  * }
  *
@@ -368,8 +369,9 @@ public function getOrdArrDims(array $uniarr): array
                 $split[$words] = [
                     'pos' => $idx,
                     'ord' => $ord,
-                    'wordwidth' => 0,
                     'spaces' => $spaces,
+                    'septype' => $unitype,
+                    'wordwidth' => 0,
                     'totwidth' => ($totwidth + ($fact * ($idx - 1))),
                     'totspacewidth' => ($totspacewidth + ($fact * ($spaces - 1))),
                 ];
@@ -389,9 +391,9 @@ public function getOrdArrDims(array $uniarr): array
         return [
             'chars' => $chars,
             'spaces' => $spaces,
+            'words' => $words,
             'totwidth' => $totwidth,
             'totspacewidth' => $totspacewidth,
-            'words' => $words,
             'split' => $split,
         ];
     }

diff --git a/test/StackTest.php b/test/StackTest.php
@@ -126,6 +126,7 @@ public function testStack(): void
 
         $this->assertEquals(11, $widths['split'][5]['pos']);
         $this->assertEquals(8203, $widths['split'][5]['ord']);
+        $this->assertEquals('BN', $widths['split'][5]['septype']);
         $this->bcAssertEqualsWithDelta(4.92, $widths['split'][5]['wordwidth'], 0.0001);
         $this->assertEquals(2, $widths['split'][5]['spaces']);
         $this->bcAssertEqualsWithDelta(60.9384, $widths['split'][5]['totwidth'], 0.0001);