needs mandoc_aux, too

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index 24ffc6389f3bc8313d6c34e3481c3279bf683afc..113c72dac8fb559fe9a106fb52eb83a08812e17d 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,6 +1,8 @@
-/*     $Id: man.c,v 1.119 2012/11/17 00:26:33 schwarze Exp $ */
+/*     $Id: man.c,v 1.125 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -28,6 +30,7 @@
 
 #include "man.h"
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libman.h"
 #include "libmandoc.h"
 
@@ -40,7 +43,8 @@ const char *const __man_macronames[MAN_MAX] = {
        "RI",           "na",           "sp",           "nf",
        "fi",           "RE",           "RS",           "DT",
        "UC",           "PD",           "AT",           "in",
-       "ft",           "OP",           "EX",           "EE"
+       "ft",           "OP",           "EX",           "EE",
+       "UR",           "UE"
        };
 
 const  char * const *man_macronames = __man_macronames;
@@ -96,7 +100,7 @@ man_free(struct man *man)
 
 
 struct man *
-man_alloc(struct roff *roff, struct mparse *parse)
+man_alloc(struct roff *roff, struct mparse *parse, int quick)
 {
        struct man      *p;
 
@@ -104,6 +108,7 @@ man_alloc(struct roff *roff, struct mparse *parse)
 
        man_hash_init();
        p->parse = parse;
+       p->quick = quick;
        p->roff = roff;
 
        man_alloc1(p);
@@ -428,16 +433,22 @@ man_ptext(struct man *man, int line, char *buf, int offs)
                return(man_descope(man, line, offs));
        }
 
-       /* Pump blank lines directly into the backend. */
-
        for (i = offs; ' ' == buf[i]; i++)
                /* Skip leading whitespace. */ ;
 
+       /*
+        * Blank lines are ignored right after headings
+        * but add a single vertical space elsewhere.
+        */
+
        if ('\0' == buf[i]) {
                /* Allocate a blank entry. */
-               if ( ! man_elem_alloc(man, line, offs, MAN_sp))
-                       return(0);
-               man->next = MAN_NEXT_SIBLING;
+               if (MAN_SH != man->last->tok &&
+                   MAN_SS != man->last->tok) {
+                       if ( ! man_elem_alloc(man, line, offs, MAN_sp))
+                               return(0);
+                       man->next = MAN_NEXT_SIBLING;
+               }
                return(1);
        }
 
@@ -472,7 +483,7 @@ man_ptext(struct man *man, int line, char *buf, int offs)
         */
 
        assert(i);
-       if (mandoc_eos(buf, (size_t)i, 0))
+       if (mandoc_eos(buf, (size_t)i))
                man->last->flags |= MAN_EOS;
 
        return(man_descope(man, line, offs));
@@ -597,6 +608,12 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
        if ( ! (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf))
                goto err;
 
+       /* In quick mode (for mandocdb), abort after the NAME section. */
+
+       if (man->quick && MAN_SH == tok &&
+           strcmp(man->last->prev->child->string, "NAME"))
+               return(2);
+
        /* 
         * We weren't in a block-line scope when entering the
         * above-parsed macro, so return.