Allow roff_parseln() to be re-run.

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index 1bfbbe1639570927b803dc97385b973d63be7986..975a82f8554952ffd3d1a3f01752698751ca7217 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.69 2010/05/15 20:51:40 kristaps Exp $ */
+/*     $Id: man.c,v 1.72 2010/05/16 10:59:36 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -49,8 +49,6 @@ const char *const __man_merrnames[WERRMAX] = {
        "no scope context", /* WNOSCOPE */
        "literal context already open", /* WOLITERAL */
        "no literal context open", /* WNLITERAL */
-       "invalid nesting of roff declarations", /* WROFFNEST */
-       "scope in roff instructions broken", /* WROFFSCOPE */
        "document title should be uppercase", /* WTITLECASE */
        "deprecated comment style", /* WBADCOMMENT */
 };
@@ -64,8 +62,7 @@ const char *const __man_macronames[MAN_MAX] = {
        "RI",           "na",           "i",            "sp",
        "nf",           "fi",           "r",            "RE",
        "RS",           "DT",           "UC",           "PD",
-       "Sp",           "Vb",           "Ve",           "de",
-       "dei",          "am",           "ami",          ".",
+       "Sp",           "Vb",           "Ve",
        };
 
 const  char * const *man_macronames = __man_macronames;
@@ -77,11 +74,11 @@ static      int              man_node_append(struct man *,
 static void             man_node_free(struct man_node *);
 static void             man_node_unlink(struct man *, 
                                struct man_node *);
-static int              man_ptext(struct man *, int, char *);
-static int              man_pmacro(struct man *, int, char *);
+static int              man_ptext(struct man *, int, char *, int);
+static int              man_pmacro(struct man *, int, char *, int);
 static void             man_free1(struct man *);
 static void             man_alloc1(struct man *);
-static int              macrowarn(struct man *, int, const char *);
+static int              macrowarn(struct man *, int, const char *, int);
 
 
 const struct man_node *
@@ -151,12 +148,15 @@ man_endparse(struct man *m)
 
 
 int
-man_parseln(struct man *m, int ln, char *buf)
+man_parseln(struct man *m, int ln, char *buf, int offs)
 {
 
-       return('.' == *buf || '\'' == *buf ? 
-                       man_pmacro(m, ln, buf) : 
-                       man_ptext(m, ln, buf));
+       if (MAN_HALT & m->flags)
+               return(0);
+
+       return(('.' == buf[offs] || '\'' == buf[offs]) ? 
+                       man_pmacro(m, ln, buf, offs) : 
+                       man_ptext(m, ln, buf, offs));
 }
 
 
@@ -366,31 +366,33 @@ man_node_delete(struct man *m, struct man_node *p)
 
 
 static int
-man_ptext(struct man *m, int line, char *buf)
+man_ptext(struct man *m, int line, char *buf, int offs)
 {
        int              i;
 
        /* Ignore bogus comments. */
 
-       if ('\\' == buf[0] && '.' == buf[1] && '\"' == buf[2])
-               return(man_pwarn(m, line, 0, WBADCOMMENT));
+       if ('\\' == buf[offs] && 
+                       '.' == buf[offs + 1] && 
+                       '"' == buf[offs + 2])
+               return(man_pwarn(m, line, offs, WBADCOMMENT));
 
        /* Literal free-form text whitespace is preserved. */
 
        if (MAN_LITERAL & m->flags) {
-               if ( ! man_word_alloc(m, line, 0, buf))
+               if ( ! man_word_alloc(m, line, offs, buf + offs))
                        return(0);
                goto descope;
        }
 
        /* Pump blank lines directly into the backend. */
 
-       for (i = 0; ' ' == buf[i]; i++)
+       for (i = offs; ' ' == buf[i]; i++)
                /* Skip leading whitespace. */ ;
 
        if ('\0' == buf[i]) {
                /* Allocate a blank entry. */
-               if ( ! man_word_alloc(m, line, 0, ""))
+               if ( ! man_word_alloc(m, line, offs, ""))
                        return(0);
                goto descope;
        }
@@ -417,7 +419,7 @@ man_ptext(struct man *m, int line, char *buf)
                buf[i] = '\0';
        }
 
-       if ( ! man_word_alloc(m, line, 0, buf))
+       if ( ! man_word_alloc(m, line, offs, buf + offs))
                return(0);
 
        /*
@@ -426,10 +428,7 @@ man_ptext(struct man *m, int line, char *buf)
         * sentence.  The front-end will know how to interpret this.
         */
 
-       /* FIXME: chain of close delims. */
-
        assert(i);
-
        if (mandoc_eos(buf, (size_t)i))
                m->last->flags |= MAN_EOS;
 
@@ -452,23 +451,23 @@ descope:
 
        if ( ! man_unscope(m, m->last->parent, WERRMAX))
                return(0);
-       return(man_body_alloc(m, line, 0, m->last->tok));
+       return(man_body_alloc(m, line, offs, m->last->tok));
 }
 
 
 static int
-macrowarn(struct man *m, int ln, const char *buf)
+macrowarn(struct man *m, int ln, const char *buf, int offs)
 {
        if ( ! (MAN_IGN_MACRO & m->pflags))
-               return(man_verr(m, ln, 0, "unknown macro: %s%s", 
+               return(man_verr(m, ln, offs, "unknown macro: %s%s", 
                                buf, strlen(buf) > 3 ? "..." : ""));
-       return(man_vwarn(m, ln, 0, "unknown macro: %s%s",
+       return(man_vwarn(m, ln, offs, "unknown macro: %s%s",
                                buf, strlen(buf) > 3 ? "..." : ""));
 }
 
 
 int
-man_pmacro(struct man *m, int ln, char *buf)
+man_pmacro(struct man *m, int ln, char *buf, int offs)
 {
        int              i, j, ppos;
        enum mant        tok;
@@ -477,10 +476,12 @@ man_pmacro(struct man *m, int ln, char *buf)
 
        /* Comments and empties are quickly ignored. */
 
-       if ('\0' == buf[1])
+       offs++;
+
+       if ('\0' == buf[offs])
                return(1);
 
-       i = 1;
+       i = offs;
 
        /*
         * Skip whitespace between the control character and initial
@@ -525,7 +526,7 @@ man_pmacro(struct man *m, int ln, char *buf)
        }
        
        if (MAN_MAX == (tok = man_hash_find(mac))) {
-               if ( ! macrowarn(m, ln, mac))
+               if ( ! macrowarn(m, ln, mac, ppos))
                        goto err;
                return(1);
        }
@@ -548,9 +549,6 @@ man_pmacro(struct man *m, int ln, char *buf)
         * Remove prior ELINE macro, as it's being clobbering by a new
         * macro.  Note that NSCOPED macros do not close out ELINE
         * macros---they don't print text---so we let those slip by.
-        * NOTE: we don't allow roff blocks (NOCLOSE) to be embedded
-        * here because that would stipulate blocks as children of
-        * elements!
         */
 
        if ( ! (MAN_NSCOPED & man_macros[tok].flags) &&
@@ -634,7 +632,7 @@ out:
 
        if ( ! man_unscope(m, m->last->parent, WERRMAX))
                return(0);
-       return(man_body_alloc(m, ln, 0, m->last->tok));
+       return(man_body_alloc(m, ln, offs, m->last->tok));
 
 err:   /* Error out. */