Merge branch 'master' into issue4197

src/PhpSpreadsheet/Chart/Layout.php

@@ -450,6 +450,13 @@ class Layout
         return $this->labelFont;
     }
 
+    public function setLabelFont(?Font $labelFont): self
+    {
+        $this->labelFont = $labelFont;
+
+        return $this;
+    }
+
     public function getLabelEffects(): ?Properties
     {
         return $this->labelEffects;

src/PhpSpreadsheet/Reader/Xlsx/Chart.php

@@ -1192,6 +1192,9 @@ class Chart
         }
         $fontArray = [];
         $fontArray['size'] = self::getAttributeInteger($titleDetailPart->pPr->defRPr, 'sz');
+        if ($fontArray['size'] !== null && $fontArray['size'] >= 100) {
+            $fontArray['size'] /= 100.0;
+        }
         $fontArray['bold'] = self::getAttributeBoolean($titleDetailPart->pPr->defRPr, 'b');
         $fontArray['italic'] = self::getAttributeBoolean($titleDetailPart->pPr->defRPr, 'i');
         $fontArray['underscore'] = self::getAttributeString($titleDetailPart->pPr->defRPr, 'u');
@@ -1305,6 +1308,10 @@ class Chart
                 case 'showLeaderLines':
                     $plotArea->setShowLeaderLines($plotAttributeValue);
 
+                    break;
+                case 'labelFont':
+                    $plotArea->setLabelFont($plotAttributeValue);
+
                     break;
             }
         }

src/PhpSpreadsheet/Style/Font.php

@@ -20,10 +20,12 @@ class Font extends Supervisor
 
     protected ?string $cap = null;
 
+    public const DEFAULT_FONT_NAME = 'Calibri';
+
     /**
      * Font Name.
      */
-    protected ?string $name = 'Calibri';
+    protected ?string $name = self::DEFAULT_FONT_NAME;
 
     /**
      * The following 7 are used only for chart titles, I think.

src/PhpSpreadsheet/Writer/Xlsx/Chart.php

@@ -1912,19 +1912,23 @@ class Chart extends WriterPart
             $this->writeEffects($objWriter, $axisText);
         }
         if ($labelFont !== null) {
-            if (!empty($labelFont->getLatin())) {
+            $defaultFont = ($labelFont->getName() !== Font::DEFAULT_FONT_NAME) ? $labelFont->getName() : '';
+            $fontName = $labelFont->getLatin() ?: $defaultFont;
+            if (!empty($fontName)) {
                 $objWriter->startElement('a:latin');
-                $objWriter->writeAttribute('typeface', $labelFont->getLatin());
+                $objWriter->writeAttribute('typeface', $fontName);
                 $objWriter->endElement();
             }
-            if (!empty($labelFont->getEastAsian())) {
+            $fontName = $labelFont->getEastAsian() ?: $defaultFont;
+            if (!empty($fontName)) {
                 $objWriter->startElement('a:eastAsian');
-                $objWriter->writeAttribute('typeface', $labelFont->getEastAsian());
+                $objWriter->writeAttribute('typeface', $fontName);
                 $objWriter->endElement();
             }
-            if (!empty($labelFont->getComplexScript())) {
+            $fontName = $labelFont->getComplexScript() ?: $defaultFont;
+            if (!empty($fontName)) {
                 $objWriter->startElement('a:complexScript');
-                $objWriter->writeAttribute('typeface', $labelFont->getComplexScript());
+                $objWriter->writeAttribute('typeface', $fontName);
                 $objWriter->endElement();
             }
         }

tests/PhpSpreadsheetTests/Chart/Issue4201Test.php

@@ -0,0 +1,97 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Chart;
+
+use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
+use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
+use PhpOffice\PhpSpreadsheet\Chart\Layout;
+use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx as XlsxWriter;
+use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
+
+class Issue4201Test extends AbstractFunctional
+{
+    public function readCharts(XlsxReader $reader): void
+    {
+        $reader->setIncludeCharts(true);
+    }
+
+    public function writeCharts(XlsxWriter $writer): void
+    {
+        $writer->setIncludeCharts(true);
+    }
+
+    public function testLabelFont(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+
+        // Sample data for pie chart
+        $data = [
+            ['Category', 'Value'],
+            ['Category A', 40],
+            ['Category B', 30],
+            ['Category C', 20],
+            ['Category D', 10],
+        ];
+        $worksheet->fromArray($data, null, 'A1');
+        $worksheet->getColumnDimension('A')->setAutoSize(true);
+
+        // Create data series for the pie chart
+        $categories = [new DataSeriesValues('String', 'Worksheet!$A$2:$A$5', null, 4)];
+        $values = [new DataSeriesValues('Number', 'Worksheet!$B$2:$B$5', null, 4)];
+
+        // Set layout for data labels
+        $font = new Font();
+        $font->setName('Times New Roman');
+        $font->setSize(8);
+        $layout = new Layout();
+        $layout->setShowVal(true); // Display values
+        $layout->setShowCatName(true); // Display category names
+        $layout->setLabelFont($font);
+
+        $series = new DataSeries(
+            DataSeries::TYPE_PIECHART, // Chart type: Pie chart
+            null,
+            range(0, count($values) - 1),
+            [],
+            $categories,
+            $values
+        );
+
+        $plotArea = new PlotArea($layout, [$series]);
+        $chart = new Chart('Pie Chart', null, null, $plotArea);
+        $chart->setTopLeftPosition('A7');
+        $chart->setBottomRightPosition('H20');
+        $worksheet->addChart($chart);
+
+        /** @var callable */
+        $callableReader = [$this, 'readCharts'];
+        /** @var callable */
+        $callableWriter = [$this, 'writeCharts'];
+        $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx', $callableReader, $callableWriter);
+        $spreadsheet->disconnectWorksheets();
+
+        $sheet = $reloadedSpreadsheet->getActiveSheet();
+        $charts = $sheet->getChartCollection();
+        self::assertCount(1, $charts);
+        $chart2 = $charts[0];
+        self::assertNotNull($chart2);
+        $plotArea2 = $chart2->getPlotArea();
+        self::assertNotNull($plotArea2);
+        $layout2 = $plotArea2->getLayout();
+        self::assertNotNull($layout2);
+        $font2 = $layout2->getLabelFont();
+        self::assertNotNull($font2);
+        self::assertSame('Times New Roman', $font2->getLatin());
+        self::assertSame(8.0, $font2->getSize());
+
+        $reloadedSpreadsheet->disconnectWorksheets();
+    }
+}