From a8ef92a7835b9e67e397c597d13572c197a52da9 Mon Sep 17 00:00:00 2001 From: "S. Gilles" Date: Wed, 1 Nov 2017 09:16:05 -0400 Subject: [PATCH] Carry mona patch forward --- dev-libs/libcss/Manifest | 2 +- .../libcss/files/libcss-9999-add-mona-family.patch | 84 ++++++++++------------ 2 files changed, 37 insertions(+), 49 deletions(-) diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest index 8be62ce..53ed01a 100644 --- a/dev-libs/libcss/Manifest +++ b/dev-libs/libcss/Manifest @@ -1,4 +1,4 @@ -AUX libcss-9999-add-mona-family.patch 5640 SHA256 642302249427e24e47a7838e6a2b876cf2dbb22217900dba46eea98af5eb83b2 SHA512 10ddc3b51976be880bdfaa2d773919833c73d6e37e7781a9326e65de1c9e69f33d769cfb3f70f4fa4851a5f72907a8ae09f43e1a4623c24b47a4ba43511efe9a WHIRLPOOL 13b6a42ee250c1a1aa8fd01f39700e3ffaa80990447314e80a5d7cd1a18f65a25ffecca93adcc0bad0880aa44a877f635477ac713e545f0696de6a18e22e3c8e +AUX libcss-9999-add-mona-family.patch 5354 SHA256 dc70e6bc78858bfd873707d12ed10758b1c3930e8c3ae9e5fa1fbc6808966e80 SHA512 1855c7dc1c4c014a1b3f61d0f1ae569adca140d9c3540f63120df92b556ca243ebfec196da0dc373a9c05ad84f7b1f0b45782375f88fa705e417671d4fd9f47f WHIRLPOOL 3f58c224d4d314333e8b07e7a8229db4f198df220f05cf7bbb89571989cfa2275a4703b6affe96d1af33d76ac6cb5cefd75ce24140b045de902b1cda0acd5bb6 AUX libcss-9999-glibc2.20.patch 759 SHA256 e9b4822f79e5dc35ba8985a703e67ddc2171b57a81ed9250e4dec9efb58d6315 SHA512 ebbebef87835e748cbc5a5160d4f7a6b59c041b101542a07604af4a4f35d89ef84136a6c2f8cbad73d81756f5c455d53a490dadd9dca49aff1efafdb58e48af7 WHIRLPOOL 704a323454e8101bc8b0fd0a44cfde388b2480d539b371b5ee1102c48a8ada384d23012c23d74fbef86a2b6e8968252a2543c8935ce09d6bfe49294605b0a4f5 EBUILD libcss-9999.ebuild 994 SHA256 b688fa54b0c5faad4607682f1a053a28c47d83361cb6739f740efe87c85ab6a6 SHA512 a9fb602d046a5071657a3d98cb217feab67bacb792296e65cdcae60d9c9d62f75b60a4d81b8869ac1667c1e44bf3aac5e6731d643bb8c147fa0d8a4a5b62b94b WHIRLPOOL a7e870f4c4bdb52849e8d70bf64c652dd55ba712cf809dec881b4ca32e24905a3f83b4848a19e30e11e8bc1524cb609c7ebe57aef2702fd30977a1aee24846e3 MISC ChangeLog 1430 SHA256 46363aa78c694f9e8f09e628fa3967a3dbac47bf31554a868674f1d2de2e44d6 SHA512 73c18cc7db3cd793d84efdbd960b649a6361960227a8cc611b1e4b4db9ae55ca5bbfa7f1f7c8875589c95c53388c79042d49077c4c8e04d405215bb0f340b99e WHIRLPOOL 2f4c0ee7296d60cada844d25cfc25793bef0a633c86219f5bd15fc155f3d6c79112f9cdae895f947a8e8db83d204d3ed5f5f152f81c62c2e85afc7971934614d diff --git a/dev-libs/libcss/files/libcss-9999-add-mona-family.patch b/dev-libs/libcss/files/libcss-9999-add-mona-family.patch index 890df83..606d53c 100644 --- a/dev-libs/libcss/files/libcss-9999-add-mona-family.patch +++ b/dev-libs/libcss/files/libcss-9999-add-mona-family.patch @@ -1,20 +1,8 @@ -diff --git a/docs/Bytecode b/docs/Bytecode -index 3f53d71..78b5bb1 100644 ---- a/docs/Bytecode -+++ b/docs/Bytecode -@@ -508,6 +508,7 @@ Opcodes - 0000011 => cursive, - 0000100 => fantasy, - 0000101 => monospace, -+ 0000110 => mona, - other => rffe. - - In all cases, there is a parameter list. Each item is preceded by a diff --git a/include/libcss/properties.h b/include/libcss/properties.h -index 0840f6f..55de5f5 100644 +index 577bed0..3e181ab 100644 --- a/include/libcss/properties.h +++ b/include/libcss/properties.h -@@ -415,7 +415,8 @@ enum css_font_family_e { +@@ -495,7 +495,8 @@ enum css_font_family_e { CSS_FONT_FAMILY_SANS_SERIF = 0x2, CSS_FONT_FAMILY_CURSIVE = 0x3, CSS_FONT_FAMILY_FANTASY = 0x4, @@ -25,34 +13,34 @@ index 0840f6f..55de5f5 100644 enum css_font_size_e { diff --git a/src/bytecode/opcodes.h b/src/bytecode/opcodes.h -index 4f80142..e33bf26 100644 +index 82bf75f..cc0c3bd 100644 --- a/src/bytecode/opcodes.h +++ b/src/bytecode/opcodes.h -@@ -331,7 +331,8 @@ enum op_font_family { +@@ -392,7 +392,8 @@ enum op_font_family { FONT_FAMILY_SANS_SERIF = 0x0002, FONT_FAMILY_CURSIVE = 0x0003, FONT_FAMILY_FANTASY = 0x0004, - FONT_FAMILY_MONOSPACE = 0x0005 + FONT_FAMILY_MONOSPACE = 0x0005, -+ FONT_FAMILY_MONA = 0x0006, ++ FONT_FAMILY_MONA = 0x0006 }; enum op_font_size { diff --git a/src/parse/font_face.c b/src/parse/font_face.c -index 8eab006..d678239 100644 +index f17d50e..60a821d 100644 --- a/src/parse/font_face.c +++ b/src/parse/font_face.c -@@ -29,6 +29,8 @@ static bool font_rule_font_family_reserved(css_language *c, - &match) == lwc_error_ok && match) || - (lwc_string_caseless_isequal(ident->idata, c->strings[FANTASY], +@@ -31,6 +31,8 @@ static bool font_rule_font_family_reserved(css_language *c, &match) == lwc_error_ok && match) || + (lwc_string_caseless_isequal(ident->idata, + c->strings[MONOSPACE], &match) == lwc_error_ok && + (lwc_string_caseless_isequal(ident->idata, c->strings[MONA], + &match) == lwc_error_ok && match) || - (lwc_string_caseless_isequal(ident->idata, - c->strings[MONOSPACE], &match) == lwc_error_ok && match) || + (lwc_string_caseless_isequal(ident->idata, c->strings[INHERIT], + &match) == lwc_error_ok && match) || diff --git a/src/parse/properties/font.c b/src/parse/properties/font.c -index 8d66aec..3ccf6e5 100644 +index 9903f75..7c0b68b 100644 --- a/src/parse/properties/font.c +++ b/src/parse/properties/font.c @@ -146,6 +146,8 @@ static css_error parse_system_font(css_language *c, @@ -65,35 +53,35 @@ index 8d66aec..3ccf6e5 100644 error = css__stylesheet_style_appendOPV(result, CSS_PROP_FONT_FAMILY, 0, FONT_FAMILY_MONOSPACE); else { diff --git a/src/parse/properties/font_family.c b/src/parse/properties/font_family.c -index 60c069d..734915b 100644 +index 23c080b..2555f71 100644 --- a/src/parse/properties/font_family.c +++ b/src/parse/properties/font_family.c -@@ -37,6 +37,9 @@ static bool font_family_reserved(css_language *c, const css_token *ident) +@@ -36,6 +36,9 @@ static bool font_family_reserved(css_language *c, const css_token *ident) + (lwc_string_caseless_isequal( ident->idata, c->strings[FANTASY], &match) == lwc_error_ok && match) || - (lwc_string_caseless_isequal( ++ (lwc_string_caseless_isequal( + ident->idata, c->strings[MONA], + &match) == lwc_error_ok && match) || -+ (lwc_string_caseless_isequal( + (lwc_string_caseless_isequal( ident->idata, c->strings[MONOSPACE], &match) == lwc_error_ok && match); - } -@@ -72,6 +75,10 @@ static css_code_t font_family_value(css_language *c, const css_token *token, boo +@@ -71,6 +74,10 @@ static css_code_t font_family_value(css_language *c, const css_token *token, boo + token->idata, c->strings[FANTASY], &match) == lwc_error_ok && match)) value = FONT_FAMILY_FANTASY; - else if ((lwc_string_caseless_isequal( ++ else if ((lwc_string_caseless_isequal( + token->idata, c->strings[MONA], + &match) == lwc_error_ok && match)) -+ value = FONT_FAMILY_MONA; -+ else if ((lwc_string_caseless_isequal( ++ value = MONA; + else if ((lwc_string_caseless_isequal( token->idata, c->strings[MONOSPACE], &match) == lwc_error_ok && match)) - value = FONT_FAMILY_MONOSPACE; diff --git a/src/parse/propstrings.c b/src/parse/propstrings.c -index 2c166a0..c33f9e0 100644 +index bfd2965..10bf940 100644 --- a/src/parse/propstrings.c +++ b/src/parse/propstrings.c -@@ -377,6 +377,7 @@ const stringmap_entry stringmap[LAST_KNOWN] = { +@@ -390,6 +390,7 @@ const stringmap_entry stringmap[LAST_KNOWN] = { { "sans-serif", SLEN("sans-serif") }, { "cursive", SLEN("cursive") }, { "fantasy", SLEN("fantasy") }, @@ -102,30 +90,30 @@ index 2c166a0..c33f9e0 100644 { "male", SLEN("male") }, { "female", SLEN("female") }, diff --git a/src/parse/propstrings.h b/src/parse/propstrings.h -index c686a91..51e7264 100644 +index 67eaa5f..8a5a253 100644 --- a/src/parse/propstrings.h +++ b/src/parse/propstrings.h -@@ -93,7 +93,7 @@ enum { - COUNTER, COUNTERS, CROSSHAIR, DEFAULT, POINTER, MOVE, E_RESIZE, - NE_RESIZE, NW_RESIZE, N_RESIZE, SE_RESIZE, SW_RESIZE, S_RESIZE, +@@ -94,7 +94,7 @@ enum { + COUNTER, COUNTERS, CROSSHAIR, DEFAULT, POINTER, MOVE, E_RESIZE, + NE_RESIZE, NW_RESIZE, N_RESIZE, SE_RESIZE, SW_RESIZE, S_RESIZE, W_RESIZE, LIBCSS_TEXT, WAIT, HELP, PROGRESS, SERIF, SANS_SERIF, CURSIVE, -- FANTASY, MONOSPACE, MALE, FEMALE, CHILD, MIX, UNDERLINE, OVERLINE, -+ FANTASY, MONA, MONOSPACE, MALE, FEMALE, CHILD, MIX, UNDERLINE, OVERLINE, +- FANTASY, MONOSPACE, MALE, FEMALE, CHILD, MIX, UNDERLINE, OVERLINE, ++ MONA, FANTASY, MONOSPACE, MALE, FEMALE, CHILD, MIX, UNDERLINE, OVERLINE, LINE_THROUGH, BLINK, RGB, RGBA, HSL, HSLA, LIBCSS_LEFT, LIBCSS_CENTER, LIBCSS_RIGHT, CURRENTCOLOR, ODD, EVEN, SRC, LOCAL, INITIAL, FORMAT, WOFF, TRUETYPE, OPENTYPE, EMBEDDED_OPENTYPE, SVG, COLUMN, diff --git a/src/select/properties/font_family.c b/src/select/properties/font_family.c -index 514a43a..2e3045a 100644 +index f853fcc..9f2cf4c 100644 --- a/src/select/properties/font_family.c +++ b/src/select/properties/font_family.c -@@ -56,6 +56,10 @@ css_error css__cascade_font_family(uint32_t opv, css_style *style, +@@ -52,6 +52,10 @@ css_error css__cascade_font_family(uint32_t opv, css_style *style, if (value == CSS_FONT_FAMILY_INHERIT) - value = CSS_FONT_FAMILY_MONOSPACE; + value = CSS_FONT_FAMILY_FANTASY; break; + case FONT_FAMILY_MONA: + if (value == CSS_FONT_FAMILY_INHERIT) + value = CSS_FONT_FAMILY_MONA; + break; - } - - /* Only use family-names which occur before the first + case FONT_FAMILY_MONOSPACE: + if (value == CSS_FONT_FAMILY_INHERIT) + value = CSS_FONT_FAMILY_MONOSPACE; -- 2.11.4.GIT