summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--man_html.c2
-rw-r--r--man_term.c18
-rw-r--r--mdoc_html.c4
-rw-r--r--mdoc_man.c4
-rw-r--r--mdoc_term.c25
-rw-r--r--out.c65
6 files changed, 49 insertions, 69 deletions
diff --git a/man_html.c b/man_html.c
index efcaa51f..e91ec88c 100644
--- a/man_html.c
+++ b/man_html.c
@@ -362,7 +362,7 @@ man_br_pre(MAN_ARGS)
if (MAN_sp == n->tok) {
if (NULL != (n = n->child))
if ( ! a2roffsu(n->string, &su, SCALE_VS))
- SCALE_VS_INIT(&su, atoi(n->string));
+ su.scale = 1.0;
} else
su.scale = 0.0;
diff --git a/man_term.c b/man_term.c
index a85f00fe..03456b2b 100644
--- a/man_term.c
+++ b/man_term.c
@@ -57,7 +57,6 @@ struct termact {
};
static int a2width(const struct termp *, const char *);
-static size_t a2height(const struct termp *, const char *);
static void print_man_nodelist(DECL_ARGS);
static void print_man_node(DECL_ARGS);
@@ -184,18 +183,6 @@ terminal_man(void *arg, const struct man *man)
}
}
-
-static size_t
-a2height(const struct termp *p, const char *cp)
-{
- struct roffsu su;
-
- if ( ! a2roffsu(cp, &su, SCALE_VS))
- SCALE_VS_INIT(&su, atoi(cp));
-
- return(term_vspan(p, &su));
-}
-
static int
a2width(const struct termp *p, const char *cp)
{
@@ -464,6 +451,7 @@ pre_in(DECL_ARGS)
static int
pre_sp(DECL_ARGS)
{
+ struct roffsu su;
char *s;
size_t i, len;
int neg;
@@ -501,7 +489,9 @@ pre_sp(DECL_ARGS)
neg = 1;
s++;
}
- len = a2height(p, s);
+ if ( ! a2roffsu(s, &su, SCALE_VS))
+ su.scale = 1.0;
+ len = term_vspan(p, &su);
break;
}
diff --git a/mdoc_html.c b/mdoc_html.c
index 305ad499..402ee1ad 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -279,7 +279,7 @@ static void
a2width(const char *p, struct roffsu *su)
{
- if ( ! a2roffsu(p, su, SCALE_MAX)) {
+ if (a2roffsu(p, su, SCALE_MAX) < 2) {
su->unit = SCALE_EN;
su->scale = html_strlen(p);
}
@@ -1568,7 +1568,7 @@ mdoc_sp_pre(MDOC_ARGS)
if (MDOC_sp == n->tok) {
if (NULL != (n = n->child))
if ( ! a2roffsu(n->string, &su, SCALE_VS))
- SCALE_VS_INIT(&su, atoi(n->string));
+ su.scale = 1.0;
} else
su.scale = 0.0;
diff --git a/mdoc_man.c b/mdoc_man.c
index 458706c5..505d274f 100644
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -434,7 +434,7 @@ print_offs(const char *v, int keywords)
sz = 6;
else if (keywords && !strcmp(v, "indent-two"))
sz = 12;
- else if (a2roffsu(v, &su, SCALE_MAX)) {
+ else if (a2roffsu(v, &su, SCALE_EN) < 2) {
if (SCALE_EN == su.unit)
sz = su.scale;
else {
@@ -481,7 +481,7 @@ print_width(const char *v, const struct mdoc_node *child, size_t defsz)
/* Convert v into a number (of characters). */
if (NULL == v)
sz = defsz;
- else if (a2roffsu(v, &su, SCALE_MAX)) {
+ else if (a2roffsu(v, &su, SCALE_MAX) < 2) {
if (SCALE_EN == su.unit)
sz = su.scale;
else {
diff --git a/mdoc_term.c b/mdoc_term.c
index e940ab9d..4a8ddb86 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -50,7 +50,6 @@ struct termact {
};
static size_t a2width(const struct termp *, const char *);
-static size_t a2height(const struct termp *, const char *);
static void print_bvspace(struct termp *,
const struct mdoc_node *,
@@ -527,25 +526,11 @@ print_mdoc_head(struct termp *p, const void *arg)
}
static size_t
-a2height(const struct termp *p, const char *v)
-{
- struct roffsu su;
-
-
- assert(v);
- if ( ! a2roffsu(v, &su, SCALE_VS))
- SCALE_VS_INIT(&su, atoi(v));
-
- return(term_vspan(p, &su));
-}
-
-static size_t
a2width(const struct termp *p, const char *v)
{
struct roffsu su;
- assert(v);
- if ( ! a2roffsu(v, &su, SCALE_MAX)) {
+ if (a2roffsu(v, &su, SCALE_MAX) < 2) {
SCALE_HS_INIT(&su, term_strlen(p, v));
su.scale /= term_strlen(p, "0");
}
@@ -1816,11 +1801,17 @@ termp_in_post(DECL_ARGS)
static int
termp_sp_pre(DECL_ARGS)
{
+ struct roffsu su;
size_t i, len;
switch (n->tok) {
case MDOC_sp:
- len = n->child ? a2height(p, n->child->string) : 1;
+ if (n->child) {
+ if ( ! a2roffsu(n->child->string, &su, SCALE_VS))
+ su.scale = 1.0;
+ len = term_vspan(p, &su);
+ } else
+ len = 1;
break;
case MDOC_br:
len = 0;
diff --git a/out.c b/out.c
index 54b35317..f5d36fb1 100644
--- a/out.c
+++ b/out.c
@@ -40,65 +40,64 @@ static void tblcalc_number(struct rofftbl *, struct roffcol *,
* Parse the *src string and store a scaling unit into *dst.
* If the string doesn't specify the unit, use the default.
* If no default is specified, fail.
- * Return 1 on success and 0 on failure.
+ * Return 2 on complete success, 1 when a conversion was done,
+ * but there was trailing garbage, and 0 on total failure.
*/
int
a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
{
char *endptr;
- double scale;
- enum roffscale unit;
- scale = strtod(src, &endptr);
- if (endptr == src || (endptr[0] != '\0' && endptr[1] != '\0'))
+ dst->unit = def == SCALE_MAX ? SCALE_BU : def;
+ dst->scale = strtod(src, &endptr);
+ if (endptr == src)
return(0);
- switch (*endptr) {
+ switch (*endptr++) {
case 'c':
- unit = SCALE_CM;
+ dst->unit = SCALE_CM;
break;
case 'i':
- unit = SCALE_IN;
+ dst->unit = SCALE_IN;
+ break;
+ case 'f':
+ dst->unit = SCALE_FS;
+ break;
+ case 'M':
+ dst->unit = SCALE_MM;
+ break;
+ case 'm':
+ dst->unit = SCALE_EM;
+ break;
+ case 'n':
+ dst->unit = SCALE_EN;
break;
case 'P':
- unit = SCALE_PC;
+ dst->unit = SCALE_PC;
break;
case 'p':
- unit = SCALE_PT;
+ dst->unit = SCALE_PT;
break;
- case 'f':
- unit = SCALE_FS;
+ case 'u':
+ dst->unit = SCALE_BU;
break;
case 'v':
- unit = SCALE_VS;
- break;
- case 'm':
- unit = SCALE_EM;
+ dst->unit = SCALE_VS;
break;
case '\0':
+ endptr--;
+ /* FALLTHROUGH */
+ default:
if (SCALE_MAX == def)
return(0);
- unit = def;
+ dst->unit = def;
break;
- case 'u':
- unit = SCALE_BU;
- break;
- case 'M':
- unit = SCALE_MM;
- break;
- case 'n':
- unit = SCALE_EN;
- break;
- default:
- return(0);
}
/* FIXME: do this in the caller. */
- if (scale < 0.0)
- scale = 0.0;
- dst->scale = scale;
- dst->unit = unit;
- return(1);
+ if (dst->scale < 0.0)
+ dst->scale = 0.0;
+ return(*endptr == '\0' ? 2 : 1);
}
/*
generated by cgit (git 2.34.1) at 2024-11-15 04:09:01 +0000