From a402288cbc55468718b938f141533b127b843eeb Mon Sep 17 00:00:00 2001 From: Christian Budde Date: Sun, 10 Jan 2021 14:33:14 +0100 Subject: [PATCH 1/2] Update Path.php Fixes issue #618 --- src/Tag/Svg/Path.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tag/Svg/Path.php b/src/Tag/Svg/Path.php index 9593ce91..10065793 100644 --- a/src/Tag/Svg/Path.php +++ b/src/Tag/Svg/Path.php @@ -41,6 +41,7 @@ protected function drawSvg($properties) $path = str_replace(',', ' ', $path); $path = preg_replace('/([a-zA-Z])([0-9\.\-])/', '$1 $2', $path); $path = preg_replace('/([0-9\.])([a-zA-Z])/', '$1 $2', $path); + $path = preg_replace('/([0-9\.])([-])([0-9\.])/', '$1 $2$3', $path); $path = preg_replace('/[\s]+/', ' ', trim($path)); $path = preg_replace('/ ([a-z]{2})/', '$1', $path); $path = preg_replace('/Z([a-zA-Z])/', 'Z $1', $path); From 63af6f46b20c733a5cf54b98582cc9a24bb80ee9 Mon Sep 17 00:00:00 2001 From: Christian Budde Date: Sun, 10 Jan 2021 19:08:22 +0100 Subject: [PATCH 2/2] Adapt path preparation for e notation --- src/Tag/Svg/Path.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tag/Svg/Path.php b/src/Tag/Svg/Path.php index 10065793..42c5b81a 100644 --- a/src/Tag/Svg/Path.php +++ b/src/Tag/Svg/Path.php @@ -39,8 +39,8 @@ protected function drawSvg($properties) if ($path) { // prepare the path $path = str_replace(',', ' ', $path); - $path = preg_replace('/([a-zA-Z])([0-9\.\-])/', '$1 $2', $path); - $path = preg_replace('/([0-9\.])([a-zA-Z])/', '$1 $2', $path); + $path = preg_replace('/([a-df-zA-DF-Z])([0-9\.\-])/', '$1 $2', $path); + $path = preg_replace('/([0-9\.])([a-df-zA-DF-Z])/', '$1 $2', $path); $path = preg_replace('/([0-9\.])([-])([0-9\.])/', '$1 $2$3', $path); $path = preg_replace('/[\s]+/', ' ', trim($path)); $path = preg_replace('/ ([a-z]{2})/', '$1', $path);