From 8fdf289416a520f746af3363335da5cbeac97a20 Mon Sep 17 00:00:00 2001 From: Casper Bakker Date: Sun, 22 Sep 2024 09:52:34 +0200 Subject: [PATCH] Add a RendererInterface --- generate-verified-files.php | 4 +- src/Renderers/DynamicHtmlRenderer.php | 19 ++- src/Renderers/HtmlRenderer.php | 16 +-- src/Renderers/PngRenderer.php | 18 ++- src/Renderers/RendererInterface.php | 14 ++ src/Renderers/SvgRenderer.php | 14 +- tests/verified-files/0049000004632-ean13.svg | 2 +- .../081231723897-code128-red-background.html | 58 ++++---- .../verified-files/081231723897-code128.html | 56 ++++---- .../081231723897-dynamic-code128.html | 56 ++++---- .../081231723897-ean13-fractional-width.svg | 2 +- .../081231723897-ean13-red-background.svg | 4 +- tests/verified-files/081231723897-ean13.svg | 2 +- .../12345678903-dynamic-imb.html | 130 +++++++++--------- tests/verified-files/12345678903-imb.html | 130 +++++++++--------- .../verified-files/TypeCodabar-123456789.svg | 2 +- tests/verified-files/TypeCode11-123456789.svg | 2 +- .../TypeCode128-081231723897.svg | 2 +- .../TypeCode128-1234567890abcABC-283-33.svg | 2 +- .../TypeCode128A-1234567890.svg | 2 +- .../TypeCode128B-081231723897.svg | 2 +- .../TypeCode128B-1234567890abcABC-283-33.svg | 2 +- .../TypeCode39-1234567890ABC.svg | 2 +- .../TypeCode39Checksum-1234567890ABC.svg | 2 +- .../TypeCode39Extended-1234567890abcABC.svg | 2 +- ...ode39ExtendedChecksum-1234567890abcABC.svg | 2 +- .../TypeCode93-1234567890abcABC.svg | 2 +- .../verified-files/TypeEan13-004900000463.svg | 2 +- .../TypeEan13-0049000004632.svg | 2 +- .../verified-files/TypeEan13-081231723897.svg | 2 +- tests/verified-files/TypeEan8-1234568.svg | 2 +- .../TypeITF14-00012345600012.svg | 2 +- .../TypeITF14-05400141288766.svg | 2 +- .../TypeIntelligentMailBarcode-123456789.svg | 2 +- .../TypeInterleaved25-1234567890.svg | 2 +- .../TypeInterleaved25Checksum-1234567890.svg | 2 +- tests/verified-files/TypeKix-123456789.svg | 2 +- tests/verified-files/TypeMsi-123456789.svg | 2 +- .../TypeMsiChecksum-123456789.svg | 2 +- .../TypePharmacode-123456789.svg | 2 +- .../TypePharmacodeTwoCode-123456789.svg | 2 +- tests/verified-files/TypePlanet-123456789.svg | 2 +- .../verified-files/TypePostnet-123456789.svg | 2 +- tests/verified-files/TypeRms4cc-123456789.svg | 2 +- .../TypeStandard2of5-1234567890.svg | 2 +- .../TypeStandard2of5Checksum-1234567890.svg | 2 +- .../TypeTelepen-1234567890ASCD.svg | 2 +- .../TypeTelepenNumeric-1234567890.svg | 2 +- tests/verified-files/TypeUpcA-123456789.svg | 2 +- tests/verified-files/TypeUpcE-123456789.svg | 2 +- tests/verified-files/TypeUpcExtension2-22.svg | 2 +- ...eUpcExtension5-1234567890abcABC-283-33.svg | 2 +- 52 files changed, 308 insertions(+), 291 deletions(-) create mode 100644 src/Renderers/RendererInterface.php diff --git a/generate-verified-files.php b/generate-verified-files.php index 3d02f76b..d5135460 100644 --- a/generate-verified-files.php +++ b/generate-verified-files.php @@ -15,13 +15,13 @@ file_put_contents('tests/verified-files/081231723897-ean13-fractional-width.svg', $svgRenderer->render($barcode, $barcode->getWidth() * 0.25, 25.75)); $svgRendererRed = new Picqer\Barcode\Renderers\SvgRenderer(); -$svgRendererRed->setBackgroundColor('red'); +$svgRendererRed->setBackgroundColor([255, 0, 0]); file_put_contents('tests/verified-files/081231723897-ean13-red-background.svg', $svgRendererRed->render($barcode, $barcode->getWidth() * 2)); $barcode = $typeEncoderCode128->getBarcode('081231723897'); file_put_contents('tests/verified-files/081231723897-code128.html', $htmlRenderer->render($barcode, $barcode->getWidth() * 2)); $htmlRendererRed = new Picqer\Barcode\Renderers\HtmlRenderer(); -$htmlRendererRed->setBackgroundColor('red'); +$htmlRendererRed->setBackgroundColor([255, 0, 0]); file_put_contents('tests/verified-files/081231723897-code128-red-background.html', $htmlRendererRed->render($barcode, $barcode->getWidth() * 2)); $barcode = $typeEncoderIMB->getBarcode('12345678903'); diff --git a/src/Renderers/DynamicHtmlRenderer.php b/src/Renderers/DynamicHtmlRenderer.php index 45500e56..c19de85e 100644 --- a/src/Renderers/DynamicHtmlRenderer.php +++ b/src/Renderers/DynamicHtmlRenderer.php @@ -5,16 +5,17 @@ use Picqer\Barcode\Barcode; use Picqer\Barcode\BarcodeBar; -class DynamicHtmlRenderer +class DynamicHtmlRenderer implements RendererInterface { protected const WIDTH_PRECISION = 6; - protected string $foregroundColor = 'black'; - protected ?string $backgroundColor = null; + protected array $foregroundColor = [0, 0, 0]; + protected ?array $backgroundColor = null; - public function render(Barcode $barcode): string + // Width and height are ignored in this renderer + public function render(Barcode $barcode, float $width = 200, float $height = 30): string { - $html = '
' . PHP_EOL; + $html = '
' . PHP_EOL; $positionHorizontal = 0; /** @var BarcodeBar $bar */ @@ -26,7 +27,7 @@ public function render(Barcode $barcode): string $positionVertical = round(($bar->getPositionVertical() / $barcode->getHeight() * 100), 3); // draw a vertical bar - $html .= '
 
' . PHP_EOL; + $html .= '
 
' . PHP_EOL; } $positionHorizontal += $barWidth; @@ -37,15 +38,13 @@ public function render(Barcode $barcode): string return $html; } - // Use HTML color definitions, like 'red' or '#ff0000' - public function setForegroundColor(string $color): self + public function setForegroundColor(array $color): self { $this->foregroundColor = $color; return $this; } - // Use HTML color definitions, like 'red' or '#ff0000' - public function setBackgroundColor(?string $color): self + public function setBackgroundColor(?array $color): self { $this->backgroundColor = $color; return $this; diff --git a/src/Renderers/HtmlRenderer.php b/src/Renderers/HtmlRenderer.php index fae8ffa2..9b93651d 100644 --- a/src/Renderers/HtmlRenderer.php +++ b/src/Renderers/HtmlRenderer.php @@ -5,16 +5,16 @@ use Picqer\Barcode\Barcode; use Picqer\Barcode\BarcodeBar; -class HtmlRenderer +class HtmlRenderer implements RendererInterface { - protected string $foregroundColor = 'black'; - protected ?string $backgroundColor = null; + protected array $foregroundColor = [0, 0, 0]; + protected ?array $backgroundColor = null; public function render(Barcode $barcode, float $width = 200, float $height = 30): string { $widthFactor = $width / $barcode->getWidth(); - $html = '
' . PHP_EOL; + $html = '
' . PHP_EOL; $positionHorizontal = 0; /** @var BarcodeBar $bar */ @@ -26,7 +26,7 @@ public function render(Barcode $barcode, float $width = 200, float $height = 30) $positionVertical = round(($bar->getPositionVertical() * $height / $barcode->getHeight()), 3); // draw a vertical bar - $html .= '
 
' . PHP_EOL; + $html .= '
 
' . PHP_EOL; } $positionHorizontal += $barWidth; @@ -37,15 +37,13 @@ public function render(Barcode $barcode, float $width = 200, float $height = 30) return $html; } - // Use HTML color definitions, like 'red' or '#ff0000' - public function setForegroundColor(string $color): self + public function setForegroundColor(array $color): self { $this->foregroundColor = $color; return $this; } - // Use HTML color definitions, like 'red' or '#ff0000' - public function setBackgroundColor(?string $color): self + public function setBackgroundColor(?array $color): self { $this->backgroundColor = $color; return $this; diff --git a/src/Renderers/PngRenderer.php b/src/Renderers/PngRenderer.php index 226a7b7e..4fd6e684 100644 --- a/src/Renderers/PngRenderer.php +++ b/src/Renderers/PngRenderer.php @@ -9,7 +9,7 @@ use Picqer\Barcode\BarcodeBar; use Picqer\Barcode\Exceptions\BarcodeException; -class PngRenderer +class PngRenderer implements RendererInterface { protected array $foregroundColor = [0, 0, 0]; protected ?array $backgroundColor = null; @@ -49,9 +49,15 @@ public function useGd(): self return $this; } - public function render(Barcode $barcode, int $widthFactor = 2, int $height = 30): string + // Floats in width and height will be rounded to integers + // For best (and valid) result, use a width as a factor of the width of the Barcode object + // Example: $width = $barcode->getWidth() * 3 + public function render(Barcode $barcode, float $width = 200, float $height = 30): string { - $width = (int)round($barcode->getWidth() * $widthFactor); + $width = round($width); + $height = round($height); + + $widthFactor = $width / $barcode->getWidth(); if ($this->useImagick) { $image = $this->createImagickImageObject($width, $height); @@ -66,7 +72,7 @@ public function render(Barcode $barcode, int $widthFactor = 2, int $height = 30) $positionHorizontal = 0; /** @var BarcodeBar $bar */ foreach ($barcode->getBars() as $bar) { - $barWidth = (int)round(($bar->getWidth() * $widthFactor)); + $barWidth = $bar->getWidth() * $widthFactor; if ($bar->isBar() && $barWidth > 0) { $y = (int)round(($bar->getPositionVertical() * $height / $barcode->getHeight())); @@ -74,9 +80,9 @@ public function render(Barcode $barcode, int $widthFactor = 2, int $height = 30) // draw a vertical bar if ($this->useImagick) { - $imagickBarsShape->rectangle($positionHorizontal, $y, ($positionHorizontal + $barWidth - 1), ($y + $barHeight)); + $imagickBarsShape->rectangle(round($positionHorizontal), $y, round($positionHorizontal + $barWidth - 1), ($y + $barHeight)); } else { - \imagefilledrectangle($image, $positionHorizontal, $y, ($positionHorizontal + $barWidth - 1), ($y + $barHeight), $gdForegroundColor); + \imagefilledrectangle($image, round($positionHorizontal), $y, round($positionHorizontal + $barWidth - 1), ($y + $barHeight), $gdForegroundColor); } } $positionHorizontal += $barWidth; diff --git a/src/Renderers/RendererInterface.php b/src/Renderers/RendererInterface.php new file mode 100644 index 00000000..eaba33d6 --- /dev/null +++ b/src/Renderers/RendererInterface.php @@ -0,0 +1,14 @@ +backgroundColor !== null) { - $svg .= "\t" . '' . PHP_EOL; + $svg .= "\t" . '' . PHP_EOL; } - $svg .= "\t" . '' . PHP_EOL; + $svg .= "\t" . '' . PHP_EOL; // print bars $positionHorizontal = 0; @@ -56,13 +56,13 @@ public function render(Barcode $barcode, float $width = 200, float $height = 30) return $svg; } - public function setForegroundColor(string $color): self + public function setForegroundColor(array $color): self { $this->foregroundColor = $color; return $this; } - public function setBackgroundColor(?string $color): self + public function setBackgroundColor(?array $color): self { $this->backgroundColor = $color; return $this; diff --git a/tests/verified-files/0049000004632-ean13.svg b/tests/verified-files/0049000004632-ean13.svg index 427ff401..5c46159d 100644 --- a/tests/verified-files/0049000004632-ean13.svg +++ b/tests/verified-files/0049000004632-ean13.svg @@ -2,7 +2,7 @@ 0049000004632 - + diff --git a/tests/verified-files/081231723897-code128-red-background.html b/tests/verified-files/081231723897-code128-red-background.html index 6023c225..45f6b312 100644 --- a/tests/verified-files/081231723897-code128-red-background.html +++ b/tests/verified-files/081231723897-code128-red-background.html @@ -1,30 +1,30 @@ -
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
+
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
diff --git a/tests/verified-files/081231723897-code128.html b/tests/verified-files/081231723897-code128.html index e9cf37a8..7b3f9f20 100644 --- a/tests/verified-files/081231723897-code128.html +++ b/tests/verified-files/081231723897-code128.html @@ -1,30 +1,30 @@
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
diff --git a/tests/verified-files/081231723897-dynamic-code128.html b/tests/verified-files/081231723897-dynamic-code128.html index cdf2d940..6d88107c 100644 --- a/tests/verified-files/081231723897-dynamic-code128.html +++ b/tests/verified-files/081231723897-dynamic-code128.html @@ -1,30 +1,30 @@
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
diff --git a/tests/verified-files/081231723897-ean13-fractional-width.svg b/tests/verified-files/081231723897-ean13-fractional-width.svg index d6164900..2ff29675 100644 --- a/tests/verified-files/081231723897-ean13-fractional-width.svg +++ b/tests/verified-files/081231723897-ean13-fractional-width.svg @@ -2,7 +2,7 @@ 0812317238973 - + diff --git a/tests/verified-files/081231723897-ean13-red-background.svg b/tests/verified-files/081231723897-ean13-red-background.svg index 406af573..52bad4d7 100644 --- a/tests/verified-files/081231723897-ean13-red-background.svg +++ b/tests/verified-files/081231723897-ean13-red-background.svg @@ -2,8 +2,8 @@ 0812317238973 - - + + diff --git a/tests/verified-files/081231723897-ean13.svg b/tests/verified-files/081231723897-ean13.svg index 96e16193..a3964392 100644 --- a/tests/verified-files/081231723897-ean13.svg +++ b/tests/verified-files/081231723897-ean13.svg @@ -2,7 +2,7 @@ 0812317238973 - + diff --git a/tests/verified-files/12345678903-dynamic-imb.html b/tests/verified-files/12345678903-dynamic-imb.html index c06f1fb8..7142156f 100644 --- a/tests/verified-files/12345678903-dynamic-imb.html +++ b/tests/verified-files/12345678903-dynamic-imb.html @@ -1,67 +1,67 @@
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
diff --git a/tests/verified-files/12345678903-imb.html b/tests/verified-files/12345678903-imb.html index eba3400b..7620abc9 100644 --- a/tests/verified-files/12345678903-imb.html +++ b/tests/verified-files/12345678903-imb.html @@ -1,67 +1,67 @@
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
diff --git a/tests/verified-files/TypeCodabar-123456789.svg b/tests/verified-files/TypeCodabar-123456789.svg index 0d9606ad..0bbe6d1c 100644 --- a/tests/verified-files/TypeCodabar-123456789.svg +++ b/tests/verified-files/TypeCodabar-123456789.svg @@ -2,7 +2,7 @@ 123456789 - + diff --git a/tests/verified-files/TypeCode11-123456789.svg b/tests/verified-files/TypeCode11-123456789.svg index f30d9191..8c8eb3fb 100644 --- a/tests/verified-files/TypeCode11-123456789.svg +++ b/tests/verified-files/TypeCode11-123456789.svg @@ -2,7 +2,7 @@ 123456789 - + diff --git a/tests/verified-files/TypeCode128-081231723897.svg b/tests/verified-files/TypeCode128-081231723897.svg index 64b544fa..d7267abf 100644 --- a/tests/verified-files/TypeCode128-081231723897.svg +++ b/tests/verified-files/TypeCode128-081231723897.svg @@ -2,7 +2,7 @@ 081231723897 - + diff --git a/tests/verified-files/TypeCode128-1234567890abcABC-283-33.svg b/tests/verified-files/TypeCode128-1234567890abcABC-283-33.svg index 4a3708ad..32b8c1fc 100644 --- a/tests/verified-files/TypeCode128-1234567890abcABC-283-33.svg +++ b/tests/verified-files/TypeCode128-1234567890abcABC-283-33.svg @@ -2,7 +2,7 @@ 1234567890abcABC-283*33 - + diff --git a/tests/verified-files/TypeCode128A-1234567890.svg b/tests/verified-files/TypeCode128A-1234567890.svg index 22d2cf41..9964f3dc 100644 --- a/tests/verified-files/TypeCode128A-1234567890.svg +++ b/tests/verified-files/TypeCode128A-1234567890.svg @@ -2,7 +2,7 @@ 1234567890 - + diff --git a/tests/verified-files/TypeCode128B-081231723897.svg b/tests/verified-files/TypeCode128B-081231723897.svg index f3ee4e03..99133e9d 100644 --- a/tests/verified-files/TypeCode128B-081231723897.svg +++ b/tests/verified-files/TypeCode128B-081231723897.svg @@ -2,7 +2,7 @@ 081231723897 - + diff --git a/tests/verified-files/TypeCode128B-1234567890abcABC-283-33.svg b/tests/verified-files/TypeCode128B-1234567890abcABC-283-33.svg index ec25033c..9d79a944 100644 --- a/tests/verified-files/TypeCode128B-1234567890abcABC-283-33.svg +++ b/tests/verified-files/TypeCode128B-1234567890abcABC-283-33.svg @@ -2,7 +2,7 @@ 1234567890abcABC-283*33 - + diff --git a/tests/verified-files/TypeCode39-1234567890ABC.svg b/tests/verified-files/TypeCode39-1234567890ABC.svg index 448792d4..a0285647 100644 --- a/tests/verified-files/TypeCode39-1234567890ABC.svg +++ b/tests/verified-files/TypeCode39-1234567890ABC.svg @@ -2,7 +2,7 @@ *1234567890ABC* - + diff --git a/tests/verified-files/TypeCode39Checksum-1234567890ABC.svg b/tests/verified-files/TypeCode39Checksum-1234567890ABC.svg index 280551ac..00a99a7a 100644 --- a/tests/verified-files/TypeCode39Checksum-1234567890ABC.svg +++ b/tests/verified-files/TypeCode39Checksum-1234567890ABC.svg @@ -2,7 +2,7 @@ *1234567890ABCZ* - + diff --git a/tests/verified-files/TypeCode39Extended-1234567890abcABC.svg b/tests/verified-files/TypeCode39Extended-1234567890abcABC.svg index d85cc717..39fc3e3c 100644 --- a/tests/verified-files/TypeCode39Extended-1234567890abcABC.svg +++ b/tests/verified-files/TypeCode39Extended-1234567890abcABC.svg @@ -2,7 +2,7 @@ *1234567890+A+B+CABC* - + diff --git a/tests/verified-files/TypeCode39ExtendedChecksum-1234567890abcABC.svg b/tests/verified-files/TypeCode39ExtendedChecksum-1234567890abcABC.svg index a1a87c5d..a6880d6a 100644 --- a/tests/verified-files/TypeCode39ExtendedChecksum-1234567890abcABC.svg +++ b/tests/verified-files/TypeCode39ExtendedChecksum-1234567890abcABC.svg @@ -2,7 +2,7 @@ *1234567890+A+B+CABCJ* - + diff --git a/tests/verified-files/TypeCode93-1234567890abcABC.svg b/tests/verified-files/TypeCode93-1234567890abcABC.svg index 120c36fb..efa0b6e7 100644 --- a/tests/verified-files/TypeCode93-1234567890abcABC.svg +++ b/tests/verified-files/TypeCode93-1234567890abcABC.svg @@ -2,7 +2,7 @@ *1234567890dAdBdCABC6-* - + diff --git a/tests/verified-files/TypeEan13-004900000463.svg b/tests/verified-files/TypeEan13-004900000463.svg index 427ff401..5c46159d 100644 --- a/tests/verified-files/TypeEan13-004900000463.svg +++ b/tests/verified-files/TypeEan13-004900000463.svg @@ -2,7 +2,7 @@ 0049000004632 - + diff --git a/tests/verified-files/TypeEan13-0049000004632.svg b/tests/verified-files/TypeEan13-0049000004632.svg index 427ff401..5c46159d 100644 --- a/tests/verified-files/TypeEan13-0049000004632.svg +++ b/tests/verified-files/TypeEan13-0049000004632.svg @@ -2,7 +2,7 @@ 0049000004632 - + diff --git a/tests/verified-files/TypeEan13-081231723897.svg b/tests/verified-files/TypeEan13-081231723897.svg index 96e16193..a3964392 100644 --- a/tests/verified-files/TypeEan13-081231723897.svg +++ b/tests/verified-files/TypeEan13-081231723897.svg @@ -2,7 +2,7 @@ 0812317238973 - + diff --git a/tests/verified-files/TypeEan8-1234568.svg b/tests/verified-files/TypeEan8-1234568.svg index 9c4e210d..2dc590c9 100644 --- a/tests/verified-files/TypeEan8-1234568.svg +++ b/tests/verified-files/TypeEan8-1234568.svg @@ -2,7 +2,7 @@ 12345687 - + diff --git a/tests/verified-files/TypeITF14-00012345600012.svg b/tests/verified-files/TypeITF14-00012345600012.svg index 25553f09..c2a317be 100644 --- a/tests/verified-files/TypeITF14-00012345600012.svg +++ b/tests/verified-files/TypeITF14-00012345600012.svg @@ -2,7 +2,7 @@ 00012345600012 - + diff --git a/tests/verified-files/TypeITF14-05400141288766.svg b/tests/verified-files/TypeITF14-05400141288766.svg index ece67b75..dd1a0b9c 100644 --- a/tests/verified-files/TypeITF14-05400141288766.svg +++ b/tests/verified-files/TypeITF14-05400141288766.svg @@ -2,7 +2,7 @@ 05400141288766 - + diff --git a/tests/verified-files/TypeIntelligentMailBarcode-123456789.svg b/tests/verified-files/TypeIntelligentMailBarcode-123456789.svg index a82dcd97..8637b41e 100644 --- a/tests/verified-files/TypeIntelligentMailBarcode-123456789.svg +++ b/tests/verified-files/TypeIntelligentMailBarcode-123456789.svg @@ -2,7 +2,7 @@ 123456789 - + diff --git a/tests/verified-files/TypeInterleaved25-1234567890.svg b/tests/verified-files/TypeInterleaved25-1234567890.svg index 77af1b41..3d0c1ed3 100644 --- a/tests/verified-files/TypeInterleaved25-1234567890.svg +++ b/tests/verified-files/TypeInterleaved25-1234567890.svg @@ -2,7 +2,7 @@ AA1234567890ZA - + diff --git a/tests/verified-files/TypeInterleaved25Checksum-1234567890.svg b/tests/verified-files/TypeInterleaved25Checksum-1234567890.svg index 55f32b0e..394bf7d1 100644 --- a/tests/verified-files/TypeInterleaved25Checksum-1234567890.svg +++ b/tests/verified-files/TypeInterleaved25Checksum-1234567890.svg @@ -2,7 +2,7 @@ AA012345678905ZA - + diff --git a/tests/verified-files/TypeKix-123456789.svg b/tests/verified-files/TypeKix-123456789.svg index 0c051776..953a3309 100644 --- a/tests/verified-files/TypeKix-123456789.svg +++ b/tests/verified-files/TypeKix-123456789.svg @@ -2,7 +2,7 @@ 123456789 - + diff --git a/tests/verified-files/TypeMsi-123456789.svg b/tests/verified-files/TypeMsi-123456789.svg index 89c00904..a48095ed 100644 --- a/tests/verified-files/TypeMsi-123456789.svg +++ b/tests/verified-files/TypeMsi-123456789.svg @@ -2,7 +2,7 @@ 123456789 - + diff --git a/tests/verified-files/TypeMsiChecksum-123456789.svg b/tests/verified-files/TypeMsiChecksum-123456789.svg index de5eae86..6cd6062f 100644 --- a/tests/verified-files/TypeMsiChecksum-123456789.svg +++ b/tests/verified-files/TypeMsiChecksum-123456789.svg @@ -2,7 +2,7 @@ 1234567892 - + diff --git a/tests/verified-files/TypePharmacode-123456789.svg b/tests/verified-files/TypePharmacode-123456789.svg index 46044b0a..3dac6de4 100644 --- a/tests/verified-files/TypePharmacode-123456789.svg +++ b/tests/verified-files/TypePharmacode-123456789.svg @@ -2,7 +2,7 @@ 123456789 - + diff --git a/tests/verified-files/TypePharmacodeTwoCode-123456789.svg b/tests/verified-files/TypePharmacodeTwoCode-123456789.svg index 39975d48..6a409d35 100644 --- a/tests/verified-files/TypePharmacodeTwoCode-123456789.svg +++ b/tests/verified-files/TypePharmacodeTwoCode-123456789.svg @@ -2,7 +2,7 @@ 123456789 - + diff --git a/tests/verified-files/TypePlanet-123456789.svg b/tests/verified-files/TypePlanet-123456789.svg index 51de3aab..a6a3fe8f 100644 --- a/tests/verified-files/TypePlanet-123456789.svg +++ b/tests/verified-files/TypePlanet-123456789.svg @@ -2,7 +2,7 @@ 123456789 - + diff --git a/tests/verified-files/TypePostnet-123456789.svg b/tests/verified-files/TypePostnet-123456789.svg index ca895ecb..5cefece1 100644 --- a/tests/verified-files/TypePostnet-123456789.svg +++ b/tests/verified-files/TypePostnet-123456789.svg @@ -2,7 +2,7 @@ 123456789 - + diff --git a/tests/verified-files/TypeRms4cc-123456789.svg b/tests/verified-files/TypeRms4cc-123456789.svg index ee91be75..5e7c698d 100644 --- a/tests/verified-files/TypeRms4cc-123456789.svg +++ b/tests/verified-files/TypeRms4cc-123456789.svg @@ -2,7 +2,7 @@ 123456789 - + diff --git a/tests/verified-files/TypeStandard2of5-1234567890.svg b/tests/verified-files/TypeStandard2of5-1234567890.svg index 26d48c56..8aee6352 100644 --- a/tests/verified-files/TypeStandard2of5-1234567890.svg +++ b/tests/verified-files/TypeStandard2of5-1234567890.svg @@ -2,7 +2,7 @@ 1234567890 - + diff --git a/tests/verified-files/TypeStandard2of5Checksum-1234567890.svg b/tests/verified-files/TypeStandard2of5Checksum-1234567890.svg index dcdc32af..650cc9f3 100644 --- a/tests/verified-files/TypeStandard2of5Checksum-1234567890.svg +++ b/tests/verified-files/TypeStandard2of5Checksum-1234567890.svg @@ -2,7 +2,7 @@ 12345678905 - + diff --git a/tests/verified-files/TypeTelepen-1234567890ASCD.svg b/tests/verified-files/TypeTelepen-1234567890ASCD.svg index d44f436d..22429b29 100644 --- a/tests/verified-files/TypeTelepen-1234567890ASCD.svg +++ b/tests/verified-files/TypeTelepen-1234567890ASCD.svg @@ -2,7 +2,7 @@ 1234567890ASCD - + diff --git a/tests/verified-files/TypeTelepenNumeric-1234567890.svg b/tests/verified-files/TypeTelepenNumeric-1234567890.svg index 079766bc..34c44795 100644 --- a/tests/verified-files/TypeTelepenNumeric-1234567890.svg +++ b/tests/verified-files/TypeTelepenNumeric-1234567890.svg @@ -2,7 +2,7 @@ 1234567890 - + diff --git a/tests/verified-files/TypeUpcA-123456789.svg b/tests/verified-files/TypeUpcA-123456789.svg index d7ed6dc3..38b420c1 100644 --- a/tests/verified-files/TypeUpcA-123456789.svg +++ b/tests/verified-files/TypeUpcA-123456789.svg @@ -2,7 +2,7 @@ 0001234567895 - + diff --git a/tests/verified-files/TypeUpcE-123456789.svg b/tests/verified-files/TypeUpcE-123456789.svg index 4347e926..4333be74 100644 --- a/tests/verified-files/TypeUpcE-123456789.svg +++ b/tests/verified-files/TypeUpcE-123456789.svg @@ -2,7 +2,7 @@ 012349 - + diff --git a/tests/verified-files/TypeUpcExtension2-22.svg b/tests/verified-files/TypeUpcExtension2-22.svg index d7f285d0..1fb84e7d 100644 --- a/tests/verified-files/TypeUpcExtension2-22.svg +++ b/tests/verified-files/TypeUpcExtension2-22.svg @@ -2,7 +2,7 @@ 22 - + diff --git a/tests/verified-files/TypeUpcExtension5-1234567890abcABC-283-33.svg b/tests/verified-files/TypeUpcExtension5-1234567890abcABC-283-33.svg index df18eae3..a4287a51 100644 --- a/tests/verified-files/TypeUpcExtension5-1234567890abcABC-283-33.svg +++ b/tests/verified-files/TypeUpcExtension5-1234567890abcABC-283-33.svg @@ -2,7 +2,7 @@ 1234567890abcABC-283*33 - +