minor markup simplifications

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index 6effb29b66ddbddc39aacd654be1667c10a59961..73769d2b3e4520fa0af92fadfffa617c2e0d7d32 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,7 +1,7 @@
-/*     $Id: out.c,v 1.61 2015/10/06 18:32:19 schwarze Exp $ */
+/*     $Id: out.c,v 1.65 2017/06/08 18:11:22 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -29,9 +29,10 @@
 #include "out.h"
 
 static void    tblcalc_data(struct rofftbl *, struct roffcol *,
-                       const struct tbl_opts *, const struct tbl_dat *);
+                       const struct tbl_opts *, const struct tbl_dat *,
+                       size_t);
 static void    tblcalc_literal(struct rofftbl *, struct roffcol *,
-                       const struct tbl_dat *);
+                       const struct tbl_dat *, size_t);
 static void    tblcalc_number(struct rofftbl *, struct roffcol *,
                        const struct tbl_opts *, const struct tbl_dat *);
 
@@ -40,10 +41,10 @@ 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 2 on complete success, 1 when a conversion was done,
- * but there was trailing garbage, and 0 on total failure.
+ * Return a pointer to the byte after the last byte used,
+ * or NULL on total failure.
  */
-int
+const char *
 a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
 {
        char            *endptr;
@@ -51,7 +52,7 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
        dst->unit = def == SCALE_MAX ? SCALE_BU : def;
        dst->scale = strtod(src, &endptr);
        if (endptr == src)
-               return 0;
+               return NULL;
 
        switch (*endptr++) {
        case 'c':
@@ -89,12 +90,11 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
                /* FALLTHROUGH */
        default:
                if (SCALE_MAX == def)
-                       return 0;
+                       return NULL;
                dst->unit = def;
                break;
        }
-
-       return *endptr == '\0' ? 2 : 1;
+       return endptr;
 }
 
 /*
@@ -107,6 +107,7 @@ void
 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
        size_t totalwidth)
 {
+       struct roffsu            su;
        const struct tbl_opts   *opts;
        const struct tbl_dat    *dp;
        struct roffcol          *col;
@@ -147,7 +148,16 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
                        col->flags |= dp->layout->flags;
                        if (dp->layout->flags & TBL_CELL_WIGN)
                                continue;
-                       tblcalc_data(tbl, col, opts, dp);
+                       if (dp->layout->wstr != NULL &&
+                           dp->layout->width == 0 &&
+                           a2roffsu(dp->layout->wstr, &su, SCALE_EN)
+                           != NULL)
+                               dp->layout->width =
+                                   (*tbl->sulen)(&su, tbl->arg);
+                       if (col->width < dp->layout->width)
+                               col->width = dp->layout->width;
+                       tblcalc_data(tbl, col, opts, dp, dp->block ?
+                           totalwidth / (sp->opts->cols + 1) : 0);
                }
        }
 
@@ -197,9 +207,12 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
         */
 
        if (nxcol && totalwidth) {
-               xwidth = totalwidth - xwidth - 3*maxcol -
+               xwidth += 3*maxcol +
                    (opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ?
                     2 : !!opts->lvert + !!opts->rvert);
+               if (xwidth >= totalwidth)
+                       return;
+               xwidth = totalwidth - xwidth;
 
                /*
                 * Emulate a bug in GNU tbl width calculation that
@@ -232,7 +245,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
 
 static void
 tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
-               const struct tbl_opts *opts, const struct tbl_dat *dp)
+    const struct tbl_opts *opts, const struct tbl_dat *dp, size_t mw)
 {
        size_t           sz;
 
@@ -240,20 +253,16 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
 
        switch (dp->layout->pos) {
        case TBL_CELL_HORIZ:
-               /* FALLTHROUGH */
        case TBL_CELL_DHORIZ:
                sz = (*tbl->len)(1, tbl->arg);
                if (col->width < sz)
                        col->width = sz;
                break;
        case TBL_CELL_LONG:
-               /* FALLTHROUGH */
        case TBL_CELL_CENTRE:
-               /* FALLTHROUGH */
        case TBL_CELL_LEFT:
-               /* FALLTHROUGH */
        case TBL_CELL_RIGHT:
-               tblcalc_literal(tbl, col, dp);
+               tblcalc_literal(tbl, col, dp, mw);
                break;
        case TBL_CELL_NUMBER:
                tblcalc_number(tbl, col, opts, dp);
@@ -267,16 +276,29 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
 
 static void
 tblcalc_literal(struct rofftbl *tbl, struct roffcol *col,
-               const struct tbl_dat *dp)
+    const struct tbl_dat *dp, size_t mw)
 {
-       size_t           sz;
-       const char      *str;
-
-       str = dp->string ? dp->string : "";
-       sz = (*tbl->slen)(str, tbl->arg);
-
-       if (col->width < sz)
-               col->width = sz;
+       const char      *str;   /* Beginning of the first line. */
+       const char      *beg;   /* Beginning of the current line. */
+       char            *end;   /* End of the current line. */
+       size_t           sz;    /* Length of the current line. */
+
+       if (dp->string == NULL || *dp->string == '\0')
+               return;
+       str = mw ? mandoc_strdup(dp->string) : dp->string;
+       for (beg = str; beg != NULL && *beg != '\0'; beg = end) {
+               end = mw ? strchr(beg, ' ') : NULL;
+               if (end != NULL) {
+                       *end++ = '\0';
+                       while (*end == ' ')
+                               end++;
+               }
+               sz = (*tbl->slen)(beg, tbl->arg);
+               if (col->width < sz)
+                       col->width = sz;
+       }
+       if (mw)
+               free((void *)str);
 }
 
 static void