Map deprecated system colours

Current CSS color module level 4 has deprecated several system colours and replaced them with alternatives.

This performs the mapping before asking the client to map the colour names to actual colours

Author: kyllikki

src/parse/properties/utils.c

@@ -834,22 +834,58 @@ css_error css__parse_named_colour(css_language *c, lwc_string *data,
 		0xffffff00, /* YELLOW */
 		0xff9acd32  /* YELLOWGREEN */
 	};
+	/** Legacy system colour mapping */
+	static const int deprecatedmap[LAST_DEPRECATEDCOLOUR + 1 - FIRST_DEPRECATEDCOLOUR] = {
+		BUTTONBORDER, /* ACTIVEBORDER */
+		CANVAS, /* ACTIVECAPTION */
+		CANVAS, /* APPWORKSPACE */
+		CANVAS, /* BACKGROUND */
+		BUTTONFACE, /* BUTTONHIGHLIGHT */
+		BUTTONFACE, /* BUTTONSHADOW */
+		CANVASTEXT, /* CAPTIONTEXT */
+		BUTTONBORDER, /* INACTIVEBORDER */
+		CANVAS, /* INACTIVECAPTION */
+		GRAYTEXT, /* INACTIVECAPTIONTEXT */
+		CANVAS, /* INFOBACKGROUND */
+		CANVASTEXT, /* INFOTEXT */
+		CANVAS, /* MENU */
+		CANVASTEXT, /* MENUTEXT */
+		CANVAS, /* SCROLLBAR */
+		BUTTONBORDER, /* THREEDDARKSHADOW */
+		BUTTONFACE, /* THREEDFACE */
+		BUTTONBORDER, /* THREEDHIGHLIGHT */
+		BUTTONBORDER, /* THREEDLIGHTSHADOW */
+		BUTTONBORDER, /* THREEDSHADOW */
+		CANVAS, /* WINDOW */
+		BUTTONBORDER, /* WINDOWFRAME */
+		CANVASTEXT, /* WINDOWTEXT */
+	};
 	int i;
 	bool match;
 
+	/* try to match a named colour */
 	for (i = FIRST_COLOUR; i <= LAST_COLOUR; i++) {
-		if (lwc_string_caseless_isequal(data, c->strings[i],
-				&match) == lwc_error_ok && match)
-			break;
+		if (lwc_string_caseless_isequal(data, c->strings[i], &match) ==
+		    lwc_error_ok &&
+		    match) {
+			/* Known named colour */
+			*result = colourmap[i - FIRST_COLOUR];
+			return CSS_OK;
+		}
 	}
 
-	if (i <= LAST_COLOUR) {
-		/* Known named colour */
-		*result = colourmap[i - FIRST_COLOUR];
-		return CSS_OK;
+	/* map deprecated system colours to current system colours */
+	for (i = FIRST_DEPRECATEDCOLOUR; i <= LAST_DEPRECATEDCOLOUR; i++) {
+		if (lwc_string_caseless_isequal(data, c->strings[i], &match) ==
+		    lwc_error_ok &&
+		    match) {
+			/* Known legacy system named colour */
+			data = c->strings[deprecatedmap[i - FIRST_DEPRECATEDCOLOUR]];
+			break;
+		}
 	}
 
-	/* We don't know this colour name; ask the client */
+	/* attempt to get client to map colour */
 	if (c->sheet->color != NULL)
 		return c->sheet->color(c->sheet->color_pw, data, result);
 

src/parse/propstrings.c

@@ -493,6 +493,7 @@ const stringmap_entry stringmap[LAST_KNOWN] = {
 	SMAP("sticky"),
 	SMAP("calc"),
 
+	/* Named colours */
 	SMAP("aliceblue"),
 	SMAP("antiquewhite"),
 	SMAP("aqua"),
@@ -642,7 +643,53 @@ const stringmap_entry stringmap[LAST_KNOWN] = {
 	SMAP("white"),
 	SMAP("whitesmoke"),
 	SMAP("yellow"),
-	SMAP("yellowgreen")
+	SMAP("yellowgreen"),
+
+	/* CSS Color Module Level 4 system colors */
+	SMAP("accentcolor"),
+	SMAP("accentcolortext"),
+	SMAP("activetext"),
+	SMAP("buttonborder"),
+	SMAP("buttonface"),
+	SMAP("buttontext"),
+	SMAP("canvas"),
+	SMAP("canvastext"),
+	SMAP("field"),
+	SMAP("fieldtext"),
+	SMAP("graytext"),
+	SMAP("highlight"),
+	SMAP("highlighttext"),
+	SMAP("linktext"),
+	SMAP("mark"),
+	SMAP("marktext"),
+	SMAP("selecteditem"),
+	SMAP("selecteditemtext"),
+	SMAP("visitedtext"),
+
+	/* CSS Color Module Level 4 deprecated system colors */
+	SMAP("activeborder"),
+	SMAP("activecaption"),
+	SMAP("appworkspace"),
+	SMAP("background"),
+	SMAP("buttonhighlight"),
+	SMAP("buttonshadow"),
+	SMAP("captiontext"),
+	SMAP("inactiveborder"),
+	SMAP("inactivecaption"),
+	SMAP("inactivecaptiontext"),
+	SMAP("infobackground"),
+	SMAP("infotext"),
+	SMAP("menu"),
+	SMAP("menutext"),
+	SMAP("scrollbar"),
+	SMAP("threeddarkshadow"),
+	SMAP("threedface"),
+	SMAP("threedhighlight"),
+	SMAP("threedlightshadow"),
+	SMAP("threedshadow"),
+	SMAP("window"),
+	SMAP("windowframe"),
+	SMAP("windowtext")
 };
 
 

src/parse/propstrings.h

@@ -143,6 +143,28 @@ enum {
 
 	LAST_COLOUR = YELLOWGREEN,
 
+	/* CSS Color Module Level 4 system colors */
+	FIRST_SYSTEMCOLOUR,
+
+	ACCENTCOLOR = FIRST_SYSTEMCOLOUR, ACCENTCOLORTEXT, ACTIVETEXT,
+	BUTTONBORDER, BUTTONFACE, BUTTONTEXT, CANVAS, CANVASTEXT, FIELD,
+	FIELDTEXT, GRAYTEXT, HIGHLIGHT, HIGHLIGHTTEXT, LINKTEXT, MARK,
+	MARKTEXT, SELECTEDITEM, SELECTEDITEMTEXT, VISITEDTEXT,
+
+	LAST_SYSTEMCOLOUR = VISITEDTEXT,
+
+	/* CSS Color Module Level 4 deprecated system colors */
+	FIRST_DEPRECATEDCOLOUR,
+
+	ACTIVEBORDER = FIRST_DEPRECATEDCOLOUR, ACTIVECAPTION, APPWORKSPACE,
+	DCBACKGROUND, BUTTONHIGHLIGHT, BUTTONSHADOW, CAPTIONTEXT, INACTIVEBORDER,
+	INACTIVECAPTION, INACTIVECAPTIONTEXT, INFOBACKGROUND, INFOTEXT,
+	MENU, MENUTEXT, SCROLLBAR, THREEDDARKSHADOW, THREEDFACE,
+	THREEDHIGHLIGHT, THREEDLIGHTSHADOW, THREEDSHADOW, WINDOW, WINDOWFRAME,
+	WINDOWTEXT,
+
+	LAST_DEPRECATEDCOLOUR = WINDOWTEXT,
+
 	LAST_KNOWN
 };