diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2014-11-19 22:00:37 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-11-19 22:00:37 +0000 |
| commit | 2a40e9cd75077d3621f7f425661de140f506c850 (patch) | |
| tree | 4f131bfba1c591ebf79257ebac7938111b344138 | |
| parent | 25bd307bf14d7b37f731ce817ce1acb10646fc7f (diff) | |
| download | mandoc-2a40e9cd75077d3621f7f425661de140f506c850.tar.gz mandoc-2a40e9cd75077d3621f7f425661de140f506c850.tar.zst mandoc-2a40e9cd75077d3621f7f425661de140f506c850.zip | |
Let .Ao and .Aq render as "<>" after .An and as "\(la\(ra" elsewhere,
just like groff; minibug noticed by bentley@.
| -rw-r--r-- | mdoc_html.c | 8 | ||||
| -rw-r--r-- | mdoc_man.c | 27 | ||||
| -rw-r--r-- | mdoc_term.c | 8 |
3 files changed, 34 insertions, 9 deletions
diff --git a/mdoc_html.c b/mdoc_html.c index 1d0c2d0e..eed9b048 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.210 2014/11/17 06:44:58 schwarze Exp $ */ +/* $Id: mdoc_html.c,v 1.211 2014/11/19 22:00:37 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -2075,7 +2075,8 @@ mdoc_quote_pre(MDOC_ARGS) case MDOC_Ao: /* FALLTHROUGH */ case MDOC_Aq: - print_text(h, "\\(la"); + print_text(h, n->parent->prev != NULL && + n->parent->prev->tok == MDOC_An ? "<" : "\\(la"); break; case MDOC_Bro: /* FALLTHROUGH */ @@ -2151,7 +2152,8 @@ mdoc_quote_post(MDOC_ARGS) case MDOC_Ao: /* FALLTHROUGH */ case MDOC_Aq: - print_text(h, "\\(ra"); + print_text(h, n->parent->prev != NULL && + n->parent->prev->tok == MDOC_An ? ">" : "\\(ra"); break; case MDOC_Bro: /* FALLTHROUGH */ @@ -1,4 +1,4 @@ -/* $Id: mdoc_man.c,v 1.73 2014/11/17 06:44:58 schwarze Exp $ */ +/* $Id: mdoc_man.c,v 1.74 2014/11/19 22:00:37 schwarze Exp $ */ /* * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> * @@ -46,6 +46,7 @@ static void font_push(char); static void font_pop(void); static void mid_it(void); static void post__t(DECL_ARGS); +static void post_aq(DECL_ARGS); static void post_bd(DECL_ARGS); static void post_bf(DECL_ARGS); static void post_bk(DECL_ARGS); @@ -72,6 +73,7 @@ static void post_vt(DECL_ARGS); static int pre__t(DECL_ARGS); static int pre_an(DECL_ARGS); static int pre_ap(DECL_ARGS); +static int pre_aq(DECL_ARGS); static int pre_bd(DECL_ARGS); static int pre_bf(DECL_ARGS); static int pre_bk(DECL_ARGS); @@ -172,8 +174,8 @@ static const struct manact manacts[MDOC_MAX + 1] = { { NULL, pre__t, post__t, NULL, NULL }, /* %T */ { NULL, NULL, post_percent, NULL, NULL }, /* %V */ { NULL, NULL, NULL, NULL, NULL }, /* Ac */ - { cond_body, pre_enc, post_enc, "<", ">" }, /* Ao */ - { cond_body, pre_enc, post_enc, "<", ">" }, /* Aq */ + { cond_body, pre_aq, post_aq, NULL, NULL }, /* Ao */ + { cond_body, pre_aq, post_aq, NULL, NULL }, /* Aq */ { NULL, NULL, NULL, NULL, NULL }, /* At */ { NULL, NULL, NULL, NULL, NULL }, /* Bc */ { NULL, pre_bf, post_bf, NULL, NULL }, /* Bf */ @@ -870,6 +872,25 @@ pre_ap(DECL_ARGS) } static int +pre_aq(DECL_ARGS) +{ + + print_word(n->parent->prev != NULL && + n->parent->prev->tok == MDOC_An ? "<" : "\\(la"); + outflags &= ~MMAN_spc; + return(1); +} + +static void +post_aq(DECL_ARGS) +{ + + outflags &= ~(MMAN_spc | MMAN_nl); + print_word(n->parent->prev != NULL && + n->parent->prev->tok == MDOC_An ? ">" : "\\(ra"); +} + +static int pre_bd(DECL_ARGS) { diff --git a/mdoc_term.c b/mdoc_term.c index f4fbed4c..9940c58b 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.290 2014/11/17 06:44:58 schwarze Exp $ */ +/* $Id: mdoc_term.c,v 1.291 2014/11/19 22:00:37 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -1854,7 +1854,8 @@ termp_quote_pre(DECL_ARGS) case MDOC_Ao: /* FALLTHROUGH */ case MDOC_Aq: - term_word(p, "<"); + term_word(p, n->parent->prev != NULL && + n->parent->prev->tok == MDOC_An ? "<" : "\\(la"); break; case MDOC_Bro: /* FALLTHROUGH */ @@ -1925,7 +1926,8 @@ termp_quote_post(DECL_ARGS) case MDOC_Ao: /* FALLTHROUGH */ case MDOC_Aq: - term_word(p, ">"); + term_word(p, n->parent->prev != NULL && + n->parent->prev->tok == MDOC_An ? ">" : "\\(ra"); break; case MDOC_Bro: /* FALLTHROUGH */ |