From 91aadba3912fe0fdff4c02b75adc3741e4749d2c Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sat, 7 Jul 2012 21:16:35 +0000 Subject: rudimentary support for -Tman .Ft and .Fn; some blank lines are still missing from the output OpenBSD rev. 1.13 --- mdoc_man.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/mdoc_man.c b/mdoc_man.c index aa195b3e..ac22f6cc 100644 --- a/mdoc_man.c +++ b/mdoc_man.c @@ -53,6 +53,7 @@ static void post_bd(DECL_ARGS); static void post_bk(DECL_ARGS); static void post_dl(DECL_ARGS); static void post_enc(DECL_ARGS); +static void post_fn(DECL_ARGS); static void post_in(DECL_ARGS); static void post_lb(DECL_ARGS); static void post_nm(DECL_ARGS); @@ -67,6 +68,7 @@ static int pre_br(DECL_ARGS); static int pre_bx(DECL_ARGS); static int pre_dl(DECL_ARGS); static int pre_enc(DECL_ARGS); +static int pre_fn(DECL_ARGS); static int pre_in(DECL_ARGS); static int pre_it(DECL_ARGS); static int pre_nm(DECL_ARGS); @@ -110,8 +112,8 @@ static const struct manact manacts[MDOC_MAX + 1] = { { NULL, NULL, NULL, NULL, NULL }, /* _Fa */ { NULL, NULL, NULL, NULL, NULL }, /* _Fd */ { NULL, pre_enc, post_enc, "\\fB-", "\\fP" }, /* Fl */ - { NULL, NULL, NULL, NULL, NULL }, /* _Fn */ - { NULL, NULL, NULL, NULL, NULL }, /* _Ft */ + { NULL, pre_fn, post_fn, NULL, NULL }, /* Fn */ + { NULL, pre_enc, post_enc, "\\fI", "\\fP" }, /* Ft */ { NULL, pre_enc, post_enc, "\\fB", "\\fP" }, /* Ic */ { NULL, pre_in, post_in, NULL, NULL }, /* In */ { NULL, pre_enc, post_enc, "\\fR", "\\fP" }, /* Li */ @@ -587,6 +589,50 @@ post_dl(DECL_ARGS) mm->need_nl = 1; } +static int +pre_fn(DECL_ARGS) +{ + + n = n->child; + if (NULL == n) + return(0); + + if (MDOC_SYNPRETTY & n->flags) { + mm->need_nl = 1; + print_word(mm, ".br"); + mm->need_nl = 1; + } + print_word(mm, "\\fB"); + mm->need_space = 0; + print_node(m, n, mm); + mm->need_space = 0; + print_word(mm, "\\fP("); + mm->need_space = 0; + for (n = n->next; n; n = n->next) { + print_word(mm, "\\fI"); + mm->need_space = 0; + print_node(m, n, mm); + mm->need_space = 0; + print_word(mm, "\\fP"); + if (NULL != n->next) + print_word(mm, ","); + } + return(0); +} + +static void +post_fn(DECL_ARGS) +{ + + mm->need_space = 0; + print_word(mm, ");"); + if (MDOC_SYNPRETTY & n->flags) { + mm->need_nl = 1; + print_word(mm, ".br"); + mm->need_nl = 1; + } +} + static int pre_in(DECL_ARGS) { -- cgit