MANWIDTH

[mandoc.git] / mdoc_macro.c

diff --git a/mdoc_macro.c b/mdoc_macro.c
index 062021dec0ff081d83dca0b524fe5a50ffc6b818..dd3885c702b737dfc992d04a1eb5467ead161605 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_macro.c,v 1.228 2018/12/21 17:15:19 schwarze Exp $ */
+/*     $Id: mdoc_macro.c,v 1.234 2020/01/19 18:02:00 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012-2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2020 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -61,7 +61,7 @@ static        void            rew_pending(struct roff_man *,
                                const struct roff_node *);
 
 static const struct mdoc_macro mdoc_macros[MDOC_MAX - MDOC_Dd] = {
-       { in_line_eoln, MDOC_PROLOGUE }, /* Dd */
+       { in_line_eoln, MDOC_PROLOGUE | MDOC_JOIN }, /* Dd */
        { in_line_eoln, MDOC_PROLOGUE }, /* Dt */
        { in_line_eoln, MDOC_PROLOGUE }, /* Os */
        { blk_full, MDOC_PARSED | MDOC_JOIN }, /* Sh */
@@ -200,6 +200,7 @@ static const struct mdoc_macro mdoc_macros[MDOC_MAX - MDOC_Dd] = {
        { in_line_eoln, MDOC_JOIN }, /* %Q */
        { in_line_eoln, 0 }, /* %U */
        { phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */
+       { in_line_eoln, 0 }, /* Tg */
 };
 
 
@@ -233,8 +234,7 @@ mdoc_endparse(struct roff_man *mdoc)
 
        /* Rewind to the first. */
 
-       rew_last(mdoc, mdoc->first);
-       mdoc_state_reset(mdoc);
+       rew_last(mdoc, mdoc->meta.first);
 }
 
 /*
@@ -296,6 +296,8 @@ rew_pending(struct roff_man *mdoc, const struct roff_node *n)
                        case ROFFT_HEAD:
                                roff_body_alloc(mdoc, n->line, n->pos,
                                    n->tok);
+                               if (n->tok == MDOC_Ss)
+                                       mdoc->flags &= ~ROFF_NONOFILL;
                                break;
                        case ROFFT_BLOCK:
                                break;
@@ -697,6 +699,19 @@ blk_exp_close(MACRO_PROT_ARGS)
                            "%s %s", roff_name[tok], buf + *pos);
                if (endbody == NULL && n != NULL)
                        rew_pending(mdoc, n);
+
+               /*
+                * Restore the fill mode that was set before the display.
+                * This needs to be done here rather than during validation
+                * such that subsequent nodes get the right flags.
+                */
+
+               if (tok == MDOC_Ed && body != NULL) {
+                       if (body->flags & NODE_NOFILL)
+                               mdoc->flags |= ROFF_NOFILL;
+                       else
+                               mdoc->flags &= ~ROFF_NOFILL;
+               }
                return;
        }
 
@@ -937,14 +952,15 @@ in_line(MACRO_PROT_ARGS)
 static void
 blk_full(MACRO_PROT_ARGS)
 {
-       int               done, la, nl, parsed;
        struct mdoc_arg  *arg;
        struct roff_node *blk; /* Our own or a broken block. */
        struct roff_node *head; /* Our own head. */
        struct roff_node *body; /* Our own body. */
        struct roff_node *n;
-       enum margserr     ac, lac;
        char             *p;
+       size_t            iarg;
+       int               done, la, nl, parsed;
+       enum margserr     ac, lac;
 
        nl = MDOC_NEWLINE & mdoc->flags;
 
@@ -1040,6 +1056,16 @@ blk_full(MACRO_PROT_ARGS)
         * regular child nodes.
         */
 
+       switch (tok) {
+       case MDOC_Sh:
+               mdoc->flags &= ~ROFF_NOFILL;
+               break;
+       case MDOC_Ss:
+               mdoc->flags |= ROFF_NONOFILL;
+               break;
+       default:
+               break;
+       }
        mdoc_argv(mdoc, line, tok, &arg, pos, buf);
        blk = mdoc_block_alloc(mdoc, line, ppos, tok, arg);
        head = body = NULL;
@@ -1181,6 +1207,33 @@ blk_full(MACRO_PROT_ARGS)
 
        rew_last(mdoc, head);
        body = roff_body_alloc(mdoc, line, ppos, tok);
+       if (tok == MDOC_Ss)
+               mdoc->flags &= ~ROFF_NONOFILL;
+
+       /*
+        * Set up fill mode for display blocks.
+        * This needs to be done here up front rather than during
+        * validation such that child nodes get the right flags.
+        */
+
+       if (tok == MDOC_Bd && arg != NULL) {
+               for (iarg = 0; iarg < arg->argc; iarg++) {
+                       switch (arg->argv[iarg].arg) {
+                       case MDOC_Unfilled:
+                       case MDOC_Literal:
+                               mdoc->flags |= ROFF_NOFILL;
+                               break;
+                       case MDOC_Filled:
+                       case MDOC_Ragged:
+                       case MDOC_Centred:
+                               mdoc->flags &= ~ROFF_NOFILL;
+                               break;
+                       default:
+                               continue;
+                       }
+                       break;
+               }
+       }
 out:
        if (mdoc->flags & MDOC_FREECOL) {
                rew_last(mdoc, body);