Gitweb links:
...log
http://git.netsurf-browser.org/libcss.git/shortlog/1c76ee6efeab2e9307d0a8aafa6666ca9db83128
...commit
http://git.netsurf-browser.org/libcss.git/commit/1c76ee6efeab2e9307d0a8aafa6666ca9db83128
...tree
http://git.netsurf-browser.org/libcss.git/tree/1c76ee6efeab2e9307d0a8aafa6666ca9db83128
The branch, master has been updated
via 1c76ee6efeab2e9307d0a8aafa6666ca9db83128 (commit)
from b1e7643b3ebf75cf98236f1464ec4715e2d16ddb (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=1c76ee6efeab2e9307d0a8aafa6666ca9db83128
commit 1c76ee6efeab2e9307d0a8aafa6666ca9db83128
Author: Vincent Sanders <vi...@kyllikki.org>
Commit: Vincent Sanders <vi...@kyllikki.org>
make roman numeral list style obey range limit and fix decimal fallback
diff --git a/src/select/format_list_style.c b/src/select/format_list_style.c
index 3457e41..07d028b 100644
--- a/src/select/format_list_style.c
+++ b/src/select/format_list_style.c
@@ -281,27 +281,32 @@ calc_roman_system(uint8_t *buf,
const struct list_counter_style *cstyle)
{
const int S[] = { 0, 2, 4, 2, 4, 2, 4 };
- const int D[] = { 1000, 500, 100, 50, 10, 5, 1 };
- const size_t L = sizeof(D) / sizeof(int) - 1;
size_t k = 0; /* index into output buffer */
unsigned int i = 0; /* index into maps */
- int r, r2;
-
- UNUSED(cstyle);
+ int r;
+ int r2 = 0;
+ size_t L;
assert(cstyle->items == 7);
+ /* ensure value is within acceptable range of this system */
+ if ((value < cstyle->range.start) || (value > cstyle->range.end)) {
+ return 0;
+ }
+
+ L = cstyle->items - 1;
+
while (value > 0) {
- if (D[i] <= value) {
- r = value / D[i];
- value = value - (r * D[i]);
+ if (cstyle->weights[i] <= value) {
+ r = value / cstyle->weights[i];
+ value = value - (r * cstyle->weights[i]);
if (i < L) {
/* lookahead */
- r2 = value / D[i+1];
+ r2 = value / cstyle->weights[i+1];
}
if (i < L && r2 >= S[i+1]) {
/* will violate repeat boundary on next pass */
- value = value - (r2 * D[i+1]);
+ value = value - (r2 * cstyle->weights[i+1]);
if (k < maxlen) buf[k++] = i+1;
if (k < maxlen) buf[k++] = i-1;
} else if (S[i] && r >= S[i]) {
@@ -316,9 +321,7 @@ calc_roman_system(uint8_t *buf,
}
i++;
}
- if (k < maxlen) {
- buf[k] = '\0';
- }
+
return k;
}
@@ -437,12 +440,19 @@ static struct list_counter_style lcs_lower_alpha = {
};
+static const int roman_weights[] = {
+ 1000, 500, 100, 50, 10, 5, 1
+};
static const symbol_t upper_roman_symbols[] = {
"M", "D", "C", "L", "X", "V", "I"
};
static const struct list_counter_style lcs_upper_roman = {
.name = "upper-roman",
+ .range = {
+ .start = 1,
+ .end = 3999,},
.symbols = upper_roman_symbols,
+ .weights = roman_weights,
.items = (sizeof(upper_roman_symbols) / SYMBOL_SIZE),
.calc = calc_roman_system,
};
@@ -453,7 +463,11 @@ static const symbol_t lower_roman_symbols[] = {
};
static const struct list_counter_style lcs_lower_roman = {
.name = "lower-roman",
+ .range = {
+ .start = 1,
+ .end = 3999,},
.symbols = lower_roman_symbols,
+ .weights = roman_weights,
.items = (sizeof(lower_roman_symbols) / SYMBOL_SIZE),
.calc = calc_roman_system,
};
@@ -532,10 +546,12 @@ css_error css_computed_format_list_style(
/* ensure it is possible to calculate with the selected system */
if ((alen == 0) || (alen >= sizeof(aval))) {
/* retry in decimal */
- alen = lcs_decimal.calc(aval, sizeof(aval), value,
&lcs_decimal);
+ cstyle = &lcs_decimal;
+
+ alen = cstyle->calc(aval, sizeof(aval), value, cstyle);
if ((alen == 0) || (alen >= sizeof(aval))) {
/* failed in decimal, give up */
- return 0;
+ return CSS_INVALID;
}
}
-----------------------------------------------------------------------
Summary of changes:
src/select/format_list_style.c | 46 +++++++++++++++++++++++++++-------------
1 file changed, 31 insertions(+), 15 deletions(-)
diff --git a/src/select/format_list_style.c b/src/select/format_list_style.c
index 3457e41..07d028b 100644
--- a/src/select/format_list_style.c
+++ b/src/select/format_list_style.c
@@ -281,27 +281,32 @@ calc_roman_system(uint8_t *buf,
const struct list_counter_style *cstyle)
{
const int S[] = { 0, 2, 4, 2, 4, 2, 4 };
- const int D[] = { 1000, 500, 100, 50, 10, 5, 1 };
- const size_t L = sizeof(D) / sizeof(int) - 1;
size_t k = 0; /* index into output buffer */
unsigned int i = 0; /* index into maps */
- int r, r2;
-
- UNUSED(cstyle);
+ int r;
+ int r2 = 0;
+ size_t L;
assert(cstyle->items == 7);
+ /* ensure value is within acceptable range of this system */
+ if ((value < cstyle->range.start) || (value > cstyle->range.end)) {
+ return 0;
+ }
+
+ L = cstyle->items - 1;
+
while (value > 0) {
- if (D[i] <= value) {
- r = value / D[i];
- value = value - (r * D[i]);
+ if (cstyle->weights[i] <= value) {
+ r = value / cstyle->weights[i];
+ value = value - (r * cstyle->weights[i]);
if (i < L) {
/* lookahead */
- r2 = value / D[i+1];
+ r2 = value / cstyle->weights[i+1];
}
if (i < L && r2 >= S[i+1]) {
/* will violate repeat boundary on next pass */
- value = value - (r2 * D[i+1]);
+ value = value - (r2 * cstyle->weights[i+1]);
if (k < maxlen) buf[k++] = i+1;
if (k < maxlen) buf[k++] = i-1;
} else if (S[i] && r >= S[i]) {
@@ -316,9 +321,7 @@ calc_roman_system(uint8_t *buf,
}
i++;
}
- if (k < maxlen) {
- buf[k] = '\0';
- }
+
return k;
}
@@ -437,12 +440,19 @@ static struct list_counter_style lcs_lower_alpha = {
};
+static const int roman_weights[] = {
+ 1000, 500, 100, 50, 10, 5, 1
+};
static const symbol_t upper_roman_symbols[] = {
"M", "D", "C", "L", "X", "V", "I"
};
static const struct list_counter_style lcs_upper_roman = {
.name = "upper-roman",
+ .range = {
+ .start = 1,
+ .end = 3999,},
.symbols = upper_roman_symbols,
+ .weights = roman_weights,
.items = (sizeof(upper_roman_symbols) / SYMBOL_SIZE),
.calc = calc_roman_system,
};
@@ -453,7 +463,11 @@ static const symbol_t lower_roman_symbols[] = {
};
static const struct list_counter_style lcs_lower_roman = {
.name = "lower-roman",
+ .range = {
+ .start = 1,
+ .end = 3999,},
.symbols = lower_roman_symbols,
+ .weights = roman_weights,
.items = (sizeof(lower_roman_symbols) / SYMBOL_SIZE),
.calc = calc_roman_system,
};
@@ -532,10 +546,12 @@ css_error css_computed_format_list_style(
/* ensure it is possible to calculate with the selected system */
if ((alen == 0) || (alen >= sizeof(aval))) {
/* retry in decimal */
- alen = lcs_decimal.calc(aval, sizeof(aval), value,
&lcs_decimal);
+ cstyle = &lcs_decimal;
+
+ alen = cstyle->calc(aval, sizeof(aval), value, cstyle);
if ((alen == 0) || (alen >= sizeof(aval))) {
/* failed in decimal, give up */
- return 0;
+ return CSS_INVALID;
}
}
--
Cascading Style Sheets library
_______________________________________________
netsurf-commits mailing list -- netsurf-commits@netsurf-browser.org
To unsubscribe send an email to netsurf-commits-le...@netsurf-browser.org
