For .Do/.Dq, use the documented and portable \(lq and \(rq

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index 228f3afce5f6ce6a177bdc20cbf812c36913d573..7a2bcc96881893e8ee041829f5c4773a64a40e29 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.171 2017/05/01 23:27:39 schwarze Exp $ */
+/*     $Id: man.c,v 1.176 2017/06/28 12:52:45 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -76,6 +76,8 @@ static int
 man_ptext(struct roff_man *man, int line, char *buf, int offs)
 {
        int              i;
+       const char      *cp, *sp;
+       char            *ep;
 
        /* Literal free-form text whitespace is preserved. */
 
@@ -89,17 +91,36 @@ man_ptext(struct roff_man *man, int line, char *buf, int offs)
                /* Skip leading whitespace. */ ;
 
        /*
-        * Blank lines are ignored right after headings
+        * Blank lines are ignored in next line scope
+        * and right after headings and cancel preceding \c,
         * but add a single vertical space elsewhere.
         */
 
        if (buf[i] == '\0') {
-               /* Allocate a blank entry. */
-               if (man->last->tok != MAN_SH &&
-                   man->last->tok != MAN_SS) {
-                       roff_elem_alloc(man, line, offs, MAN_sp);
-                       man->next = ROFF_NEXT_SIBLING;
+               if (man->flags & (MAN_ELINE | MAN_BLINE)) {
+                       mandoc_msg(MANDOCERR_BLK_BLANK, man->parse,
+                           line, 0, NULL);
+                       return 1;
                }
+               if (man->last->tok == MAN_SH || man->last->tok == MAN_SS)
+                       return 1;
+               switch (man->last->type) {
+               case ROFFT_TEXT:
+                       sp = man->last->string;
+                       cp = ep = strchr(sp, '\0') - 2;
+                       if (cp < sp || cp[0] != '\\' || cp[1] != 'c')
+                               break;
+                       while (cp > sp && cp[-1] == '\\')
+                               cp--;
+                       if ((ep - cp) % 2)
+                               break;
+                       *ep = '\0';
+                       return 1;
+               default:
+                       break;
+               }
+               roff_elem_alloc(man, line, offs, ROFF_sp);
+               man->next = ROFF_NEXT_SIBLING;
                return 1;
        }
 
@@ -258,17 +279,18 @@ man_breakscope(struct roff_man *man, int tok)
         * Delete the element that is being broken.
         */
 
-       if (man->flags & MAN_ELINE && (tok == TOKEN_NONE ||
+       if (man->flags & MAN_ELINE && (tok < MAN_TH ||
            ! (man_macros[tok].flags & MAN_NSCOPED))) {
                n = man->last;
-               assert(n->type != ROFFT_TEXT);
-               if (man_macros[n->tok].flags & MAN_NSCOPED)
+               if (n->type == ROFFT_TEXT)
+                       n = n->parent;
+               if (n->tok < MAN_TH ||
+                   man_macros[n->tok].flags & MAN_NSCOPED)
                        n = n->parent;
 
                mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
                    n->line, n->pos, "%s breaks %s",
-                   tok == TOKEN_NONE ? "TS" : roff_name[tok],
-                   roff_name[n->tok]);
+                   roff_name[tok], roff_name[n->tok]);
 
                roff_node_delete(man, n);
                man->flags &= ~MAN_ELINE;
@@ -294,12 +316,13 @@ man_breakscope(struct roff_man *man, int tok)
         * Delete the block that is being broken.
         */
 
-       if (man->flags & MAN_BLINE && (tok == TOKEN_NONE ||
+       if (man->flags & MAN_BLINE && (tok < MAN_TH ||
            man_macros[tok].flags & MAN_BSCOPE)) {
                n = man->last;
                if (n->type == ROFFT_TEXT)
                        n = n->parent;
-               if ( ! (man_macros[n->tok].flags & MAN_BSCOPE))
+               if (n->tok < MAN_TH ||
+                   (man_macros[n->tok].flags & MAN_BSCOPE) == 0)
                        n = n->parent;
 
                assert(n->type == ROFFT_HEAD);
@@ -309,8 +332,7 @@ man_breakscope(struct roff_man *man, int tok)
 
                mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
                    n->line, n->pos, "%s breaks %s",
-                   tok == TOKEN_NONE ? "TS" : roff_name[tok],
-                   roff_name[n->tok]);
+                   roff_name[tok], roff_name[n->tok]);
 
                roff_node_delete(man, n);
                man->flags &= ~MAN_BLINE;