Make it more explicit that the statement "-O tag does not work with less(1)"

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index e36dc833ff9c1b54c961b675a6cd7931f3a72d58..f0e4002b2a2c99cc0039ef780913cdf72af724b0 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,7 +1,7 @@
-/*     $Id: man.c,v 1.180 2018/08/26 16:21:23 schwarze Exp $ */
+/*     $Id: man.c,v 1.187 2019/01/05 00:36:50 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -92,9 +92,9 @@ man_descope(struct roff_man *man, int line, int offs, char *start)
        }
        if ( ! (man->flags & MAN_BLINE))
                return;
-       man->flags &= ~MAN_BLINE;
        man_unscope(man, man->last->parent);
        roff_body_alloc(man, line, offs, man->last->tok);
+       man->flags &= ~(MAN_BLINE | ROFF_NONOFILL);
 }
 
 static int
@@ -103,9 +103,9 @@ man_ptext(struct roff_man *man, int line, char *buf, int offs)
        int              i;
        char            *ep;
 
-       /* Literal free-form text whitespace is preserved. */
+       /* In no-fill mode, whitespace is preserved on text lines. */
 
-       if (man->flags & MAN_LITERAL) {
+       if (man->flags & ROFF_NOFILL) {
                roff_word_alloc(man, line, offs, buf + offs);
                man_descope(man, line, offs, buf + offs);
                return 1;
@@ -122,8 +122,7 @@ man_ptext(struct roff_man *man, int line, char *buf, int offs)
 
        if (buf[i] == '\0') {
                if (man->flags & (MAN_ELINE | MAN_BLINE)) {
-                       mandoc_msg(MANDOCERR_BLK_BLANK, man->parse,
-                           line, 0, NULL);
+                       mandoc_msg(MANDOCERR_BLK_BLANK, line, 0, NULL);
                        return 1;
                }
                if (man->last->tok == MAN_SH || man->last->tok == MAN_SS)
@@ -148,8 +147,7 @@ man_ptext(struct roff_man *man, int line, char *buf, int offs)
 
        if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
                if (i > 1 && '\\' != buf[i - 2])
-                       mandoc_msg(MANDOCERR_SPACE_EOL, man->parse,
-                           line, i - 1, NULL);
+                       mandoc_msg(MANDOCERR_SPACE_EOL, line, i - 1, NULL);
 
                for (--i; i && ' ' == buf[i]; i--)
                        /* Spin back to non-space. */ ;
@@ -194,8 +192,7 @@ man_pmacro(struct roff_man *man, int ln, char *buf, int offs)
        if (sz > 0 && sz < 4)
                tok = roffhash_find(man->manmac, buf + ppos, sz);
        if (tok == TOKEN_NONE) {
-               mandoc_msg(MANDOCERR_MACRO, man->parse,
-                   ln, ppos, buf + ppos - 1);
+               mandoc_msg(MANDOCERR_MACRO, ln, ppos, "%s", buf + ppos - 1);
                return 1;
        }
 
@@ -225,8 +222,7 @@ man_pmacro(struct roff_man *man, int ln, char *buf, int offs)
         */
 
        if (buf[offs] == '\0' && buf[offs - 1] == ' ')
-               mandoc_msg(MANDOCERR_SPACE_EOL, man->parse,
-                   ln, offs - 1, NULL);
+               mandoc_msg(MANDOCERR_SPACE_EOL, ln, offs - 1, NULL);
 
        /*
         * Some macros break next-line scopes; otherwise, remember
@@ -272,9 +268,9 @@ man_pmacro(struct roff_man *man, int ln, char *buf, int offs)
            man_macro(tok)->flags & MAN_NSCOPED)
                return 1;
 
-       man->flags &= ~MAN_BLINE;
        man_unscope(man, man->last->parent);
        roff_body_alloc(man, ln, ppos, man->last->tok);
+       man->flags &= ~(MAN_BLINE | ROFF_NONOFILL);
        return 1;
 }
 
@@ -299,9 +295,8 @@ man_breakscope(struct roff_man *man, int tok)
                     == MAN_NSCOPED)
                        n = n->parent;
 
-               mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
-                   n->line, n->pos, "%s breaks %s",
-                   roff_name[tok], roff_name[n->tok]);
+               mandoc_msg(MANDOCERR_BLK_LINE, n->line, n->pos,
+                   "%s breaks %s", roff_name[tok], roff_name[n->tok]);
 
                roff_node_delete(man, n);
                man->flags &= ~MAN_ELINE;
@@ -313,12 +308,12 @@ man_breakscope(struct roff_man *man, int tok)
         */
 
        if (man->flags & MAN_BLINE &&
-           (tok == MAN_nf || tok == MAN_fi) &&
+           (tok == ROFF_nf || tok == ROFF_fi) &&
            (man->last->tok == MAN_SH || man->last->tok == MAN_SS)) {
                n = man->last;
                man_unscope(man, n);
                roff_body_alloc(man, n->line, n->pos, n->tok);
-               man->flags &= ~MAN_BLINE;
+               man->flags &= ~(MAN_BLINE | ROFF_NONOFILL);
        }
 
        /*
@@ -327,8 +322,8 @@ man_breakscope(struct roff_man *man, int tok)
         * Delete the block that is being broken.
         */
 
-       if (man->flags & MAN_BLINE && (tok < MAN_TH ||
-           man_macro(tok)->flags & MAN_XSCOPE)) {
+       if (man->flags & MAN_BLINE && tok != ROFF_nf && tok != ROFF_fi &&
+           (tok < MAN_TH || man_macro(tok)->flags & MAN_XSCOPE)) {
                n = man->last;
                if (n->type == ROFFT_TEXT)
                        n = n->parent;
@@ -341,46 +336,10 @@ man_breakscope(struct roff_man *man, int tok)
                assert(n->type == ROFFT_BLOCK);
                assert(man_macro(n->tok)->flags & MAN_BSCOPED);
 
-               mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
-                   n->line, n->pos, "%s breaks %s",
-                   roff_name[tok], roff_name[n->tok]);
+               mandoc_msg(MANDOCERR_BLK_LINE, n->line, n->pos,
+                   "%s breaks %s", roff_name[tok], roff_name[n->tok]);
 
                roff_node_delete(man, n);
-               man->flags &= ~MAN_BLINE;
+               man->flags &= ~(MAN_BLINE | ROFF_NONOFILL);
        }
 }
-
-void
-man_state(struct roff_man *man, struct roff_node *n)
-{
-
-       switch(n->tok) {
-       case MAN_nf:
-       case MAN_EX:
-               if (man->flags & MAN_LITERAL && ! (n->flags & NODE_VALID))
-                       mandoc_msg(MANDOCERR_NF_SKIP, man->parse,
-                           n->line, n->pos, "nf");
-               man->flags |= MAN_LITERAL;
-               break;
-       case MAN_fi:
-       case MAN_EE:
-               if ( ! (man->flags & MAN_LITERAL) &&
-                    ! (n->flags & NODE_VALID))
-                       mandoc_msg(MANDOCERR_FI_SKIP, man->parse,
-                           n->line, n->pos, "fi");
-               man->flags &= ~MAN_LITERAL;
-               break;
-       default:
-               break;
-       }
-       man->last->flags |= NODE_VALID;
-}
-
-void
-man_validate(struct roff_man *man)
-{
-
-       man->last = man->first;
-       man_node_validate(man);
-       man->flags &= ~MAN_LITERAL;
-}