From 6c1fb7187f3a394f82862465310ed3207e0642d2 Mon Sep 17 00:00:00 2001 From: rasamassen Date: Mon, 6 Oct 2025 21:05:50 -0500 Subject: [PATCH 01/18] Create Color.php --- src/PhpWord/SimpleType/Color.php | 59 ++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 src/PhpWord/SimpleType/Color.php diff --git a/src/PhpWord/SimpleType/Color.php b/src/PhpWord/SimpleType/Color.php new file mode 100644 index 0000000000..69d8557676 --- /dev/null +++ b/src/PhpWord/SimpleType/Color.php @@ -0,0 +1,59 @@ + Date: Mon, 6 Oct 2025 21:08:36 -0500 Subject: [PATCH 02/18] Update Font.php - deprecate FGCOLOR constants --- src/PhpWord/Style/Font.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php index f03e8899d1..0e006c0db8 100644 --- a/src/PhpWord/Style/Font.php +++ b/src/PhpWord/Style/Font.php @@ -53,6 +53,7 @@ class Font extends AbstractStyle /** * Foreground colors. * + * @deprecated 1.5 use \PhpOffice\PhpWord\SimpleType\Color instead * @const string */ const FGCOLOR_YELLOW = 'yellow'; From 794776c3aa3793cb0eb5dfe5aaae7cebde4049d4 Mon Sep 17 00:00:00 2001 From: rasamassen Date: Mon, 6 Oct 2025 21:12:16 -0500 Subject: [PATCH 03/18] Update Color.php --- src/PhpWord/SimpleType/Color.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PhpWord/SimpleType/Color.php b/src/PhpWord/SimpleType/Color.php index 69d8557676..5fa62f5ada 100644 --- a/src/PhpWord/SimpleType/Color.php +++ b/src/PhpWord/SimpleType/Color.php @@ -43,9 +43,9 @@ final class Color extends AbstractEnum const GRAY = 'gray'; const GREEN = 'green'; const LIGHTBLUE = 'lightBlue'; - const LIGHTCYAN = 'lightcyan'; + const LIGHTCYAN = 'lightCyan'; const LIGHTGRAY = 'lightGray'; - const LIGHTGREEN = 'lightgreen'; + const LIGHTGREEN = 'lightGreen'; const LIGHTPINK = 'lightPink'; const LIGHTYELLOW = 'lightYellow'; const MAGENTA = 'magenta'; From 18c82d316f57953dd9042b00ba1dc55bdc61683a Mon Sep 17 00:00:00 2001 From: rasamassen Date: Mon, 6 Oct 2025 21:23:03 -0500 Subject: [PATCH 04/18] Update Converter.php --- src/PhpWord/Shared/Converter.php | 91 ++++++++++++++++++++++++++------ 1 file changed, 76 insertions(+), 15 deletions(-) diff --git a/src/PhpWord/Shared/Converter.php b/src/PhpWord/Shared/Converter.php index 17d2e1a05d..b41c9b38ac 100644 --- a/src/PhpWord/Shared/Converter.php +++ b/src/PhpWord/Shared/Converter.php @@ -18,6 +18,9 @@ namespace PhpOffice\PhpWord\Shared; +use PhpOffice\PhpWord\SimpleType\Color +use PhpOffice\PhpWord\Style\Font as FontColor + /** * Common converter functions. */ @@ -305,35 +308,93 @@ public static function angleToDegree($angle = 1) public static function stringToRgb($value) { switch ($value) { - case \PhpOffice\PhpWord\Style\Font::FGCOLOR_YELLOW: + case Color::BLACK: + return '000000'; + case Color::BLUE: + return '0000FF'; + case Color::BROWN: + return 'A52A2A'; + case Color::CYAN: + return '00FFFF'; + case Color::DARKBLUE: + return '00008B'; + case Color::DARKCYAN: + return '008B8B'; + case Color::DARKGRAY: + return 'A9A9A9'; + case Color::DARKGREEN: + return '006400'; + case Color::DARKMAGENTA: + return '8B008B'; + case Color::DARKORANGE: + return 'FF8C00'; + case Color::DARKRED: + return '8B0000'; + case Color::DARKVIOLET: + return '9400D3'; + case Color::GRAY: + return '808080'; + case Color::GREEN: + return '008000'; + case Color::LIGHTBLUE: + return 'ADD8E6'; + case Color::LIGHTCYAN: + return 'E0FFFF'; + case Color::LIGHTGRAY: + return 'D3D3D3'; + case Color::LIGHTGREEN: + return '90EE90'; + case Color::LIGHTPINK: + return 'FFB6C1'; + case Color::LIGHTYELLOW: + return 'FFFFE0'; + case Color::MAGENTA: + return 'FF00FF'; + case Color::ORANGE: + return 'FFA500'; + case Color::PINK: + return 'FFC0CB'; + case Color::PURPLE: + return '800080'; + case Color::RED: + return 'FF0000'; + case Color::VIOLET: + return 'EE82EE'; + case Color::WHITE: + return 'FFFFFF'; + case Color::YELLOW: + return 'FFFF00'; + + // deprecated constants + case FontColor::FGCOLOR_YELLOW: return 'FFFF00'; - case \PhpOffice\PhpWord\Style\Font::FGCOLOR_LIGHTGREEN: + case FontColor::FGCOLOR_LIGHTGREEN: return '90EE90'; - case \PhpOffice\PhpWord\Style\Font::FGCOLOR_CYAN: + case FontColor::FGCOLOR_CYAN: return '00FFFF'; - case \PhpOffice\PhpWord\Style\Font::FGCOLOR_MAGENTA: + case FontColor::FGCOLOR_MAGENTA: return 'FF00FF'; - case \PhpOffice\PhpWord\Style\Font::FGCOLOR_BLUE: + case FontColor::FGCOLOR_BLUE: return '0000FF'; - case \PhpOffice\PhpWord\Style\Font::FGCOLOR_RED: + case FontColor::FGCOLOR_RED: return 'FF0000'; - case \PhpOffice\PhpWord\Style\Font::FGCOLOR_DARKBLUE: + case FontColor::FGCOLOR_DARKBLUE: return '00008B'; - case \PhpOffice\PhpWord\Style\Font::FGCOLOR_DARKCYAN: + case FontColor::FGCOLOR_DARKCYAN: return '008B8B'; - case \PhpOffice\PhpWord\Style\Font::FGCOLOR_DARKGREEN: + case FontColor::FGCOLOR_DARKGREEN: return '006400'; - case \PhpOffice\PhpWord\Style\Font::FGCOLOR_DARKMAGENTA: + case FontColor::FGCOLOR_DARKMAGENTA: return '8B008B'; - case \PhpOffice\PhpWord\Style\Font::FGCOLOR_DARKRED: + case FontColor::FGCOLOR_DARKRED: return '8B0000'; - case \PhpOffice\PhpWord\Style\Font::FGCOLOR_DARKYELLOW: + case FontColor::FGCOLOR_DARKYELLOW: return '8B8B00'; - case \PhpOffice\PhpWord\Style\Font::FGCOLOR_DARKGRAY: + case FontColor::FGCOLOR_DARKGRAY: return 'A9A9A9'; - case \PhpOffice\PhpWord\Style\Font::FGCOLOR_LIGHTGRAY: + case FontColor::FGCOLOR_LIGHTGRAY: return 'D3D3D3'; - case \PhpOffice\PhpWord\Style\Font::FGCOLOR_BLACK: + case FontColor::FGCOLOR_BLACK: return '000000'; } From 42aee4728d9e53d1344a18979a461e49e926bfc8 Mon Sep 17 00:00:00 2001 From: rasamassen Date: Mon, 6 Oct 2025 21:30:24 -0500 Subject: [PATCH 05/18] Create color.md --- docs/usage/simpletypes/color.md | 34 +++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 docs/usage/simpletypes/color.md diff --git a/docs/usage/simpletypes/color.md b/docs/usage/simpletypes/color.md new file mode 100644 index 0000000000..98d26f920c --- /dev/null +++ b/docs/usage/simpletypes/color.md @@ -0,0 +1,34 @@ +# Colors + +## Constants +- `BLACK`. +- `BLUE`. +- `BROWN`. +- `CYAN`. +- `DARKBLUE`. +- `DARKCYAN`. +- `DARKGRAY`. +- `DARKGREEN`. +- `DARKMAGENTA`. +- `DARKORANGE`. +- `DARKRED`. +- `DARKVIOLET`. +- `GRAY`. +- `GREEN`. +- `LIGHTBLUE`. +- `LIGHTCYAN`. +- `LIGHTGRAY`. +- `LIGHTGREEN`. +- `LIGHTPINK`. +- `LIGHTYELLOW`. +- `MAGENTA`. +- `ORANGE`. +- `PINK`. +- `PURPLE`. +- `RED`. +- `VIOLET`. +- `WHITE`. +- `YELLOW`. + +## Used In +- Anywhere a hexadecimal color can be specified. From 47f7438a3a445bfcba69c0def72f1b2389617e3d Mon Sep 17 00:00:00 2001 From: rasamassen Date: Mon, 6 Oct 2025 21:36:08 -0500 Subject: [PATCH 06/18] Update Color.php --- src/PhpWord/SimpleType/Color.php | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/PhpWord/SimpleType/Color.php b/src/PhpWord/SimpleType/Color.php index 5fa62f5ada..37a969cc84 100644 --- a/src/PhpWord/SimpleType/Color.php +++ b/src/PhpWord/SimpleType/Color.php @@ -25,35 +25,38 @@ * See https://learn.microsoft.com/en-us/dotnet/api/documentformat.openxml.drawing.presetcolor * See https://www.datypic.com/sc/ooxml/t-a_ST_PresetColorVal.html. * See https://c-rex.net/samples/ooxml/e1/Part4/OOXML_P4_DOCX_ST_PresetColorVal_topic_ID0ELA5NB.html. + * + * Highlight colors limited to certain select colors. + * See https://c-rex.net/samples/ooxml/e1/Part4/OOXML_P4_DOCX_ST_HighlightColor_topic_ID0E4PY2.html. */ final class Color extends AbstractEnum { - const BLACK = 'black'; - const BLUE = 'blue'; + const BLACK = 'black'; // highlight color + const BLUE = 'blue'; // highlight color const BROWN = 'brown'; - const CYAN = 'cyan'; - const DARKBLUE = 'darkBlue'; - const DARKCYAN = 'darkCyan'; + const CYAN = 'cyan'; // highlight color + const DARKBLUE = 'darkBlue'; // highlight color + const DARKCYAN = 'darkCyan'; // highlight color const DARKGRAY = 'darkGray'; - const DARKGREEN = 'darkGreen'; - const DARKMAGENTA = 'darkMagenta'; + const DARKGREEN = 'darkGreen'; // highlight color + const DARKMAGENTA = 'darkMagenta'; // highlight color const DARKORANGE = 'darkOrange'; - const DARKRED = 'darkRed'; + const DARKRED = 'darkRed'; // highlight color const DARKVIOLET = 'darkViolet'; const GRAY = 'gray'; - const GREEN = 'green'; + const GREEN = 'green'; // highlight color const LIGHTBLUE = 'lightBlue'; const LIGHTCYAN = 'lightCyan'; - const LIGHTGRAY = 'lightGray'; + const LIGHTGRAY = 'lightGray'; // highlight color const LIGHTGREEN = 'lightGreen'; const LIGHTPINK = 'lightPink'; const LIGHTYELLOW = 'lightYellow'; - const MAGENTA = 'magenta'; + const MAGENTA = 'magenta'; // highlight color const ORANGE = 'orange'; const PINK = 'pink'; const PURPLE = 'purple'; - const RED = 'red'; + const RED = 'red'; // highlight color const VIOLET = 'violet'; - const WHITE = 'white'; - const YELLOW = 'yellow'; + const WHITE = 'white'; // highlight color + const YELLOW = 'yellow'; // highlight color } From ddb346d287b10868cf5bf70d002be4d2da58dba5 Mon Sep 17 00:00:00 2001 From: rasamassen Date: Mon, 6 Oct 2025 21:42:35 -0500 Subject: [PATCH 07/18] Update Converter.php --- src/PhpWord/Shared/Converter.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/PhpWord/Shared/Converter.php b/src/PhpWord/Shared/Converter.php index b41c9b38ac..a63c31e505 100644 --- a/src/PhpWord/Shared/Converter.php +++ b/src/PhpWord/Shared/Converter.php @@ -332,6 +332,8 @@ public static function stringToRgb($value) return '8B0000'; case Color::DARKVIOLET: return '9400D3'; + case Color::DARKYELLOW: + return '8B8B00'; case Color::GRAY: return '808080'; case Color::GREEN: From 3e1776be0c4006d89e37d53edb7b1260b06ffebe Mon Sep 17 00:00:00 2001 From: rasamassen Date: Mon, 6 Oct 2025 21:43:00 -0500 Subject: [PATCH 08/18] Update Color.php --- src/PhpWord/SimpleType/Color.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/PhpWord/SimpleType/Color.php b/src/PhpWord/SimpleType/Color.php index 37a969cc84..a644701be4 100644 --- a/src/PhpWord/SimpleType/Color.php +++ b/src/PhpWord/SimpleType/Color.php @@ -43,6 +43,7 @@ final class Color extends AbstractEnum const DARKORANGE = 'darkOrange'; const DARKRED = 'darkRed'; // highlight color const DARKVIOLET = 'darkViolet'; + const DARKYELLOW = 'darkYellow'; // highlight color const GRAY = 'gray'; const GREEN = 'green'; // highlight color const LIGHTBLUE = 'lightBlue'; From b542e72655c4bdcbbc0e8ade70abc994fd438b8a Mon Sep 17 00:00:00 2001 From: rasamassen Date: Mon, 6 Oct 2025 21:45:25 -0500 Subject: [PATCH 09/18] Update color.md --- docs/usage/simpletypes/color.md | 34 +++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/docs/usage/simpletypes/color.md b/docs/usage/simpletypes/color.md index 98d26f920c..97f5b62c18 100644 --- a/docs/usage/simpletypes/color.md +++ b/docs/usage/simpletypes/color.md @@ -1,34 +1,36 @@ # Colors +When used in [`Styles > Font`](../styles/font.md) to set the `fgColor`, only certain colors may be used, as identified below. ## Constants -- `BLACK`. -- `BLUE`. +- `BLACK`. Possible `fgColor` option. +- `BLUE`. Possible `fgColor` option. - `BROWN`. -- `CYAN`. -- `DARKBLUE`. -- `DARKCYAN`. -- `DARKGRAY`. -- `DARKGREEN`. -- `DARKMAGENTA`. +- `CYAN`. Possible `fgColor` option. +- `DARKBLUE`. Possible `fgColor` option. +- `DARKCYAN`. Possible `fgColor` option. +- `DARKGRAY`. Possible `fgColor` option. +- `DARKGREEN`. Possible `fgColor` option. +- `DARKMAGENTA`. Possible `fgColor` option. - `DARKORANGE`. -- `DARKRED`. +- `DARKRED`. Possible `fgColor` option. - `DARKVIOLET`. +- `DARKYELLOW`. Possible `fgColor` option. - `GRAY`. -- `GREEN`. +- `GREEN`. Possible `fgColor` option. - `LIGHTBLUE`. - `LIGHTCYAN`. -- `LIGHTGRAY`. +- `LIGHTGRAY`. Possible `fgColor` option. - `LIGHTGREEN`. - `LIGHTPINK`. - `LIGHTYELLOW`. -- `MAGENTA`. +- `MAGENTA`. Possible `fgColor` option. - `ORANGE`. - `PINK`. - `PURPLE`. -- `RED`. +- `RED`. Possible `fgColor` option. - `VIOLET`. -- `WHITE`. -- `YELLOW`. +- `WHITE`. Possible `fgColor` option. +- `YELLOW`. Possible `fgColor` option. ## Used In -- Anywhere a hexadecimal color can be specified. +- Anywhere a hexadecimal color can be specified. e.g. *FF0000*. From e2ef5f63896a2557709a06f24befd31863e4a2a5 Mon Sep 17 00:00:00 2001 From: rasamassen Date: Mon, 6 Oct 2025 21:48:42 -0500 Subject: [PATCH 10/18] Update Converter.php --- src/PhpWord/Shared/Converter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PhpWord/Shared/Converter.php b/src/PhpWord/Shared/Converter.php index a63c31e505..24024528d0 100644 --- a/src/PhpWord/Shared/Converter.php +++ b/src/PhpWord/Shared/Converter.php @@ -18,8 +18,8 @@ namespace PhpOffice\PhpWord\Shared; -use PhpOffice\PhpWord\SimpleType\Color -use PhpOffice\PhpWord\Style\Font as FontColor +use PhpOffice\PhpWord\SimpleType\Color; +use PhpOffice\PhpWord\Style\Font as FontColor; /** * Common converter functions. From 5865a99cc294f8b490a8ea432a56a17901f0f806 Mon Sep 17 00:00:00 2001 From: rasamassen Date: Mon, 6 Oct 2025 21:48:59 -0500 Subject: [PATCH 11/18] Update Font.php --- src/PhpWord/Style/Font.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php index 0e006c0db8..b323f531fc 100644 --- a/src/PhpWord/Style/Font.php +++ b/src/PhpWord/Style/Font.php @@ -54,6 +54,7 @@ class Font extends AbstractStyle * Foreground colors. * * @deprecated 1.5 use \PhpOffice\PhpWord\SimpleType\Color instead + * * @const string */ const FGCOLOR_YELLOW = 'yellow'; From 2e14cd0a588f79aad02fe67155c950cf971c64f2 Mon Sep 17 00:00:00 2001 From: rasamassen Date: Mon, 6 Oct 2025 21:56:04 -0500 Subject: [PATCH 12/18] Update Converter.php --- src/PhpWord/Shared/Converter.php | 56 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/PhpWord/Shared/Converter.php b/src/PhpWord/Shared/Converter.php index 24024528d0..e45422a1b9 100644 --- a/src/PhpWord/Shared/Converter.php +++ b/src/PhpWord/Shared/Converter.php @@ -310,61 +310,61 @@ public static function stringToRgb($value) switch ($value) { case Color::BLACK: return '000000'; - case Color::BLUE: + case Color::BLUE: return '0000FF'; - case Color::BROWN: + case Color::BROWN: return 'A52A2A'; - case Color::CYAN: + case Color::CYAN: return '00FFFF'; - case Color::DARKBLUE: + case Color::DARKBLUE: return '00008B'; - case Color::DARKCYAN: + case Color::DARKCYAN: return '008B8B'; - case Color::DARKGRAY: + case Color::DARKGRAY: return 'A9A9A9'; - case Color::DARKGREEN: + case Color::DARKGREEN: return '006400'; - case Color::DARKMAGENTA: + case Color::DARKMAGENTA: return '8B008B'; - case Color::DARKORANGE: + case Color::DARKORANGE: return 'FF8C00'; - case Color::DARKRED: + case Color::DARKRED: return '8B0000'; - case Color::DARKVIOLET: + case Color::DARKVIOLET: return '9400D3'; - case Color::DARKYELLOW: + case Color::DARKYELLOW: return '8B8B00'; - case Color::GRAY: + case Color::GRAY: return '808080'; - case Color::GREEN: + case Color::GREEN: return '008000'; - case Color::LIGHTBLUE: + case Color::LIGHTBLUE: return 'ADD8E6'; - case Color::LIGHTCYAN: + case Color::LIGHTCYAN: return 'E0FFFF'; - case Color::LIGHTGRAY: + case Color::LIGHTGRAY: return 'D3D3D3'; - case Color::LIGHTGREEN: + case Color::LIGHTGREEN: return '90EE90'; - case Color::LIGHTPINK: + case Color::LIGHTPINK: return 'FFB6C1'; - case Color::LIGHTYELLOW: + case Color::LIGHTYELLOW: return 'FFFFE0'; - case Color::MAGENTA: + case Color::MAGENTA: return 'FF00FF'; - case Color::ORANGE: + case Color::ORANGE: return 'FFA500'; - case Color::PINK: + case Color::PINK: return 'FFC0CB'; - case Color::PURPLE: + case Color::PURPLE: return '800080'; - case Color::RED: + case Color::RED: return 'FF0000'; - case Color::VIOLET: + case Color::VIOLET: return 'EE82EE'; - case Color::WHITE: + case Color::WHITE: return 'FFFFFF'; - case Color::YELLOW: + case Color::YELLOW: return 'FFFF00'; // deprecated constants From a30266723720db71a3df91337eb7bf7eda04334a Mon Sep 17 00:00:00 2001 From: rasamassen Date: Mon, 6 Oct 2025 21:56:23 -0500 Subject: [PATCH 13/18] Update Font.php --- src/PhpWord/Style/Font.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php index b323f531fc..3fd53230d6 100644 --- a/src/PhpWord/Style/Font.php +++ b/src/PhpWord/Style/Font.php @@ -58,7 +58,7 @@ class Font extends AbstractStyle * @const string */ const FGCOLOR_YELLOW = 'yellow'; - const FGCOLOR_LIGHTGREEN = 'green'; + const FGCOLOR_LIGHTGREEN = 'lightGreen'; const FGCOLOR_CYAN = 'cyan'; const FGCOLOR_MAGENTA = 'magenta'; const FGCOLOR_BLUE = 'blue'; From d0fa282341fa7261f1064f6438d65e73347b2878 Mon Sep 17 00:00:00 2001 From: rasamassen Date: Mon, 6 Oct 2025 21:59:18 -0500 Subject: [PATCH 14/18] Update Converter.php --- src/PhpWord/Shared/Converter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PhpWord/Shared/Converter.php b/src/PhpWord/Shared/Converter.php index e45422a1b9..1ff838a12a 100644 --- a/src/PhpWord/Shared/Converter.php +++ b/src/PhpWord/Shared/Converter.php @@ -367,7 +367,7 @@ public static function stringToRgb($value) case Color::YELLOW: return 'FFFF00'; - // deprecated constants + // deprecated constants case FontColor::FGCOLOR_YELLOW: return 'FFFF00'; case FontColor::FGCOLOR_LIGHTGREEN: From 5074422f36703c86f4eb59552c1f2de56a464df8 Mon Sep 17 00:00:00 2001 From: rasamassen Date: Mon, 6 Oct 2025 22:02:37 -0500 Subject: [PATCH 15/18] Update 1.5.0.md --- docs/changes/1.x/1.5.0.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/changes/1.x/1.5.0.md b/docs/changes/1.x/1.5.0.md index b96865bada..e204a61911 100644 --- a/docs/changes/1.x/1.5.0.md +++ b/docs/changes/1.x/1.5.0.md @@ -11,9 +11,11 @@ ### Miscellaneous - Update phpstan/phpstan requirement from ^0.12.88 || ^1.0.0 to ^0.12.88 || ^1.0.0 || ^2.0.0 by [@dependabot](https://github.com/dependabot) & [@Progi1984](https://github.com/Progi1984) in [#2736](https://github.com/PHPOffice/PHPWord/pull/2736) +- SimpleType: Create Color, adding a variety of preset colors for use anywhere a color is specified by [@rasamassen](https://github.com/rasamassen) in [#2839](https://github.com/PHPOffice/PHPWord/pull/2839) ### Deprecations +- Style > Font deprecate FGCOLOR constants, replaced by SimpleType > Color by [@rasamassen](https://github.com/rasamassen) in [#2839](https://github.com/PHPOffice/PHPWord/pull/2839) ### BC Breaks -### Notes \ No newline at end of file +### Notes From 4652f1289a605a17932ab0e72ab2a244d19de4e6 Mon Sep 17 00:00:00 2001 From: rasamassen Date: Tue, 7 Oct 2025 09:05:38 -0500 Subject: [PATCH 16/18] Update Color.php --- src/PhpWord/SimpleType/Color.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/PhpWord/SimpleType/Color.php b/src/PhpWord/SimpleType/Color.php index a644701be4..33ffb720a1 100644 --- a/src/PhpWord/SimpleType/Color.php +++ b/src/PhpWord/SimpleType/Color.php @@ -31,6 +31,7 @@ */ final class Color extends AbstractEnum { + const AQUA = 'aqua'; const BLACK = 'black'; // highlight color const BLUE = 'blue'; // highlight color const BROWN = 'brown'; @@ -44,6 +45,8 @@ final class Color extends AbstractEnum const DARKRED = 'darkRed'; // highlight color const DARKVIOLET = 'darkViolet'; const DARKYELLOW = 'darkYellow'; // highlight color + const FUCHSIA = 'fuchsia'; + const GOLD = 'gold'; const GRAY = 'gray'; const GREEN = 'green'; // highlight color const LIGHTBLUE = 'lightBlue'; @@ -52,11 +55,19 @@ final class Color extends AbstractEnum const LIGHTGREEN = 'lightGreen'; const LIGHTPINK = 'lightPink'; const LIGHTYELLOW = 'lightYellow'; + const LIME = 'lime'; const MAGENTA = 'magenta'; // highlight color + const MAROON = 'maroon'; + const NAVY = 'navy'; + const OLIVE = 'olive'; const ORANGE = 'orange'; const PINK = 'pink'; const PURPLE = 'purple'; const RED = 'red'; // highlight color + const SILVER = 'silver'; + const TAN = 'tan'; + const TEAL = 'teal'; + const TURQUOISE = 'turqoise'; const VIOLET = 'violet'; const WHITE = 'white'; // highlight color const YELLOW = 'yellow'; // highlight color From c1cfe64036f2617b9562362f2663db6929ab500e Mon Sep 17 00:00:00 2001 From: rasamassen Date: Tue, 7 Oct 2025 09:05:42 -0500 Subject: [PATCH 17/18] Update color.md --- docs/usage/simpletypes/color.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/usage/simpletypes/color.md b/docs/usage/simpletypes/color.md index 97f5b62c18..5086421f75 100644 --- a/docs/usage/simpletypes/color.md +++ b/docs/usage/simpletypes/color.md @@ -2,6 +2,7 @@ When used in [`Styles > Font`](../styles/font.md) to set the `fgColor`, only certain colors may be used, as identified below. ## Constants +- `AQUA`. - `BLACK`. Possible `fgColor` option. - `BLUE`. Possible `fgColor` option. - `BROWN`. @@ -15,6 +16,8 @@ When used in [`Styles > Font`](../styles/font.md) to set the `fgColor`, only cer - `DARKRED`. Possible `fgColor` option. - `DARKVIOLET`. - `DARKYELLOW`. Possible `fgColor` option. +- `FUCHSIA`. +- `GOLD`. - `GRAY`. - `GREEN`. Possible `fgColor` option. - `LIGHTBLUE`. @@ -23,11 +26,19 @@ When used in [`Styles > Font`](../styles/font.md) to set the `fgColor`, only cer - `LIGHTGREEN`. - `LIGHTPINK`. - `LIGHTYELLOW`. +- `LIME`. - `MAGENTA`. Possible `fgColor` option. +- `MAROON`. +- `NAVY`. +- `OLIVE`. - `ORANGE`. - `PINK`. - `PURPLE`. - `RED`. Possible `fgColor` option. +- `SILVER`. +- `TAN`. +- `TEAL`. +- `TURQUOISE`. - `VIOLET`. - `WHITE`. Possible `fgColor` option. - `YELLOW`. Possible `fgColor` option. From eb4ab9d9c9ab02a87d77356a6298481e42dbd596 Mon Sep 17 00:00:00 2001 From: rasamassen Date: Tue, 7 Oct 2025 09:05:45 -0500 Subject: [PATCH 18/18] Update Converter.php --- src/PhpWord/Shared/Converter.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/PhpWord/Shared/Converter.php b/src/PhpWord/Shared/Converter.php index 1ff838a12a..cd62b3aeca 100644 --- a/src/PhpWord/Shared/Converter.php +++ b/src/PhpWord/Shared/Converter.php @@ -308,6 +308,8 @@ public static function angleToDegree($angle = 1) public static function stringToRgb($value) { switch ($value) { + case Color::AQUA: + return '00FFFF'; case Color::BLACK: return '000000'; case Color::BLUE: @@ -334,6 +336,10 @@ public static function stringToRgb($value) return '9400D3'; case Color::DARKYELLOW: return '8B8B00'; + case Color::FUCHSIA: + return 'FF00FF'; + case Color::GOLD: + return 'FFD700'; case Color::GRAY: return '808080'; case Color::GREEN: @@ -350,8 +356,16 @@ public static function stringToRgb($value) return 'FFB6C1'; case Color::LIGHTYELLOW: return 'FFFFE0'; + case Color::LIME: + return '00FF00'; case Color::MAGENTA: return 'FF00FF'; + case Color::MAROON: + return '800000'; + case Color::NAVY: + return '000080'; + case Color::OLIVE: + return '808000'; case Color::ORANGE: return 'FFA500'; case Color::PINK: @@ -360,6 +374,14 @@ public static function stringToRgb($value) return '800080'; case Color::RED: return 'FF0000'; + case Color::SILVER: + return 'C0C0C0'; + case Color::TAN: + return 'D2B48C'; + case Color::TEAL: + return '008080'; + case Color::TURQUOISE: + return '40E0D0'; case Color::VIOLET: return 'EE82EE'; case Color::WHITE: