From 5ed0f170935ce38ca540df68ac554bfbf6f8ae64 Mon Sep 17 00:00:00 2001
From: MichaelFrey <michael.frey@gmx.ch>
Date: Tue, 28 Jan 2025 04:09:07 +0100
Subject: [PATCH 1/2] Writer HTML: Support Default font color

---
 docs/changes/1.x/1.4.0.md                   |  3 +-
 src/PhpWord/Writer/HTML/Part/Body.php       |  2 +-
 src/PhpWord/Writer/HTML/Part/Head.php       |  5 +--
 tests/PhpWordTests/Writer/HTML/FontTest.php | 39 ++++++++++++++++++---
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/docs/changes/1.x/1.4.0.md b/docs/changes/1.x/1.4.0.md
index cb12a3f68a..5189924e31 100644
--- a/docs/changes/1.x/1.4.0.md
+++ b/docs/changes/1.x/1.4.0.md
@@ -11,7 +11,8 @@
 - Writer Word2007: Support for padding in Table Cell by [@Azamat8405](https://github.com/Azamat8405) in [#2697](https://github.com/PHPOffice/PHPWord/pull/2697)
 - Added support for PHP 8.4 by [@Progi1984](https://github.com/Progi1984) in [#2660](https://github.com/PHPOffice/PHPWord/pull/2660)
 - Autoload : Allow to use PHPWord without Composer fixing [#2543](https://github.com/PHPOffice/PHPWord/issues/2543), [#2552](https://github.com/PHPOffice/PHPWord/issues/2552), [#2716](https://github.com/PHPOffice/PHPWord/issues/2716), [#2717](https://github.com/PHPOffice/PHPWord/issues/2717) in [#2722](https://github.com/PHPOffice/PHPWord/pull/2722)
-- Add Default font color for Word by [@Collie-IT](https://github.com/Collie-IT) in [#2700](https://github.com/PHPOffice/PHPWord/pull/2700)
+- Writer Word2007: Support Default font color by [@Collie-IT](https://github.com/Collie-IT) in [#2700](https://github.com/PHPOffice/PHPWord/pull/2700)
+- Writer HTML: Support Default font color by [@MichaelPFrey](https://github.com/MichaelPFrey)
 
 ### Bug fixes
 
diff --git a/src/PhpWord/Writer/HTML/Part/Body.php b/src/PhpWord/Writer/HTML/Part/Body.php
index 4a391b53ef..bad1415c21 100644
--- a/src/PhpWord/Writer/HTML/Part/Body.php
+++ b/src/PhpWord/Writer/HTML/Part/Body.php
@@ -23,7 +23,7 @@
 use PhpOffice\PhpWord\Writer\PDF\TCPDF;
 
 /**
- * RTF body part writer.
+ * HTML body part writer.
  *
  * @since 0.11.0
  */
diff --git a/src/PhpWord/Writer/HTML/Part/Head.php b/src/PhpWord/Writer/HTML/Part/Head.php
index 32761a7959..79235e1c4a 100644
--- a/src/PhpWord/Writer/HTML/Part/Head.php
+++ b/src/PhpWord/Writer/HTML/Part/Head.php
@@ -30,7 +30,7 @@
 use PhpOffice\PhpWord\Writer\HTML\Style\Table as TableStyleWriter;
 
 /**
- * RTF head part writer.
+ * HTML head part writer.
  *
  * @since 0.11.0
  */
@@ -85,11 +85,12 @@ public function write()
     private function writeStyles(): string
     {
         $css = '<style>' . PHP_EOL;
-
+        $defaultFontColor = Settings::getDefaultFontColor();
         // Default styles
         $astarray = [
             'font-family' => $this->getFontFamily(Settings::getDefaultFontName(), $this->getParentWriter()->getDefaultGenericFont()),
             'font-size' => Settings::getDefaultFontSize() . 'pt',
+            'color' => "#{$defaultFontColor}",
         ];
         // Mpdf sometimes needs separate tag for body; doesn't harm others.
         $bodyarray = $astarray;
diff --git a/tests/PhpWordTests/Writer/HTML/FontTest.php b/tests/PhpWordTests/Writer/HTML/FontTest.php
index 17f82a26be..0a203b7237 100644
--- a/tests/PhpWordTests/Writer/HTML/FontTest.php
+++ b/tests/PhpWordTests/Writer/HTML/FontTest.php
@@ -57,6 +57,37 @@ protected function tearDown(): void
         Settings::setDefaultFontColor($this->defaultFontColor);
     }
 
+    public function testDefaultDefaults(): void
+    {
+        $phpWord = new PhpWord();
+
+        $dom = Helper::getAsHTML($phpWord);
+        $xpath = new DOMXPath($dom);
+        $style = Helper::getTextContent($xpath, '/html/head/style[1]');
+
+        $prg = preg_match('/body {(.*?)}/', $style, $matches);
+        self::assertNotEmpty($matches);
+        self::assertNotFalse($prg);
+        self::assertEquals('body {font-family: \'Arial\'; font-size: 12pt; color: #000000;}', $matches[0]);
+    }
+
+    public function testSettingDefaultFontColor(): void
+    {
+        $phpWord = new PhpWord();
+
+        $defaultFontColor = '00FF00';
+        $phpWord->setDefaultFontColor($defaultFontColor);
+
+        $dom = Helper::getAsHTML($phpWord);
+        $xpath = new DOMXPath($dom);
+        $style = Helper::getTextContent($xpath, '/html/head/style[1]');
+
+        $prg = preg_match('/body {(.*?)}/', $style, $matches);
+        self::assertNotEmpty($matches);
+        self::assertNotFalse($prg);
+        self::assertEquals('body {font-family: \'Arial\'; font-size: 12pt; color: #00FF00;}', $matches[0]);
+    }
+
     /**
      * Tests font names - without generics.
      */
@@ -93,7 +124,7 @@ public function testFontNames1(): void
         $prg = preg_match('/^[*][^\\r\\n]*/m', $style, $matches);
         self::assertNotEmpty($matches);
         self::assertNotFalse($prg);
-        self::assertEquals('* {font-family: \'Courier New\'; font-size: 12pt;}', $matches[0]);
+        self::assertEquals('* {font-family: \'Courier New\'; font-size: 12pt; color: #000000;}', $matches[0]);
         $prg = preg_match('/^[.]style1[^\\r\\n]*/m', $style, $matches);
         self::assertNotEmpty($matches);
         self::assertNotFalse($prg);
@@ -149,7 +180,7 @@ public function testFontNames2(): void
         $prg = preg_match('/^[*][^\\r\\n]*/m', $style, $matches);
         self::assertNotEmpty($matches);
         self::assertNotFalse($prg);
-        self::assertEquals('* {font-family: \'Courier New\'; font-size: 12pt;}', $matches[0]);
+        self::assertEquals('* {font-family: \'Courier New\'; font-size: 12pt; color: #000000;}', $matches[0]);
         $prg = preg_match('/^[.]style1[^\\r\\n]*/m', $style, $matches);
         self::assertNotEmpty($matches);
         self::assertNotFalse($prg);
@@ -201,7 +232,7 @@ public function testFontNames3(): void
         $prg = preg_match('/^[*][^\\r\\n]*/m', $style, $matches);
         self::assertNotEmpty($matches);
         self::assertNotFalse($prg);
-        self::assertEquals('* {font-family: \'Courier New\', monospace; font-size: 12pt;}', $matches[0]);
+        self::assertEquals('* {font-family: \'Courier New\', monospace; font-size: 12pt; color: #000000;}', $matches[0]);
         $prg = preg_match('/^[.]style1[^\\r\\n]*/m', $style, $matches);
         self::assertNotEmpty($matches);
         self::assertNotFalse($prg);
@@ -244,7 +275,7 @@ public function testWhiteSpace(): void
 
         $style = Helper::getTextContent($xpath, '/html/head/style');
         self::assertNotFalse(preg_match('/^[*][^\\r\\n]*/m', $style, $matches));
-        self::assertEquals('* {font-family: \'Arial\'; font-size: 12pt; white-space: pre-wrap;}', $matches[0]);
+        self::assertEquals('* {font-family: \'Arial\'; font-size: 12pt; color: #000000; white-space: pre-wrap;}', $matches[0]);
         $prg = preg_match('/^[.]style1[^\\r\\n]*/m', $style, $matches);
         self::assertNotEmpty($matches);
         self::assertNotFalse($prg);

From 157cc5c72d9a3ce84e2d3da9dd13989f3de9b476 Mon Sep 17 00:00:00 2001
From: MichaelFrey <michael.frey@gmx.ch>
Date: Tue, 28 Jan 2025 04:14:38 +0100
Subject: [PATCH 2/2] the reader should already support default font color

---
 docs/changes/1.x/1.4.0.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changes/1.x/1.4.0.md b/docs/changes/1.x/1.4.0.md
index 5189924e31..e733a5b2e2 100644
--- a/docs/changes/1.x/1.4.0.md
+++ b/docs/changes/1.x/1.4.0.md
@@ -11,7 +11,7 @@
 - Writer Word2007: Support for padding in Table Cell by [@Azamat8405](https://github.com/Azamat8405) in [#2697](https://github.com/PHPOffice/PHPWord/pull/2697)
 - Added support for PHP 8.4 by [@Progi1984](https://github.com/Progi1984) in [#2660](https://github.com/PHPOffice/PHPWord/pull/2660)
 - Autoload : Allow to use PHPWord without Composer fixing [#2543](https://github.com/PHPOffice/PHPWord/issues/2543), [#2552](https://github.com/PHPOffice/PHPWord/issues/2552), [#2716](https://github.com/PHPOffice/PHPWord/issues/2716), [#2717](https://github.com/PHPOffice/PHPWord/issues/2717) in [#2722](https://github.com/PHPOffice/PHPWord/pull/2722)
-- Writer Word2007: Support Default font color by [@Collie-IT](https://github.com/Collie-IT) in [#2700](https://github.com/PHPOffice/PHPWord/pull/2700)
+- Add Default font color for Word by [@Collie-IT](https://github.com/Collie-IT) in [#2700](https://github.com/PHPOffice/PHPWord/pull/2700)
 - Writer HTML: Support Default font color by [@MichaelPFrey](https://github.com/MichaelPFrey)
 
 ### Bug fixes