ODPresentation Reader : Read differents units for margin

PHPOffice · Jan 27, 2025 · ef67364 · ef67364
1 parent 9b0921a
commit ef67364
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 13 deletions.
diff --git a/docs/changes/1.2.0.md b/docs/changes/1.2.0.md
@@ -18,6 +18,7 @@
 - `Gd::setImageResource()` : Fixed when imagecreatetruecolor returns false  by [@jaapdh](https://github.com/jaapdh) in [#843](https://github.com/PHPOffice/PHPPresentation/pull/843)
 - Word2007 Writer: LineChart supports LabelPosition for Series by [@pal-software](https://github.com/pal-software) fixing [#606](https://github.com/PHPOffice/PHPPresentation/pull/606) in [#8434](https://github.com/PHPOffice/PHPPresentation/pull/844)
 - `createDrawingShape` has no container defined by [@Progi1984](https://github.com/Progi1984) fixing [#820](https://github.com/PHPOffice/PHPPresentation/pull/820) in [#845](https://github.com/PHPOffice/PHPPresentation/pull/845)
+- ODPresentation Reader : Read differents units for margin by [@Progi1984](https://github.com/Progi1984) fixing [#830](https://github.com/PHPOffice/PHPPresentation/pull/830) in [#847](https://github.com/PHPOffice/PHPPresentation/pull/847)
 
 ## Miscellaneous
 

diff --git a/samples/Sample_12_Reader_ODPresentation.php b/samples/Sample_12_Reader_ODPresentation.php
@@ -2,12 +2,12 @@
 
 set_time_limit(10);
 
-include_once 'Sample_Header.php';
+include_once __DIR__ . '/Sample_Header.php';
 
 use PhpOffice\PhpPresentation\IOFactory;
 
 $pptReader = IOFactory::createReader('ODPresentation');
-$oPHPPresentation = $pptReader->load('resources/Sample_12.odp');
+$oPHPPresentation = $pptReader->load(__DIR__ . '/resources/Sample_12.odp');
 
 $oTree = new PhpPptTree($oPHPPresentation);
 echo $oTree->display();

diff --git a/src/PhpPresentation/Reader/ODPresentation.php b/src/PhpPresentation/Reader/ODPresentation.php
@@ -424,12 +424,10 @@ protected function loadStyle(DOMElement $nodeStyle): bool
                 $lineSpacing = $this->getExpressionValue($nodeParagraphProps->getAttribute('fo:margin-bottom'));
             }
             if ($nodeParagraphProps->hasAttribute('fo:margin-bottom')) {
-                $spacingAfter = (float) substr($nodeParagraphProps->getAttribute('fo:margin-bottom'), 0, -2);
-                $spacingAfter = CommonDrawing::centimetersToPoints($spacingAfter);
+                $spacingAfter = self::sizeToPoint($nodeParagraphProps->getAttribute('fo:margin-bottom'));
             }
             if ($nodeParagraphProps->hasAttribute('fo:margin-top')) {
-                $spacingBefore = (float) substr($nodeParagraphProps->getAttribute('fo:margin-top'), 0, -2);
-                $spacingBefore = CommonDrawing::centimetersToPoints($spacingBefore);
+                $spacingBefore = self::sizeToPoint($nodeParagraphProps->getAttribute('fo:margin-top'));
             }
             $oAlignment = new Alignment();
             if ($nodeParagraphProps->hasAttribute('fo:text-align')) {
@@ -774,4 +772,36 @@ private function getExpressionValue(string $expr): string
 
         return substr($expr, 0, -2);
     }
+
+    /**
+     * Transforms a size in CSS format (eg. 10px, 10px, ...) to points.
+     */
+    protected static function sizeToPoint(string $value): ?float
+    {
+        if ($value == '0') {
+            return 0;
+        }
+        $matches = [];
+        if (preg_match('/^[+-]?([0-9]+\.?[0-9]*)?(px|em|ex|%|in|cm|mm|pt|pc)$/i', $value, $matches)) {
+            $size = (float) $matches[1];
+            $unit = $matches[2];
+
+            switch ($unit) {
+                case 'pt':
+                    return $size;
+                case 'px':
+                    return CommonDrawing::pixelsToPoints((int) $size);
+                case 'cm':
+                    return CommonDrawing::centimetersToPoints($size);
+                case 'mm':
+                    return CommonDrawing::centimetersToPoints($size / 10);
+                case 'in':
+                    return CommonDrawing::inchesToPoints($size);
+                case 'pc':
+                    return CommonDrawing::picasToPoints($size);
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/src/PhpPresentation/Shape/RichText/Paragraph.php b/src/PhpPresentation/Shape/RichText/Paragraph.php
@@ -72,12 +72,12 @@ class Paragraph implements ComparableInterface
     private $lineSpacingMode = self::LINE_SPACING_MODE_PERCENT;
 
     /**
-     * @var int
+     * @var float
      */
     private $spacingBefore = 0;
 
     /**
-     * @var int
+     * @var float
      */
     private $spacingAfter = 0;
 
@@ -346,15 +346,15 @@ public function setLineSpacingMode(string $lineSpacingMode): self
     /**
      * Value in points.
      */
-    public function getSpacingBefore(): int
+    public function getSpacingBefore(): float
     {
         return $this->spacingBefore;
     }
 
     /**
      * Value in points.
      */
-    public function setSpacingBefore(int $spacingBefore): self
+    public function setSpacingBefore(float $spacingBefore): self
     {
         $this->spacingBefore = $spacingBefore;
 
@@ -364,15 +364,15 @@ public function setSpacingBefore(int $spacingBefore): self
     /**
      * Value in points.
      */
-    public function getSpacingAfter(): int
+    public function getSpacingAfter(): float
     {
         return $this->spacingAfter;
     }
 
     /**
      * Value in points.
      */
-    public function setSpacingAfter(int $spacingAfter): self
+    public function setSpacingAfter(float $spacingAfter): self
     {
         $this->spacingAfter = $spacingAfter;
 

diff --git a/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptChartsTest.php b/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptChartsTest.php
@@ -751,7 +751,7 @@ public function testAxisVisibility(): void
 
     public function testAxisXUnit(): void
     {
-        $value = mt_rand(0, 100);
+        $value = mt_rand(1, 100);
 
         $oSeries = new Series('Downloads', $this->seriesData);
         $oLine = new Line();