mirror of
https://github.com/netsurf-browser/netsurf
synced 2024-12-23 04:26:50 +03:00
implement list marker counting for roman, latin and greek
This commit is contained in:
Vincent Sanders
parent
da2aa05b73
commit
4455f1b712
@ -349,6 +349,332 @@ box_construct_generate(dom_node *n,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* compute the index for a list marker
|
||||||
|
*
|
||||||
|
* calculates a one based index of a list item
|
||||||
|
*/
|
||||||
|
static unsigned int compute_list_marker_index(struct box *last)
|
||||||
|
{
|
||||||
|
/* Drill down into last child of parent
|
||||||
|
* to find the list marker (if any)
|
||||||
|
*
|
||||||
|
* Floated list boxes end up as:
|
||||||
|
*
|
||||||
|
* parent
|
||||||
|
* BOX_INLINE_CONTAINER
|
||||||
|
* BOX_FLOAT_{LEFT,RIGHT}
|
||||||
|
* BOX_BLOCK <-- list box
|
||||||
|
* ...
|
||||||
|
*/
|
||||||
|
while ((last != NULL) && (last->list_marker == NULL)) {
|
||||||
|
struct box *last_inner = last;
|
||||||
|
|
||||||
|
while (last_inner != NULL) {
|
||||||
|
if (last_inner->list_marker != NULL) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (last_inner->type == BOX_INLINE_CONTAINER ||
|
||||||
|
last_inner->type == BOX_FLOAT_LEFT ||
|
||||||
|
last_inner->type == BOX_FLOAT_RIGHT) {
|
||||||
|
last_inner = last_inner->last;
|
||||||
|
} else {
|
||||||
|
last_inner = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (last_inner != NULL) {
|
||||||
|
last = last_inner;
|
||||||
|
} else {
|
||||||
|
last = last->prev;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((last == NULL) || (last->list_marker == NULL)) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return last->list_marker->rows + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Roman numeral conversion
|
||||||
|
*
|
||||||
|
* \return The number of characters that are nesesary for full output
|
||||||
|
*/
|
||||||
|
static int
|
||||||
|
ntoromannumeral(char *buf, const size_t maxlen, int value, const char *C)
|
||||||
|
{
|
||||||
|
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;
|
||||||
|
|
||||||
|
while (value > 0) {
|
||||||
|
if (D[i] <= value) {
|
||||||
|
r = value / D[i];
|
||||||
|
value = value - (r * D[i]);
|
||||||
|
if (i < L) {
|
||||||
|
/* lookahead */
|
||||||
|
r2 = value / D[i+1];
|
||||||
|
}
|
||||||
|
if (i < L && r2 >= S[i+1]) {
|
||||||
|
/* will violate repeat boundary on next pass */
|
||||||
|
value = value - (r2 * D[i+1]);
|
||||||
|
if (k < maxlen) buf[k++] = C[i+1];
|
||||||
|
if (k < maxlen) buf[k++] = C[i-1];
|
||||||
|
} else if (S[i] && r >= S[i]) {
|
||||||
|
/* violated repeat boundary on this pass */
|
||||||
|
if (k < maxlen) buf[k++] = C[i];
|
||||||
|
if (k < maxlen) buf[k++] = C[i-1];
|
||||||
|
} else {
|
||||||
|
while (r-- > 0 && k < maxlen) {
|
||||||
|
buf[k++] = C[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
if (k < maxlen) {
|
||||||
|
buf[k] = '\0';
|
||||||
|
}
|
||||||
|
return k;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* lower case roman numeral
|
||||||
|
*/
|
||||||
|
static int ntolcromannumeral(char *buf, const size_t maxlen, int value)
|
||||||
|
{
|
||||||
|
const char C[] = { 'm', 'd', 'c', 'l', 'x', 'v', 'i' };
|
||||||
|
return ntoromannumeral(buf, maxlen, value, C);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* upper case roman numeral
|
||||||
|
*/
|
||||||
|
static int ntoucromannumeral(char *buf, const size_t maxlen, int value)
|
||||||
|
{
|
||||||
|
const char C[] = { 'M', 'D', 'C', 'L', 'X', 'V', 'I' };
|
||||||
|
return ntoromannumeral(buf, maxlen, value, C);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* generate alphabet symbol values for latin and greek labelling
|
||||||
|
*
|
||||||
|
* fills array with alphabet values suitable for the input value
|
||||||
|
*
|
||||||
|
* \param ares Buffer to recive the converted values
|
||||||
|
* \param alen the length of \a ares buffer
|
||||||
|
* \param value The value to convert
|
||||||
|
* \param slen The number of symbols in the alphabet
|
||||||
|
* \return The length a complete conversion which may be larger than \a alen
|
||||||
|
*/
|
||||||
|
static size_t
|
||||||
|
calc_alphabet_values(uint8_t *ares,
|
||||||
|
const size_t alen,
|
||||||
|
int value,
|
||||||
|
unsigned char slen)
|
||||||
|
{
|
||||||
|
size_t idx = 0;
|
||||||
|
uint8_t *first;
|
||||||
|
uint8_t *last;
|
||||||
|
|
||||||
|
/* generate alphabet values in ascending order */
|
||||||
|
while (value > 0) {
|
||||||
|
--value;
|
||||||
|
if (idx < alen) ares[idx] = value % slen;
|
||||||
|
idx++;
|
||||||
|
value = value / slen;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* put the values in decending order */
|
||||||
|
first = ares;
|
||||||
|
if (idx < alen) {
|
||||||
|
last = first + (idx - 1);
|
||||||
|
} else {
|
||||||
|
last = first + (alen - 1);
|
||||||
|
}
|
||||||
|
while (first < last) {
|
||||||
|
*first ^= *last;
|
||||||
|
*last ^= *first;
|
||||||
|
*first ^= *last;
|
||||||
|
first++;
|
||||||
|
last--;
|
||||||
|
}
|
||||||
|
|
||||||
|
return idx;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* maps alphabet values to output values with a symbol table
|
||||||
|
*
|
||||||
|
* Takes a list of alphabet values and for each one outputs the
|
||||||
|
* compete symbol (in utf8) to an output buffer.
|
||||||
|
*
|
||||||
|
* \param buf The oputput buffer
|
||||||
|
* \param buflen the length of \a buf
|
||||||
|
* \param aval array of alphabet values
|
||||||
|
* \param alen The number of values in \a alen
|
||||||
|
* \param symtab The symbol table
|
||||||
|
* \param symtablen The number of symbols in \a symtab
|
||||||
|
* \return The number of bytes needed in the output buffer whichmay be
|
||||||
|
* larger than \a buflen but the buffer will not be overrun
|
||||||
|
*/
|
||||||
|
static int
|
||||||
|
map_aval_to_symbols(char *buf, const size_t buflen,
|
||||||
|
const uint8_t *aval, const size_t alen,
|
||||||
|
const char symtab[][4], const size_t symtablen)
|
||||||
|
{
|
||||||
|
size_t oidx;
|
||||||
|
size_t aidx;
|
||||||
|
int sidx;
|
||||||
|
|
||||||
|
oidx = 0;
|
||||||
|
for (aidx=0; aidx < alen; aidx++) {
|
||||||
|
sidx=0;
|
||||||
|
while ((sidx < 4) &&
|
||||||
|
(symtab[aval[aidx]][sidx] != 0)) {
|
||||||
|
if (oidx < buflen) {
|
||||||
|
buf[oidx] = symtab[aval[aidx]][sidx];
|
||||||
|
}
|
||||||
|
oidx++;
|
||||||
|
sidx++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return oidx;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int ntolcalpha(char *buf, const size_t buflen, int value)
|
||||||
|
{
|
||||||
|
size_t alen;
|
||||||
|
uint8_t aval[20];
|
||||||
|
const char symtab[][4] = {
|
||||||
|
"a", "b", "c", "d", "e", "f", "g", "h", "i", "j",
|
||||||
|
"k", "l", "m", "n", "o", "p", "q", "r", "s", "t",
|
||||||
|
"u", "v", "w", "x", "y", "z"
|
||||||
|
};
|
||||||
|
const size_t symtablen = sizeof(symtab) / 4;
|
||||||
|
|
||||||
|
alen = calc_alphabet_values(aval, sizeof(aval), value, symtablen);
|
||||||
|
if (alen >= sizeof(aval)) {
|
||||||
|
*buf = '?';
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return map_aval_to_symbols(buf, buflen, aval, alen, symtab, symtablen);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int ntoucalpha(char *buf, const size_t buflen, int value)
|
||||||
|
{
|
||||||
|
size_t alen;
|
||||||
|
uint8_t aval[20];
|
||||||
|
const char symtab[][4] = {
|
||||||
|
"A", "B", "C", "D", "E", "F", "G", "H", "I", "J",
|
||||||
|
"K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",
|
||||||
|
"U", "V", "W", "X", "Y", "Z"
|
||||||
|
};
|
||||||
|
const size_t symtablen = sizeof(symtab) / 4;
|
||||||
|
|
||||||
|
alen = calc_alphabet_values(aval, sizeof(aval), value, symtablen);
|
||||||
|
if (alen >= sizeof(aval)) {
|
||||||
|
*buf = '?';
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return map_aval_to_symbols(buf, buflen, aval, alen, symtab, symtablen);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int ntolcgreek(char *buf, const size_t buflen, int value)
|
||||||
|
{
|
||||||
|
size_t alen;
|
||||||
|
uint8_t aval[20];
|
||||||
|
const char symtab[][4] = {
|
||||||
|
"α", "β", "γ", "δ", "ε", "ζ", "η", "θ", "ι", "κ",
|
||||||
|
"λ", "μ", "ν", "ξ", "ο", "π", "ρ", "σ", "τ", "υ",
|
||||||
|
"φ", "χ", "ψ", "ω"
|
||||||
|
};
|
||||||
|
const size_t symtablen = sizeof(symtab) / 4;
|
||||||
|
|
||||||
|
alen = calc_alphabet_values(aval, sizeof(aval), value, symtablen);
|
||||||
|
if (alen >= sizeof(aval)) {
|
||||||
|
*buf = '?';
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return map_aval_to_symbols(buf, buflen, aval, alen, symtab, symtablen);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* format value into a list marker with a style
|
||||||
|
*
|
||||||
|
* The value is a one based index into the list. This means for
|
||||||
|
* numeric printing the value must be incremented by one.
|
||||||
|
*/
|
||||||
|
static size_t
|
||||||
|
format_list_marker_value(char *text,
|
||||||
|
size_t text_len,
|
||||||
|
enum css_list_style_type_e list_style_type,
|
||||||
|
unsigned int value)
|
||||||
|
{
|
||||||
|
int res = -1;
|
||||||
|
|
||||||
|
switch (list_style_type) {
|
||||||
|
case CSS_LIST_STYLE_TYPE_DECIMAL_LEADING_ZERO:
|
||||||
|
res = snprintf(text, text_len, "%02u", value);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CSS_LIST_STYLE_TYPE_LOWER_ROMAN:
|
||||||
|
res = ntolcromannumeral(text, text_len, value);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CSS_LIST_STYLE_TYPE_UPPER_ROMAN:
|
||||||
|
res = ntoucromannumeral(text, text_len, value);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CSS_LIST_STYLE_TYPE_LOWER_ALPHA:
|
||||||
|
case CSS_LIST_STYLE_TYPE_LOWER_LATIN:
|
||||||
|
res = ntolcalpha(text, text_len, value);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CSS_LIST_STYLE_TYPE_UPPER_ALPHA:
|
||||||
|
case CSS_LIST_STYLE_TYPE_UPPER_LATIN:
|
||||||
|
res = ntoucalpha(text, text_len, value);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CSS_LIST_STYLE_TYPE_LOWER_GREEK:
|
||||||
|
res = ntolcgreek(text, text_len, value);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CSS_LIST_STYLE_TYPE_ARMENIAN:
|
||||||
|
case CSS_LIST_STYLE_TYPE_GEORGIAN:
|
||||||
|
case CSS_LIST_STYLE_TYPE_DECIMAL:
|
||||||
|
default:
|
||||||
|
res = snprintf(text, text_len, "%u", value);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* deal with error */
|
||||||
|
if (res < 0) {
|
||||||
|
text[0] = 0;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* deal with overflow */
|
||||||
|
if ((size_t)res >= (text_len-2)) {
|
||||||
|
res = text_len-2;
|
||||||
|
}
|
||||||
|
text[res++] = '.';
|
||||||
|
text[res++] = 0;
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Construct a list marker box
|
* Construct a list marker box
|
||||||
*
|
*
|
||||||
@ -366,6 +692,7 @@ box_construct_marker(struct box *box,
|
|||||||
{
|
{
|
||||||
lwc_string *image_uri;
|
lwc_string *image_uri;
|
||||||
struct box *marker;
|
struct box *marker;
|
||||||
|
enum css_list_style_type_e list_style_type;
|
||||||
|
|
||||||
marker = box_create(NULL, box->style, false, NULL, NULL, title,
|
marker = box_create(NULL, box->style, false, NULL, NULL, title,
|
||||||
NULL, ctx->bctx);
|
NULL, ctx->bctx);
|
||||||
@ -374,83 +701,46 @@ box_construct_marker(struct box *box,
|
|||||||
|
|
||||||
marker->type = BOX_BLOCK;
|
marker->type = BOX_BLOCK;
|
||||||
|
|
||||||
|
list_style_type = css_computed_list_style_type(box->style);
|
||||||
|
|
||||||
/** \todo marker content (list-style-type) */
|
/** \todo marker content (list-style-type) */
|
||||||
switch (css_computed_list_style_type(box->style)) {
|
switch (list_style_type) {
|
||||||
case CSS_LIST_STYLE_TYPE_DISC:
|
case CSS_LIST_STYLE_TYPE_DISC:
|
||||||
/* 2022 BULLET */
|
/* 2022 BULLET */
|
||||||
marker->text = (char *) "\342\200\242";
|
marker->text = (char *) "\342\200\242";
|
||||||
marker->length = 3;
|
marker->length = 3;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CSS_LIST_STYLE_TYPE_CIRCLE:
|
case CSS_LIST_STYLE_TYPE_CIRCLE:
|
||||||
/* 25CB WHITE CIRCLE */
|
/* 25CB WHITE CIRCLE */
|
||||||
marker->text = (char *) "\342\227\213";
|
marker->text = (char *) "\342\227\213";
|
||||||
marker->length = 3;
|
marker->length = 3;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CSS_LIST_STYLE_TYPE_SQUARE:
|
case CSS_LIST_STYLE_TYPE_SQUARE:
|
||||||
/* 25AA BLACK SMALL SQUARE */
|
/* 25AA BLACK SMALL SQUARE */
|
||||||
marker->text = (char *) "\342\226\252";
|
marker->text = (char *) "\342\226\252";
|
||||||
marker->length = 3;
|
marker->length = 3;
|
||||||
break;
|
break;
|
||||||
case CSS_LIST_STYLE_TYPE_DECIMAL:
|
|
||||||
case CSS_LIST_STYLE_TYPE_LOWER_ALPHA:
|
case CSS_LIST_STYLE_TYPE_NONE:
|
||||||
case CSS_LIST_STYLE_TYPE_LOWER_ROMAN:
|
marker->text = 0;
|
||||||
case CSS_LIST_STYLE_TYPE_UPPER_ALPHA:
|
marker->length = 0;
|
||||||
case CSS_LIST_STYLE_TYPE_UPPER_ROMAN:
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
if (parent->last) {
|
marker->rows = compute_list_marker_index(parent->last);
|
||||||
struct box *last = parent->last;
|
|
||||||
|
|
||||||
/* Drill down into last child of parent
|
|
||||||
* to find the list marker (if any)
|
|
||||||
*
|
|
||||||
* Floated list boxes end up as:
|
|
||||||
*
|
|
||||||
* parent
|
|
||||||
* BOX_INLINE_CONTAINER
|
|
||||||
* BOX_FLOAT_{LEFT,RIGHT}
|
|
||||||
* BOX_BLOCK <-- list box
|
|
||||||
* ...
|
|
||||||
*/
|
|
||||||
while (last != NULL && last->list_marker == NULL) {
|
|
||||||
struct box *last_inner = last;
|
|
||||||
|
|
||||||
while (last_inner != NULL) {
|
|
||||||
if (last_inner->list_marker != NULL)
|
|
||||||
break;
|
|
||||||
if (last_inner->type ==
|
|
||||||
BOX_INLINE_CONTAINER ||
|
|
||||||
last_inner->type ==
|
|
||||||
BOX_FLOAT_LEFT ||
|
|
||||||
last_inner->type ==
|
|
||||||
BOX_FLOAT_RIGHT) {
|
|
||||||
last_inner = last_inner->last;
|
|
||||||
} else {
|
|
||||||
last_inner = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (last_inner != NULL) {
|
|
||||||
last = last_inner;
|
|
||||||
} else {
|
|
||||||
last = last->prev;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (last && last->list_marker) {
|
|
||||||
marker->rows = last->list_marker->rows + 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
marker->text = talloc_array(ctx->bctx, char, 20);
|
marker->text = talloc_array(ctx->bctx, char, 20);
|
||||||
if (marker->text == NULL)
|
if (marker->text == NULL)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
snprintf(marker->text, 20, "%u.", marker->rows);
|
marker->length = format_list_marker_value(marker->text,
|
||||||
marker->length = strlen(marker->text);
|
20,
|
||||||
break;
|
list_style_type,
|
||||||
case CSS_LIST_STYLE_TYPE_NONE:
|
marker->rows);
|
||||||
marker->text = 0;
|
|
||||||
marker->length = 0;
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (css_computed_list_style_image(box->style, &image_uri) == CSS_LIST_STYLE_IMAGE_URI &&
|
if (css_computed_list_style_image(box->style, &image_uri) == CSS_LIST_STYLE_IMAGE_URI &&
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user