unify names of AST node flags; no change of cpp output

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index 1d8c8ab4b662b7684a8ba09a77c007d8f96ef050..aff3558372dcc8c45438f43cf87caf402d0d8c41 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,7 +1,7 @@
-/*     $Id: out.c,v 1.45 2013/05/31 21:37:17 schwarze Exp $ */
+/*     $Id: out.c,v 1.62 2015/10/12 00:08:16 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2014, 2015 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -15,19 +15,16 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif

 
 #include <sys/types.h>
 
 #include <assert.h>
 
 #include <sys/types.h>
 
 #include <assert.h>

-#include <ctype.h>
-#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 

+#include "mandoc_aux.h"

 #include "mandoc.h"
 #include "out.h"
 
 #include "mandoc.h"
 #include "out.h"
 


@@ -38,98 +35,66 @@ static      void    tblcalc_literal(struct rofftbl *, struct roffcol *,
 static void    tblcalc_number(struct rofftbl *, struct roffcol *,
                        const struct tbl_opts *, const struct tbl_dat *);
 
 static void    tblcalc_number(struct rofftbl *, struct roffcol *,
                        const struct tbl_opts *, const struct tbl_dat *);
 

-/* 
- * Convert a `scaling unit' to a consistent form, or fail.  Scaling
- * units are documented in groff.7, mdoc.7, man.7.
+
+/*
+ * 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.

  */
 int
 a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
 {
  */
 int
 a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
 {

-       char             buf[BUFSIZ], hasd;
-       int              i;
-       enum roffscale   unit;
-
-       if ('\0' == *src)
-               return(0);
+       char            *endptr;

 
 

-       i = hasd = 0;
+       dst->unit = def == SCALE_MAX ? SCALE_BU : def;
+       dst->scale = strtod(src, &endptr);
+       if (endptr == src)
+               return 0;

 
 

-       switch (*src) {
-       case ('+'):
-               src++;
+       switch (*endptr++) {
+       case 'c':
+               dst->unit = SCALE_CM;

                break;
                break;

-       case ('-'):
-               buf[i++] = *src++;
+       case 'i':
+               dst->unit = SCALE_IN;

                break;
                break;

-       default:
+       case 'f':
+               dst->unit = SCALE_FS;

                break;
                break;

-       }
-
-       if ('\0' == *src)
-               return(0);
-
-       while (i < BUFSIZ) {
-               if ( ! isdigit((unsigned char)*src)) {
-                       if ('.' != *src)
-                               break;
-                       else if (hasd)
-                               break;
-                       else
-                               hasd = 1;
-               }
-               buf[i++] = *src++;
-       }
-
-       if (BUFSIZ == i || (*src && *(src + 1)))
-               return(0);
-
-       buf[i] = '\0';
-
-       switch (*src) {
-       case ('c'):
-               unit = SCALE_CM;
+       case 'M':
+               dst->unit = SCALE_MM;

                break;
                break;

-       case ('i'):
-               unit = SCALE_IN;
+       case 'm':
+               dst->unit = SCALE_EM;

                break;
                break;

-       case ('P'):
-               unit = SCALE_PC;
+       case 'n':
+               dst->unit = SCALE_EN;

                break;
                break;

-       case ('p'):
-               unit = SCALE_PT;
+       case 'P':
+               dst->unit = SCALE_PC;

                break;
                break;

-       case ('f'):
-               unit = SCALE_FS;
+       case 'p':
+               dst->unit = SCALE_PT;

                break;
                break;

-       case ('v'):
-               unit = SCALE_VS;
+       case 'u':
+               dst->unit = SCALE_BU;

                break;
                break;

-       case ('m'):
-               unit = SCALE_EM;
+       case 'v':
+               dst->unit = SCALE_VS;

                break;
                break;

-       case ('\0'):
+       case '\0':
+               endptr--;
+               /* FALLTHROUGH */
+       default:

                if (SCALE_MAX == def)
                if (SCALE_MAX == def)

-                       return(0);
-               unit = SCALE_BU;
-               break;
-       case ('u'):
-               unit = SCALE_BU;
-               break;
-       case ('M'):
-               unit = SCALE_MM;
+                       return 0;
+               dst->unit = def;

                break;
                break;

-       case ('n'):
-               unit = SCALE_EN;
-               break;
-       default:
-               return(0);

        }
 
        }
 

-       /* FIXME: do this in the caller. */
-       if ((dst->scale = atof(buf)) < 0)
-               dst->scale = 0;
-       dst->unit = unit;
-       return(1);
+       return *endptr == '\0' ? 2 : 1;

 }
 
 /*
 }
 
 /*


@@ -139,12 +104,15 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
  * used for the actual width calculations.
  */
 void
  * used for the actual width calculations.
  */
 void

-tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
+tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
+       size_t totalwidth)

 {
 {

+       const struct tbl_opts   *opts;

        const struct tbl_dat    *dp;
        const struct tbl_dat    *dp;

-       const struct tbl_head   *hp;

        struct roffcol          *col;
        struct roffcol          *col;

+       size_t                   ewidth, xwidth;

        int                      spans;
        int                      spans;

+       int                      icol, maxcol, necol, nxcol, quirkcol;

 
        /*
         * Allocate the master column specifiers.  These will hold the
 
        /*
         * Allocate the master column specifiers.  These will hold the


@@ -153,12 +121,11 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
         */
 
        assert(NULL == tbl->cols);
         */
 
        assert(NULL == tbl->cols);

-       tbl->cols = mandoc_calloc
-               ((size_t)sp->opts->cols, sizeof(struct roffcol));
-
-       hp = sp->head;
+       tbl->cols = mandoc_calloc((size_t)sp->opts->cols,
+           sizeof(struct roffcol));
+       opts = sp->opts;

 
 

-       for ( ; sp; sp = sp->next) {
+       for (maxcol = -1; sp; sp = sp->next) {

                if (TBL_SPAN_DATA != sp->pos)
                        continue;
                spans = 1;
                if (TBL_SPAN_DATA != sp->pos)
                        continue;
                spans = 1;


@@ -173,9 +140,92 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
                        spans = dp->spans;
                        if (1 < spans)
                                continue;
                        spans = dp->spans;
                        if (1 < spans)
                                continue;

-                       assert(dp->layout);
-                       col = &tbl->cols[dp->layout->head->ident];
-                       tblcalc_data(tbl, col, sp->opts, dp);
+                       icol = dp->layout->col;
+                       if (maxcol < icol)
+                               maxcol = icol;
+                       col = tbl->cols + icol;
+                       col->flags |= dp->layout->flags;
+                       if (dp->layout->flags & TBL_CELL_WIGN)
+                               continue;
+                       tblcalc_data(tbl, col, opts, dp);
+               }
+       }
+
+       /*
+        * Count columns to equalize and columns to maximize.
+        * Find maximum width of the columns to equalize.
+        * Find total width of the columns *not* to maximize.
+        */
+
+       necol = nxcol = 0;
+       ewidth = xwidth = 0;
+       for (icol = 0; icol <= maxcol; icol++) {
+               col = tbl->cols + icol;
+               if (col->flags & TBL_CELL_EQUAL) {
+                       necol++;
+                       if (ewidth < col->width)
+                               ewidth = col->width;
+               }
+               if (col->flags & TBL_CELL_WMAX)
+                       nxcol++;
+               else
+                       xwidth += col->width;
+       }
+
+       /*
+        * Equalize columns, if requested for any of them.
+        * Update total width of the columns not to maximize.
+        */
+
+       if (necol) {
+               for (icol = 0; icol <= maxcol; icol++) {
+                       col = tbl->cols + icol;
+                       if ( ! (col->flags & TBL_CELL_EQUAL))
+                               continue;
+                       if (col->width == ewidth)
+                               continue;
+                       if (nxcol && totalwidth)
+                               xwidth += ewidth - col->width;
+                       col->width = ewidth;
+               }
+       }
+
+       /*
+        * If there are any columns to maximize, find the total
+        * available width, deducting 3n margins between columns.
+        * Distribute the available width evenly.
+        */
+
+       if (nxcol && totalwidth) {
+               xwidth = totalwidth - xwidth - 3*maxcol -
+                   (opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ?
+                    2 : !!opts->lvert + !!opts->rvert);
+
+               /*
+                * Emulate a bug in GNU tbl width calculation that
+                * manifests itself for large numbers of x-columns.
+                * Emulating it for 5 x-columns gives identical
+                * behaviour for up to 6 x-columns.
+                */
+
+               if (nxcol == 5) {
+                       quirkcol = xwidth % nxcol + 2;
+                       if (quirkcol != 3 && quirkcol != 4)
+                               quirkcol = -1;
+               } else
+                       quirkcol = -1;
+
+               necol = 0;
+               ewidth = 0;
+               for (icol = 0; icol <= maxcol; icol++) {
+                       col = tbl->cols + icol;
+                       if ( ! (col->flags & TBL_CELL_WMAX))
+                               continue;
+                       col->width = (double)xwidth * ++necol / nxcol
+                           - ewidth + 0.4995;
+                       if (necol == quirkcol)
+                               col->width--;
+                       ewidth += col->width;

                }
        }
 }
                }
        }
 }


@@ -189,30 +239,25 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
        /* Branch down into data sub-types. */
 
        switch (dp->layout->pos) {
        /* Branch down into data sub-types. */
 
        switch (dp->layout->pos) {

-       case (TBL_CELL_HORIZ):
-               /* FALLTHROUGH */
-       case (TBL_CELL_DHORIZ):
+       case TBL_CELL_HORIZ:
+       case TBL_CELL_DHORIZ:

                sz = (*tbl->len)(1, tbl->arg);
                if (col->width < sz)
                        col->width = sz;
                break;
                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):
+       case TBL_CELL_LONG:
+       case TBL_CELL_CENTRE:
+       case TBL_CELL_LEFT:
+       case TBL_CELL_RIGHT:

                tblcalc_literal(tbl, col, dp);
                break;
                tblcalc_literal(tbl, col, dp);
                break;

-       case (TBL_CELL_NUMBER):
+       case TBL_CELL_NUMBER:

                tblcalc_number(tbl, col, opts, dp);
                break;
                tblcalc_number(tbl, col, opts, dp);
                break;

-       case (TBL_CELL_DOWN):
+       case TBL_CELL_DOWN:

                break;
        default:
                abort();
                break;
        default:
                abort();

-               /* NOTREACHED */

        }
 }
 
        }
 }
 


@@ -234,7 +279,7 @@ static void
 tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
                const struct tbl_opts *opts, const struct tbl_dat *dp)
 {
 tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
                const struct tbl_opts *opts, const struct tbl_dat *dp)
 {

-       int              i;
+       int              i;

        size_t           sz, psz, ssz, d;
        const char      *str;
        char            *cp;
        size_t           sz, psz, ssz, d;
        const char      *str;
        char            *cp;