Let .Aq/.Ao/.Ac print "<>" instead of the normal "\(la\(ra"

when the only child is .Mt, not when the preceding node is .An,
to improve robustness.  Triggered by a question from Svyatoslav
Mishyn <juef at openmailbox dot org> (Crux Linux).

diff --git a/mdoc_html.c b/mdoc_html.c
index 137a763f83e0557d0b2a03d68ab2748fc1501555..f7ce59e8b2e84c9501d101b529259bb09d5a10de 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_html.c,v 1.218 2014/12/23 13:48:57 schwarze Exp $ */
+/*     $Id: mdoc_html.c,v 1.219 2015/01/23 14:21:01 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015 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
@@ -2084,8 +2084,8 @@ mdoc_quote_pre(MDOC_ARGS)
        case MDOC_Ao:
                /* FALLTHROUGH */
        case MDOC_Aq:
-               print_text(h, n->parent->prev != NULL &&
-                   n->parent->prev->tok == MDOC_An ?  "<" : "\\(la");
+               print_text(h, n->nchild == 1 &&
+                   n->child->tok == MDOC_Mt ?  "<" : "\\(la");
                break;
        case MDOC_Bro:
                /* FALLTHROUGH */
@@ -2162,8 +2162,8 @@ mdoc_quote_post(MDOC_ARGS)
        case MDOC_Ao:
                /* FALLTHROUGH */
        case MDOC_Aq:
-               print_text(h, n->parent->prev != NULL &&
-                   n->parent->prev->tok == MDOC_An ?  ">" : "\\(ra");
+               print_text(h, n->nchild == 1 &&
+                   n->child->tok == MDOC_Mt ?  ">" : "\\(ra");
                break;
        case MDOC_Bro:
                /* FALLTHROUGH */

diff --git a/mdoc_man.c b/mdoc_man.c
index ffb141b160543b473eb90e205e5174868e91b7f4..3181b4a3a13843fb349c4cc161d3875b4e1f80c9 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_man.c,v 1.81 2014/12/24 23:32:42 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.82 2015/01/23 14:21:01 schwarze Exp $ */
 /*
- * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2015 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
@@ -879,8 +879,8 @@ static int
 pre_aq(DECL_ARGS)
 {
 
-       print_word(n->parent->prev != NULL &&
-           n->parent->prev->tok == MDOC_An ?  "<" : "\\(la");
+       print_word(n->nchild == 1 &&
+           n->child->tok == MDOC_Mt ?  "<" : "\\(la");
        outflags &= ~MMAN_spc;
        return(1);
 }
@@ -890,8 +890,8 @@ post_aq(DECL_ARGS)
 {
 
        outflags &= ~(MMAN_spc | MMAN_nl);
-       print_word(n->parent->prev != NULL &&
-           n->parent->prev->tok == MDOC_An ?  ">" : "\\(ra");
+       print_word(n->nchild == 1 &&
+           n->child->tok == MDOC_Mt ?  ">" : "\\(ra");
 }
 
 static int

diff --git a/mdoc_term.c b/mdoc_term.c
index 6a392f6479371cce9b946ca7610825c4e1e183f0..a7058f8eb7f71d5fc0c7c23d59b5a0ebda9095ef 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_term.c,v 1.302 2014/12/24 23:32:42 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.303 2015/01/23 14:21:01 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -1855,8 +1855,8 @@ termp_quote_pre(DECL_ARGS)
        case MDOC_Ao:
                /* FALLTHROUGH */
        case MDOC_Aq:
-               term_word(p, n->parent->prev != NULL &&
-                   n->parent->prev->tok == MDOC_An ?  "<" : "\\(la");
+               term_word(p, n->nchild == 1 &&
+                   n->child->tok == MDOC_Mt ? "<" : "\\(la");
                break;
        case MDOC_Bro:
                /* FALLTHROUGH */
@@ -1928,8 +1928,8 @@ termp_quote_post(DECL_ARGS)
        case MDOC_Ao:
                /* FALLTHROUGH */
        case MDOC_Aq:
-               term_word(p, n->parent->prev != NULL &&
-                   n->parent->prev->tok == MDOC_An ?  ">" : "\\(ra");
+               term_word(p, n->nchild == 1 &&
+                   n->child->tok == MDOC_Mt ? ">" : "\\(ra");
                break;
        case MDOC_Bro:
                /* FALLTHROUGH */