Skip to content

Commit

Permalink
mupdf: expand list of supported CSS color names (#1894)
Browse files Browse the repository at this point in the history
  • Loading branch information
@benoit-pierre
benoit-pierre authored Aug 17, 2024
1 parent 99ddf05 commit 93cf3e0
Show file tree
Hide file tree
Showing 2 changed files with 371 additions and 0 deletions.
2 changes: 2 additions & 0 deletions thirdparty/mupdf/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ list(APPEND PATCH_FILES
relink_on_xlibs_change.patch
# Fix symbols visiblity.
visibility.patch
# Expand list of supported CSS color names.
css_color_names.patch
)

list(APPEND PATCH_CMD COMMAND rm -rf
Expand Down
369 changes: 369 additions & 0 deletions thirdparty/mupdf/css_color_names.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,369 @@
--- a/source/html/css-apply.c
+++ b/source/html/css-apply.c
@@ -48,24 +48,307 @@
};

static const char *color_kw[] = {
+ "aliceblue",
+ "antiquewhite",
"aqua",
+ "aquamarine",
+ "azure",
+ "beige",
+ "bisque",
"black",
+ "blanchedalmond",
"blue",
+ "blueviolet",
+ "brown",
+ "burlywood",
+ "cadetblue",
+ "chartreuse",
+ "chocolate",
+ "coral",
+ "cornflowerblue",
+ "cornsilk",
+ "crimson",
+ "cyan",
+ "darkblue",
+ "darkcyan",
+ "darkgoldenrod",
+ "darkgray",
+ "darkgreen",
+ "darkgrey",
+ "darkkhaki",
+ "darkmagenta",
+ "darkolivegreen",
+ "darkorange",
+ "darkorchid",
+ "darkred",
+ "darksalmon",
+ "darkseagreen",
+ "darkslateblue",
+ "darkslategray",
+ "darkslategrey",
+ "darkturquoise",
+ "darkviolet",
+ "deeppink",
+ "deepskyblue",
+ "dimgray",
+ "dimgrey",
+ "dodgerblue",
+ "firebrick",
+ "floralwhite",
+ "forestgreen",
"fuchsia",
+ "gainsboro",
+ "ghostwhite",
+ "gold",
+ "goldenrod",
"gray",
"green",
+ "greenyellow",
+ "grey",
+ "honeydew",
+ "hotpink",
+ "indianred",
+ "indigo",
+ "ivory",
+ "khaki",
+ "lavender",
+ "lavenderblush",
+ "lawngreen",
+ "lemonchiffon",
+ "lightblue",
+ "lightcoral",
+ "lightcyan",
+ "lightgoldenrodyellow",
+ "lightgray",
+ "lightgreen",
+ "lightgrey",
+ "lightpink",
+ "lightsalmon",
+ "lightseagreen",
+ "lightskyblue",
+ "lightslategray",
+ "lightslategrey",
+ "lightsteelblue",
+ "lightyellow",
"lime",
+ "limegreen",
+ "linen",
+ "magenta",
"maroon",
+ "mediumaquamarine",
+ "mediumblue",
+ "mediumorchid",
+ "mediumpurple",
+ "mediumseagreen",
+ "mediumslateblue",
+ "mediumspringgreen",
+ "mediumturquoise",
+ "mediumvioletred",
+ "midnightblue",
+ "mintcream",
+ "mistyrose",
+ "moccasin",
+ "navajowhite",
"navy",
+ "oldlace",
"olive",
+ "olivedrab",
"orange",
+ "orangered",
+ "orchid",
+ "palegoldenrod",
+ "palegreen",
+ "paleturquoise",
+ "palevioletred",
+ "papayawhip",
+ "peachpuff",
+ "peru",
+ "pink",
+ "plum",
+ "powderblue",
"purple",
+ "rebeccapurple",
"red",
+ "rosybrown",
+ "royalblue",
+ "saddlebrown",
+ "salmon",
+ "sandybrown",
+ "seagreen",
+ "seashell",
+ "sienna",
"silver",
+ "skyblue",
+ "slateblue",
+ "slategray",
+ "slategrey",
+ "snow",
+ "springgreen",
+ "steelblue",
+ "tan",
"teal",
+ "thistle",
+ "tomato",
"transparent",
+ "turquoise",
+ "violet",
+ "wheat",
"white",
+ "whitesmoke",
"yellow",
+ "yellowgreen",
+};
+
+static uint8_t color_rgb[][3] = {
+ { 240, 248, 255 },
+ { 250, 235, 215 },
+ { 0, 255, 255 },
+ { 127, 255, 212 },
+ { 240, 255, 255 },
+ { 245, 245, 220 },
+ { 255, 228, 196 },
+ { 0, 0, 0 },
+ { 255, 235, 205 },
+ { 0, 0, 255 },
+ { 138, 43, 226 },
+ { 165, 42, 42 },
+ { 222, 184, 135 },
+ { 95, 158, 160 },
+ { 127, 255, 0 },
+ { 210, 105, 30 },
+ { 255, 127, 80 },
+ { 100, 149, 237 },
+ { 255, 248, 220 },
+ { 220, 20, 60 },
+ { 0, 255, 255 },
+ { 0, 0, 139 },
+ { 0, 139, 139 },
+ { 184, 134, 11 },
+ { 169, 169, 169 },
+ { 0, 100, 0 },
+ { 169, 169, 169 },
+ { 189, 183, 107 },
+ { 139, 0, 139 },
+ { 85, 107, 47 },
+ { 255, 140, 0 },
+ { 153, 50, 204 },
+ { 139, 0, 0 },
+ { 233, 150, 122 },
+ { 143, 188, 143 },
+ { 72, 61, 139 },
+ { 47, 79, 79 },
+ { 47, 79, 79 },
+ { 0, 206, 209 },
+ { 148, 0, 211 },
+ { 255, 20, 147 },
+ { 0, 191, 255 },
+ { 105, 105, 105 },
+ { 105, 105, 105 },
+ { 30, 144, 255 },
+ { 178, 34, 34 },
+ { 255, 250, 240 },
+ { 34, 139, 34 },
+ { 255, 0, 255 },
+ { 220, 220, 220 },
+ { 248, 248, 255 },
+ { 255, 215, 0 },
+ { 218, 165, 32 },
+ { 128, 128, 128 },
+ { 0, 128, 0 },
+ { 173, 255, 47 },
+ { 128, 128, 128 },
+ { 240, 255, 240 },
+ { 255, 105, 180 },
+ { 205, 92, 92 },
+ { 75, 0, 130 },
+ { 255, 255, 240 },
+ { 240, 230, 140 },
+ { 230, 230, 250 },
+ { 255, 240, 245 },
+ { 124, 252, 0 },
+ { 255, 250, 205 },
+ { 173, 216, 230 },
+ { 240, 128, 128 },
+ { 224, 255, 255 },
+ { 250, 250, 210 },
+ { 211, 211, 211 },
+ { 144, 238, 144 },
+ { 211, 211, 211 },
+ { 255, 182, 193 },
+ { 255, 160, 122 },
+ { 32, 178, 170 },
+ { 135, 206, 250 },
+ { 119, 136, 153 },
+ { 119, 136, 153 },
+ { 176, 196, 222 },
+ { 255, 255, 224 },
+ { 0, 255, 0 },
+ { 50, 205, 50 },
+ { 250, 240, 230 },
+ { 255, 0, 255 },
+ { 128, 0, 0 },
+ { 102, 205, 170 },
+ { 0, 0, 205 },
+ { 186, 85, 211 },
+ { 147, 112, 219 },
+ { 60, 179, 113 },
+ { 123, 104, 238 },
+ { 0, 250, 154 },
+ { 72, 209, 204 },
+ { 199, 21, 133 },
+ { 25, 25, 112 },
+ { 245, 255, 250 },
+ { 255, 228, 225 },
+ { 255, 228, 181 },
+ { 255, 222, 173 },
+ { 0, 0, 128 },
+ { 253, 245, 230 },
+ { 128, 128, 0 },
+ { 107, 142, 35 },
+ { 255, 165, 0 },
+ { 255, 69, 0 },
+ { 218, 112, 214 },
+ { 238, 232, 170 },
+ { 152, 251, 152 },
+ { 175, 238, 238 },
+ { 219, 112, 147 },
+ { 255, 239, 213 },
+ { 255, 218, 185 },
+ { 205, 133, 63 },
+ { 255, 192, 203 },
+ { 221, 160, 221 },
+ { 176, 224, 230 },
+ { 128, 0, 128 },
+ { 102, 51, 153 },
+ { 255, 0, 0 },
+ { 188, 143, 143 },
+ { 65, 105, 225 },
+ { 139, 69, 19 },
+ { 250, 128, 114 },
+ { 244, 164, 96 },
+ { 46, 139, 87 },
+ { 255, 245, 238 },
+ { 160, 82, 45 },
+ { 192, 192, 192 },
+ { 135, 206, 235 },
+ { 106, 90, 205 },
+ { 112, 128, 144 },
+ { 112, 128, 144 },
+ { 255, 250, 250 },
+ { 0, 255, 127 },
+ { 70, 130, 180 },
+ { 210, 180, 140 },
+ { 0, 128, 128 },
+ { 216, 191, 216 },
+ { 255, 99, 71 },
+ { 0, 0, 0 },
+ { 64, 224, 208 },
+ { 238, 130, 238 },
+ { 245, 222, 179 },
+ { 255, 255, 255 },
+ { 245, 245, 245 },
+ { 255, 255, 0 },
+ { 154, 205, 50 },
};

static const char *list_style_type_kw[] = {
@@ -106,7 +387,7 @@
else if (c > 0)
l = m + 1;
else
- return 1;
+ return m + 1;
}
return 0;
}
@@ -1116,43 +1397,12 @@

if (value->type == CSS_KEYWORD)
{
- if (!strcmp(value->data, "transparent"))
- return make_color(0, 0, 0, 0);
+ int n = keyword_in_list(value->data, color_kw, nelem(color_kw));
+ if (!n)
+ goto hex_color; /* last ditch attempt: maybe it's a #XXXXXX color without the # */
+ if (--n == 141)
+ return make_color(0, 0, 0, 0); // transparent
- if (!strcmp(value->data, "maroon"))
- return make_color(0x80, 0x00, 0x00, 255);
- if (!strcmp(value->data, "red"))
- return make_color(0xFF, 0x00, 0x00, 255);
- if (!strcmp(value->data, "orange"))
- return make_color(0xFF, 0xA5, 0x00, 255);
- if (!strcmp(value->data, "yellow"))
- return make_color(0xFF, 0xFF, 0x00, 255);
- if (!strcmp(value->data, "olive"))
- return make_color(0x80, 0x80, 0x00, 255);
- if (!strcmp(value->data, "purple"))
- return make_color(0x80, 0x00, 0x80, 255);
- if (!strcmp(value->data, "fuchsia"))
- return make_color(0xFF, 0x00, 0xFF, 255);
- if (!strcmp(value->data, "white"))
- return make_color(0xFF, 0xFF, 0xFF, 255);
- if (!strcmp(value->data, "lime"))
- return make_color(0x00, 0xFF, 0x00, 255);
- if (!strcmp(value->data, "green"))
- return make_color(0x00, 0x80, 0x00, 255);
- if (!strcmp(value->data, "navy"))
- return make_color(0x00, 0x00, 0x80, 255);
- if (!strcmp(value->data, "blue"))
- return make_color(0x00, 0x00, 0xFF, 255);
- if (!strcmp(value->data, "aqua"))
- return make_color(0x00, 0xFF, 0xFF, 255);
- if (!strcmp(value->data, "teal"))
- return make_color(0x00, 0x80, 0x80, 255);
- if (!strcmp(value->data, "black"))
- return make_color(0x00, 0x00, 0x00, 255);
- if (!strcmp(value->data, "silver"))
- return make_color(0xC0, 0xC0, 0xC0, 255);
- if (!strcmp(value->data, "gray"))
- return make_color(0x80, 0x80, 0x80, 255);
- goto hex_color; /* last ditch attempt: maybe it's a #XXXXXX color without the # */
+ return make_color(color_rgb[n][0], color_rgb[n][1], color_rgb[n][2], 255);
}
return initial;
}

0 comments on commit 93cf3e0

Please sign in to comment.