Gitweb links:
...log
http://git.netsurf-browser.org/libcss.git/shortlog/7e7bb2cde575d6ce2c01231b7759fe30c918b400
...commit
http://git.netsurf-browser.org/libcss.git/commit/7e7bb2cde575d6ce2c01231b7759fe30c918b400
...tree
http://git.netsurf-browser.org/libcss.git/tree/7e7bb2cde575d6ce2c01231b7759fe30c918b400
The branch, master has been updated
via 7e7bb2cde575d6ce2c01231b7759fe30c918b400 (commit)
from dd74dbf4b1a8d27cb49855f067f65b722d65bd42 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/libcss.git/commit/?id=7e7bb2cde575d6ce2c01231b7759fe30c918b400
commit 7e7bb2cde575d6ce2c01231b7759fe30c918b400
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
implement the remaining css 3.1 simple predefined counter styles
diff --git a/include/libcss/properties.h b/include/libcss/properties.h
index 6f8a51c..a5569d0 100644
--- a/include/libcss/properties.h
+++ b/include/libcss/properties.h
@@ -620,8 +620,25 @@ enum css_list_style_type_e {
CSS_LIST_STYLE_TYPE_CJK_DECIMAL = 0x1a,
CSS_LIST_STYLE_TYPE_DEVANAGARI = 0x1b,
CSS_LIST_STYLE_TYPE_GUJARATI = 0x1c,
- CSS_LIST_STYLE_TYPE_GURMUKHI = 0x1d
-
+ CSS_LIST_STYLE_TYPE_GURMUKHI = 0x1d,
+ CSS_LIST_STYLE_TYPE_HEBREW = 0x1e,
+ CSS_LIST_STYLE_TYPE_KANNADA = 0x1f,
+ CSS_LIST_STYLE_TYPE_LAO = 0x20,
+ CSS_LIST_STYLE_TYPE_MALAYALAM = 0x21,
+ CSS_LIST_STYLE_TYPE_MONGOLIAN = 0x22,
+ CSS_LIST_STYLE_TYPE_MYANMAR = 0x23,
+ CSS_LIST_STYLE_TYPE_ORIYA = 0x24,
+ CSS_LIST_STYLE_TYPE_PERSIAN = 0x25,
+ CSS_LIST_STYLE_TYPE_TAMIL = 0x26,
+ CSS_LIST_STYLE_TYPE_TELUGU = 0x27,
+ CSS_LIST_STYLE_TYPE_THAI = 0x28,
+ CSS_LIST_STYLE_TYPE_TIBETAN = 0x29,
+ CSS_LIST_STYLE_TYPE_CJK_EARTHLY_BRANCH = 0x2a,
+ CSS_LIST_STYLE_TYPE_CJK_HEAVENLY_STEM = 0x2b,
+ CSS_LIST_STYLE_TYPE_HIAGANA = 0x2c,
+ CSS_LIST_STYLE_TYPE_HIAGANA_IROHA = 0x2d,
+ CSS_LIST_STYLE_TYPE_KATAKANA = 0x2e,
+ CSS_LIST_STYLE_TYPE_KATAKANA_IROHA = 0x2f
};
enum css_margin_e {
diff --git a/src/bytecode/opcodes.h b/src/bytecode/opcodes.h
index b74e990..1e561e5 100644
--- a/src/bytecode/opcodes.h
+++ b/src/bytecode/opcodes.h
@@ -505,7 +505,25 @@ enum op_list_style_type {
LIST_STYLE_TYPE_CJK_DECIMAL = 0x0019,
LIST_STYLE_TYPE_DEVANAGARI = 0x001a,
LIST_STYLE_TYPE_GUJARATI = 0x001b,
- LIST_STYLE_TYPE_GURMUKHI = 0x001c
+ LIST_STYLE_TYPE_GURMUKHI = 0x001c,
+ LIST_STYLE_TYPE_HEBREW = 0x001d,
+ LIST_STYLE_TYPE_KANNADA = 0x001e,
+ LIST_STYLE_TYPE_LAO = 0x001f,
+ LIST_STYLE_TYPE_MALAYALAM = 0x0020,
+ LIST_STYLE_TYPE_MONGOLIAN = 0x0021,
+ LIST_STYLE_TYPE_MYANMAR = 0x0022,
+ LIST_STYLE_TYPE_ORIYA = 0x0023,
+ LIST_STYLE_TYPE_PERSIAN = 0x0024,
+ LIST_STYLE_TYPE_TAMIL = 0x0025,
+ LIST_STYLE_TYPE_TELUGU = 0x0026,
+ LIST_STYLE_TYPE_THAI = 0x0027,
+ LIST_STYLE_TYPE_TIBETAN = 0x0028,
+ LIST_STYLE_TYPE_CJK_EARTHLY_BRANCH = 0x0029,
+ LIST_STYLE_TYPE_CJK_HEAVENLY_STEM = 0x002a,
+ LIST_STYLE_TYPE_HIAGANA = 0x002b,
+ LIST_STYLE_TYPE_HIAGANA_IROHA = 0x002c,
+ LIST_STYLE_TYPE_KATAKANA = 0x002d,
+ LIST_STYLE_TYPE_KATAKANA_IROHA = 0x002e
};
enum op_margin {
diff --git a/src/parse/properties/utils.c b/src/parse/properties/utils.c
index a71e22d..c82c88f 100644
--- a/src/parse/properties/utils.c
+++ b/src/parse/properties/utils.c
@@ -34,7 +34,7 @@ css_error css__parse_list_style_type_value(css_language *c,
const css_token *ide
* upper-latin, armenian, georgian, lower-alpha, upper-alpha,
* none)
*/
- #define MAP_ENTRIES 29
+ #define MAP_ENTRIES 47
bool match;
int midx;
const struct {
@@ -69,7 +69,25 @@ css_error css__parse_list_style_type_value(css_language *c,
const css_token *ide
{ CJK_DECIMAL, LIST_STYLE_TYPE_CJK_DECIMAL },
{ DEVANAGARI, LIST_STYLE_TYPE_DEVANAGARI },
{ GUJARATI, LIST_STYLE_TYPE_GUJARATI },
- { GURMUKHI, LIST_STYLE_TYPE_GURMUKHI }
+ { GURMUKHI, LIST_STYLE_TYPE_GURMUKHI },
+ { HEBREW, LIST_STYLE_TYPE_HEBREW },
+ { KANNADA, LIST_STYLE_TYPE_KANNADA },
+ { LAO, LIST_STYLE_TYPE_LAO },
+ { MALAYALAM, LIST_STYLE_TYPE_MALAYALAM },
+ { MONGOLIAN, LIST_STYLE_TYPE_MONGOLIAN },
+ { MYANMAR, LIST_STYLE_TYPE_MYANMAR },
+ { ORIYA, LIST_STYLE_TYPE_ORIYA },
+ { PERSIAN, LIST_STYLE_TYPE_PERSIAN },
+ { TAMIL, LIST_STYLE_TYPE_TAMIL },
+ { TELUGU, LIST_STYLE_TYPE_TELUGU },
+ { THAI, LIST_STYLE_TYPE_THAI },
+ { TIBETAN, LIST_STYLE_TYPE_TIBETAN },
+ { CJK_EARTHLY_BRANCH, LIST_STYLE_TYPE_CJK_EARTHLY_BRANCH },
+ { CJK_HEAVENLY_STEM, LIST_STYLE_TYPE_CJK_HEAVENLY_STEM },
+ { HIAGANA, LIST_STYLE_TYPE_HIAGANA },
+ { HIAGANA_IROHA, LIST_STYLE_TYPE_HIAGANA_IROHA },
+ { KATAKANA, LIST_STYLE_TYPE_KATAKANA },
+ { KATAKANA_IROHA, LIST_STYLE_TYPE_KATAKANA_IROHA }
};
for (midx = 0; midx < MAP_ENTRIES; midx++) {
diff --git a/src/parse/propstrings.c b/src/parse/propstrings.c
index 302f7f8..5528645 100644
--- a/src/parse/propstrings.c
+++ b/src/parse/propstrings.c
@@ -323,6 +323,24 @@ const stringmap_entry stringmap[LAST_KNOWN] = {
{ "devanagari", SLEN("devanagari") },
{ "gujarati", SLEN("gujarati") },
{ "gurmukhi", SLEN("gurmukhi") },
+ { "hebrew", SLEN("hebrew") },
+ { "kannada", SLEN("kannada") },
+ { "lao", SLEN("lao") },
+ { "malayalam", SLEN("malayalam") },
+ { "mongolian", SLEN("mongolian") },
+ { "myanmar", SLEN("myanmar") },
+ { "oriya", SLEN("oriya") },
+ { "persian", SLEN("persian") },
+ { "tamil", SLEN("tamil") },
+ { "telugu", SLEN("telugu") },
+ { "thai", SLEN("thai") },
+ { "tibetan", SLEN("tibetan") },
+ { "cjk-earthly-branch", SLEN("cjk-earthly-branch") },
+ { "cjk-heavenly-stem", SLEN("cjk-heavenly-stem") },
+ { "hiragana", SLEN("hiragana") },
+ { "hiragana-iroha", SLEN("hiragana-iroha") },
+ { "katakana", SLEN("katakana") },
+ { "katakana-iroha", SLEN("katakana-iroha") },
{ "invert", SLEN("invert") },
{ "visible", SLEN("visible") },
{ "always", SLEN("always") },
diff --git a/src/parse/propstrings.h b/src/parse/propstrings.h
index 65954c6..f011231 100644
--- a/src/parse/propstrings.h
+++ b/src/parse/propstrings.h
@@ -85,7 +85,10 @@ enum {
LOWER_LATIN, UPPER_LATIN, ARMENIAN, GEORGIAN, LOWER_ALPHA, UPPER_ALPHA,
BINARY, OCTAL, LOWER_HEXADECIMAL, UPPER_HEXADECIMAL, ARABIC_INDIC,
LOWER_ARMENIAN, UPPER_ARMENIAN, BENGALI, CAMBODIAN, KHMER, CJK_DECIMAL,
- DEVANAGARI, GUJARATI, GURMUKHI,
+ DEVANAGARI, GUJARATI, GURMUKHI, HEBREW, KANNADA, LAO, MALAYALAM,
+ MONGOLIAN, MYANMAR, ORIYA, PERSIAN, TAMIL, TELUGU, THAI, TIBETAN,
+ CJK_EARTHLY_BRANCH, CJK_HEAVENLY_STEM, HIAGANA, HIAGANA_IROHA,
+ KATAKANA, KATAKANA_IROHA,
INVERT, VISIBLE, ALWAYS, AVOID, X_LOW, LOW, HIGH, X_HIGH, LIBCSS_STATIC,
RELATIVE, ABSOLUTE, ONCE, DIGITS, CONTINUOUS, CODE, SPELL_OUT, X_SLOW,
SLOW, FAST, X_FAST, FASTER, SLOWER, CENTER, JUSTIFY, CAPITALIZE,
diff --git a/src/select/format_list_style.c b/src/select/format_list_style.c
index e61f981..8636c03 100644
--- a/src/select/format_list_style.c
+++ b/src/select/format_list_style.c
@@ -659,6 +659,207 @@ static const struct list_counter_style lcs_gurmukhi = {
.calc = calc_numeric_system,
};
+static const int hebrew_weights[] = {
+ 10000,
+ 9000, 8000, 7000, 6000, 5000, 4000, 3000, 2000, 1000,
+ 400, 300, 200, 100,
+ 90, 80, 70, 60, 50, 40, 30, 20, 19, 18, 17, 16, 15, 10,
+ 9, 8, 7, 6, 5, 4, 3, 2, 1
+};
+static const symbol_t hebrew_symbols[] = {
+ "\xD7\x99\xD7\xB3",
+ "\xD7\x98\xD7\xB3", "\xD7\x97\xD7\xB3", "\xD7\x96\xD7\xB3",
"\xD7\x95\xD7\xB3", "\xD7\x94\xD7\xB3", "\xD7\x93\xD7\xB3", "\xD7\x92\xD7\xB3",
"\xD7\x91\xD7\xB3", "\xD7\x90\xD7\xB3",
+ "\xD7\xAA", "\xD7\xA9", "\xD7\xA8", "\xD7\xA7",
+ "\xD7\xA6", "\xD7\xA4", "\xD7\xA2", "\xD7\xA1", "\xD7\xA0", "\xD7\x9E",
"\xD7\x9C", /* 20 */"\xD7\x9B", "\xD7\x99\xD7\x98", "\xD7\x99\xD7\x97",
"\xD7\x99\xD7\x96", "\xD7\x98\xD7\x96", "\xD7\x98\xD7\x95", "\xD7\x99",
+ "\xD7\x98", "\xD7\x97", "\xD7\x96", "\xD7\x95", "\xD7\x94", "\xD7\x93",
"\xD7\x92", "\xD7\x91", "\xD7\x90"
+};
+static const struct list_counter_style lcs_hebrew = {
+ .name = "hebrew",
+ .range = {
+ .start = 1,
+ .end = 10999,},
+ .symbols = hebrew_symbols,
+ .weights = hebrew_weights,
+ .items = (sizeof(hebrew_symbols) / SYMBOL_SIZE),
+ .calc = calc_additive_system,
+};
+
+static const symbol_t kannada_symbols[] = {
+ "\xE0\xB3\xA6", "\xE0\xB3\xA7", "\xE0\xB3\xA8", "\xE0\xB3\xA9",
"\xE0\xB3\xAA", "\xE0\xB3\xAB", "\xE0\xB3\xAC", "\xE0\xB3\xAD", "\xE0\xB3\xAE",
"\xE0\xB3\xAF"
+};
+static const struct list_counter_style lcs_kannada = {
+ .name = "kannada",
+ .symbols = kannada_symbols,
+ .items = (sizeof(kannada_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t lao_symbols[] = {
+ "໐", "໑", "໒", "໓", "໔", "໕", "໖", "໗", "໘", "໙"
+};
+static const struct list_counter_style lcs_lao = {
+ .name = "lao",
+ .symbols = lao_symbols,
+ .items = (sizeof(lao_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t malayalam_symbols[] = {
+ "൦", "൧", "൨", "൩", "൪", "൫", "൬", "൭", "൮", "൯"
+};
+static const struct list_counter_style lcs_malayalam = {
+ .name = "malayalam",
+ .symbols = malayalam_symbols,
+ .items = (sizeof(malayalam_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t mongolian_symbols[] = {
+ "᠐", "᠑", "᠒", "᠓", "᠔", "᠕", "᠖", "᠗", "᠘", "᠙"
+};
+static const struct list_counter_style lcs_mongolian = {
+ .name = "mongolian",
+ .symbols = mongolian_symbols,
+ .items = (sizeof(mongolian_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t myanmar_symbols[] = {
+ "၀", "၁", "၂", "၃", "၄", "၅", "၆", "၇", "၈", "၉"
+};
+static const struct list_counter_style lcs_myanmar = {
+ .name = "myanmar",
+ .symbols = myanmar_symbols,
+ .items = (sizeof(myanmar_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t oriya_symbols[] = {
+ "୦", "୧", "୨", "୩", "୪", "୫", "୬", "୭", "୮", "୯"
+};
+static const struct list_counter_style lcs_oriya = {
+ .name = "oriya",
+ .symbols = oriya_symbols,
+ .items = (sizeof(oriya_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t persian_symbols[] = {
+ "۰", "۱", "۲", "۳", "۴", "۵", "۶", "۷", "۸", "۹"
+};
+static const struct list_counter_style lcs_persian = {
+ .name = "persian",
+ .symbols = persian_symbols,
+ .items = (sizeof(persian_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t tamil_symbols[] = {
+ "௦", "௧", "௨", "௩", "௪", "௫", "௬", "௭", "௮", "௯"
+};
+static const struct list_counter_style lcs_tamil = {
+ .name = "tamil",
+ .symbols = tamil_symbols,
+ .items = (sizeof(tamil_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t telugu_symbols[] = {
+ "౦", "౧", "౨", "౩", "౪", "౫", "౬", "౭", "౮", "౯"
+};
+static const struct list_counter_style lcs_telugu = {
+ .name = "telugu",
+ .symbols = telugu_symbols,
+ .items = (sizeof(telugu_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t thai_symbols[] = {
+ "๐", "๑", "๒", "๓", "๔", "๕", "๖", "๗", "๘", "๙"
+};
+static const struct list_counter_style lcs_thai = {
+ .name = "thai",
+ .symbols = thai_symbols,
+ .items = (sizeof(thai_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t tibetan_symbols[] = {
+ "༠", "༡", "༢", "༣", "༤", "༥", "༦", "༧", "༨", "༩"
+};
+static const struct list_counter_style lcs_tibetan = {
+ .name = "tibetan",
+ .symbols = tibetan_symbols,
+ .items = (sizeof(tibetan_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t cjk_earthly_branch_symbols[] = {
+ "子", "丑", "寅", "卯", "辰", "巳", "午", "未", "申", "酉", "戌", "亥"
+};
+static struct list_counter_style lcs_cjk_earthly_branch = {
+ .name = "cjk-earthly-branch",
+ .symbols = cjk_earthly_branch_symbols,
+ .items = (sizeof(cjk_earthly_branch_symbols) / SYMBOL_SIZE),
+ .postfix = "、",
+ .calc = calc_alphabet_system,
+};
+
+static const symbol_t cjk_heavenly_stem_symbols[] = {
+ "甲", "乙", "丙", "丁", "戊", "己", "庚", "辛", "壬", "癸"
+};
+static struct list_counter_style lcs_cjk_heavenly_stem = {
+ .name = "cjk-heavenly-stem",
+ .symbols = cjk_heavenly_stem_symbols,
+ .items = (sizeof(cjk_heavenly_stem_symbols) / SYMBOL_SIZE),
+ .postfix = "、",
+ .calc = calc_alphabet_system,
+};
+
+static const symbol_t hiragana_symbols[] = {
+ "あ", "い", "う", "え", "お", "か", "き", "く", "け", "こ", "さ", "し", "す", "せ",
"そ", "た", "ち", "つ", "て", "と", "な", "に", "ぬ", "ね", "の", "は", "ひ", "ふ", "へ", "ほ",
"ま", "み", "む", "め", "も", "や", "ゆ", "よ", "ら", "り", "る", "れ", "ろ", "わ", "ゐ", "ゑ",
"を", "ん"
+};
+static struct list_counter_style lcs_hiragana = {
+ .name = "hiragana",
+ .symbols = hiragana_symbols,
+ .items = (sizeof(hiragana_symbols) / SYMBOL_SIZE),
+ .postfix = "、",
+ .calc = calc_alphabet_system,
+};
+
+static const symbol_t hiragana_iroha_symbols[] = {
+ "い", "ろ", "は", "に", "ほ", "へ", "と", "ち", "り", "ぬ", "る", "を", "わ", "か",
"よ", "た", "れ", "そ", "つ", "ね", "な", "ら", "む", "う", "ゐ", "の", "お", "く", "や", "ま",
"け", "ふ", "こ", "え", "て", "あ", "さ", "き", "ゆ", "め", "み", "し", "ゑ", "ひ", "も", "せ",
"す"
+};
+static struct list_counter_style lcs_hiragana_iroha = {
+ .name = "hiragana-iroha",
+ .symbols = hiragana_iroha_symbols,
+ .items = (sizeof(hiragana_iroha_symbols) / SYMBOL_SIZE),
+ .postfix = "、",
+ .calc = calc_alphabet_system,
+};
+
+static const symbol_t katakana_symbols[] = {
+ "ア", "イ", "ウ", "エ", "オ", "カ", "キ", "ク", "ケ", "コ", "サ", "シ", "ス", "セ",
"ソ", "タ", "チ", "ツ", "テ", "ト", "ナ", "ニ", "ヌ", "ネ", "ノ", "ハ", "ヒ", "フ", "ヘ", "ホ",
"マ", "ミ", "ム", "メ", "モ", "ヤ", "ユ", "ヨ", "ラ", "リ", "ル", "レ", "ロ", "ワ", "ヰ", "ヱ",
"ヲ", "ン"
+};
+static struct list_counter_style lcs_katakana = {
+ .name = "katakana",
+ .symbols = katakana_symbols,
+ .items = (sizeof(katakana_symbols) / SYMBOL_SIZE),
+ .postfix = "、",
+ .calc = calc_alphabet_system,
+};
+
+static const symbol_t katakana_iroha_symbols[] = {
+ "イ", "ロ", "ハ", "ニ", "ホ", "ヘ", "ト", "チ", "リ", "ヌ", "ル", "ヲ", "ワ", "カ",
"ヨ", "タ", "レ", "ソ", "ツ", "ネ", "ナ", "ラ", "ム", "ウ", "ヰ", "ノ", "オ", "ク", "ヤ", "マ",
"ケ", "フ", "コ", "エ", "テ", "ア", "サ", "キ", "ユ", "メ", "ミ", "シ", "ヱ", "ヒ", "モ", "セ",
"ス"
+};
+static struct list_counter_style lcs_katakana_iroha = {
+ .name = "katakana-iroha",
+ .symbols = katakana_iroha_symbols,
+ .items = (sizeof(katakana_iroha_symbols) / SYMBOL_SIZE),
+ .postfix = "、",
+ .calc = calc_alphabet_system,
+};
+
/* exported interface defined in select.h */
css_error css_computed_format_list_style(
@@ -779,6 +980,60 @@ css_error css_computed_format_list_style(
cstyle = &lcs_gurmukhi;
break;
+ case CSS_LIST_STYLE_TYPE_HEBREW:
+ cstyle = &lcs_hebrew;
+ break;
+ case CSS_LIST_STYLE_TYPE_KANNADA:
+ cstyle = &lcs_kannada;
+ break;
+ case CSS_LIST_STYLE_TYPE_LAO:
+ cstyle = &lcs_lao;
+ break;
+ case CSS_LIST_STYLE_TYPE_MALAYALAM:
+ cstyle = &lcs_malayalam;
+ break;
+ case CSS_LIST_STYLE_TYPE_MONGOLIAN:
+ cstyle = &lcs_mongolian;
+ break;
+ case CSS_LIST_STYLE_TYPE_MYANMAR:
+ cstyle = &lcs_myanmar;
+ break;
+ case CSS_LIST_STYLE_TYPE_ORIYA:
+ cstyle = &lcs_oriya;
+ break;
+ case CSS_LIST_STYLE_TYPE_PERSIAN:
+ cstyle = &lcs_persian;
+ break;
+ case CSS_LIST_STYLE_TYPE_TAMIL:
+ cstyle = &lcs_tamil;
+ break;
+ case CSS_LIST_STYLE_TYPE_TELUGU:
+ cstyle = &lcs_telugu;
+ break;
+ case CSS_LIST_STYLE_TYPE_THAI:
+ cstyle = &lcs_thai;
+ break;
+ case CSS_LIST_STYLE_TYPE_TIBETAN:
+ cstyle = &lcs_tibetan;
+ break;
+ case CSS_LIST_STYLE_TYPE_CJK_EARTHLY_BRANCH:
+ cstyle = &lcs_cjk_earthly_branch;
+ break;
+ case CSS_LIST_STYLE_TYPE_CJK_HEAVENLY_STEM:
+ cstyle = &lcs_cjk_heavenly_stem;
+ break;
+ case CSS_LIST_STYLE_TYPE_HIAGANA:
+ cstyle = &lcs_hiragana;
+ break;
+ case CSS_LIST_STYLE_TYPE_HIAGANA_IROHA:
+ cstyle = &lcs_hiragana_iroha;
+ break;
+ case CSS_LIST_STYLE_TYPE_KATAKANA:
+ cstyle = &lcs_katakana;
+ break;
+ case CSS_LIST_STYLE_TYPE_KATAKANA_IROHA:
+ cstyle = &lcs_katakana_iroha;
+ break;
default:
return CSS_BADPARM;
}
diff --git a/src/select/properties/list_style_type.c
b/src/select/properties/list_style_type.c
index 9a6af2c..7560c3b 100644
--- a/src/select/properties/list_style_type.c
+++ b/src/select/properties/list_style_type.c
@@ -110,6 +110,60 @@ css_error css__cascade_list_style_type(uint32_t opv,
css_style *style,
case LIST_STYLE_TYPE_GURMUKHI:
value = CSS_LIST_STYLE_TYPE_GURMUKHI;
break;
+ case LIST_STYLE_TYPE_HEBREW:
+ value = CSS_LIST_STYLE_TYPE_HEBREW;
+ break;
+ case LIST_STYLE_TYPE_KANNADA:
+ value = CSS_LIST_STYLE_TYPE_KANNADA;
+ break;
+ case LIST_STYLE_TYPE_LAO:
+ value = CSS_LIST_STYLE_TYPE_LAO;
+ break;
+ case LIST_STYLE_TYPE_MALAYALAM:
+ value = CSS_LIST_STYLE_TYPE_MALAYALAM;
+ break;
+ case LIST_STYLE_TYPE_MONGOLIAN:
+ value = CSS_LIST_STYLE_TYPE_MONGOLIAN;
+ break;
+ case LIST_STYLE_TYPE_MYANMAR:
+ value = CSS_LIST_STYLE_TYPE_MYANMAR;
+ break;
+ case LIST_STYLE_TYPE_ORIYA:
+ value = CSS_LIST_STYLE_TYPE_ORIYA;
+ break;
+ case LIST_STYLE_TYPE_PERSIAN:
+ value = CSS_LIST_STYLE_TYPE_PERSIAN;
+ break;
+ case LIST_STYLE_TYPE_TAMIL:
+ value = CSS_LIST_STYLE_TYPE_TAMIL;
+ break;
+ case LIST_STYLE_TYPE_TELUGU:
+ value = CSS_LIST_STYLE_TYPE_TELUGU;
+ break;
+ case LIST_STYLE_TYPE_THAI:
+ value = CSS_LIST_STYLE_TYPE_THAI;
+ break;
+ case LIST_STYLE_TYPE_TIBETAN:
+ value = CSS_LIST_STYLE_TYPE_TIBETAN;
+ break;
+ case LIST_STYLE_TYPE_CJK_EARTHLY_BRANCH:
+ value = CSS_LIST_STYLE_TYPE_CJK_EARTHLY_BRANCH;
+ break;
+ case LIST_STYLE_TYPE_CJK_HEAVENLY_STEM:
+ value = CSS_LIST_STYLE_TYPE_CJK_HEAVENLY_STEM;
+ break;
+ case LIST_STYLE_TYPE_HIAGANA:
+ value = CSS_LIST_STYLE_TYPE_HIAGANA;
+ break;
+ case LIST_STYLE_TYPE_HIAGANA_IROHA:
+ value = CSS_LIST_STYLE_TYPE_HIAGANA_IROHA;
+ break;
+ case LIST_STYLE_TYPE_KATAKANA:
+ value = CSS_LIST_STYLE_TYPE_KATAKANA;
+ break;
+ case LIST_STYLE_TYPE_KATAKANA_IROHA:
+ value = CSS_LIST_STYLE_TYPE_KATAKANA_IROHA;
+ break;
}
}
-----------------------------------------------------------------------
Summary of changes:
include/libcss/properties.h | 21 ++-
src/bytecode/opcodes.h | 20 ++-
src/parse/properties/utils.c | 22 ++-
src/parse/propstrings.c | 18 +++
src/parse/propstrings.h | 5 +-
src/select/format_list_style.c | 255 +++++++++++++++++++++++++++++++
src/select/properties/list_style_type.c | 54 +++++++
7 files changed, 389 insertions(+), 6 deletions(-)
diff --git a/include/libcss/properties.h b/include/libcss/properties.h
index 6f8a51c..a5569d0 100644
--- a/include/libcss/properties.h
+++ b/include/libcss/properties.h
@@ -620,8 +620,25 @@ enum css_list_style_type_e {
CSS_LIST_STYLE_TYPE_CJK_DECIMAL = 0x1a,
CSS_LIST_STYLE_TYPE_DEVANAGARI = 0x1b,
CSS_LIST_STYLE_TYPE_GUJARATI = 0x1c,
- CSS_LIST_STYLE_TYPE_GURMUKHI = 0x1d
-
+ CSS_LIST_STYLE_TYPE_GURMUKHI = 0x1d,
+ CSS_LIST_STYLE_TYPE_HEBREW = 0x1e,
+ CSS_LIST_STYLE_TYPE_KANNADA = 0x1f,
+ CSS_LIST_STYLE_TYPE_LAO = 0x20,
+ CSS_LIST_STYLE_TYPE_MALAYALAM = 0x21,
+ CSS_LIST_STYLE_TYPE_MONGOLIAN = 0x22,
+ CSS_LIST_STYLE_TYPE_MYANMAR = 0x23,
+ CSS_LIST_STYLE_TYPE_ORIYA = 0x24,
+ CSS_LIST_STYLE_TYPE_PERSIAN = 0x25,
+ CSS_LIST_STYLE_TYPE_TAMIL = 0x26,
+ CSS_LIST_STYLE_TYPE_TELUGU = 0x27,
+ CSS_LIST_STYLE_TYPE_THAI = 0x28,
+ CSS_LIST_STYLE_TYPE_TIBETAN = 0x29,
+ CSS_LIST_STYLE_TYPE_CJK_EARTHLY_BRANCH = 0x2a,
+ CSS_LIST_STYLE_TYPE_CJK_HEAVENLY_STEM = 0x2b,
+ CSS_LIST_STYLE_TYPE_HIAGANA = 0x2c,
+ CSS_LIST_STYLE_TYPE_HIAGANA_IROHA = 0x2d,
+ CSS_LIST_STYLE_TYPE_KATAKANA = 0x2e,
+ CSS_LIST_STYLE_TYPE_KATAKANA_IROHA = 0x2f
};
enum css_margin_e {
diff --git a/src/bytecode/opcodes.h b/src/bytecode/opcodes.h
index b74e990..1e561e5 100644
--- a/src/bytecode/opcodes.h
+++ b/src/bytecode/opcodes.h
@@ -505,7 +505,25 @@ enum op_list_style_type {
LIST_STYLE_TYPE_CJK_DECIMAL = 0x0019,
LIST_STYLE_TYPE_DEVANAGARI = 0x001a,
LIST_STYLE_TYPE_GUJARATI = 0x001b,
- LIST_STYLE_TYPE_GURMUKHI = 0x001c
+ LIST_STYLE_TYPE_GURMUKHI = 0x001c,
+ LIST_STYLE_TYPE_HEBREW = 0x001d,
+ LIST_STYLE_TYPE_KANNADA = 0x001e,
+ LIST_STYLE_TYPE_LAO = 0x001f,
+ LIST_STYLE_TYPE_MALAYALAM = 0x0020,
+ LIST_STYLE_TYPE_MONGOLIAN = 0x0021,
+ LIST_STYLE_TYPE_MYANMAR = 0x0022,
+ LIST_STYLE_TYPE_ORIYA = 0x0023,
+ LIST_STYLE_TYPE_PERSIAN = 0x0024,
+ LIST_STYLE_TYPE_TAMIL = 0x0025,
+ LIST_STYLE_TYPE_TELUGU = 0x0026,
+ LIST_STYLE_TYPE_THAI = 0x0027,
+ LIST_STYLE_TYPE_TIBETAN = 0x0028,
+ LIST_STYLE_TYPE_CJK_EARTHLY_BRANCH = 0x0029,
+ LIST_STYLE_TYPE_CJK_HEAVENLY_STEM = 0x002a,
+ LIST_STYLE_TYPE_HIAGANA = 0x002b,
+ LIST_STYLE_TYPE_HIAGANA_IROHA = 0x002c,
+ LIST_STYLE_TYPE_KATAKANA = 0x002d,
+ LIST_STYLE_TYPE_KATAKANA_IROHA = 0x002e
};
enum op_margin {
diff --git a/src/parse/properties/utils.c b/src/parse/properties/utils.c
index a71e22d..c82c88f 100644
--- a/src/parse/properties/utils.c
+++ b/src/parse/properties/utils.c
@@ -34,7 +34,7 @@ css_error css__parse_list_style_type_value(css_language *c,
const css_token *ide
* upper-latin, armenian, georgian, lower-alpha, upper-alpha,
* none)
*/
- #define MAP_ENTRIES 29
+ #define MAP_ENTRIES 47
bool match;
int midx;
const struct {
@@ -69,7 +69,25 @@ css_error css__parse_list_style_type_value(css_language *c,
const css_token *ide
{ CJK_DECIMAL, LIST_STYLE_TYPE_CJK_DECIMAL },
{ DEVANAGARI, LIST_STYLE_TYPE_DEVANAGARI },
{ GUJARATI, LIST_STYLE_TYPE_GUJARATI },
- { GURMUKHI, LIST_STYLE_TYPE_GURMUKHI }
+ { GURMUKHI, LIST_STYLE_TYPE_GURMUKHI },
+ { HEBREW, LIST_STYLE_TYPE_HEBREW },
+ { KANNADA, LIST_STYLE_TYPE_KANNADA },
+ { LAO, LIST_STYLE_TYPE_LAO },
+ { MALAYALAM, LIST_STYLE_TYPE_MALAYALAM },
+ { MONGOLIAN, LIST_STYLE_TYPE_MONGOLIAN },
+ { MYANMAR, LIST_STYLE_TYPE_MYANMAR },
+ { ORIYA, LIST_STYLE_TYPE_ORIYA },
+ { PERSIAN, LIST_STYLE_TYPE_PERSIAN },
+ { TAMIL, LIST_STYLE_TYPE_TAMIL },
+ { TELUGU, LIST_STYLE_TYPE_TELUGU },
+ { THAI, LIST_STYLE_TYPE_THAI },
+ { TIBETAN, LIST_STYLE_TYPE_TIBETAN },
+ { CJK_EARTHLY_BRANCH, LIST_STYLE_TYPE_CJK_EARTHLY_BRANCH },
+ { CJK_HEAVENLY_STEM, LIST_STYLE_TYPE_CJK_HEAVENLY_STEM },
+ { HIAGANA, LIST_STYLE_TYPE_HIAGANA },
+ { HIAGANA_IROHA, LIST_STYLE_TYPE_HIAGANA_IROHA },
+ { KATAKANA, LIST_STYLE_TYPE_KATAKANA },
+ { KATAKANA_IROHA, LIST_STYLE_TYPE_KATAKANA_IROHA }
};
for (midx = 0; midx < MAP_ENTRIES; midx++) {
diff --git a/src/parse/propstrings.c b/src/parse/propstrings.c
index 302f7f8..5528645 100644
--- a/src/parse/propstrings.c
+++ b/src/parse/propstrings.c
@@ -323,6 +323,24 @@ const stringmap_entry stringmap[LAST_KNOWN] = {
{ "devanagari", SLEN("devanagari") },
{ "gujarati", SLEN("gujarati") },
{ "gurmukhi", SLEN("gurmukhi") },
+ { "hebrew", SLEN("hebrew") },
+ { "kannada", SLEN("kannada") },
+ { "lao", SLEN("lao") },
+ { "malayalam", SLEN("malayalam") },
+ { "mongolian", SLEN("mongolian") },
+ { "myanmar", SLEN("myanmar") },
+ { "oriya", SLEN("oriya") },
+ { "persian", SLEN("persian") },
+ { "tamil", SLEN("tamil") },
+ { "telugu", SLEN("telugu") },
+ { "thai", SLEN("thai") },
+ { "tibetan", SLEN("tibetan") },
+ { "cjk-earthly-branch", SLEN("cjk-earthly-branch") },
+ { "cjk-heavenly-stem", SLEN("cjk-heavenly-stem") },
+ { "hiragana", SLEN("hiragana") },
+ { "hiragana-iroha", SLEN("hiragana-iroha") },
+ { "katakana", SLEN("katakana") },
+ { "katakana-iroha", SLEN("katakana-iroha") },
{ "invert", SLEN("invert") },
{ "visible", SLEN("visible") },
{ "always", SLEN("always") },
diff --git a/src/parse/propstrings.h b/src/parse/propstrings.h
index 65954c6..f011231 100644
--- a/src/parse/propstrings.h
+++ b/src/parse/propstrings.h
@@ -85,7 +85,10 @@ enum {
LOWER_LATIN, UPPER_LATIN, ARMENIAN, GEORGIAN, LOWER_ALPHA, UPPER_ALPHA,
BINARY, OCTAL, LOWER_HEXADECIMAL, UPPER_HEXADECIMAL, ARABIC_INDIC,
LOWER_ARMENIAN, UPPER_ARMENIAN, BENGALI, CAMBODIAN, KHMER, CJK_DECIMAL,
- DEVANAGARI, GUJARATI, GURMUKHI,
+ DEVANAGARI, GUJARATI, GURMUKHI, HEBREW, KANNADA, LAO, MALAYALAM,
+ MONGOLIAN, MYANMAR, ORIYA, PERSIAN, TAMIL, TELUGU, THAI, TIBETAN,
+ CJK_EARTHLY_BRANCH, CJK_HEAVENLY_STEM, HIAGANA, HIAGANA_IROHA,
+ KATAKANA, KATAKANA_IROHA,
INVERT, VISIBLE, ALWAYS, AVOID, X_LOW, LOW, HIGH, X_HIGH, LIBCSS_STATIC,
RELATIVE, ABSOLUTE, ONCE, DIGITS, CONTINUOUS, CODE, SPELL_OUT, X_SLOW,
SLOW, FAST, X_FAST, FASTER, SLOWER, CENTER, JUSTIFY, CAPITALIZE,
diff --git a/src/select/format_list_style.c b/src/select/format_list_style.c
index e61f981..8636c03 100644
--- a/src/select/format_list_style.c
+++ b/src/select/format_list_style.c
@@ -659,6 +659,207 @@ static const struct list_counter_style lcs_gurmukhi = {
.calc = calc_numeric_system,
};
+static const int hebrew_weights[] = {
+ 10000,
+ 9000, 8000, 7000, 6000, 5000, 4000, 3000, 2000, 1000,
+ 400, 300, 200, 100,
+ 90, 80, 70, 60, 50, 40, 30, 20, 19, 18, 17, 16, 15, 10,
+ 9, 8, 7, 6, 5, 4, 3, 2, 1
+};
+static const symbol_t hebrew_symbols[] = {
+ "\xD7\x99\xD7\xB3",
+ "\xD7\x98\xD7\xB3", "\xD7\x97\xD7\xB3", "\xD7\x96\xD7\xB3",
"\xD7\x95\xD7\xB3", "\xD7\x94\xD7\xB3", "\xD7\x93\xD7\xB3", "\xD7\x92\xD7\xB3",
"\xD7\x91\xD7\xB3", "\xD7\x90\xD7\xB3",
+ "\xD7\xAA", "\xD7\xA9", "\xD7\xA8", "\xD7\xA7",
+ "\xD7\xA6", "\xD7\xA4", "\xD7\xA2", "\xD7\xA1", "\xD7\xA0", "\xD7\x9E",
"\xD7\x9C", /* 20 */"\xD7\x9B", "\xD7\x99\xD7\x98", "\xD7\x99\xD7\x97",
"\xD7\x99\xD7\x96", "\xD7\x98\xD7\x96", "\xD7\x98\xD7\x95", "\xD7\x99",
+ "\xD7\x98", "\xD7\x97", "\xD7\x96", "\xD7\x95", "\xD7\x94", "\xD7\x93",
"\xD7\x92", "\xD7\x91", "\xD7\x90"
+};
+static const struct list_counter_style lcs_hebrew = {
+ .name = "hebrew",
+ .range = {
+ .start = 1,
+ .end = 10999,},
+ .symbols = hebrew_symbols,
+ .weights = hebrew_weights,
+ .items = (sizeof(hebrew_symbols) / SYMBOL_SIZE),
+ .calc = calc_additive_system,
+};
+
+static const symbol_t kannada_symbols[] = {
+ "\xE0\xB3\xA6", "\xE0\xB3\xA7", "\xE0\xB3\xA8", "\xE0\xB3\xA9",
"\xE0\xB3\xAA", "\xE0\xB3\xAB", "\xE0\xB3\xAC", "\xE0\xB3\xAD", "\xE0\xB3\xAE",
"\xE0\xB3\xAF"
+};
+static const struct list_counter_style lcs_kannada = {
+ .name = "kannada",
+ .symbols = kannada_symbols,
+ .items = (sizeof(kannada_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t lao_symbols[] = {
+ "໐", "໑", "໒", "໓", "໔", "໕", "໖", "໗", "໘", "໙"
+};
+static const struct list_counter_style lcs_lao = {
+ .name = "lao",
+ .symbols = lao_symbols,
+ .items = (sizeof(lao_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t malayalam_symbols[] = {
+ "൦", "൧", "൨", "൩", "൪", "൫", "൬", "൭", "൮", "൯"
+};
+static const struct list_counter_style lcs_malayalam = {
+ .name = "malayalam",
+ .symbols = malayalam_symbols,
+ .items = (sizeof(malayalam_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t mongolian_symbols[] = {
+ "᠐", "᠑", "᠒", "᠓", "᠔", "᠕", "᠖", "᠗", "᠘", "᠙"
+};
+static const struct list_counter_style lcs_mongolian = {
+ .name = "mongolian",
+ .symbols = mongolian_symbols,
+ .items = (sizeof(mongolian_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t myanmar_symbols[] = {
+ "၀", "၁", "၂", "၃", "၄", "၅", "၆", "၇", "၈", "၉"
+};
+static const struct list_counter_style lcs_myanmar = {
+ .name = "myanmar",
+ .symbols = myanmar_symbols,
+ .items = (sizeof(myanmar_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t oriya_symbols[] = {
+ "୦", "୧", "୨", "୩", "୪", "୫", "୬", "୭", "୮", "୯"
+};
+static const struct list_counter_style lcs_oriya = {
+ .name = "oriya",
+ .symbols = oriya_symbols,
+ .items = (sizeof(oriya_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t persian_symbols[] = {
+ "۰", "۱", "۲", "۳", "۴", "۵", "۶", "۷", "۸", "۹"
+};
+static const struct list_counter_style lcs_persian = {
+ .name = "persian",
+ .symbols = persian_symbols,
+ .items = (sizeof(persian_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t tamil_symbols[] = {
+ "௦", "௧", "௨", "௩", "௪", "௫", "௬", "௭", "௮", "௯"
+};
+static const struct list_counter_style lcs_tamil = {
+ .name = "tamil",
+ .symbols = tamil_symbols,
+ .items = (sizeof(tamil_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t telugu_symbols[] = {
+ "౦", "౧", "౨", "౩", "౪", "౫", "౬", "౭", "౮", "౯"
+};
+static const struct list_counter_style lcs_telugu = {
+ .name = "telugu",
+ .symbols = telugu_symbols,
+ .items = (sizeof(telugu_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t thai_symbols[] = {
+ "๐", "๑", "๒", "๓", "๔", "๕", "๖", "๗", "๘", "๙"
+};
+static const struct list_counter_style lcs_thai = {
+ .name = "thai",
+ .symbols = thai_symbols,
+ .items = (sizeof(thai_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t tibetan_symbols[] = {
+ "༠", "༡", "༢", "༣", "༤", "༥", "༦", "༧", "༨", "༩"
+};
+static const struct list_counter_style lcs_tibetan = {
+ .name = "tibetan",
+ .symbols = tibetan_symbols,
+ .items = (sizeof(tibetan_symbols) / SYMBOL_SIZE),
+ .calc = calc_numeric_system,
+};
+
+static const symbol_t cjk_earthly_branch_symbols[] = {
+ "子", "丑", "寅", "卯", "辰", "巳", "午", "未", "申", "酉", "戌", "亥"
+};
+static struct list_counter_style lcs_cjk_earthly_branch = {
+ .name = "cjk-earthly-branch",
+ .symbols = cjk_earthly_branch_symbols,
+ .items = (sizeof(cjk_earthly_branch_symbols) / SYMBOL_SIZE),
+ .postfix = "、",
+ .calc = calc_alphabet_system,
+};
+
+static const symbol_t cjk_heavenly_stem_symbols[] = {
+ "甲", "乙", "丙", "丁", "戊", "己", "庚", "辛", "壬", "癸"
+};
+static struct list_counter_style lcs_cjk_heavenly_stem = {
+ .name = "cjk-heavenly-stem",
+ .symbols = cjk_heavenly_stem_symbols,
+ .items = (sizeof(cjk_heavenly_stem_symbols) / SYMBOL_SIZE),
+ .postfix = "、",
+ .calc = calc_alphabet_system,
+};
+
+static const symbol_t hiragana_symbols[] = {
+ "あ", "い", "う", "え", "お", "か", "き", "く", "け", "こ", "さ", "し", "す", "せ",
"そ", "た", "ち", "つ", "て", "と", "な", "に", "ぬ", "ね", "の", "は", "ひ", "ふ", "へ", "ほ",
"ま", "み", "む", "め", "も", "や", "ゆ", "よ", "ら", "り", "る", "れ", "ろ", "わ", "ゐ", "ゑ",
"を", "ん"
+};
+static struct list_counter_style lcs_hiragana = {
+ .name = "hiragana",
+ .symbols = hiragana_symbols,
+ .items = (sizeof(hiragana_symbols) / SYMBOL_SIZE),
+ .postfix = "、",
+ .calc = calc_alphabet_system,
+};
+
+static const symbol_t hiragana_iroha_symbols[] = {
+ "い", "ろ", "は", "に", "ほ", "へ", "と", "ち", "り", "ぬ", "る", "を", "わ", "か",
"よ", "た", "れ", "そ", "つ", "ね", "な", "ら", "む", "う", "ゐ", "の", "お", "く", "や", "ま",
"け", "ふ", "こ", "え", "て", "あ", "さ", "き", "ゆ", "め", "み", "し", "ゑ", "ひ", "も", "せ",
"す"
+};
+static struct list_counter_style lcs_hiragana_iroha = {
+ .name = "hiragana-iroha",
+ .symbols = hiragana_iroha_symbols,
+ .items = (sizeof(hiragana_iroha_symbols) / SYMBOL_SIZE),
+ .postfix = "、",
+ .calc = calc_alphabet_system,
+};
+
+static const symbol_t katakana_symbols[] = {
+ "ア", "イ", "ウ", "エ", "オ", "カ", "キ", "ク", "ケ", "コ", "サ", "シ", "ス", "セ",
"ソ", "タ", "チ", "ツ", "テ", "ト", "ナ", "ニ", "ヌ", "ネ", "ノ", "ハ", "ヒ", "フ", "ヘ", "ホ",
"マ", "ミ", "ム", "メ", "モ", "ヤ", "ユ", "ヨ", "ラ", "リ", "ル", "レ", "ロ", "ワ", "ヰ", "ヱ",
"ヲ", "ン"
+};
+static struct list_counter_style lcs_katakana = {
+ .name = "katakana",
+ .symbols = katakana_symbols,
+ .items = (sizeof(katakana_symbols) / SYMBOL_SIZE),
+ .postfix = "、",
+ .calc = calc_alphabet_system,
+};
+
+static const symbol_t katakana_iroha_symbols[] = {
+ "イ", "ロ", "ハ", "ニ", "ホ", "ヘ", "ト", "チ", "リ", "ヌ", "ル", "ヲ", "ワ", "カ",
"ヨ", "タ", "レ", "ソ", "ツ", "ネ", "ナ", "ラ", "ム", "ウ", "ヰ", "ノ", "オ", "ク", "ヤ", "マ",
"ケ", "フ", "コ", "エ", "テ", "ア", "サ", "キ", "ユ", "メ", "ミ", "シ", "ヱ", "ヒ", "モ", "セ",
"ス"
+};
+static struct list_counter_style lcs_katakana_iroha = {
+ .name = "katakana-iroha",
+ .symbols = katakana_iroha_symbols,
+ .items = (sizeof(katakana_iroha_symbols) / SYMBOL_SIZE),
+ .postfix = "、",
+ .calc = calc_alphabet_system,
+};
+
/* exported interface defined in select.h */
css_error css_computed_format_list_style(
@@ -779,6 +980,60 @@ css_error css_computed_format_list_style(
cstyle = &lcs_gurmukhi;
break;
+ case CSS_LIST_STYLE_TYPE_HEBREW:
+ cstyle = &lcs_hebrew;
+ break;
+ case CSS_LIST_STYLE_TYPE_KANNADA:
+ cstyle = &lcs_kannada;
+ break;
+ case CSS_LIST_STYLE_TYPE_LAO:
+ cstyle = &lcs_lao;
+ break;
+ case CSS_LIST_STYLE_TYPE_MALAYALAM:
+ cstyle = &lcs_malayalam;
+ break;
+ case CSS_LIST_STYLE_TYPE_MONGOLIAN:
+ cstyle = &lcs_mongolian;
+ break;
+ case CSS_LIST_STYLE_TYPE_MYANMAR:
+ cstyle = &lcs_myanmar;
+ break;
+ case CSS_LIST_STYLE_TYPE_ORIYA:
+ cstyle = &lcs_oriya;
+ break;
+ case CSS_LIST_STYLE_TYPE_PERSIAN:
+ cstyle = &lcs_persian;
+ break;
+ case CSS_LIST_STYLE_TYPE_TAMIL:
+ cstyle = &lcs_tamil;
+ break;
+ case CSS_LIST_STYLE_TYPE_TELUGU:
+ cstyle = &lcs_telugu;
+ break;
+ case CSS_LIST_STYLE_TYPE_THAI:
+ cstyle = &lcs_thai;
+ break;
+ case CSS_LIST_STYLE_TYPE_TIBETAN:
+ cstyle = &lcs_tibetan;
+ break;
+ case CSS_LIST_STYLE_TYPE_CJK_EARTHLY_BRANCH:
+ cstyle = &lcs_cjk_earthly_branch;
+ break;
+ case CSS_LIST_STYLE_TYPE_CJK_HEAVENLY_STEM:
+ cstyle = &lcs_cjk_heavenly_stem;
+ break;
+ case CSS_LIST_STYLE_TYPE_HIAGANA:
+ cstyle = &lcs_hiragana;
+ break;
+ case CSS_LIST_STYLE_TYPE_HIAGANA_IROHA:
+ cstyle = &lcs_hiragana_iroha;
+ break;
+ case CSS_LIST_STYLE_TYPE_KATAKANA:
+ cstyle = &lcs_katakana;
+ break;
+ case CSS_LIST_STYLE_TYPE_KATAKANA_IROHA:
+ cstyle = &lcs_katakana_iroha;
+ break;
default:
return CSS_BADPARM;
}
diff --git a/src/select/properties/list_style_type.c
b/src/select/properties/list_style_type.c
index 9a6af2c..7560c3b 100644
--- a/src/select/properties/list_style_type.c
+++ b/src/select/properties/list_style_type.c
@@ -110,6 +110,60 @@ css_error css__cascade_list_style_type(uint32_t opv,
css_style *style,
case LIST_STYLE_TYPE_GURMUKHI:
value = CSS_LIST_STYLE_TYPE_GURMUKHI;
break;
+ case LIST_STYLE_TYPE_HEBREW:
+ value = CSS_LIST_STYLE_TYPE_HEBREW;
+ break;
+ case LIST_STYLE_TYPE_KANNADA:
+ value = CSS_LIST_STYLE_TYPE_KANNADA;
+ break;
+ case LIST_STYLE_TYPE_LAO:
+ value = CSS_LIST_STYLE_TYPE_LAO;
+ break;
+ case LIST_STYLE_TYPE_MALAYALAM:
+ value = CSS_LIST_STYLE_TYPE_MALAYALAM;
+ break;
+ case LIST_STYLE_TYPE_MONGOLIAN:
+ value = CSS_LIST_STYLE_TYPE_MONGOLIAN;
+ break;
+ case LIST_STYLE_TYPE_MYANMAR:
+ value = CSS_LIST_STYLE_TYPE_MYANMAR;
+ break;
+ case LIST_STYLE_TYPE_ORIYA:
+ value = CSS_LIST_STYLE_TYPE_ORIYA;
+ break;
+ case LIST_STYLE_TYPE_PERSIAN:
+ value = CSS_LIST_STYLE_TYPE_PERSIAN;
+ break;
+ case LIST_STYLE_TYPE_TAMIL:
+ value = CSS_LIST_STYLE_TYPE_TAMIL;
+ break;
+ case LIST_STYLE_TYPE_TELUGU:
+ value = CSS_LIST_STYLE_TYPE_TELUGU;
+ break;
+ case LIST_STYLE_TYPE_THAI:
+ value = CSS_LIST_STYLE_TYPE_THAI;
+ break;
+ case LIST_STYLE_TYPE_TIBETAN:
+ value = CSS_LIST_STYLE_TYPE_TIBETAN;
+ break;
+ case LIST_STYLE_TYPE_CJK_EARTHLY_BRANCH:
+ value = CSS_LIST_STYLE_TYPE_CJK_EARTHLY_BRANCH;
+ break;
+ case LIST_STYLE_TYPE_CJK_HEAVENLY_STEM:
+ value = CSS_LIST_STYLE_TYPE_CJK_HEAVENLY_STEM;
+ break;
+ case LIST_STYLE_TYPE_HIAGANA:
+ value = CSS_LIST_STYLE_TYPE_HIAGANA;
+ break;
+ case LIST_STYLE_TYPE_HIAGANA_IROHA:
+ value = CSS_LIST_STYLE_TYPE_HIAGANA_IROHA;
+ break;
+ case LIST_STYLE_TYPE_KATAKANA:
+ value = CSS_LIST_STYLE_TYPE_KATAKANA;
+ break;
+ case LIST_STYLE_TYPE_KATAKANA_IROHA:
+ value = CSS_LIST_STYLE_TYPE_KATAKANA_IROHA;
+ break;
}
}
--
Cascading Style Sheets library
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
