diff options
| -rw-r--r-- | TODO | 5 | ||||
| -rw-r--r-- | mdoc_html.c | 10 | ||||
| -rw-r--r-- | mdoc_term.c | 10 |
3 files changed, 16 insertions, 9 deletions
@@ -1,6 +1,6 @@ ************************************************************************ * Official mandoc TODO. -* $Id: TODO,v 1.85 2011/01/25 15:17:18 kristaps Exp $ +* $Id: TODO,v 1.86 2011/01/25 16:20:24 kristaps Exp $ ************************************************************************ ************************************************************************ @@ -225,9 +225,6 @@ should be "NetBSD 1.0A", not "NetBSD 1.0a", see OpenBSD ccdconfig(8). -- The space character joining .Dx .Fx .Nx .Ox (are these all?) to its - argument is non-breaking. See the cdio(1) HISTORY and many others. - - In .Bl -tag, if a tag exceeds the right margin and must be continued on the next line, it must be indented by -width, not width+1; see "rule block|pass" in OpenBSD ifconfig(8). diff --git a/mdoc_html.c b/mdoc_html.c index 0641d32e..8b1478de 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.147 2011/01/25 15:46:05 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.148 2011/01/25 16:20:24 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -823,8 +823,14 @@ mdoc_xx_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "unix"); print_otag(h, TAG_SPAN, 1, &tag); + print_text(h, pp); - return(1); + if (n->child) { + h->flags |= HTML_KEEP; + print_text(h, n->child->string); + h->flags &= ~HTML_KEEP; + } + return(0); } diff --git a/mdoc_term.c b/mdoc_term.c index e1b43e46..6aa3e8b5 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.213 2011/01/25 15:46:05 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.214 2011/01/25 16:20:24 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> @@ -1728,9 +1728,13 @@ termp_xx_pre(DECL_ARGS) break; } - assert(pp); term_word(p, pp); - return(1); + if (n->child) { + p->flags |= TERMP_KEEP; + term_word(p, n->child->string); + p->flags &= ~TERMP_KEEP; + } + return(0); } |