diff options
| author |   schwarze <schwarze@openbsd.org> | 2013-05-29 15:40:14 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2013-05-29 15:40:14 +0000 |
| commit | 0ad6ab48fcebcaeb8875ca1e52090903a0922464 (patch) | |
| tree | 3b67d041b70c9e434b3857f72020abe8806aa7d1 | |
| parent | In keep mode, if any text is printed (even in NOSPACE mode), (diff) | |
| download | wireguard-openbsd-0ad6ab48fcebcaeb8875ca1e52090903a0922464.tar.xz wireguard-openbsd-0ad6ab48fcebcaeb8875ca1e52090903a0922464.zip | |
In SYNOPSIS mode, .Ek doesn't end a keep.
Found and fixed on the plane to the OpenBSD t2k13 hackathon in Toronto.
| -rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bk/synopsis.in | 8 | ||||
| -rw-r--r-- | regress/usr.bin/mandoc/mdoc/Bk/synopsis.out_ascii | 4 | ||||
| -rw-r--r-- | usr.bin/mandoc/mdoc_man.c | 4 | ||||
| -rw-r--r-- | usr.bin/mandoc/mdoc_term.c | 4 |
4 files changed, 14 insertions, 6 deletions
diff --git a/regress/usr.bin/mandoc/mdoc/Bk/synopsis.in b/regress/usr.bin/mandoc/mdoc/Bk/synopsis.in index 047ef3a29c7..7dccddb388a 100644 --- a/regress/usr.bin/mandoc/mdoc/Bk/synopsis.in +++ b/regress/usr.bin/mandoc/mdoc/Bk/synopsis.in @@ -1,4 +1,4 @@ -.Dd November 18, 2012 +.Dd $Mdocdate: May 29 2013 $ .Dt BK-SYNOPSIS 1 .Os OpenBSD .Sh NAME @@ -9,6 +9,12 @@ .Op Fl +abCefhiklmnpruvXx .Op Fl +o Ar option .Op Fl c Ar string \*(Ba Fl s \*(Ba Ar file Op Ar argument ... +.Bk -words +.Ek +.Nm ksh +.Op Fl +abCefhiklmnpruvXx +.Op Fl +o Ar option +.Op Fl c Ar string \*(Ba Fl s \*(Ba Ar file Op Ar argument ... .Sh DESCRIPTION .Nm ksh .Op Fl +abCefhiklmnpruvXx diff --git a/regress/usr.bin/mandoc/mdoc/Bk/synopsis.out_ascii b/regress/usr.bin/mandoc/mdoc/Bk/synopsis.out_ascii index 217409f4e61..05710039eef 100644 --- a/regress/usr.bin/mandoc/mdoc/Bk/synopsis.out_ascii +++ b/regress/usr.bin/mandoc/mdoc/Bk/synopsis.out_ascii @@ -6,9 +6,11 @@ NNAAMMEE SSYYNNOOPPSSIISS kksshh [--++aabbCCeeffhhiikkllmmnnpprruuvvXXxx] [--++oo _o_p_t_i_o_n] [--cc _s_t_r_i_n_g | --ss | _f_i_l_e [_a_r_g_u_m_e_n_t _._._.]] + kksshh [--++aabbCCeeffhhiikkllmmnnpprruuvvXXxx] [--++oo _o_p_t_i_o_n] + [--cc _s_t_r_i_n_g | --ss | _f_i_l_e [_a_r_g_u_m_e_n_t _._._.]] DDEESSCCRRIIPPTTIIOONN kksshh [--++aabbCCeeffhhiikkllmmnnpprruuvvXXxx] [--++oo _o_p_t_i_o_n] [--cc _s_t_r_i_n_g | --ss | _f_i_l_e [_a_r_g_u_m_e_n_t _._._.]] -OpenBSD November 18, 2012 OpenBSD +OpenBSD May 29, 2013 OpenBSD diff --git a/usr.bin/mandoc/mdoc_man.c b/usr.bin/mandoc/mdoc_man.c index 0b172127d9e..4ad95c77063 100644 --- a/usr.bin/mandoc/mdoc_man.c +++ b/usr.bin/mandoc/mdoc_man.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_man.c,v 1.48 2013/05/19 21:40:18 schwarze Exp $ */ +/* $Id: mdoc_man.c,v 1.49 2013/05/29 15:40:14 schwarze Exp $ */ /* * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org> * @@ -897,7 +897,7 @@ static void post_bk(DECL_ARGS) { - if (MDOC_BODY == n->type) + if (MDOC_BODY == n->type && ! (MDOC_SYNPRETTY & n->flags)) outflags &= ~MMAN_Bk; } diff --git a/usr.bin/mandoc/mdoc_term.c b/usr.bin/mandoc/mdoc_term.c index ec1955d3e84..4df769b7bf5 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.148 2013/05/18 17:47:17 schwarze Exp $ */ +/* $Id: mdoc_term.c,v 1.149 2013/05/29 15:40:14 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012 Ingo Schwarze <schwarze@openbsd.org> @@ -2211,7 +2211,7 @@ static void termp_bk_post(DECL_ARGS) { - if (MDOC_BODY == n->type) + if (MDOC_BODY == n->type && ! (MDOC_SYNPRETTY & n->flags)) p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); } |