Added mail archive periodically generated by hypermail.

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index 41467209fa8cd06d33bf9a700f3fc8a982600166..20d4a9151312dc136a2d146b1dea791785a6c947 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,6 +1,6 @@
-/*     $Id: out.c,v 1.4 2009/10/09 06:54:11 kristaps Exp $ */
+/*     $Id: out.c,v 1.24 2010/08/16 09:37:58 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,42 +14,35 @@
  * 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 <sys/types.h>
 

+#include <assert.h>

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

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

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

-

 /* 
  * Convert a `scaling unit' to a consistent form, or fail.  Scaling
 /* 
  * Convert a `scaling unit' to a consistent form, or fail.  Scaling

- * units are documented in groff.7, which stipulates the following:
- *
- *  (1) A scaling unit is a signed/unsigned integer/float with or
- *      without a unit.
- *
- *  (2) The following units exist:
- *     c       Centimeter
- *     i       Inch
- *     P       Pica = 1/6 inch
- *     p       Point = 1/72 inch
- *     m       Em = the font size in points (width of letter m)
- *     M       100th of an Em 
- *     n       En = Em/2 
- *     u       Basic unit for actual output device
- *     v       Vertical line space in basic units scaled point =
- *             1/sizescale of a point (defined in font DESC file)
- *     f       Scale by 65536.
+ * units are documented in groff.7, mdoc.7, man.7.

  */
 int
  */
 int

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

 {
        char             buf[BUFSIZ], hasd;
        int              i;
        enum roffscale   unit;
 
 {
        char             buf[BUFSIZ], hasd;
        int              i;
        enum roffscale   unit;
 

+       if ('\0' == *src)
+               return(0);
+

        i = hasd = 0;
 
        switch (*src) {
        i = hasd = 0;
 
        switch (*src) {


@@ -63,6 +56,9 @@ a2roffsu(const char *src, struct roffsu *dst)
                break;
        }
 
                break;
        }
 

+       if ('\0' == *src)
+               return(0);
+

        while (i < BUFSIZ) {
                if ( ! isdigit((u_char)*src)) {
                        if ('.' != *src)
        while (i < BUFSIZ) {
                if ( ! isdigit((u_char)*src)) {
                        if ('.' != *src)


@@ -103,7 +99,10 @@ a2roffsu(const char *src, struct roffsu *dst)
                unit = SCALE_EM;
                break;
        case ('\0'):
                unit = SCALE_EM;
                break;
        case ('\0'):

-               /* FALLTHROUGH */
+               if (SCALE_MAX == def)
+                       return(0);
+               unit = SCALE_BU;
+               break;

        case ('u'):
                unit = SCALE_BU;
                break;
        case ('u'):
                unit = SCALE_BU;
                break;


@@ -117,10 +116,206 @@ a2roffsu(const char *src, struct roffsu *dst)
                return(0);
        }
 
                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.
+ */
+void
+time2a(time_t t, char *dst, size_t sz)
+{
+       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);
+}
+
+
+int
+a2roffdeco(enum roffdeco *d, const char **word, size_t *sz)
+{
+       int              i, j, lim;
+       char             term, c;
+       const char      *wp;
+
+       *d = DECO_NONE;
+       lim = i = 0;
+       term = '\0';
+       wp = *word;
+
+       switch ((c = wp[i++])) {
+       case ('('):
+               *d = DECO_SPECIAL;
+               lim = 2;
+               break;
+       case ('F'):
+               /* FALLTHROUGH */
+       case ('f'):
+               *d = 'F' == c ? DECO_FFONT : DECO_FONT;
+
+               switch (wp[i++]) {
+               case ('('):
+                       lim = 2;
+                       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 ('M'):
+               /* FALLTHROUGH */
+       case ('m'):
+               /* FALLTHROUGH */
+       case ('*'):
+               if ('*' == c)
+                       *d = DECO_RESERVED;
+
+               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;
+               }
+
+               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++;
+               } 
+               
+               break;
+       case ('['):
+               *d = DECO_SPECIAL;
+               term = ']';
+               break;
+       case ('c'):
+               *d = DECO_NOSPACE;
+               return(i);
+       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);
+}