improve documentation of .Fa, .Va, and .Vt;

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index c931664977899a0adf99f2239b5ef36fb52ae6f2..5b08a09abd42b6cd4923885bbc55e3fc31e939c2 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,7 +1,7 @@
-/*     $Id: out.c,v 1.46 2013/10/05 20:30:05 schwarze Exp $ */
+/*     $Id: out.c,v 1.53 2014/10/14 18:18:05 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 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,9 +15,7 @@
  * 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 <sys/types.h>
 


@@ -28,6 +26,7 @@
 #include <string.h>
 #include <time.h>
 
 #include <string.h>
 #include <time.h>
 

+#include "mandoc_aux.h"

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


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


@@ -55,10 +55,10 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
        i = hasd = 0;
 
        switch (*src) {
        i = hasd = 0;
 
        switch (*src) {

-       case ('+'):
+       case '+':

                src++;
                break;
                src++;
                break;

-       case ('-'):
+       case '-':

                buf[i++] = *src++;
                break;
        default:
                buf[i++] = *src++;
                break;
        default:


@@ -86,39 +86,39 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
        buf[i] = '\0';
 
        switch (*src) {
        buf[i] = '\0';
 
        switch (*src) {

-       case ('c'):
+       case 'c':

                unit = SCALE_CM;
                break;
                unit = SCALE_CM;
                break;

-       case ('i'):
+       case 'i':

                unit = SCALE_IN;
                break;
                unit = SCALE_IN;
                break;

-       case ('P'):
+       case 'P':

                unit = SCALE_PC;
                break;
                unit = SCALE_PC;
                break;

-       case ('p'):
+       case 'p':

                unit = SCALE_PT;
                break;
                unit = SCALE_PT;
                break;

-       case ('f'):
+       case 'f':

                unit = SCALE_FS;
                break;
                unit = SCALE_FS;
                break;

-       case ('v'):
+       case 'v':

                unit = SCALE_VS;
                break;
                unit = SCALE_VS;
                break;

-       case ('m'):
+       case 'm':

                unit = SCALE_EM;
                break;
                unit = SCALE_EM;
                break;

-       case ('\0'):
+       case '\0':

                if (SCALE_MAX == def)
                        return(0);
                if (SCALE_MAX == def)
                        return(0);

-               unit = SCALE_BU;
+               unit = SCALE_EN;

                break;
                break;

-       case ('u'):
+       case 'u':

                unit = SCALE_BU;
                break;
                unit = SCALE_BU;
                break;

-       case ('M'):
+       case 'M':

                unit = SCALE_MM;
                break;
                unit = SCALE_MM;
                break;

-       case ('n'):
+       case 'n':

                unit = SCALE_EN;
                break;
        default:
                unit = SCALE_EN;
                break;
        default:


@@ -126,8 +126,8 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
        }
 
        /* FIXME: do this in the caller. */
        }
 
        /* FIXME: do this in the caller. */

-       if ((dst->scale = atof(buf)) < 0)
-               dst->scale = 0;
+       if ((dst->scale = atof(buf)) < 0.0)
+               dst->scale = 0.0;

        dst->unit = unit;
        return(1);
 }
        dst->unit = unit;
        return(1);
 }


@@ -139,11 +139,14 @@ 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_dat    *dp;
        struct roffcol          *col;
 {
        const struct tbl_dat    *dp;
        struct roffcol          *col;

+       size_t                   ewidth, xwidth;

        int                      spans;
        int                      spans;

+       int                      icol, maxcol, necol, nxcol;

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


@@ -152,10 +155,10 @@ 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));
+       tbl->cols = mandoc_calloc((size_t)sp->opts->cols,
+           sizeof(struct roffcol));

 
 

-       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;


@@ -170,11 +173,72 @@ 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];
+                       icol = dp->layout->head->ident;
+                       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, sp->opts, dp);
                }
        }
                        tblcalc_data(tbl, col, sp->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 - 3*maxcol - xwidth;
+               for (icol = 0; icol <= maxcol; icol++) {
+                       col = tbl->cols + icol;
+                       if ( ! (col->flags & TBL_CELL_WMAX))
+                               continue;
+                       col->width = xwidth / nxcol--;
+                       xwidth -= col->width;
+               }
+       }

 }
 
 static void
 }
 
 static void


@@ -186,26 +250,26 @@ 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):
+       case TBL_CELL_HORIZ:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (TBL_CELL_DHORIZ):
+       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):
+       case TBL_CELL_LONG:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (TBL_CELL_CENTRE):
+       case TBL_CELL_CENTRE:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (TBL_CELL_LEFT):
+       case TBL_CELL_LEFT:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (TBL_CELL_RIGHT):
+       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();


@@ -231,7 +295,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;