summaryrefslogtreecommitdiffstats
path: root/mdoc_man.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2012-07-09 18:56:12 +0000
committerIngo Schwarze <schwarze@openbsd.org>2012-07-09 18:56:12 +0000
commit440b9016f8a464cc4ba637677b3ba8509d802e08 (patch)
tree6baf8157aef963084f0efe6fae127b80ea1682e1 /mdoc_man.c
parent78d36449f35c2eb5b5cb95c6fa9ff3eb84ab6d7f (diff)
downloadmandoc-440b9016f8a464cc4ba637677b3ba8509d802e08.tar.gz
Implement -Tman .Bf.
To get the spacing right, * avoid man(7) code line breaks at places where no spacing is allowed * allow spacing right after .Sm on * allow spacing after empty .Fl at the end of an input line OpenBSD rev. 1.25
Diffstat (limited to 'mdoc_man.c')
-rw-r--r--mdoc_man.c46
1 files changed, 41 insertions, 5 deletions
diff --git a/mdoc_man.c b/mdoc_man.c
index 19ff5192..81c14ec1 100644
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -44,6 +44,7 @@ static int cond_head(DECL_ARGS);
static void font_push(char);
static void font_pop(void);
static void post_bd(DECL_ARGS);
+static void post_bf(DECL_ARGS);
static void post_bk(DECL_ARGS);
static void post_dl(DECL_ARGS);
static void post_enc(DECL_ARGS);
@@ -63,6 +64,7 @@ static void post_vt(DECL_ARGS);
static int pre_an(DECL_ARGS);
static int pre_ap(DECL_ARGS);
static int pre_bd(DECL_ARGS);
+static int pre_bf(DECL_ARGS);
static int pre_bk(DECL_ARGS);
static int pre_br(DECL_ARGS);
static int pre_bx(DECL_ARGS);
@@ -158,7 +160,7 @@ static const struct manact manacts[MDOC_MAX + 1] = {
{ cond_body, pre_enc, post_enc, "<", ">" }, /* Aq */
{ NULL, NULL, NULL, NULL, NULL }, /* At */
{ NULL, NULL, NULL, NULL, NULL }, /* Bc */
- { NULL, NULL, NULL, NULL, NULL }, /* _Bf */
+ { NULL, pre_bf, post_bf, NULL, NULL }, /* Bf */
{ cond_body, pre_enc, post_enc, "[", "]" }, /* Bo */
{ cond_body, pre_enc, post_enc, "[", "]" }, /* Bq */
{ NULL, pre_ux, NULL, "BSD/OS", NULL }, /* Bsx */
@@ -396,8 +398,7 @@ print_node(DECL_ARGS)
* This makes the page structure be more consistent.
*/
prev = n->prev ? n->prev : n->parent;
- if (prev && prev->line < n->line &&
- MDOC_Fo != prev->tok && MDOC_Ns != prev->tok)
+ if (MMAN_spc & outflags && prev && prev->line < n->line)
outflags |= MMAN_nl;
act = NULL;
@@ -644,6 +645,40 @@ post_bd(DECL_ARGS)
}
static int
+pre_bf(DECL_ARGS)
+{
+
+ switch (n->type) {
+ case (MDOC_BLOCK):
+ return(1);
+ case (MDOC_BODY):
+ break;
+ default:
+ return(0);
+ }
+ switch (n->norm->Bf.font) {
+ case (FONT_Em):
+ font_push('I');
+ break;
+ case (FONT_Sy):
+ font_push('B');
+ break;
+ default:
+ font_push('R');
+ break;
+ }
+ return(1);
+}
+
+static void
+post_bf(DECL_ARGS)
+{
+
+ if (MDOC_BODY == n->type)
+ font_pop();
+}
+
+static int
pre_bk(DECL_ARGS)
{
@@ -761,7 +796,8 @@ post_fl(DECL_ARGS)
{
font_pop();
- if (0 == n->nchild)
+ if (0 == n->nchild && NULL != n->next &&
+ n->next->line == n->line)
outflags &= ~MMAN_spc;
}
@@ -1007,7 +1043,7 @@ pre_sm(DECL_ARGS)
assert(n->child && MDOC_TEXT == n->child->type);
if (0 == strcmp("on", n->child->string))
- outflags |= MMAN_Sm;
+ outflags |= MMAN_Sm | MMAN_spc;
else
outflags &= ~MMAN_Sm;
return(0);