diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2010-05-08 02:10:10 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2010-05-08 02:10:10 +0000 |
| commit | 619c68ca772fb6d675f34fb216ee24ec14d1d0bd (patch) | |
| tree | 92b7193c614a1397f84928022e2f72fa26915c1d | |
| parent | cca99e71d7e5cdf77d88bd9f3abcb3249b338e23 (diff) | |
sync to bsd.lv mdoc_term.c 1.117, mdoc_html.c 1.61:
fixed %T: it now correctly underlines, instead of quoting;
noted by jmc@, fixed by kristaps@
| -rw-r--r-- | usr.bin/mandoc/mdoc_html.c | 14 | ||||
| -rw-r--r-- | usr.bin/mandoc/mdoc_term.c | 24 |
2 files changed, 5 insertions, 33 deletions
diff --git a/usr.bin/mandoc/mdoc_html.c b/usr.bin/mandoc/mdoc_html.c index 8414e69ced0..24f1b4c00c4 100644 --- a/usr.bin/mandoc/mdoc_html.c +++ b/usr.bin/mandoc/mdoc_html.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.11 2010/04/07 23:15:05 schwarze Exp $ */ +/* $Id: mdoc_html.c,v 1.12 2010/05/08 02:10:09 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -2219,8 +2219,6 @@ mdoc__x_pre(MDOC_ARGS) break; case(MDOC__T): PAIR_CLASS_INIT(&tag[0], "ref-title"); - print_text(h, "\\(lq"); - h->flags |= HTML_NOSPACE; break; case(MDOC__U): PAIR_CLASS_INIT(&tag[0], "link-ref"); @@ -2249,14 +2247,8 @@ static void mdoc__x_post(MDOC_ARGS) { + /* TODO: %U */ + h->flags |= HTML_NOSPACE; - switch (n->tok) { - case (MDOC__T): - print_text(h, "\\(rq"); - h->flags |= HTML_NOSPACE; - break; - default: - break; - } print_text(h, n->next ? "," : "."); } diff --git a/usr.bin/mandoc/mdoc_term.c b/usr.bin/mandoc/mdoc_term.c index 7d7e8e95914..2047066b6a8 100644 --- a/usr.bin/mandoc/mdoc_term.c +++ b/usr.bin/mandoc/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.75 2010/04/23 00:23:46 schwarze Exp $ */ +/* $Id: mdoc_term.c,v 1.76 2010/05/08 02:10:09 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -89,7 +89,6 @@ static void termp_sq_post(DECL_ARGS); static void termp_ss_post(DECL_ARGS); static void termp_vt_post(DECL_ARGS); -static int termp__t_pre(DECL_ARGS); static int termp_an_pre(DECL_ARGS); static int termp_ap_pre(DECL_ARGS); static int termp_aq_pre(DECL_ARGS); @@ -185,7 +184,7 @@ static const struct termact termacts[MDOC_MAX] = { { NULL, termp____post }, /* %O */ { NULL, termp____post }, /* %P */ { NULL, termp____post }, /* %R */ - { termp__t_pre, termp____post }, /* %T */ + { termp_under_pre, termp____post }, /* %T */ { NULL, termp____post }, /* %V */ { NULL, NULL }, /* Ac */ { termp_aq_pre, termp_aq_post }, /* Ao */ @@ -2081,14 +2080,6 @@ termp____post(DECL_ARGS) /* TODO: %U. */ p->flags |= TERMP_NOSPACE; - switch (n->tok) { - case (MDOC__T): - term_word(p, "\\(rq"); - p->flags |= TERMP_NOSPACE; - break; - default: - break; - } term_word(p, n->next ? "," : "."); } @@ -2142,17 +2133,6 @@ termp_under_pre(DECL_ARGS) /* ARGSUSED */ static int -termp__t_pre(DECL_ARGS) -{ - - term_word(p, "\\(lq"); - p->flags |= TERMP_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static int termp_eos_pre(DECL_ARGS) { const char ascii_eos[2] = { ASCII_EOS, 0 }; |