Revert IGNPAR to a warning after clue-stick applied by schwarze@:

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index 4166bf96045a6d49a020b5b2d9f1e9afa4ef9512..2a683fae8ed4e7640ee4a5e898800677aebf1f7e 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,6 +1,6 @@
-/*     $Id: out.c,v 1.1 2009/09/21 00:39:02 kristaps Exp $ */
+/*     $Id: out.c,v 1.29 2010/08/29 11:28:09 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>

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


@@ -14,100 +14,347 @@
  * 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"
+#endif
+

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

+#include <stdio.h>

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

+#include <time.h>

 
 

-#include "mdoc.h"
-#include "man.h"

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

+/* 
+ * Convert a `scaling unit' to a consistent form, or fail.  Scaling
+ * units are documented in groff.7, mdoc.7, man.7.
+ */

 int
 int

-out_a2list(const struct mdoc_node *n)
+a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)

 {
 {

+       char             buf[BUFSIZ], hasd;

        int              i;
        int              i;

+       enum roffscale   unit;

 
 

-       assert(MDOC_BLOCK == n->type && MDOC_Bl == n->tok);
-       assert(n->args);
+       if ('\0' == *src)
+               return(0);

 
 

-       for (i = 0; i < (int)n->args->argc; i++) 
-               switch (n->args->argv[i].arg) {
-               case (MDOC_Enum):
-                       /* FALLTHROUGH */
-               case (MDOC_Dash):
-                       /* FALLTHROUGH */
-               case (MDOC_Hyphen):
-                       /* FALLTHROUGH */
-               case (MDOC_Bullet):
-                       /* FALLTHROUGH */
-               case (MDOC_Tag):
-                       /* FALLTHROUGH */
-               case (MDOC_Hang):
-                       /* FALLTHROUGH */
-               case (MDOC_Inset):
-                       /* FALLTHROUGH */
-               case (MDOC_Diag):
-                       /* FALLTHROUGH */
-               case (MDOC_Item):
-                       /* FALLTHROUGH */
-               case (MDOC_Column):
-                       /* FALLTHROUGH */
-               case (MDOC_Ohang):
-                       return(n->args->argv[i].arg);
-               default:
-                       break;
+       i = hasd = 0;
+
+       switch (*src) {
+       case ('+'):
+               src++;
+               break;
+       case ('-'):
+               buf[i++] = *src++;
+               break;
+       default:
+               break;
+       }
+
+       if ('\0' == *src)
+               return(0);
+
+       while (i < BUFSIZ) {
+               if ( ! isdigit((u_char)*src)) {
+                       if ('.' != *src)
+                               break;
+                       else if (hasd)
+                               break;
+                       else
+                               hasd = 1;

                }
                }

+               buf[i++] = *src++;
+       }

 
 

-       abort();
-       /* NOTREACHED */
+       if (BUFSIZ == i || (*src && *(src + 1)))
+               return(0);
+
+       buf[i] = '\0';
+
+       switch (*src) {
+       case ('c'):
+               unit = SCALE_CM;
+               break;
+       case ('i'):
+               unit = SCALE_IN;
+               break;
+       case ('P'):
+               unit = SCALE_PC;
+               break;
+       case ('p'):
+               unit = SCALE_PT;
+               break;
+       case ('f'):
+               unit = SCALE_FS;
+               break;
+       case ('v'):
+               unit = SCALE_VS;
+               break;
+       case ('m'):
+               unit = SCALE_EM;
+               break;
+       case ('\0'):
+               if (SCALE_MAX == def)
+                       return(0);
+               unit = SCALE_BU;
+               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 ((dst->scale = atof(buf)) < 0)
+               dst->scale = 0;
+       dst->unit = unit;
+       return(1);

 }
 
 
 }
 
 

-int
-out_a2width(const char *p)
+/*
+ * 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.
+ */
+void
+time2a(time_t t, char *dst, size_t sz)

 {
 {

-       int              i, len;
+       struct tm        tm;
+       char             buf[5];
+       char            *p;
+       size_t           nsz;

 
 

-       if (0 == (len = (int)strlen(p)))
-               return(0);
-       for (i = 0; i < len - 1; i++) 
-               if ( ! isdigit((u_char)p[i]))
-                       break;
+       assert(sz > 1);
+       localtime_r(&t, &tm);

 
 

-       if (i == len - 1) 
-               if ('n' == p[len - 1] || 'm' == p[len - 1])
-                       return(atoi(p) + 2);
+       p = dst;
+       nsz = 0;

 
 

-       return(len + 2);
+       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);

 }
 
 
 int
 }
 
 
 int

-out_a2offs(const char *p, int indent)
+a2roffdeco(enum roffdeco *d, const char **word, size_t *sz)

 {
 {

-       int              len, i;
+       int              i, j, lim;
+       char             term, c;
+       const char      *wp;
+       enum roffdeco    dd;

 
 

-       if (0 == strcmp(p, "left"))
-               return(0);
-       if (0 == strcmp(p, "indent"))
-               return(indent + 1);
-       if (0 == strcmp(p, "indent-two"))
-               return((indent + 1) * 2);
+       *d = DECO_NONE;
+       lim = i = 0;
+       term = '\0';
+       wp = *word;

 
 

-       if (0 == (len = (int)strlen(p)))
-               return(0);
+       switch ((c = wp[i++])) {
+       case ('('):
+               *d = DECO_SPECIAL;
+               lim = 2;
+               break;
+       case ('F'):
+               /* FALLTHROUGH */
+       case ('f'):
+               *d = 'F' == c ? DECO_FFONT : DECO_FONT;

 
 

-       for (i = 0; i < len - 1; i++) 
-               if ( ! isdigit((u_char)p[i]))
+               switch (wp[i++]) {
+               case ('('):
+                       lim = 2;

                        break;
                        break;

+               case ('['):
+                       term = ']';
+                       break;
+               case ('3'):
+                       /* FALLTHROUGH */
+               case ('B'):
+                       *d = DECO_BOLD;
+                       return(i);
+               case ('2'):
+                       /* FALLTHROUGH */
+               case ('I'):
+                       *d = DECO_ITALIC;
+                       return(i);
+               case ('P'):
+                       *d = DECO_PREVIOUS;
+                       return(i);
+               case ('1'):
+                       /* FALLTHROUGH */
+               case ('R'):
+                       *d = DECO_ROMAN;
+                       return(i);
+               default:
+                       i--;
+                       lim = 1;
+                       break;
+               }
+               break;
+       case ('k'):
+               /* FALLTHROUGH */
+       case ('M'):
+               /* FALLTHROUGH */
+       case ('m'):
+               /* FALLTHROUGH */
+       case ('*'):
+               if ('*' == c)
+                       *d = DECO_RESERVED;

 
 

-       if (i == len - 1) 
-               if ('n' == p[len - 1] || 'm' == p[len - 1])
-                       return(atoi(p));
+               switch (wp[i++]) {
+               case ('('):
+                       lim = 2;
+                       break;
+               case ('['):
+                       term = ']';
+                       break;
+               default:
+                       i--;
+                       lim = 1;
+                       break;
+               }
+               break;
+       case ('h'):
+               /* FALLTHROUGH */
+       case ('v'):
+               /* FALLTHROUGH */
+       case ('s'):
+               j = 0;
+               if ('+' == wp[i] || '-' == wp[i]) {
+                       i++;
+                       j = 1;
+               }

 
 

-       return(len);
-}
+               switch (wp[i++]) {
+               case ('('):
+                       lim = 2;
+                       break;
+               case ('['):
+                       term = ']';
+                       break;
+               case ('\''):
+                       term = '\'';
+                       break;
+               case ('0'):
+                       j = 1;
+                       /* FALLTHROUGH */
+               default:
+                       i--;
+                       lim = 1;
+                       break;
+               }
+
+               if ('+' == wp[i] || '-' == wp[i]) {
+                       if (j)
+                               return(i);
+                       i++;
+               } 
+
+               /* Handle embedded numerical subexp or escape. */
+
+               if ('(' == wp[i]) {
+                       while (wp[i] && ')' != wp[i])
+                               if ('\\' == wp[i++]) {
+                                       /* Handle embedded escape. */
+                                       *word = &wp[i];
+                                       i += a2roffdeco(&dd, word, sz);
+                               }
+
+                       if (')' == wp[i++])
+                               break;
+
+                       *d = DECO_NONE;
+                       return(i - 1);
+               } else if ('\\' == wp[i]) {
+                       *word = &wp[++i];
+                       i += a2roffdeco(&dd, word, sz);
+               }
+
+               break;
+       case ('['):
+               *d = DECO_SPECIAL;
+               term = ']';
+               break;
+       case ('c'):
+               *d = DECO_NOSPACE;
+               return(i);
+       case ('z'):
+               *d = DECO_NONE;
+               if ('\\' == wp[i]) {
+                       *word = &wp[++i];
+                       return(i + a2roffdeco(&dd, word, sz));
+               } else
+                       lim = 1;
+               break;
+       case ('o'):
+               /* FALLTHROUGH */
+       case ('w'):
+               if ('\'' == wp[i++]) {
+                       term = '\'';
+                       break;
+               } 
+               /* FALLTHROUGH */
+       default:
+               *d = DECO_SSPECIAL;
+               i--;
+               lim = 1;
+               break;
+       }
+
+       assert(term || lim);
+       *word = &wp[i];
+
+       if (term) {
+               j = i;
+               while (wp[i] && wp[i] != term)
+                       i++;
+               if ('\0' == wp[i]) {
+                       *d = DECO_NONE;
+                       return(i);
+               }
+
+               assert(i >= j);
+               *sz = (size_t)(i - j);

 
 

+               return(i + 1);
+       }
+
+       assert(lim > 0);
+       *sz = (size_t)lim;
+
+       for (j = 0; wp[i] && j < lim; j++)
+               i++;
+       if (j < lim)
+               *d = DECO_NONE;
+
+       return(i);
+}