fix the two manual links on the index page

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index 6a26f95a30e5745438d6a0089b049b533c2d126d..9c4e4c94e0cf3030576438a7242b53349cd1fac5 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,6 +1,7 @@
-/*     $Id: out.c,v 1.16 2010/06/19 20:46:28 kristaps Exp $ */
+/*     $Id: out.c,v 1.48 2014/04/20 16:46:05 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011 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


@@ -27,29 +28,19 @@
 #include <string.h>
 #include <time.h>
 
 #include <string.h>
 #include <time.h>
 

+#include "mandoc_aux.h"
+#include "mandoc.h"

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

-/* See a2roffdeco(). */
-#define        C2LIM(c, l) do { \
-       (l) = 1; \
-       if ('[' == (c) || '\'' == (c)) \
-               (l) = 0; \
-       else if ('(' == (c)) \
-               (l) = 2; } \
-       while (/* CONSTCOND */ 0)
-
-/* See a2roffdeco(). */
-#define        C2TERM(c, t) do { \
-       (t) = 0; \
-       if ('\'' == (c)) \
-               (t) = 1; \
-       else if ('[' == (c)) \
-               (t) = 2; \
-       else if ('(' == (c)) \
-               (t) = 3; } \
-       while (/* CONSTCOND */ 0)
-
-/* 
+static void    tblcalc_data(struct rofftbl *, struct roffcol *,
+                       const struct tbl_opts *, const struct tbl_dat *);
+static void    tblcalc_literal(struct rofftbl *, struct roffcol *,
+                       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.
  */


@@ -66,10 +57,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:


@@ -80,7 +71,7 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
                return(0);
 
        while (i < BUFSIZ) {
                return(0);
 
        while (i < BUFSIZ) {

-               if ( ! isdigit((u_char)*src)) {
+               if ( ! isdigit((unsigned char)*src)) {

                        if ('.' != *src)
                                break;
                        else if (hasd)
                        if ('.' != *src)
                                break;
                        else if (hasd)


@@ -97,303 +88,196 @@ 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);
                unit = SCALE_BU;
                break;
                if (SCALE_MAX == def)
                        return(0);
                unit = SCALE_BU;
                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:
                return(0);
        }
 
                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;
        if ((dst->scale = atof(buf)) < 0)
                dst->scale = 0;
        dst->unit = unit;

-       dst->pt = hasd;
-

        return(1);
 }
 
        return(1);
 }
 

-

 /*
 /*

- * Correctly writes the time in nroff form, which differs from standard
- * form in that a space isn't printed in lieu of the extra %e field for
- * single-digit dates.
+ * Calculate the abstract widths and decimal positions of columns in a
+ * table.  This routine allocates the columns structures then runs over
+ * all rows and cells in the table.  The function pointers in "tbl" are
+ * used for the actual width calculations.

  */
 void
  */
 void

-time2a(time_t t, char *dst, size_t sz)
+tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)

 {
 {

-       struct tm        tm;
-       char             buf[5];
-       char            *p;
-       size_t           nsz;
-
-       assert(sz > 1);
-       localtime_r(&t, &tm);
-
-       p = dst;
-       nsz = 0;
-
-       dst[0] = '\0';
-
-       if (0 == (nsz = strftime(p, sz, "%B ", &tm)))
-               return;
-
-       p += (int)nsz;
-       sz -= nsz;
-
-       if (0 == strftime(buf, sizeof(buf), "%e, ", &tm))
-               return;
-
-       nsz = strlcat(p, buf + (' ' == buf[0] ? 1 : 0), sz);
-
-       if (nsz >= sz)
-               return;
-
-       p += (int)nsz;
-       sz -= nsz;
-
-       (void)strftime(p, sz, "%Y", &tm);
+       const struct tbl_dat    *dp;
+       struct roffcol          *col;
+       int                      spans;
+
+       /*
+        * Allocate the master column specifiers.  These will hold the
+        * widths and decimal positions for all cells in the column.  It
+        * must be freed and nullified by the caller.
+        */
+
+       assert(NULL == tbl->cols);
+       tbl->cols = mandoc_calloc((size_t)sp->opts->cols,
+           sizeof(struct roffcol));
+
+       for ( ; sp; sp = sp->next) {
+               if (TBL_SPAN_DATA != sp->pos)
+                       continue;
+               spans = 1;
+               /*
+                * Account for the data cells in the layout, matching it
+                * to data cells in the data section.
+                */
+               for (dp = sp->first; dp; dp = dp->next) {
+                       /* Do not used spanned cells in the calculation. */
+                       if (0 < --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);
+               }
+       }

 }
 
 }
 

-
-/* 
- * Returns length of parsed string (the leading "\" should NOT be
- * included).  This can be zero if the current character is the nil
- * terminator.  "d" is set to the type of parsed decorator, which may
- * have an adjoining "word" of size "sz" (e.g., "(ab" -> "ab", 2).
- */
-int
-a2roffdeco(enum roffdeco *d,
-               const char **word, size_t *sz)
+static void
+tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
+               const struct tbl_opts *opts, const struct tbl_dat *dp)

 {
 {

-       int              j, term, lim;
-       char             set;
-       const char      *wp, *sp;
+       size_t           sz;

 
 

-       *d = DECO_NONE;
-       wp = *word;
+       /* Branch down into data sub-types. */

 
 

-       switch ((set = *wp)) {
-       case ('\0'):
-               return(0);
-
-       case ('('):
-               if ('\0' == *(++wp))
-                       return(1);
-               if ('\0' == *(wp + 1))
-                       return(2);
-
-               *d = DECO_SPECIAL;
-               *sz = 2;
-               *word = wp;
-               return(3);
-
-       case ('F'):
+       switch (dp->layout->pos) {
+       case TBL_CELL_HORIZ:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('f'):
-               /*
-                * FIXME: this needs work and consolidation (it should
-                * follow the sequence that special characters do, for
-                * one), but isn't a priority at the moment.  Note, for
-                * one, that in reality \fB != \FB, although here we let
-                * these slip by.
-                */
-               switch (*(++wp)) {
-               case ('\0'):
-                       return(1);
-               case ('3'):
-                       /* FALLTHROUGH */
-               case ('B'):
-                       *d = DECO_BOLD;
-                       return(2);
-               case ('2'):
-                       /* FALLTHROUGH */
-               case ('I'):
-                       *d = DECO_ITALIC;
-                       return(2);
-               case ('P'):
-                       *d = DECO_PREVIOUS;
-                       return(2);
-               case ('1'):
-                       /* FALLTHROUGH */
-               case ('R'):
-                       *d = DECO_ROMAN;
-                       return(2);
-               case ('('):
-                       if ('\0' == *(++wp))
-                               return(2);
-                       if ('\0' == *(wp + 1))
-                               return(3);
-
-                       *d = 'F' == set ? DECO_FFONT : DECO_FONT;
-                       *sz = 2;
-                       *word = wp;
-                       return(4);
-               case ('['):
-                       *word = ++wp;
-                       for (j = 0; *wp && ']' != *wp; wp++, j++)
-                               /* Loop... */ ;
-
-                       if ('\0' == *wp)
-                               return(j + 2);
-
-                       *d = 'F' == set ? DECO_FFONT : DECO_FONT;
-                       *sz = (size_t)j;
-                       return(j + 3);
-               default:
-                       break;
-               }
-
-               *d = 'F' == set ? DECO_FFONT : DECO_FONT;
-               *sz = 1;
-               *word = wp;
-               return(2);
-
-       case ('*'):
-               switch (*(++wp)) {
-               case ('\0'):
-                       return(1);
-
-               case ('('):
-                       if ('\0' == *(++wp))
-                               return(2);
-                       if ('\0' == *(wp + 1))
-                               return(3);
-
-                       *d = DECO_RESERVED;
-                       *sz = 2;
-                       *word = wp;
-                       return(4);
-
-               case ('['):
-                       *word = ++wp;
-                       for (j = 0; *wp && ']' != *wp; wp++, j++)
-                               /* Loop... */ ;
-
-                       if ('\0' == *wp)
-                               return(j + 2);
-
-                       *d = DECO_RESERVED;
-                       *sz = (size_t)j;
-                       return(j + 3);
-
-               default:
-                       break;
-               }
+       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);
+               break;
+       case TBL_CELL_NUMBER:
+               tblcalc_number(tbl, col, opts, dp);
+               break;
+       case TBL_CELL_DOWN:
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+}

 
 

-               *d = DECO_RESERVED;
-               *sz = 1;
-               *word = wp;
-               return(2);
-
-       case ('s'):
-               sp = wp;
-               if ('\0' == *(++wp))
-                       return(1);
-
-               C2LIM(*wp, lim);
-               C2TERM(*wp, term);
-
-               if (term) 
-                       wp++;
-
-               *word = wp;
-
-               if (*wp == '+' || *wp == '-')
-                       ++wp;
-
-               switch (*wp) {
-               case ('\''):
-                       /* FALLTHROUGH */
-               case ('['):
-                       /* FALLTHROUGH */
-               case ('('):
-                       if (term) 
-                               return((int)(wp - sp));
-
-                       C2LIM(*wp, lim);
-                       C2TERM(*wp, term);
-                       wp++;
-                       break;
-               default:
-                       break;
-               }
+static void
+tblcalc_literal(struct rofftbl *tbl, struct roffcol *col,
+               const struct tbl_dat *dp)
+{
+       size_t           sz;
+       const char      *str;

 
 

-               if ( ! isdigit((u_char)*wp))
-                       return((int)(wp - sp));
+       str = dp->string ? dp->string : "";
+       sz = (*tbl->slen)(str, tbl->arg);

 
 

-               for (j = 0; isdigit((u_char)*wp); j++) {
-                       if (lim && j >= lim)
-                               break;
-                       ++wp;
-               }
+       if (col->width < sz)
+               col->width = sz;
+}

 
 

-               if (term && term < 3) {
-                       if (1 == term && *wp != '\'')
-                               return((int)(wp - sp));
-                       if (2 == term && *wp != ']')
-                               return((int)(wp - sp));
-                       ++wp;
+static void
+tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
+               const struct tbl_opts *opts, const struct tbl_dat *dp)
+{
+       int              i;
+       size_t           sz, psz, ssz, d;
+       const char      *str;
+       char            *cp;
+       char             buf[2];
+
+       /*
+        * First calculate number width and decimal place (last + 1 for
+        * non-decimal numbers).  If the stored decimal is subsequent to
+        * ours, make our size longer by that difference
+        * (right-"shifting"); similarly, if ours is subsequent the
+        * stored, then extend the stored size by the difference.
+        * Finally, re-assign the stored values.
+        */
+
+       str = dp->string ? dp->string : "";
+       sz = (*tbl->slen)(str, tbl->arg);
+
+       /* FIXME: TBL_DATA_HORIZ et al.? */
+
+       buf[0] = opts->decimal;
+       buf[1] = '\0';
+
+       psz = (*tbl->slen)(buf, tbl->arg);
+
+       if (NULL != (cp = strrchr(str, opts->decimal))) {
+               buf[1] = '\0';
+               for (ssz = 0, i = 0; cp != &str[i]; i++) {
+                       buf[0] = str[i];
+                       ssz += (*tbl->slen)(buf, tbl->arg);

                }
                }

-
-               *d = DECO_SIZE;
-               return((int)(wp - sp));
-
-       case ('['):
-               *word = ++wp;
-
-               for (j = 0; *wp && ']' != *wp; wp++, j++)
-                       /* Loop... */ ;
-
-               if ('\0' == *wp)
-                       return(j + 1);
-
-               *d = DECO_SPECIAL;
-               *sz = (size_t)j;
-               return(j + 2);
-
-       case ('c'):
-               *d = DECO_NOSPACE;
-               *sz = 1;
-               return(1);
-
-       default:
-               break;
-       }
-
-       *d = DECO_SPECIAL;
-       *word = wp;
-       *sz = 1;
-       return(1);
+               d = ssz + psz;
+       } else
+               d = sz + psz;
+
+       /* Adjust the settings for this column. */
+
+       if (col->decimal > d) {
+               sz += col->decimal - d;
+               d = col->decimal;
+       } else
+               col->width += d - col->decimal;
+
+       if (sz > col->width)
+               col->width = sz;
+       if (d > col->decimal)
+               col->decimal = d;

 }
 }