Added mail archive periodically generated by hypermail.

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index e217327c7715941e41f81527b60fae1005e2cdcd..20d4a9151312dc136a2d146b1dea791785a6c947 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,6 +1,6 @@
-/*     $Id: out.c,v 1.9 2009/11/07 14:14:15 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,6 +14,10 @@
  * 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 <sys/types.h>
 
 #include <assert.h>


@@ -25,10 +29,6 @@
 
 #include "out.h"
 
 
 #include "out.h"
 

-#ifdef __linux__
-extern size_t    strlcat(char *, const char *, size_t);
-#endif
-

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


@@ -116,11 +116,10 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
                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);
 }
 


@@ -167,193 +166,156 @@ time2a(time_t t, char *dst, size_t sz)
 }
 
 
 }
 
 

-/* Returns length of parsed string. */

 int
 int

-a2roffdeco(enum roffdeco *d,
-               const char **word, size_t *sz)
+a2roffdeco(enum roffdeco *d, const char **word, size_t *sz)

 {
 {

-       int              j, type, sv, t, lim;
+       int              i, j, lim;
+       char             term, c;

        const char      *wp;
 
        *d = DECO_NONE;
        const char      *wp;
 
        *d = DECO_NONE;

+       lim = i = 0;
+       term = '\0';

        wp = *word;
        wp = *word;

-       type = 1;
-
-       switch (*wp) {
-       case ('\0'):
-               return(0);

 
 

+       switch ((c = wp[i++])) {

        case ('('):
        case ('('):

-               wp++;
-               if ('\0' == *wp)
-                       return(1);
-               if ('\0' == *(wp + 1))
-                       return(2);
-

                *d = DECO_SPECIAL;
                *d = DECO_SPECIAL;

-               *sz = 2;
-               *word = wp;
-               return(3);
-
-       case ('*'):
-               wp++;
-
-               switch (*wp) {
-               case ('\0'):
-                       return(1);
+               lim = 2;
+               break;
+       case ('F'):
+               /* FALLTHROUGH */
+       case ('f'):
+               *d = 'F' == c ? DECO_FFONT : DECO_FONT;

 
 

+               switch (wp[i++]) {

                case ('('):
                case ('('):

-                       wp++;
-                       if ('\0' == *wp)
-                               return(2);
-                       if ('\0' == *(wp + 1))
-                               return(3);
-
-                       *d = DECO_RESERVED;
-                       *sz = 2;
-                       *word = wp;
-                       return(4);
-
+                       lim = 2;
+                       break;

                case ('['):
                case ('['):

-                       type = 0;
+                       term = ']';

                        break;
                        break;

-
-               default:
-                       *d = DECO_RESERVED;
-                       *sz = 1;
-                       *word = wp;
-                       return(2);
-               }
-               break;
-
-#if 0
-       case ('s'):
-               wp++;
-
-               /* This closely follows mandoc_special(). */
-               if ('\0' == *wp) 
-                       return(1);
-
-               t = 0;
-               lim = 1;
-
-               if (*wp == '\'') {
-                       lim = 0;
-                       t = 1;
-                       ++wp;
-               } else if (*wp == '[') {
-                       lim = 0;
-                       t = 2;
-                       ++wp;
-               } else if (*wp == '(') {
-                       lim = 2;
-                       t = 3;
-                       ++wp;
-               }
-
-               if (*wp == '+' || *wp == '-')
-                       ++wp;
-
-               if (*wp == '\'') {
-                       if (t) {
-                               *word = wp;
-                               return;
-                       }
-                       lim = 0;
-                       t = 1;
-                       ++wp;
-               } else if (*wp == '[') {
-                       if (t) {
-                               *word = wp;
-                               return;
-                       }
-                       lim = 0;
-                       t = 2;
-                       ++wp;
-               } else if (*wp == '(') {
-                       if (t) {
-                               *word = wp;
-                               return;
-                       }
-                       lim = 2;
-                       t = 3;
-                       ++wp;
-               }
-
-               if ( ! isdigit((u_char)*wp)) {
-                       *word = --wp;
-                       return;
-               }
-
-               for (j = 0; isdigit((u_char)*wp); j++) {
-                       if (lim && j >= lim)
-                               break;
-                       ++wp;
-               }
-
-               if (t && t < 3) {
-                       if (1 == t && *wp != '\'') {
-                               *word = --wp;
-                               return;
-                       }
-                       if (2 == t && *wp != ']') {
-                               *word = --wp;
-                               return;
-                       }
-                       ++wp;
-               }
-               *word = --wp;
-               return;
-#endif
-
-       case ('f'):
-               wp++;
-
-               switch (*wp) {
-               case ('\0'):
-                       return(1);

                case ('3'):
                        /* FALLTHROUGH */
                case ('B'):
                        *d = DECO_BOLD;
                case ('3'):
                        /* FALLTHROUGH */
                case ('B'):
                        *d = DECO_BOLD;

-                       break;
+                       return(i);

                case ('2'):
                        /* FALLTHROUGH */
                case ('I'):
                        *d = DECO_ITALIC;
                case ('2'):
                        /* FALLTHROUGH */
                case ('I'):
                        *d = DECO_ITALIC;

-                       break;
+                       return(i);

                case ('P'):
                        *d = DECO_PREVIOUS;
                case ('P'):
                        *d = DECO_PREVIOUS;

-                       break;
+                       return(i);

                case ('1'):
                        /* FALLTHROUGH */
                case ('R'):
                        *d = DECO_ROMAN;
                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:
                        break;
                default:

+                       i--;
+                       lim = 1;

                        break;
                }
                        break;
                }

+               break;
+       case ('h'):
+               /* FALLTHROUGH */
+       case ('v'):
+               /* FALLTHROUGH */
+       case ('s'):
+               j = 0;
+               if ('+' == wp[i] || '-' == wp[i]) {
+                       i++;
+                       j = 1;
+               }

 
 

-               return(2);
+               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 ('['):
        case ('['):

+               *d = DECO_SPECIAL;
+               term = ']';

                break;
                break;

-
+       case ('c'):
+               *d = DECO_NOSPACE;
+               return(i);

        default:
        default:

-               *d = DECO_SPECIAL;
-               *word = wp;
-               *sz = 1;
-               return(1);
+               *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);

        }
 
        }
 

-       *word = ++wp;
-       for (j = 0; *wp && ']' != *wp; wp++, j++)
-               /* Loop... */ ;
+       assert(lim > 0);
+       *sz = (size_t)lim;

 
 

-       if ('\0' == *wp)
-               return(j + 1);
+       for (j = 0; wp[i] && j < lim; j++)
+               i++;
+       if (j < lim)
+               *d = DECO_NONE;

 
 

-       *d = type ? DECO_SPECIAL : DECO_RESERVED;
-       *sz = j;
-       return (j + 2);
+       return(i);

 }
 }