diff options
-rw-r--r-- | mdoc_action.c | 4 | ||||
-rw-r--r-- | mdoc_term.c | 12 | ||||
-rw-r--r-- | term.c | 5 |
3 files changed, 14 insertions, 7 deletions
diff --git a/mdoc_action.c b/mdoc_action.c index 8ee06aeb..55df294f 100644 --- a/mdoc_action.c +++ b/mdoc_action.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_action.c,v 1.18 2009/06/22 12:04:05 kristaps Exp $ */ +/* $Id: mdoc_action.c,v 1.19 2009/06/22 12:38:07 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -89,7 +89,7 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL, NULL }, /* Ad */ { NULL, NULL }, /* An */ { NULL, post_ar }, /* Ar */ - { NULL, NULL }, /* Cd */ + { NULL, NULL }, /* Cd */ /* FIXME: tabs are accepted! */ { NULL, NULL }, /* Cm */ { NULL, NULL }, /* Dv */ { NULL, NULL }, /* Er */ diff --git a/mdoc_term.c b/mdoc_term.c index 92e2ca87..0cacdd29 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.16 2009/06/22 12:04:05 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.17 2009/06/22 12:38:07 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -776,12 +776,14 @@ termp_it_pre(DECL_ARGS) /* FALLTHROUGH */ case (MDOC_Dash): /* FALLTHROUGH */ - case (MDOC_Enum): - /* FALLTHROUGH */ case (MDOC_Hyphen): if (width < 4) width = 4; break; + case (MDOC_Enum): + if (width < 5) + width = 5; + break; case (MDOC_Tag): if (0 == width) width = 10; @@ -791,11 +793,13 @@ termp_it_pre(DECL_ARGS) } /* - * Whitespace control. Inset bodies need an initial space. + * Whitespace control. Inset bodies need an initial space, + * while diagonal bodies need two. */ switch (type) { case (MDOC_Diag): + term_word(p, "\\ "); /* FALLTHROUGH */ case (MDOC_Inset): if (MDOC_BODY == node->type) @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.81 2009/06/22 12:04:05 kristaps Exp $ */ +/* $Id: term.c,v 1.82 2009/06/22 12:38:07 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -200,6 +200,9 @@ term_isopendelim(const char *p, int len) * Otherwise, the line will break at the right margin. Extremely long * lines will cause the system to emit a warning (TODO: hyphenate, if * possible). + * + * FIXME: newline breaks occur (in groff) also occur when a single + * space follows a NOBREAK! */ void term_flushln(struct termp *p) |