Merge branch 'master' into writestyles

Author: oleibman

docs/topics/recipes.md

@@ -1099,6 +1099,21 @@ All cells bound to the theme fonts (via the `Font::setScheme` method) can be eas
 $spreadsheet->resetThemeFonts();
 ```
 
+### Charset for Arabic and Persian Fonts
+
+It is unknown why this should be needed. However, some Excel
+users have reported better results if the internal declaration for an
+Arabic/Persian font includes a `charset` declaration.
+This seems like a bug in Excel, but, starting with release 4.4,
+this can be accomplished at the spreadsheet level, via:
+```php
+$spreadsheet->addFontCharset('C Nazanin');
+```
+As many charsets as desired can be added in this manner.
+There is a second optional parameter specifying the charset id
+to this method, but, since this seems to be needed only for
+Arabic/Persian, that is its default value.
+
 ### Styling cell borders
 
 In PhpSpreadsheet it is easy to apply various borders on a rectangular

samples/Chart33a/33_Chart_create_area_2.php

@@ -13,7 +13,7 @@
 /** @var PhpOffice\PhpSpreadsheet\Helper\Sample $helper */
 $spreadsheet = new Spreadsheet();
 // same as 33_Chart_create_area, but with 2013+ schemes
-$spreadsheet->getTheme()->setThemeColorName(SpreadsheetTheme::COLOR_SCHEME_2013_PLUS_NAME);
+$spreadsheet->getTheme()->setThemeColorName(SpreadsheetTheme::COLOR_SCHEME_2013_2022_NAME);
 $worksheet = $spreadsheet->getActiveSheet();
 $worksheet->fromArray(
     [

src/PhpSpreadsheet/Reader/Xlsx.php

@@ -655,7 +655,11 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
 
                             // add style to cellXf collection
                             $objStyle = new Style();
-                            $this->styleReader->readStyle($objStyle, $style);
+                            $this->styleReader
+                                ->readStyle($objStyle, $style);
+                            foreach ($this->styleReader->getFontCharsets() as $fontName => $charset) {
+                                $excel->addFontCharset($fontName, $charset);
+                            }
                             if ($addingFirstCellXf) {
                                 $excel->removeCellXfByIndex(0); // remove the default style
                                 $addingFirstCellXf = false;

src/PhpSpreadsheet/Reader/Xlsx/Styles.php

@@ -36,6 +36,15 @@ class Styles extends BaseParserClass
 
     private string $namespace = '';
 
+    /** @var array<string, int> */
+    private array $fontCharsets = [];
+
+    /** @return array<string, int> */
+    public function getFontCharsets(): array
+    {
+        return $this->fontCharsets;
+    }
+
     public function setNamespace(string $namespace): void
     {
         $this->namespace = $namespace;
@@ -85,6 +94,13 @@ public function readFontStyle(Font $fontStyle, SimpleXMLElement $fontStyleXml):
             if (isset($attr['val'])) {
                 $fontStyle->setName((string) $attr['val']);
             }
+            if (isset($fontStyleXml->charset)) {
+                $charsetAttr = $this->getStyleAttributes($fontStyleXml->charset);
+                if (isset($charsetAttr['val'])) {
+                    $charsetVal = (int) $charsetAttr['val'];
+                    $this->fontCharsets[$fontStyle->getName()] = $charsetVal;
+                }
+            }
         }
         if (isset($fontStyleXml->sz)) {
             $attr = $this->getStyleAttributes($fontStyleXml->sz);
@@ -136,6 +152,12 @@ public function readFontStyle(Font $fontStyle, SimpleXMLElement $fontStyleXml):
             $attr = $this->getStyleAttributes($fontStyleXml->scheme);
             $fontStyle->setScheme((string) $attr['val']);
         }
+        if (isset($fontStyleXml->auto)) {
+            $attr = $this->getStyleAttributes($fontStyleXml->auto);
+            if (isset($attr['val'])) {
+                $fontStyle->setAutoColor(self::boolean((string) $attr['val']));
+            }
+        }
     }
 
     private function readNumberFormat(NumberFormat $numfmtStyle, SimpleXMLElement $numfmtStyleXml): void

src/PhpSpreadsheet/Spreadsheet.php

@@ -8,6 +8,7 @@
 use PhpOffice\PhpSpreadsheet\Document\Properties;
 use PhpOffice\PhpSpreadsheet\Document\Security;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Shared\Font as SharedFont;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\Iterator;
@@ -177,6 +178,36 @@ class Spreadsheet implements JsonSerializable
 
     private ?IValueBinder $valueBinder = null;
 
+    /** @var array<string, int> */
+    private array $fontCharsets = [
+        'B Nazanin' => SharedFont::CHARSET_ANSI_ARABIC,
+    ];
+
+    /**
+     * @param int $charset uses any value from Shared\Font,
+     *    but defaults to ARABIC because that is the only known
+     *    charset for which this declaration might be needed
+     */
+    public function addFontCharset(string $fontName, int $charset = SharedFont::CHARSET_ANSI_ARABIC): void
+    {
+        $this->fontCharsets[$fontName] = $charset;
+    }
+
+    public function getFontCharset(string $fontName): int
+    {
+        return $this->fontCharsets[$fontName] ?? -1;
+    }
+
+    /**
+     * Return all fontCharsets.
+     *
+     * @return array<string, int>
+     */
+    public function getFontCharsets(): array
+    {
+        return $this->fontCharsets;
+    }
+
     public function getTheme(): Theme
     {
         return $this->theme;

src/PhpSpreadsheet/Style/Font.php

@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Style;
 
 use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
+use PhpOffice\PhpSpreadsheet\Theme;
 
 class Font extends Supervisor
 {
@@ -85,6 +86,8 @@ class Font extends Supervisor
      */
     protected Color $color;
 
+    protected bool $autoColor = false;
+
     public ?int $colorIndex = null;
 
     protected string $scheme = '';
@@ -124,6 +127,14 @@ public function __construct(bool $isSupervisor = false, bool $isConditional = fa
         }
     }
 
+    public function applyThemeFonts(Theme $theme): void
+    {
+        $this->setName($theme->getMinorFontLatin());
+        $this->setLatin($theme->getMinorFontLatin());
+        $this->setEastAsian($theme->getMinorFontEastAsian());
+        $this->setComplexScript($theme->getMinorFontComplexScript());
+    }
+
     /**
      * Get the shared style component for the currently active cell in currently active sheet.
      * Only used for style supervisor.
@@ -166,7 +177,7 @@ public function getStyleArray(array $array): array
      * );
      * </code>
      *
-     * @param array{name?: string, latin?: string, eastAsian?: string, complexScript?: string, bold?: bool, italic?: bool, superscript?: bool, subscript?: bool, underline?: bool|string, strikethrough?: bool, color?: string[], size?: ?int, chartColor?: ChartColor, scheme?: string, cap?: string} $styleArray Array containing style information
+     * @param array{name?: string, latin?: string, eastAsian?: string, complexScript?: string, bold?: bool, italic?: bool, superscript?: bool, subscript?: bool, underline?: bool|string, strikethrough?: bool, color?: string[], size?: ?int, chartColor?: ChartColor, scheme?: string, cap?: string, autoColor?: bool} $styleArray Array containing style information
      *
      * @return $this
      */
@@ -185,7 +196,9 @@ public function applyFromArray(array $styleArray): static
                 $this->setEastAsian($styleArray['eastAsian']);
             }
             if (isset($styleArray['complexScript'])) {
-                $this->setComplexScript($styleArray['complexScript']);
+                $this->setComplexScript(
+                    $styleArray['complexScript']
+                );
             }
             if (isset($styleArray['bold'])) {
                 $this->setBold($styleArray['bold']);
@@ -203,7 +216,9 @@ public function applyFromArray(array $styleArray): static
                 $this->setUnderline($styleArray['underline']);
             }
             if (isset($styleArray['strikethrough'])) {
-                $this->setStrikethrough($styleArray['strikethrough']);
+                $this->setStrikethrough(
+                    $styleArray['strikethrough']
+                );
             }
             if (isset($styleArray['color'])) {
                 /** @var array{rgb?: string, argb?: string, theme?: int} */
@@ -223,6 +238,9 @@ public function applyFromArray(array $styleArray): static
             if (isset($styleArray['cap'])) {
                 $this->setCap($styleArray['cap']);
             }
+            if (isset($styleArray['autoColor'])) {
+                $this->setAutoColor($styleArray['autoColor']);
+            }
         }
 
         return $this;
@@ -736,6 +754,7 @@ public function getHashCode(): string
             . ($this->subscript ? 't' : 'f')
             . $this->underline
             . ($this->strikethrough ? 't' : 'f')
+            . ($this->autoColor ? 't' : 'f')
             . $this->color->getHashCode()
             . $this->scheme
             . implode(
@@ -777,6 +796,7 @@ protected function exportArray1(): array
         $this->exportArray2($exportedArray, 'superscript', $this->getSuperscript());
         $this->exportArray2($exportedArray, 'underline', $this->getUnderline());
         $this->exportArray2($exportedArray, 'underlineColor', $this->getUnderlineColor());
+        $this->exportArray2($exportedArray, 'autoColor', $this->getAutoColor());
 
         return $exportedArray;
     }
@@ -831,6 +851,29 @@ public function setHyperlinkTheme(): self
         return $this;
     }
 
+    public function setAutoColor(bool $autoColor): self
+    {
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['autoColor' => $autoColor]);
+            $this->getActiveSheet()
+                ->getStyle($this->getSelectedCells())
+                ->applyFromArray($styleArray);
+        } else {
+            $this->autoColor = $autoColor;
+        }
+
+        return $this;
+    }
+
+    public function getAutoColor(): bool
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getAutoColor();
+        }
+
+        return $this->autoColor;
+    }
+
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */

src/PhpSpreadsheet/Theme.php

@@ -9,8 +9,8 @@ class Theme
     private string $themeFontName = 'Office';
 
     public const HYPERLINK_THEME = 10;
-    public const COLOR_SCHEME_2013_PLUS_NAME = 'Office 2013+';
-    public const COLOR_SCHEME_2013_PLUS = [
+    public const COLOR_SCHEME_2013_2022_NAME = 'Office 2013-2022';
+    public const COLOR_SCHEME_2013_2022 = [
         'dk1' => '000000',
         'lt1' => 'FFFFFF',
         'dk2' => '44546A',
@@ -24,6 +24,10 @@ class Theme
         'hlink' => '0563C1',
         'folHlink' => '954F72',
     ];
+    /** @deprecated 4.4.0 Use COLOR_SCHEME_2013_2022_NAME */
+    public const COLOR_SCHEME_2013_PLUS_NAME = 'Office 2013+';
+    /** @deprecated 4.4.0 Use COLOR_SCHEME_2013_2022 */
+    public const COLOR_SCHEME_2013_PLUS = self::COLOR_SCHEME_2013_2022;
 
     public const COLOR_SCHEME_2007_2010_NAME = 'Office 2007-2010';
     public const COLOR_SCHEME_2007_2010 = [
@@ -41,6 +45,22 @@ class Theme
         'folHlink' => '800080',
     ];
 
+    public const COLOR_SCHEME_2023_PLUS_NAME = 'Office 2023+';
+    public const COLOR_SCHEME_2023_PLUS = [
+        'dk1' => '000000',
+        'lt1' => 'FFFFFF',
+        'dk2' => '0E2841',
+        'lt2' => 'E8E8E8',
+        'accent1' => '156082',
+        'accent2' => 'E97132',
+        'accent3' => '196B24',
+        'accent4' => '0F9ED5',
+        'accent5' => 'A02B93',
+        'accent6' => '4EA72E',
+        'hlink' => '467886',
+        'folHlink' => '96607D',
+    ];
+
     /** @var string[] */
     private array $themeColors = self::COLOR_SCHEME_2007_2010;
 
@@ -155,17 +175,34 @@ public function getThemeColorName(): string
     }
 
     /** @param null|string[] $themeColors */
-    public function setThemeColorName(string $name, ?array $themeColors = null): self
+    public function setThemeColorName(string $name, ?array $themeColors = null, ?Spreadsheet $spreadsheet = null): self
     {
         $this->themeColorName = $name;
         if ($name === self::COLOR_SCHEME_2007_2010_NAME) {
             $themeColors = $themeColors ?? self::COLOR_SCHEME_2007_2010;
-        } elseif ($name === self::COLOR_SCHEME_2013_PLUS_NAME) {
-            $themeColors = $themeColors ?? self::COLOR_SCHEME_2013_PLUS;
+            $this->majorFontLatin = 'Cambria';
+            $this->minorFontLatin = 'Calibri';
+        } elseif ($name === self::COLOR_SCHEME_2013_PLUS_NAME) { //* @phpstan-ignore-line
+            // delete this block when deprecated constants removed
+            $themeColors = $themeColors ?? self::COLOR_SCHEME_2013_PLUS; //* @phpstan-ignore-line
+            $this->majorFontLatin = 'Calibri Light';
+            $this->minorFontLatin = 'Calibri';
+        } elseif ($name === self::COLOR_SCHEME_2013_2022_NAME) {
+            $themeColors = $themeColors ?? self::COLOR_SCHEME_2013_2022;
+            $this->majorFontLatin = 'Calibri Light';
+            $this->minorFontLatin = 'Calibri';
+        } elseif ($name === self::COLOR_SCHEME_2023_PLUS_NAME) {
+            $themeColors = $themeColors ?? self::COLOR_SCHEME_2023_PLUS;
+            $this->majorFontLatin = 'Aptos Display';
+            $this->minorFontLatin = 'Aptos Narrow';
         }
         if ($themeColors !== null) {
             $this->themeColors = $themeColors;
         }
+        if ($spreadsheet !== null) {
+            $spreadsheet->getDefaultStyle()->getFont()
+                ->applyThemeFonts($this);
+        }
 
         return $this;
     }

src/PhpSpreadsheet/Writer/Ods/Cell/Style.php

@@ -204,15 +204,26 @@ protected function writeTextProperties(CellStyle $style): void
 
         if ($font->getBold()) {
             $this->writer->writeAttribute('fo:font-weight', 'bold');
-            $this->writer->writeAttribute('style:font-weight-complex', 'bold');
-            $this->writer->writeAttribute('style:font-weight-asian', 'bold');
+            $this->writer->writeAttribute(
+                'style:font-weight-complex',
+                'bold'
+            );
+            $this->writer->writeAttribute(
+                'style:font-weight-asian',
+                'bold'
+            );
         }
 
         if ($font->getItalic()) {
             $this->writer->writeAttribute('fo:font-style', 'italic');
         }
 
-        $this->writer->writeAttribute('fo:color', sprintf('#%s', $font->getColor()->getRGB()));
+        if ($font->getAutoColor()) {
+            $this->writer
+                ->writeAttribute('style:use-window-font-color', 'true');
+        } else {
+            $this->writer->writeAttribute('fo:color', sprintf('#%s', $font->getColor()->getRGB()));
+        }
 
         if ($family = $font->getName()) {
             $this->writer->writeAttribute('fo:font-family', $family);