|
@@ -26,6 +26,11 @@ const char *br_bg_image_url(unsigned int idx)
|
|
|
return bg_urls[idx];
|
|
return bg_urls[idx];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+unsigned int br_root_font_px(void)
|
|
|
|
|
+{
|
|
|
|
|
+ return (unsigned int)root_font_px;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
/* ---- tag table ---- */
|
|
/* ---- tag table ---- */
|
|
|
|
|
|
|
|
struct tag_name {
|
|
struct tag_name {
|
|
@@ -2216,6 +2221,8 @@ enum {
|
|
|
PROP_ALIGN, PROP_UNDERLINE,
|
|
PROP_ALIGN, PROP_UNDERLINE,
|
|
|
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_PT_U, PROP_PR_U, PROP_PB_U, PROP_PL_U,
|
|
|
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,
|
|
@@ -2525,8 +2532,75 @@ static int parse_len(const char *s, unsigned int len, unsigned int *pos)
|
|
|
* can centre a box with a definite width. */
|
|
* can centre a box with a definite width. */
|
|
|
#define CSS_LEN_AUTO (-32768)
|
|
#define CSS_LEN_AUTO (-32768)
|
|
|
|
|
|
|
|
|
|
+/* A box length with its unit preserved for layout-time resolution:
|
|
|
|
|
+ * 0 px, 1 %, 2 em, 3 rem, 4 auto. The raw value is hundredths for %/em/
|
|
|
|
|
+ * rem and whole pixels for px. */
|
|
|
|
|
+static int parse_css_len(const char *s, unsigned int len,
|
|
|
|
|
+ unsigned int *pos, int *unit)
|
|
|
|
|
+{
|
|
|
|
|
+ unsigned int i = *pos;
|
|
|
|
|
+ int sign = 1;
|
|
|
|
|
+ long v = 0;
|
|
|
|
|
+ int digits = 0, frac = 0;
|
|
|
|
|
+
|
|
|
|
|
+ *unit = 0;
|
|
|
|
|
+ while (i < len && is_space(s[i]))
|
|
|
|
|
+ i++;
|
|
|
|
|
+ if (i < len && (s[i] == '-' || s[i] == '+')) {
|
|
|
|
|
+ if (s[i] == '-')
|
|
|
|
|
+ sign = -1;
|
|
|
|
|
+ i++;
|
|
|
|
|
+ }
|
|
|
|
|
+ while (i < len && s[i] >= '0' && s[i] <= '9') {
|
|
|
|
|
+ v = v * 10 + (s[i] - '0');
|
|
|
|
|
+ digits = 1;
|
|
|
|
|
+ i++;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (i < len && s[i] == '.') {
|
|
|
|
|
+ i++;
|
|
|
|
|
+ while (i < len && s[i] >= '0' && s[i] <= '9') {
|
|
|
|
|
+ if (frac < 2) {
|
|
|
|
|
+ v = v * 10 + (s[i] - '0');
|
|
|
|
|
+ frac++;
|
|
|
|
|
+ }
|
|
|
|
|
+ i++;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ while (frac < 2) {
|
|
|
|
|
+ v *= 10;
|
|
|
|
|
+ frac++;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (!digits) {
|
|
|
|
|
+ *pos = i;
|
|
|
|
|
+ return 0;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (i < len && s[i] == '%') {
|
|
|
|
|
+ *unit = 1;
|
|
|
|
|
+ } else if (i + 2 < len && s[i] == 'r' && s[i + 1] == 'e' &&
|
|
|
|
|
+ s[i + 2] == 'm') {
|
|
|
|
|
+ *unit = 3;
|
|
|
|
|
+ i += 3;
|
|
|
|
|
+ } else if (i + 1 < len && s[i] == 'e' && s[i + 1] == 'm') {
|
|
|
|
|
+ *unit = 2;
|
|
|
|
|
+ i += 2;
|
|
|
|
|
+ } else {
|
|
|
|
|
+ v /= 100;
|
|
|
|
|
+ }
|
|
|
|
|
+ while (i < len && (s[i] == 'p' || s[i] == 'x' || s[i] == '%' ||
|
|
|
|
|
+ s[i] == 'e' || s[i] == 'm' || s[i] == 'r' ||
|
|
|
|
|
+ s[i] == 'a' || s[i] == 'd'))
|
|
|
|
|
+ i++;
|
|
|
|
|
+ *pos = i;
|
|
|
|
|
+ v *= sign;
|
|
|
|
|
+ if (v < -32768)
|
|
|
|
|
+ v = -32768;
|
|
|
|
|
+ if (v > 32767)
|
|
|
|
|
+ v = 32767;
|
|
|
|
|
+ return (int)v;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
static int parse_margin_len(const char *s, unsigned int len,
|
|
static int parse_margin_len(const char *s, unsigned int len,
|
|
|
- unsigned int *pos)
|
|
|
|
|
|
|
+ unsigned int *pos, int *unit)
|
|
|
{
|
|
{
|
|
|
unsigned int i = *pos;
|
|
unsigned int i = *pos;
|
|
|
|
|
|
|
@@ -2535,9 +2609,10 @@ static int parse_margin_len(const char *s, unsigned int len,
|
|
|
if (i + 4 <= len && ci_eq_n(s + i, "auto", 4) &&
|
|
if (i + 4 <= len && ci_eq_n(s + i, "auto", 4) &&
|
|
|
(i + 4 == len || is_space(s[i + 4]) || s[i + 4] == ';')) {
|
|
(i + 4 == len || is_space(s[i + 4]) || s[i + 4] == ';')) {
|
|
|
*pos = i + 4;
|
|
*pos = i + 4;
|
|
|
|
|
+ *unit = 4;
|
|
|
return CSS_LEN_AUTO;
|
|
return CSS_LEN_AUTO;
|
|
|
}
|
|
}
|
|
|
- return parse_len(s, len, pos);
|
|
|
|
|
|
|
+ return parse_css_len(s, len, pos, unit);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/* calc(P% +/- Npx) for the common width/margin forms. */
|
|
/* calc(P% +/- Npx) for the common width/margin forms. */
|
|
@@ -4334,43 +4409,53 @@ static void parse_decls(struct br_doc *d, const char *s,
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} else if (str_eq(prop, "margin") || str_eq(prop, "padding")) {
|
|
} else if (str_eq(prop, "margin") || str_eq(prop, "padding")) {
|
|
|
- int vals[4], nv = 0;
|
|
|
|
|
|
|
+ int vals[4], units[4], nv = 0;
|
|
|
unsigned int pos = 0;
|
|
unsigned int pos = 0;
|
|
|
int is_pad = prop[0] == 'p';
|
|
int is_pad = prop[0] == 'p';
|
|
|
unsigned char base = is_pad ? PROP_PT : PROP_MT;
|
|
unsigned char base = is_pad ? PROP_PT : PROP_MT;
|
|
|
|
|
|
|
|
while (pos < vend - vstart && nv < 4) {
|
|
while (pos < vend - vstart && nv < 4) {
|
|
|
- vals[nv++] = parse_margin_len(s + vstart,
|
|
|
|
|
- vend - vstart,
|
|
|
|
|
- &pos);
|
|
|
|
|
|
|
+ units[nv] = 0;
|
|
|
|
|
+ vals[nv] = parse_margin_len(s + vstart,
|
|
|
|
|
+ vend - vstart,
|
|
|
|
|
+ &pos, &units[nv]);
|
|
|
|
|
+ nv++;
|
|
|
while (pos < vend - vstart &&
|
|
while (pos < vend - vstart &&
|
|
|
is_space(s[vstart + pos]))
|
|
is_space(s[vstart + pos]))
|
|
|
pos++;
|
|
pos++;
|
|
|
}
|
|
}
|
|
|
if (nv == 1) {
|
|
if (nv == 1) {
|
|
|
vals[1] = vals[2] = vals[3] = vals[0];
|
|
vals[1] = vals[2] = vals[3] = vals[0];
|
|
|
|
|
+ units[1] = units[2] = units[3] = units[0];
|
|
|
} else if (nv == 2) {
|
|
} else if (nv == 2) {
|
|
|
vals[2] = vals[0];
|
|
vals[2] = vals[0];
|
|
|
vals[3] = vals[1];
|
|
vals[3] = vals[1];
|
|
|
|
|
+ units[2] = units[0];
|
|
|
|
|
+ units[3] = units[1];
|
|
|
} else if (nv == 3) {
|
|
} else if (nv == 3) {
|
|
|
vals[3] = vals[1];
|
|
vals[3] = vals[1];
|
|
|
|
|
+ units[3] = units[1];
|
|
|
}
|
|
}
|
|
|
if (nv > 0) {
|
|
if (nv > 0) {
|
|
|
int k;
|
|
int k;
|
|
|
|
|
|
|
|
for (k = 0; k < 4; k++) {
|
|
for (k = 0; k < 4; k++) {
|
|
|
int v = vals[k];
|
|
int v = vals[k];
|
|
|
- int au = 0;
|
|
|
|
|
|
|
+ int u = units[k];
|
|
|
|
|
+ int au = u == 4;
|
|
|
|
|
|
|
|
- if (v == CSS_LEN_AUTO) {
|
|
|
|
|
- au = 1;
|
|
|
|
|
|
|
+ if (au)
|
|
|
v = 0;
|
|
v = 0;
|
|
|
- }
|
|
|
|
|
if (is_pad && au)
|
|
if (is_pad && au)
|
|
|
- v = 0;
|
|
|
|
|
|
|
+ u = 0;
|
|
|
decl_add(out, nout,
|
|
decl_add(out, nout,
|
|
|
(unsigned char)(base + k), v,
|
|
(unsigned char)(base + k), v,
|
|
|
important);
|
|
important);
|
|
|
|
|
+ decl_add(out, nout,
|
|
|
|
|
+ (unsigned char)
|
|
|
|
|
+ ((is_pad ? PROP_PT_U :
|
|
|
|
|
+ PROP_MT_U) + k),
|
|
|
|
|
+ u, important);
|
|
|
if (!is_pad && (k == 1 || k == 3))
|
|
if (!is_pad && (k == 1 || k == 3))
|
|
|
decl_add(out, nout,
|
|
decl_add(out, nout,
|
|
|
k == 1 ? PROP_MR_AUTO :
|
|
k == 1 ? PROP_MR_AUTO :
|
|
@@ -4387,19 +4472,19 @@ static void parse_decls(struct br_doc *d, const char *s,
|
|
|
str_eq(prop, "padding-bottom") ||
|
|
str_eq(prop, "padding-bottom") ||
|
|
|
str_eq(prop, "padding-left")) {
|
|
str_eq(prop, "padding-left")) {
|
|
|
unsigned int pos = 0;
|
|
unsigned int pos = 0;
|
|
|
- int v = parse_margin_len(s + vstart, vend - vstart, &pos);
|
|
|
|
|
|
|
+ int unit = 0;
|
|
|
|
|
+ int v = parse_margin_len(s + vstart, vend - vstart,
|
|
|
|
|
+ &pos, &unit);
|
|
|
unsigned char p = PROP_MT;
|
|
unsigned char p = PROP_MT;
|
|
|
const char *side;
|
|
const char *side;
|
|
|
- int au = 0;
|
|
|
|
|
|
|
+ int au = unit == 4;
|
|
|
|
|
|
|
|
- if (v == CSS_LEN_AUTO) {
|
|
|
|
|
- au = 1;
|
|
|
|
|
|
|
+ if (au)
|
|
|
v = 0;
|
|
v = 0;
|
|
|
- }
|
|
|
|
|
if (prop[0] == 'p') {
|
|
if (prop[0] == 'p') {
|
|
|
p = PROP_PT;
|
|
p = PROP_PT;
|
|
|
if (au)
|
|
if (au)
|
|
|
- v = 0;
|
|
|
|
|
|
|
+ unit = 0;
|
|
|
}
|
|
}
|
|
|
side = prop + (prop[0] == 'p' ? 8 : 7);
|
|
side = prop + (prop[0] == 'p' ? 8 : 7);
|
|
|
if (str_eq(side, "right"))
|
|
if (str_eq(side, "right"))
|
|
@@ -4409,6 +4494,12 @@ static void parse_decls(struct br_doc *d, const char *s,
|
|
|
else if (str_eq(side, "left"))
|
|
else if (str_eq(side, "left"))
|
|
|
p = (unsigned char)(p + 3);
|
|
p = (unsigned char)(p + 3);
|
|
|
decl_add(out, nout, p, v, important);
|
|
decl_add(out, nout, p, v, important);
|
|
|
|
|
+ decl_add(out, nout,
|
|
|
|
|
+ (unsigned char)((prop[0] == 'p' ?
|
|
|
|
|
+ PROP_PT_U : PROP_MT_U) +
|
|
|
|
|
+ (p - (prop[0] == 'p' ?
|
|
|
|
|
+ PROP_PT : PROP_MT))),
|
|
|
|
|
+ unit, important);
|
|
|
if (str_eq(side, "right"))
|
|
if (str_eq(side, "right"))
|
|
|
decl_add(out, nout, PROP_MR_AUTO, au, important);
|
|
decl_add(out, nout, PROP_MR_AUTO, au, important);
|
|
|
else if (str_eq(side, "left"))
|
|
else if (str_eq(side, "left"))
|
|
@@ -5424,6 +5515,17 @@ static void apply_decl(struct br_style *st, const struct br_decl *dcl)
|
|
|
case PROP_PR: st->pr = dcl->val; break;
|
|
case PROP_PR: st->pr = dcl->val; break;
|
|
|
case PROP_PB: st->pb = dcl->val; break;
|
|
case PROP_PB: st->pb = dcl->val; break;
|
|
|
case PROP_PL: st->pl = dcl->val; break;
|
|
case PROP_PL: st->pl = dcl->val; break;
|
|
|
|
|
+ case PROP_MT_U:
|
|
|
|
|
+ case PROP_MR_U:
|
|
|
|
|
+ case PROP_MB_U:
|
|
|
|
|
+ case PROP_ML_U:
|
|
|
|
|
+ case PROP_PT_U:
|
|
|
|
|
+ case PROP_PR_U:
|
|
|
|
|
+ case PROP_PB_U:
|
|
|
|
|
+ case PROP_PL_U:
|
|
|
|
|
+ st->mp_unit[dcl->prop - PROP_MT_U] =
|
|
|
|
|
+ (unsigned char)dcl->val;
|
|
|
|
|
+ break;
|
|
|
case PROP_BORDER_W:
|
|
case PROP_BORDER_W:
|
|
|
set_border_side_w(st, 0, dcl->val);
|
|
set_border_side_w(st, 0, dcl->val);
|
|
|
set_border_side_w(st, 1, dcl->val);
|
|
set_border_side_w(st, 1, dcl->val);
|
|
@@ -5635,6 +5737,8 @@ void br_style_for(struct br_doc *d, unsigned int node,
|
|
|
out->ml_auto = out->mr_auto = 0;
|
|
out->ml_auto = out->mr_auto = 0;
|
|
|
out->mt = out->mr = out->mb = out->ml = 0;
|
|
out->mt = out->mr = out->mb = out->ml = 0;
|
|
|
out->pt = out->pr = out->pb = out->pl = 0;
|
|
out->pt = out->pr = out->pb = out->pl = 0;
|
|
|
|
|
+ for (i = 0; i < 8; i++)
|
|
|
|
|
+ out->mp_unit[i] = 0;
|
|
|
out->flex_grow = out->flex_col = out->flex_wrap = 0;
|
|
out->flex_grow = out->flex_col = out->flex_wrap = 0;
|
|
|
out->justify = out->align_items = 0;
|
|
out->justify = out->align_items = 0;
|
|
|
out->grid_ncols = out->grid_gap = out->grid_slot = 0;
|
|
out->grid_ncols = out->grid_gap = out->grid_slot = 0;
|