|
@@ -2313,7 +2313,7 @@ enum {
|
|
|
PROP_BG_SIZE_KIND, PROP_BG_SIZE_W, PROP_BG_SIZE_H,
|
|
PROP_BG_SIZE_KIND, PROP_BG_SIZE_W, PROP_BG_SIZE_H,
|
|
|
PROP_FONT_PX, PROP_FONT_UNIT,
|
|
PROP_FONT_PX, PROP_FONT_UNIT,
|
|
|
PROP_BOLD, PROP_ITALIC, PROP_MONO, PROP_FONT_FACE,
|
|
PROP_BOLD, PROP_ITALIC, PROP_MONO, PROP_FONT_FACE,
|
|
|
- PROP_ALIGN, PROP_UNDERLINE,
|
|
|
|
|
|
|
+ PROP_ALIGN, PROP_UNDERLINE, PROP_STRIKE, PROP_OVERLINE,
|
|
|
PROP_DISPLAY, PROP_MT, PROP_MR, PROP_MB, PROP_ML,
|
|
PROP_DISPLAY, PROP_MT, PROP_MR, PROP_MB, PROP_ML,
|
|
|
PROP_PT, PROP_PR, PROP_PB, PROP_PL,
|
|
PROP_PT, PROP_PR, PROP_PB, PROP_PL,
|
|
|
PROP_MT_U, PROP_MR_U, PROP_MB_U, PROP_ML_U,
|
|
PROP_MT_U, PROP_MR_U, PROP_MB_U, PROP_ML_U,
|
|
@@ -2321,8 +2321,9 @@ enum {
|
|
|
PROP_BORDER_W, PROP_BORDER_COLOR,
|
|
PROP_BORDER_W, PROP_BORDER_COLOR,
|
|
|
PROP_BW_T, PROP_BW_R, PROP_BW_B, PROP_BW_L,
|
|
PROP_BW_T, PROP_BW_R, PROP_BW_B, PROP_BW_L,
|
|
|
PROP_BC_T, PROP_BC_R, PROP_BC_B, PROP_BC_L,
|
|
PROP_BC_T, PROP_BC_R, PROP_BC_B, PROP_BC_L,
|
|
|
|
|
+ PROP_BS_T, PROP_BS_R, PROP_BS_B, PROP_BS_L,
|
|
|
PROP_RADIUS_TL, PROP_RADIUS_TR, PROP_RADIUS_BR, PROP_RADIUS_BL,
|
|
PROP_RADIUS_TL, PROP_RADIUS_TR, PROP_RADIUS_BR, PROP_RADIUS_BL,
|
|
|
- PROP_LIST_NONE, PROP_NOWRAP,
|
|
|
|
|
|
|
+ PROP_LIST_NONE, PROP_LIST_STYLE, PROP_NOWRAP,
|
|
|
PROP_WIDTH, PROP_WIDTH_KIND, PROP_MAXW, PROP_MAXW_KIND,
|
|
PROP_WIDTH, PROP_WIDTH_KIND, PROP_MAXW, PROP_MAXW_KIND,
|
|
|
PROP_WIDTH_CALC_PCT, PROP_WIDTH_CALC_PX,
|
|
PROP_WIDTH_CALC_PCT, PROP_WIDTH_CALC_PX,
|
|
|
PROP_MINW, PROP_MINW_KIND, PROP_BOX_SIZING, PROP_ML_AUTO, PROP_MR_AUTO,
|
|
PROP_MINW, PROP_MINW_KIND, PROP_BOX_SIZING, PROP_ML_AUTO, PROP_MR_AUTO,
|
|
@@ -4478,11 +4479,20 @@ static void parse_decls(struct br_doc *d, const char *s,
|
|
|
a = BR_ALIGN_RIGHT;
|
|
a = BR_ALIGN_RIGHT;
|
|
|
decl_add(out, nout, PROP_ALIGN, a, important);
|
|
decl_add(out, nout, PROP_ALIGN, a, important);
|
|
|
} else if (str_eq(prop, "text-decoration")) {
|
|
} else if (str_eq(prop, "text-decoration")) {
|
|
|
- int u = 0;
|
|
|
|
|
- if (vend - vstart >= 9 &&
|
|
|
|
|
- ci_eq_n(s + vstart, "underline", 9))
|
|
|
|
|
|
|
+ int u = 0, stv = 0, ov = 0;
|
|
|
|
|
+
|
|
|
|
|
+ if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
+ "underline"))
|
|
|
u = 1;
|
|
u = 1;
|
|
|
|
|
+ if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
+ "line-through"))
|
|
|
|
|
+ stv = 1;
|
|
|
|
|
+ if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
+ "overline"))
|
|
|
|
|
+ ov = 1;
|
|
|
decl_add(out, nout, PROP_UNDERLINE, u, important);
|
|
decl_add(out, nout, PROP_UNDERLINE, u, important);
|
|
|
|
|
+ decl_add(out, nout, PROP_STRIKE, stv, important);
|
|
|
|
|
+ decl_add(out, nout, PROP_OVERLINE, ov, important);
|
|
|
} else if (str_eq(prop, "text-transform")) {
|
|
} else if (str_eq(prop, "text-transform")) {
|
|
|
int u = (vend - vstart >= 9 &&
|
|
int u = (vend - vstart >= 9 &&
|
|
|
ci_eq_n(s + vstart, "uppercase", 9));
|
|
ci_eq_n(s + vstart, "uppercase", 9));
|
|
@@ -4961,10 +4971,42 @@ static void parse_decls(struct br_doc *d, const char *s,
|
|
|
}
|
|
}
|
|
|
} else if (str_eq(prop, "list-style") ||
|
|
} else if (str_eq(prop, "list-style") ||
|
|
|
str_eq(prop, "list-style-type")) {
|
|
str_eq(prop, "list-style-type")) {
|
|
|
- int none = (vend - vstart >= 4 &&
|
|
|
|
|
- contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
- "none"));
|
|
|
|
|
- decl_add(out, nout, PROP_LIST_NONE, none, important);
|
|
|
|
|
|
|
+ int ls = BR_LIST_AUTO;
|
|
|
|
|
+
|
|
|
|
|
+ if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
+ "none"))
|
|
|
|
|
+ ls = BR_LIST_NONE;
|
|
|
|
|
+ else if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
+ "circle"))
|
|
|
|
|
+ ls = BR_LIST_CIRCLE;
|
|
|
|
|
+ else if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
+ "square"))
|
|
|
|
|
+ ls = BR_LIST_SQUARE;
|
|
|
|
|
+ else if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
+ "lower-alpha") ||
|
|
|
|
|
+ contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
+ "lower-latin"))
|
|
|
|
|
+ ls = BR_LIST_LOWER_ALPHA;
|
|
|
|
|
+ else if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
+ "upper-alpha") ||
|
|
|
|
|
+ contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
+ "upper-latin"))
|
|
|
|
|
+ ls = BR_LIST_UPPER_ALPHA;
|
|
|
|
|
+ else if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
+ "lower-roman"))
|
|
|
|
|
+ ls = BR_LIST_LOWER_ROMAN;
|
|
|
|
|
+ else if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
+ "upper-roman"))
|
|
|
|
|
+ ls = BR_LIST_UPPER_ROMAN;
|
|
|
|
|
+ else if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
+ "decimal"))
|
|
|
|
|
+ ls = BR_LIST_DECIMAL;
|
|
|
|
|
+ else if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
+ "disc"))
|
|
|
|
|
+ ls = BR_LIST_DISC;
|
|
|
|
|
+ decl_add(out, nout, PROP_LIST_NONE,
|
|
|
|
|
+ ls == BR_LIST_NONE, important);
|
|
|
|
|
+ decl_add(out, nout, PROP_LIST_STYLE, ls, important);
|
|
|
} else if (str_eq(prop, "border-radius") ||
|
|
} else if (str_eq(prop, "border-radius") ||
|
|
|
str_eq(prop, "border-top-left-radius") ||
|
|
str_eq(prop, "border-top-left-radius") ||
|
|
|
str_eq(prop, "border-top-right-radius") ||
|
|
str_eq(prop, "border-top-right-radius") ||
|
|
@@ -5165,6 +5207,14 @@ static void parse_decls(struct br_doc *d, const char *s,
|
|
|
(te - ts == 6 &&
|
|
(te - ts == 6 &&
|
|
|
ci_eq_n(v + ts, "hidden", 6)))
|
|
ci_eq_n(v + ts, "hidden", 6)))
|
|
|
stv = 0;
|
|
stv = 0;
|
|
|
|
|
+ else if (te - ts == 6 &&
|
|
|
|
|
+ ci_eq_n(v + ts,
|
|
|
|
|
+ "dashed", 6))
|
|
|
|
|
+ stv = 2;
|
|
|
|
|
+ else if (te - ts == 6 &&
|
|
|
|
|
+ ci_eq_n(v + ts,
|
|
|
|
|
+ "dotted", 6))
|
|
|
|
|
+ stv = 3;
|
|
|
else
|
|
else
|
|
|
stv = 1;
|
|
stv = 1;
|
|
|
styles[ns++] = stv;
|
|
styles[ns++] = stv;
|
|
@@ -5177,17 +5227,29 @@ static void parse_decls(struct br_doc *d, const char *s,
|
|
|
decl_add(out, nout,
|
|
decl_add(out, nout,
|
|
|
PROP_BW_T + side,
|
|
PROP_BW_T + side,
|
|
|
0, important);
|
|
0, important);
|
|
|
|
|
+ else
|
|
|
|
|
+ decl_add(out, nout,
|
|
|
|
|
+ PROP_BS_T + side,
|
|
|
|
|
+ styles[0] - 1,
|
|
|
|
|
+ important);
|
|
|
} else {
|
|
} else {
|
|
|
- for (i = 0; i < 4; i++)
|
|
|
|
|
|
|
+ for (i = 0; i < 4; i++) {
|
|
|
if (!styles[i])
|
|
if (!styles[i])
|
|
|
decl_add(out, nout,
|
|
decl_add(out, nout,
|
|
|
PROP_BW_T + i,
|
|
PROP_BW_T + i,
|
|
|
0,
|
|
0,
|
|
|
important);
|
|
important);
|
|
|
|
|
+ else
|
|
|
|
|
+ decl_add(out, nout,
|
|
|
|
|
+ PROP_BS_T + i,
|
|
|
|
|
+ styles[i] - 1,
|
|
|
|
|
+ important);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
int bw = -1, bc = -1, style_none = 0;
|
|
int bw = -1, bc = -1, style_none = 0;
|
|
|
|
|
+ int bstyle = -1;
|
|
|
|
|
|
|
|
while (next_token(v, vl, &pos, &ts, &te)) {
|
|
while (next_token(v, vl, &pos, &ts, &te)) {
|
|
|
unsigned short c;
|
|
unsigned short c;
|
|
@@ -5198,6 +5260,15 @@ static void parse_decls(struct br_doc *d, const char *s,
|
|
|
(te - ts == 6 &&
|
|
(te - ts == 6 &&
|
|
|
ci_eq_n(v + ts, "hidden", 6))) {
|
|
ci_eq_n(v + ts, "hidden", 6))) {
|
|
|
style_none = 1;
|
|
style_none = 1;
|
|
|
|
|
+ } else if (te - ts == 6 &&
|
|
|
|
|
+ ci_eq_n(v + ts, "dashed", 6)) {
|
|
|
|
|
+ bstyle = BR_BORDER_DASHED;
|
|
|
|
|
+ } else if (te - ts == 6 &&
|
|
|
|
|
+ ci_eq_n(v + ts, "dotted", 6)) {
|
|
|
|
|
+ bstyle = BR_BORDER_DOTTED;
|
|
|
|
|
+ } else if (te - ts == 5 &&
|
|
|
|
|
+ ci_eq_n(v + ts, "solid", 5)) {
|
|
|
|
|
+ bstyle = BR_BORDER_SOLID;
|
|
|
} else if (parse_len_token(v + ts,
|
|
} else if (parse_len_token(v + ts,
|
|
|
te - ts, &x)) {
|
|
te - ts, &x)) {
|
|
|
bw = x;
|
|
bw = x;
|
|
@@ -5219,6 +5290,12 @@ static void parse_decls(struct br_doc *d, const char *s,
|
|
|
decl_add(out, nout,
|
|
decl_add(out, nout,
|
|
|
PROP_BORDER_COLOR, bc,
|
|
PROP_BORDER_COLOR, bc,
|
|
|
important);
|
|
important);
|
|
|
|
|
+ if (bstyle >= 0)
|
|
|
|
|
+ for (i = 0; i < 4; i++)
|
|
|
|
|
+ decl_add(out, nout,
|
|
|
|
|
+ PROP_BS_T + i,
|
|
|
|
|
+ bstyle,
|
|
|
|
|
+ important);
|
|
|
} else {
|
|
} else {
|
|
|
if (bw >= 0)
|
|
if (bw >= 0)
|
|
|
decl_add(out, nout,
|
|
decl_add(out, nout,
|
|
@@ -5228,6 +5305,10 @@ static void parse_decls(struct br_doc *d, const char *s,
|
|
|
decl_add(out, nout,
|
|
decl_add(out, nout,
|
|
|
PROP_BC_T + side, bc,
|
|
PROP_BC_T + side, bc,
|
|
|
important);
|
|
important);
|
|
|
|
|
+ if (bstyle >= 0)
|
|
|
|
|
+ decl_add(out, nout,
|
|
|
|
|
+ PROP_BS_T + side,
|
|
|
|
|
+ bstyle, important);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} else if (str_eq(prop, "margin") || str_eq(prop, "padding")) {
|
|
} else if (str_eq(prop, "margin") || str_eq(prop, "padding")) {
|
|
@@ -6387,6 +6468,12 @@ static void apply_decl(struct br_style *st, const struct br_decl *dcl)
|
|
|
case PROP_UNDERLINE:
|
|
case PROP_UNDERLINE:
|
|
|
st->underline = (unsigned char)(dcl->val != 0);
|
|
st->underline = (unsigned char)(dcl->val != 0);
|
|
|
break;
|
|
break;
|
|
|
|
|
+ case PROP_STRIKE:
|
|
|
|
|
+ st->strike = (unsigned char)(dcl->val != 0);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case PROP_OVERLINE:
|
|
|
|
|
+ st->overline = (unsigned char)(dcl->val != 0);
|
|
|
|
|
+ break;
|
|
|
case PROP_DISPLAY:
|
|
case PROP_DISPLAY:
|
|
|
st->display = (unsigned char)dcl->val;
|
|
st->display = (unsigned char)dcl->val;
|
|
|
st->list_item = 0;
|
|
st->list_item = 0;
|
|
@@ -6451,6 +6538,10 @@ static void apply_decl(struct br_style *st, const struct br_decl *dcl)
|
|
|
case PROP_BC_R: set_border_side_c(st, 1, dcl->val); break;
|
|
case PROP_BC_R: set_border_side_c(st, 1, dcl->val); break;
|
|
|
case PROP_BC_B: set_border_side_c(st, 2, dcl->val); break;
|
|
case PROP_BC_B: set_border_side_c(st, 2, dcl->val); break;
|
|
|
case PROP_BC_L: set_border_side_c(st, 3, dcl->val); break;
|
|
case PROP_BC_L: set_border_side_c(st, 3, dcl->val); break;
|
|
|
|
|
+ case PROP_BS_T: st->border_s[0] = (unsigned char)dcl->val; break;
|
|
|
|
|
+ case PROP_BS_R: st->border_s[1] = (unsigned char)dcl->val; break;
|
|
|
|
|
+ case PROP_BS_B: st->border_s[2] = (unsigned char)dcl->val; break;
|
|
|
|
|
+ case PROP_BS_L: st->border_s[3] = (unsigned char)dcl->val; break;
|
|
|
case PROP_RADIUS_TL:
|
|
case PROP_RADIUS_TL:
|
|
|
case PROP_RADIUS_TR:
|
|
case PROP_RADIUS_TR:
|
|
|
case PROP_RADIUS_BR:
|
|
case PROP_RADIUS_BR:
|
|
@@ -6461,6 +6552,9 @@ static void apply_decl(struct br_style *st, const struct br_decl *dcl)
|
|
|
case PROP_LIST_NONE:
|
|
case PROP_LIST_NONE:
|
|
|
st->no_bullet = (unsigned char)(dcl->val != 0);
|
|
st->no_bullet = (unsigned char)(dcl->val != 0);
|
|
|
break;
|
|
break;
|
|
|
|
|
+ case PROP_LIST_STYLE:
|
|
|
|
|
+ st->list_style = (unsigned char)dcl->val;
|
|
|
|
|
+ break;
|
|
|
case PROP_NOWRAP:
|
|
case PROP_NOWRAP:
|
|
|
st->nowrap = (unsigned char)(dcl->val != 0);
|
|
st->nowrap = (unsigned char)(dcl->val != 0);
|
|
|
break;
|
|
break;
|
|
@@ -6693,6 +6787,7 @@ void br_style_for(struct br_doc *d, unsigned int node,
|
|
|
for (i = 0; i < 4; i++) {
|
|
for (i = 0; i < 4; i++) {
|
|
|
out->border_w[i] = 0;
|
|
out->border_w[i] = 0;
|
|
|
out->border_c[i] = 0;
|
|
out->border_c[i] = 0;
|
|
|
|
|
+ out->border_s[i] = BR_BORDER_SOLID;
|
|
|
out->radius[i] = 0;
|
|
out->radius[i] = 0;
|
|
|
}
|
|
}
|
|
|
out->width = out->max_width = out->min_width = out->height = 0;
|
|
out->width = out->max_width = out->min_width = out->height = 0;
|
|
@@ -6801,6 +6896,12 @@ void br_style_for(struct br_doc *d, unsigned int node,
|
|
|
case BR_TAG_I: case BR_TAG_EM:
|
|
case BR_TAG_I: case BR_TAG_EM:
|
|
|
out->italic = 1;
|
|
out->italic = 1;
|
|
|
break;
|
|
break;
|
|
|
|
|
+ case BR_TAG_U:
|
|
|
|
|
+ out->underline = 1;
|
|
|
|
|
+ break;
|
|
|
|
|
+ case BR_TAG_S: case BR_TAG_STRIKE:
|
|
|
|
|
+ out->strike = 1;
|
|
|
|
|
+ break;
|
|
|
case BR_TAG_CODE:
|
|
case BR_TAG_CODE:
|
|
|
out->color = 0x8010;
|
|
out->color = 0x8010;
|
|
|
out->mono = 1;
|
|
out->mono = 1;
|