diff options
Diffstat (limited to 'regress/mdoc')
115 files changed, 592 insertions, 134 deletions
diff --git a/regress/mdoc/Ad/font.in b/regress/mdoc/Ad/font.in index 104bc194..df84458b 100644 --- a/regress/mdoc/Ad/font.in +++ b/regress/mdoc/Ad/font.in @@ -6,5 +6,5 @@ .Nd changing fonts inside the address macro .Sh DESCRIPTION normal text -.Ad emphasis\\fBbold\\fPback | after : punctuation +.Ad emphasis\\fBbold\\fPback | after ":" punctuation "Sy" bold trailing text diff --git a/regress/mdoc/Ad/font.out_ascii b/regress/mdoc/Ad/font.out_ascii index e829efbd..b86ab465 100644 --- a/regress/mdoc/Ad/font.out_ascii +++ b/regress/mdoc/Ad/font.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE AAdd--ffoonntt - changing fonts inside the address macro DDEESSCCRRIIPPTTIIOONN - normal text _e_m_p_h_a_s_i_sbboolldd_b_a_c_k | _a_f_t_e_r: _p_u_n_c_t_u_a_t_i_o_n trailing text + normal text _e_m_p_h_a_s_i_sbboolldd_b_a_c_k | _a_f_t_e_r: _p_u_n_c_t_u_a_t_i_o_n bboolldd trailing text OpenBSD November 20, 2014 OpenBSD diff --git a/regress/mdoc/Ad/font.out_markdown b/regress/mdoc/Ad/font.out_markdown index 365add62..ed3b5901 100644 --- a/regress/mdoc/Ad/font.out_markdown +++ b/regress/mdoc/Ad/font.out_markdown @@ -7,7 +7,7 @@ AD-FONT(1) - General Commands Manual # DESCRIPTION normal text -*emphasis**bold**back* | *after*: *punctuation* +*emphasis**bold**back* | *after*: *punctuation* **bold** trailing text OpenBSD - November 20, 2014 diff --git a/regress/mdoc/An/break.in b/regress/mdoc/An/break.in index b783b337..ff96c547 100644 --- a/regress/mdoc/An/break.in +++ b/regress/mdoc/An/break.in @@ -7,7 +7,7 @@ .Sh DESCRIPTION inline is the default: .An Kristaps , -.An Ingo , +.An Ingo "," and .An Joerg . empty @@ -39,7 +39,7 @@ trailing .An -nosplit -split bogus .Pp inline: -.An Kristaps , +.An Kristaps "," .An Ingo , and .An Joerg . diff --git a/regress/mdoc/Ap/middle.in b/regress/mdoc/Ap/middle.in index 03d7b6f9..05f73b3c 100644 --- a/regress/mdoc/Ap/middle.in +++ b/regress/mdoc/Ap/middle.in @@ -1,4 +1,4 @@ -.Dd September 30, 2011 +.Dd May 21, 2017 .Dt AP-MIDDLE 1 .Os OpenBSD .Sh NAME @@ -6,3 +6,6 @@ .Nd apostrophe in the middle of a macro line .Sh DESCRIPTION .Xr mandoc 1 Ap s +.Pp +punctuation and called macros: +.Sy bold Ap ( "Sy" bold diff --git a/regress/mdoc/Ap/middle.out_ascii b/regress/mdoc/Ap/middle.out_ascii index c51bd6d8..0f687a46 100644 --- a/regress/mdoc/Ap/middle.out_ascii +++ b/regress/mdoc/Ap/middle.out_ascii @@ -6,4 +6,6 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN mandoc(1)'s -OpenBSD September 30, 2011 OpenBSD + punctuation and called macros: bboolldd'(bboolldd + +OpenBSD May 21, 2017 OpenBSD diff --git a/regress/mdoc/Ap/middle.out_markdown b/regress/mdoc/Ap/middle.out_markdown index 9600945b..dd14e8e5 100644 --- a/regress/mdoc/Ap/middle.out_markdown +++ b/regress/mdoc/Ap/middle.out_markdown @@ -8,4 +8,7 @@ AP-MIDDLE(1) - General Commands Manual mandoc(1)'s -OpenBSD - September 30, 2011 +punctuation and called macros: +**bold**'(**bold** + +OpenBSD - May 21, 2017 diff --git a/regress/mdoc/Aq/empty.in b/regress/mdoc/Aq/empty.in index a407855e..1fa5a61b 100644 --- a/regress/mdoc/Aq/empty.in +++ b/regress/mdoc/Aq/empty.in @@ -11,4 +11,4 @@ and a full .Aq user@host return path. And another -.Ao full Ac one . +.Ao full Ac one "Sy" bold . diff --git a/regress/mdoc/Aq/empty.out_ascii b/regress/mdoc/Aq/empty.out_ascii index c587ee51..236c0625 100644 --- a/regress/mdoc/Aq/empty.out_ascii +++ b/regress/mdoc/Aq/empty.out_ascii @@ -4,6 +4,7 @@ NNAAMMEE AAqq--eemmppttyy - empty implicit enclosure macros DDEESSCCRRIIPPTTIIOONN - An empty <> and a full <user@host> return path. And another <full> one. + An empty <> and a full <user@host> return path. And another <full> one + bboolldd. OpenBSD August 6, 2010 OpenBSD diff --git a/regress/mdoc/Aq/empty.out_markdown b/regress/mdoc/Aq/empty.out_markdown index 27039dd7..dc396481 100644 --- a/regress/mdoc/Aq/empty.out_markdown +++ b/regress/mdoc/Aq/empty.out_markdown @@ -12,6 +12,6 @@ and a full <user@host> return path. And another -<full> one. +<full> one **bold**. OpenBSD - August 6, 2010 diff --git a/regress/mdoc/Aq/empty.out_utf8 b/regress/mdoc/Aq/empty.out_utf8 index 0ae72b6f..0a81608b 100644 --- a/regress/mdoc/Aq/empty.out_utf8 +++ b/regress/mdoc/Aq/empty.out_utf8 @@ -4,6 +4,7 @@ NNAAMMEE AAqq--eemmppttyy – empty implicit enclosure macros DDEESSCCRRIIPPTTIIOONN - An empty ⟨⟩ and a full ⟨user@host⟩ return path. And another ⟨full⟩ one. + An empty ⟨⟩ and a full ⟨user@host⟩ return path. And another ⟨full⟩ one + bboolldd. OpenBSD August 6, 2010 OpenBSD diff --git a/regress/mdoc/Ar/punct.in b/regress/mdoc/Ar/punct.in index 963f7535..51044001 100644 --- a/regress/mdoc/Ar/punct.in +++ b/regress/mdoc/Ar/punct.in @@ -37,3 +37,6 @@ op paren .Ar ( a op bracket .Ar [ a +.Pp +quoted punctuation: +.Ar a "(" b "|" c ")" d "," "Sy" bold . diff --git a/regress/mdoc/Ar/punct.out_ascii b/regress/mdoc/Ar/punct.out_ascii index d780dbcf..01426c58 100644 --- a/regress/mdoc/Ar/punct.out_ascii +++ b/regress/mdoc/Ar/punct.out_ascii @@ -9,4 +9,6 @@ DDEESSCCRRIIPPTTIIOONN _f_i_l_e _._._.; _z colon _f_i_l_e _._._.: _z quest _f_i_l_e _._._.? _z excl _f_i_l_e _._._.! _z paren _f_i_l_e _._._.) _z bracket _f_i_l_e _._._.] _z bar | _m op paren (_a op bracket [_a + quoted punctuation: _a (_b | _c) _d, bboolldd. + OpenBSD August 21, 2014 OpenBSD diff --git a/regress/mdoc/Ar/punct.out_markdown b/regress/mdoc/Ar/punct.out_markdown index b8e3eda6..932b8660 100644 --- a/regress/mdoc/Ar/punct.out_markdown +++ b/regress/mdoc/Ar/punct.out_markdown @@ -39,4 +39,7 @@ op paren op bracket \[*a* +quoted punctuation: +*a* (*b* | *c*) *d*, **bold**. + OpenBSD - August 21, 2014 diff --git a/regress/mdoc/At/invalid.in b/regress/mdoc/At/invalid.in index 8e7d9ce5..345529ab 100644 --- a/regress/mdoc/At/invalid.in +++ b/regress/mdoc/At/invalid.in @@ -12,6 +12,6 @@ valid argument: .At v7 .Pp invalid argument: -.At murks +.At murks "Sy" bold .Pp end of file diff --git a/regress/mdoc/At/invalid.out_ascii b/regress/mdoc/At/invalid.out_ascii index c1cab598..13e82d3d 100644 --- a/regress/mdoc/At/invalid.out_ascii +++ b/regress/mdoc/At/invalid.out_ascii @@ -8,7 +8,7 @@ DDEESSCCRRIIPPTTIIOONN valid argument: Version 7 AT&T UNIX - invalid argument: AT&T UNIX murks + invalid argument: AT&T UNIX murks bboolldd end of file diff --git a/regress/mdoc/At/invalid.out_markdown b/regress/mdoc/At/invalid.out_markdown index 0b952558..d76b8fa6 100644 --- a/regress/mdoc/At/invalid.out_markdown +++ b/regress/mdoc/At/invalid.out_markdown @@ -13,7 +13,7 @@ valid argument: Version 7 AT&T UNIX invalid argument: -AT&T UNIX murks +AT&T UNIX murks **bold** end of file diff --git a/regress/mdoc/Brq/empty.in b/regress/mdoc/Brq/empty.in index 323df074..5d317474 100644 --- a/regress/mdoc/Brq/empty.in +++ b/regress/mdoc/Brq/empty.in @@ -8,7 +8,7 @@ An empty .Brq and a full -.Brq user@host +.Brq "(" user@host quotation. And another -.Bro full Brc one . +.Bro "(" full Brc one "Sy" bold . diff --git a/regress/mdoc/Brq/empty.out_ascii b/regress/mdoc/Brq/empty.out_ascii index bb59c247..9d638d0c 100644 --- a/regress/mdoc/Brq/empty.out_ascii +++ b/regress/mdoc/Brq/empty.out_ascii @@ -4,6 +4,7 @@ NNAAMMEE BBrrqq--eemmppttyy - empty implicit enclosure macros DDEESSCCRRIIPPTTIIOONN - An empty {} and a full {user@host} quotation. And another {full} one. + An empty {} and a full ({user@host} quotation. And another ({full} one + bboolldd. OpenBSD October 21, 2010 OpenBSD diff --git a/regress/mdoc/Brq/empty.out_markdown b/regress/mdoc/Brq/empty.out_markdown index f32edd8c..a335a57c 100644 --- a/regress/mdoc/Brq/empty.out_markdown +++ b/regress/mdoc/Brq/empty.out_markdown @@ -9,9 +9,9 @@ BRQ-EMPTY(1) - General Commands Manual An empty {} and a full -{user@host} +({user@host} quotation. And another -{full} one. +({full} one **bold**. OpenBSD - October 21, 2010 diff --git a/regress/mdoc/Bx/args.in b/regress/mdoc/Bx/args.in index 32530959..d4479275 100644 --- a/regress/mdoc/Bx/args.in +++ b/regress/mdoc/Bx/args.in @@ -9,7 +9,7 @@ no arguments: .Bx .Pp one standard argument: -.Bx 4.4 +.Bx 4.4 "." .Pp one non-standard argument: .Bx nett @@ -21,6 +21,6 @@ two standard arguments: .Bx 4.3 reno .Pp more arguments: -.Bx 4.3 tahoe and some additional words +.Bx 4.3 tahoe and "Em" some additional words .Pp end of test document diff --git a/regress/mdoc/Bx/args.out_ascii b/regress/mdoc/Bx/args.out_ascii index 9f45970e..24e03ffe 100644 --- a/regress/mdoc/Bx/args.out_ascii +++ b/regress/mdoc/Bx/args.out_ascii @@ -6,7 +6,7 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN no arguments: BSD - one standard argument: 4.4BSD + one standard argument: 4.4BSD. one non-standard argument: nettBSD @@ -14,7 +14,7 @@ DDEESSCCRRIIPPTTIIOONN two standard arguments: 4.3BSD-Reno - more arguments: 4.3BSD-Tahoe and some additional words + more arguments: 4.3BSD-Tahoe and _s_o_m_e _a_d_d_i_t_i_o_n_a_l _w_o_r_d_s end of test document diff --git a/regress/mdoc/Bx/args.out_markdown b/regress/mdoc/Bx/args.out_markdown index 1c9fc45d..5450ee51 100644 --- a/regress/mdoc/Bx/args.out_markdown +++ b/regress/mdoc/Bx/args.out_markdown @@ -10,7 +10,7 @@ no arguments: BSD one standard argument: -4\.4BSD +4\.4BSD. one non-standard argument: nettBSD @@ -22,7 +22,7 @@ two standard arguments: 4\.3BSD-Reno more arguments: -4\.3BSD-Tahoe and some additional words +4\.3BSD-Tahoe and *some additional words* end of test document diff --git a/regress/mdoc/Cd/Makefile b/regress/mdoc/Cd/Makefile index 164e5964..0792494c 100644 --- a/regress/mdoc/Cd/Makefile +++ b/regress/mdoc/Cd/Makefile @@ -1,6 +1,6 @@ # $OpenBSD: Makefile,v 1.5 2014/07/02 20:18:42 schwarze Exp $ -REGRESS_TARGETS = noarg font eos +REGRESS_TARGETS = eos font noarg punct LINT_TARGETS = noarg .include <bsd.regress.mk> diff --git a/regress/mdoc/Cd/punct.in b/regress/mdoc/Cd/punct.in new file mode 100644 index 00000000..9a072c0c --- /dev/null +++ b/regress/mdoc/Cd/punct.in @@ -0,0 +1,42 @@ +.Dd August 21, 2014 +.Dt CD-PUNCT 1 +.Os OpenBSD +.Sh NAME +.Nm Cd-punct +.Nd punctuation handling by the Cd macro +.Sh DESCRIPTION +closing punctuation +.Cd a ) +only one +.Cd ) +only more than one +.Cd ) ) +middle +.Cd a ) z +start +.Cd ) z +dot +.Cd . z +comma +.Cd , z +semicolon +.Cd ; z +colon +.Cd : z +quest +.Cd ? z +excl +.Cd ! z +paren +.Cd ) z +bracket +.Cd ] z +bar +.Cd | m +op paren +.Cd ( a +op bracket +.Cd [ a +.Pp +quoted punctuation: +.Cd a "(" b "|" c ")" d "." "Em" italic . diff --git a/regress/mdoc/Cd/punct.out_ascii b/regress/mdoc/Cd/punct.out_ascii new file mode 100644 index 00000000..88d369dc --- /dev/null +++ b/regress/mdoc/Cd/punct.out_ascii @@ -0,0 +1,13 @@ +CD-PUNCT(1) General Commands Manual CD-PUNCT(1) + +NNAAMMEE + CCdd--ppuunncctt - punctuation handling by the Cd macro + +DDEESSCCRRIIPPTTIIOONN + closing punctuation aa) only one ) only more than one )) middle aa) zz start + ) zz dot . zz comma , zz semicolon ; zz colon : zz quest ? zz excl ! zz paren ) + zz bracket ] zz bar | mm op paren (aa op bracket [aa + + quoted punctuation: aa (bb | cc) dd. _i_t_a_l_i_c. + +OpenBSD August 21, 2014 OpenBSD diff --git a/regress/mdoc/Cd/punct.out_markdown b/regress/mdoc/Cd/punct.out_markdown new file mode 100644 index 00000000..c39ee621 --- /dev/null +++ b/regress/mdoc/Cd/punct.out_markdown @@ -0,0 +1,45 @@ +CD-PUNCT(1) - General Commands Manual + +# NAME + +**Cd-punct** - punctuation handling by the Cd macro + +# DESCRIPTION + +closing punctuation +**a**) +only one +) +only more than one +)) +middle +**a**) **z** +start +) **z** +dot +. **z** +comma +, **z** +semicolon +; **z** +colon +: **z** +quest +? **z** +excl +! **z** +paren +) **z** +bracket +] **z** +bar +| **m** +op paren +(**a** +op bracket +\[**a** + +quoted punctuation: +**a** (**b** | **c**) **d**. *italic*. + +OpenBSD - August 21, 2014 diff --git a/regress/mdoc/Cm/Makefile b/regress/mdoc/Cm/Makefile index e674e756..4b7066ec 100644 --- a/regress/mdoc/Cm/Makefile +++ b/regress/mdoc/Cm/Makefile @@ -1,6 +1,6 @@ # $OpenBSD: Makefile,v 1.3 2014/07/02 20:18:42 schwarze Exp $ -REGRESS_TARGETS = basic font noarg +REGRESS_TARGETS = basic font noarg punct LINT_TARGETS = noarg .include <bsd.regress.mk> diff --git a/regress/mdoc/Cm/punct.in b/regress/mdoc/Cm/punct.in new file mode 100644 index 00000000..432e470c --- /dev/null +++ b/regress/mdoc/Cm/punct.in @@ -0,0 +1,42 @@ +.Dd August 21, 2014 +.Dt Cm-PUNCT 1 +.Os OpenBSD +.Sh NAME +.Nm Cm-punct +.Nd punctuation handling by the Cm macro +.Sh DESCRIPTION +closing punctuation +.Cm a ) +only one +.Cm ) +only more than one +.Cm ) ) +middle +.Cm a ) z +start +.Cm ) z +dot +.Cm . z +comma +.Cm , z +semicolon +.Cm ; z +colon +.Cm : z +quest +.Cm ? z +excl +.Cm ! z +paren +.Cm ) z +bracket +.Cm ] z +bar +.Cm | m +op paren +.Cm ( a +op bracket +.Cm [ a +.Pp +quoted punctuation: +.Cm a "(" b "|" c ")" d "." "Em" italic . diff --git a/regress/mdoc/Cm/punct.out_ascii b/regress/mdoc/Cm/punct.out_ascii new file mode 100644 index 00000000..7ac1fe76 --- /dev/null +++ b/regress/mdoc/Cm/punct.out_ascii @@ -0,0 +1,13 @@ +Cm-PUNCT(1) General Commands Manual Cm-PUNCT(1) + +NNAAMMEE + CCmm--ppuunncctt - punctuation handling by the Cm macro + +DDEESSCCRRIIPPTTIIOONN + closing punctuation aa) only one ) only more than one )) middle aa) zz start + ) zz dot . zz comma , zz semicolon ; zz colon : zz quest ? zz excl ! zz paren ) + zz bracket ] zz bar | mm op paren (aa op bracket [aa + + quoted punctuation: aa (bb | cc) dd. _i_t_a_l_i_c. + +OpenBSD August 21, 2014 OpenBSD diff --git a/regress/mdoc/Cm/punct.out_markdown b/regress/mdoc/Cm/punct.out_markdown new file mode 100644 index 00000000..c924228c --- /dev/null +++ b/regress/mdoc/Cm/punct.out_markdown @@ -0,0 +1,45 @@ +Cm-PUNCT(1) - General Commands Manual + +# NAME + +**Cm-punct** - punctuation handling by the Cm macro + +# DESCRIPTION + +closing punctuation +**a**) +only one +) +only more than one +)) +middle +**a**) **z** +start +) **z** +dot +. **z** +comma +, **z** +semicolon +; **z** +colon +: **z** +quest +? **z** +excl +! **z** +paren +) **z** +bracket +] **z** +bar +| **m** +op paren +(**a** +op bracket +\[**a** + +quoted punctuation: +**a** (**b** | **c**) **d**. *italic*. + +OpenBSD - August 21, 2014 diff --git a/regress/mdoc/Dq/empty.in b/regress/mdoc/Dq/empty.in index 6e228898..1d072d5e 100644 --- a/regress/mdoc/Dq/empty.in +++ b/regress/mdoc/Dq/empty.in @@ -8,7 +8,7 @@ An empty .Dq and a full -.Dq user@host +.Dq "(" user@host quotation. And another -.Do full Dc one . +.Do "(" full Dc one "Sy" bold . diff --git a/regress/mdoc/Dq/empty.out_ascii b/regress/mdoc/Dq/empty.out_ascii index e8f1da5b..9f7c8bbe 100644 --- a/regress/mdoc/Dq/empty.out_ascii +++ b/regress/mdoc/Dq/empty.out_ascii @@ -4,6 +4,7 @@ NNAAMMEE DDqq--eemmppttyy - empty implicit enclosure macros DDEESSCCRRIIPPTTIIOONN - An empty "" and a full "user@host" quotation. And another "full" one. + An empty "" and a full ("user@host" quotation. And another ("full" one + bboolldd. OpenBSD October 21, 2010 OpenBSD diff --git a/regress/mdoc/Dq/empty.out_markdown b/regress/mdoc/Dq/empty.out_markdown index 6cba8746..b6188f5c 100644 --- a/regress/mdoc/Dq/empty.out_markdown +++ b/regress/mdoc/Dq/empty.out_markdown @@ -9,9 +9,9 @@ DQ-EMPTY(1) - General Commands Manual An empty "" and a full -"user@host" +("user@host" quotation. And another -"full" one. +("full" one **bold**. OpenBSD - October 21, 2010 diff --git a/regress/mdoc/Dv/font.in b/regress/mdoc/Dv/font.in index 8e3c5bcb..8d9e370b 100644 --- a/regress/mdoc/Dv/font.in +++ b/regress/mdoc/Dv/font.in @@ -10,4 +10,4 @@ The macro. .Pp And with -.Dv some \\fIembedded\\fP string . +.Dv some \\fIembedded\\fP string ";" "Sy" bold . diff --git a/regress/mdoc/Dv/font.out_ascii b/regress/mdoc/Dv/font.out_ascii index 88f0760d..82013346 100644 --- a/regress/mdoc/Dv/font.out_ascii +++ b/regress/mdoc/Dv/font.out_ascii @@ -6,6 +6,6 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN The BUFSIZ macro. - And with some _e_m_b_e_d_d_e_d string. + And with some _e_m_b_e_d_d_e_d string; bboolldd. OpenBSD October 21, 2011 OpenBSD diff --git a/regress/mdoc/Dv/font.out_markdown b/regress/mdoc/Dv/font.out_markdown index b3351e32..0bf567d8 100644 --- a/regress/mdoc/Dv/font.out_markdown +++ b/regress/mdoc/Dv/font.out_markdown @@ -11,6 +11,6 @@ The macro. And with -`some embedded string`. +`some embedded string`; **bold**. OpenBSD - October 21, 2011 diff --git a/regress/mdoc/Em/punct.in b/regress/mdoc/Em/punct.in index b49ca505..a8e012e7 100644 --- a/regress/mdoc/Em/punct.in +++ b/regress/mdoc/Em/punct.in @@ -7,7 +7,7 @@ .Sh DESCRIPTION Leading punctuation: .Em ( b -.Em [ b +.Em "[" b .Em | b .Em . b .Em , b @@ -16,7 +16,7 @@ Leading punctuation: .Em ? b .Em ! b .Em ) b -.Em ] b +.Em "]" b .Pp Trailing punctuation: .Em a ( @@ -28,17 +28,17 @@ Trailing punctuation: .Em a : .Em a ? .Em a ! -.Em a ) +.Em a ")" .Em a ] .Pp Middle punctuation: .Em a ( b .Em a [ b -.Em a | b +.Em a "|" b .Em a . b .Em a , b .Em a ; b -.Em a : b +.Em a ":" b .Em a ? b .Em a ! b .Em a ) b @@ -78,5 +78,6 @@ Multiple punctuation: .Em [ ( arg ) ] . .Pp Quoted: -.Em "a . b Nm" +.Em "a . b Nm" "Sy" bold .Em ". b Nm" +.Em "." diff --git a/regress/mdoc/Em/punct.out_ascii b/regress/mdoc/Em/punct.out_ascii index 4396e669..e0f60dbe 100644 --- a/regress/mdoc/Em/punct.out_ascii +++ b/regress/mdoc/Em/punct.out_ascii @@ -21,6 +21,6 @@ DDEESSCCRRIIPPTTIIOONN Multiple punctuation: [(_a_r_g)]. - Quoted: _a _. _b _N_m _. _b _N_m + Quoted: _a _. _b _N_m bboolldd _. _b _N_m . OpenBSD November 17, 2014 OpenBSD diff --git a/regress/mdoc/Em/punct.out_lint b/regress/mdoc/Em/punct.out_lint index 7d16f436..cfcc04a7 100644 --- a/regress/mdoc/Em/punct.out_lint +++ b/regress/mdoc/Em/punct.out_lint @@ -22,3 +22,4 @@ mandoc: punct.in:70:7: WARNING: skipping empty macro: Em mandoc: punct.in:71:7: WARNING: skipping empty macro: Em mandoc: punct.in:74:7: WARNING: skipping empty macro: Em mandoc: punct.in:75:7: WARNING: skipping empty macro: Em +mandoc: punct.in:83:2: WARNING: skipping empty macro: Em diff --git a/regress/mdoc/Em/punct.out_markdown b/regress/mdoc/Em/punct.out_markdown index 5d3e8524..6cf5402d 100644 --- a/regress/mdoc/Em/punct.out_markdown +++ b/regress/mdoc/Em/punct.out_markdown @@ -79,7 +79,8 @@ Multiple punctuation: \[(*arg*)]. Quoted: -*a . b Nm* +*a . b Nm* **bold** *. b Nm* +. OpenBSD - November 17, 2014 diff --git a/regress/mdoc/Eo/empty.in b/regress/mdoc/Eo/empty.in index bf637f27..b971b6dc 100644 --- a/regress/mdoc/Eo/empty.in +++ b/regress/mdoc/Eo/empty.in @@ -32,7 +32,7 @@ text all .Eo << text -.Ec >> +.Ec >> "Sy" bold completely empty .No prefix Ns Eo .Ec diff --git a/regress/mdoc/Eo/empty.out_ascii b/regress/mdoc/Eo/empty.out_ascii index a28e5727..96849bb0 100644 --- a/regress/mdoc/Eo/empty.out_ascii +++ b/regress/mdoc/Eo/empty.out_ascii @@ -5,9 +5,9 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN completely empty closing only >> content only text opening only << no - opening text>> no content <<>> no closing <<text all <<text>> completely - empty prefix closing only prefix>> no opening prefixtext>> no closing - <<prefix stray closing + opening text>> no content <<>> no closing <<text all <<text>> bboolldd + completely empty prefix closing only prefix>> no opening prefixtext>> no + closing <<prefix stray closing >> end of file OpenBSD February 1, 2015 OpenBSD diff --git a/regress/mdoc/Eo/empty.out_markdown b/regress/mdoc/Eo/empty.out_markdown index e0ed0e9b..506a4a09 100644 --- a/regress/mdoc/Eo/empty.out_markdown +++ b/regress/mdoc/Eo/empty.out_markdown @@ -20,7 +20,7 @@ no content no closing <<text all -<<text>> +<<text>> **bold** completely empty prefixclosing only prefix>> diff --git a/regress/mdoc/Eo/obsolete.in b/regress/mdoc/Eo/obsolete.in index fe0bb087..2640f2aa 100644 --- a/regress/mdoc/Eo/obsolete.in +++ b/regress/mdoc/Eo/obsolete.in @@ -11,7 +11,7 @@ initial text .En enclosed words with Fl flags middle text -.En more enclosed words +.En "(" more enclosed words final text .Pp .Es diff --git a/regress/mdoc/Eo/obsolete.out_ascii b/regress/mdoc/Eo/obsolete.out_ascii index bb2f15c5..cba2fc7d 100644 --- a/regress/mdoc/Eo/obsolete.out_ascii +++ b/regress/mdoc/Eo/obsolete.out_ascii @@ -6,7 +6,7 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN no prior Es - surplus initial text <<enclosed words with --ffllaaggss>> middle text <<more + surplus initial text <<enclosed words with --ffllaaggss>> middle text (<<more enclosed words>> final text initial text after empty Es final text diff --git a/regress/mdoc/Eo/obsolete.out_markdown b/regress/mdoc/Eo/obsolete.out_markdown index 21a3e690..200ea657 100644 --- a/regress/mdoc/Eo/obsolete.out_markdown +++ b/regress/mdoc/Eo/obsolete.out_markdown @@ -12,7 +12,7 @@ surplus initial text <<enclosed words with **-flags**>> middle text -<<more enclosed words>> +(<<more enclosed words>> final text initial text diff --git a/regress/mdoc/Er/noarg.in b/regress/mdoc/Er/noarg.in index 96aa2cee..6dc2aea6 100644 --- a/regress/mdoc/Er/noarg.in +++ b/regress/mdoc/Er/noarg.in @@ -6,7 +6,7 @@ .Nd error constant macro without an argument .Sh DESCRIPTION with error: -.Er ENOENT +.Er ENOENT ";" "Sy" bold ; no error: .Er end of test document diff --git a/regress/mdoc/Er/noarg.out_ascii b/regress/mdoc/Er/noarg.out_ascii index 83f45f07..cd8cc77b 100644 --- a/regress/mdoc/Er/noarg.out_ascii +++ b/regress/mdoc/Er/noarg.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE EErr--nnooaarrgg - error constant macro without an argument DDEESSCCRRIIPPTTIIOONN - with error: ENOENT no error: end of test document + with error: ENOENT; bboolldd; no error: end of test document OpenBSD January 19, 2011 OpenBSD diff --git a/regress/mdoc/Er/noarg.out_markdown b/regress/mdoc/Er/noarg.out_markdown index 0bb4b979..17dba3d4 100644 --- a/regress/mdoc/Er/noarg.out_markdown +++ b/regress/mdoc/Er/noarg.out_markdown @@ -7,7 +7,7 @@ ER-NOARG(1) - General Commands Manual # DESCRIPTION with error: -`ENOENT` +`ENOENT`; **bold**; no error: end of test document diff --git a/regress/mdoc/Ev/font.in b/regress/mdoc/Ev/font.in index a9213d81..75237cb0 100644 --- a/regress/mdoc/Ev/font.in +++ b/regress/mdoc/Ev/font.in @@ -10,4 +10,4 @@ The variable. .Pp And with -.Ev some \\fIembedded\\fP string . +.Ev some \\fIembedded\\fP string ";" "Sy" bold. diff --git a/regress/mdoc/Ev/font.out_ascii b/regress/mdoc/Ev/font.out_ascii index fad07429..a5dc5399 100644 --- a/regress/mdoc/Ev/font.out_ascii +++ b/regress/mdoc/Ev/font.out_ascii @@ -6,6 +6,6 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN The PATH variable. - And with some _e_m_b_e_d_d_e_d string. + And with some _e_m_b_e_d_d_e_d string; bboolldd.. OpenBSD October 21, 2011 OpenBSD diff --git a/regress/mdoc/Ev/font.out_markdown b/regress/mdoc/Ev/font.out_markdown index 491c9329..f2bac6dc 100644 --- a/regress/mdoc/Ev/font.out_markdown +++ b/regress/mdoc/Ev/font.out_markdown @@ -11,6 +11,6 @@ The variable. And with -`some embedded string`. +`some embedded string`; **bold.** OpenBSD - October 21, 2011 diff --git a/regress/mdoc/Fl/punct.in b/regress/mdoc/Fl/punct.in index ac7eecc7..8cc4c2fe 100644 --- a/regress/mdoc/Fl/punct.in +++ b/regress/mdoc/Fl/punct.in @@ -37,3 +37,6 @@ op paren .Fl ( a op bracket .Fl [ a +.Pp +quoted punctuation: +.Fl a "(" b "|" c ")" d "," "Em" italic . diff --git a/regress/mdoc/Fl/punct.out_ascii b/regress/mdoc/Fl/punct.out_ascii index b619154d..1ef60d4d 100644 --- a/regress/mdoc/Fl/punct.out_ascii +++ b/regress/mdoc/Fl/punct.out_ascii @@ -9,4 +9,6 @@ DDEESSCCRRIIPPTTIIOONN excl --! --zz paren --) --zz bracket --] --zz bar -- | --mm op paren (--aa op bracket [--aa + quoted punctuation: --aa (--bb | --cc) --dd, _i_t_a_l_i_c. + OpenBSD August 21, 2014 OpenBSD diff --git a/regress/mdoc/Fl/punct.out_markdown b/regress/mdoc/Fl/punct.out_markdown index aba7054d..54d10ae5 100644 --- a/regress/mdoc/Fl/punct.out_markdown +++ b/regress/mdoc/Fl/punct.out_markdown @@ -39,4 +39,7 @@ op paren op bracket \[**-a** +quoted punctuation: +**-a** (**-b** | **-c**) **-d**, *italic*. + OpenBSD - August 21, 2014 diff --git a/regress/mdoc/Fo/font.in b/regress/mdoc/Fo/font.in index 894a86aa..6e2c7d86 100644 --- a/regress/mdoc/Fo/font.in +++ b/regress/mdoc/Fo/font.in @@ -15,5 +15,5 @@ trailing text .Pp .Fo function .Fa prefix\\fBbold\\fPsuffix -.Fc +.Fc "Sy" bold trailing text diff --git a/regress/mdoc/Fo/font.out_ascii b/regress/mdoc/Fo/font.out_ascii index 3490ad8a..698a7683 100644 --- a/regress/mdoc/Fo/font.out_ascii +++ b/regress/mdoc/Fo/font.out_ascii @@ -8,6 +8,6 @@ DDEESSCCRRIIPPTTIIOONN pprreeffiixx_n_a_m_essuuffffiixx(_t_y_p_e _a_r_g) trailing text - ffuunnccttiioonn(_p_r_e_f_i_xbboolldd_s_u_f_f_i_x) trailing text + ffuunnccttiioonn(_p_r_e_f_i_xbboolldd_s_u_f_f_i_x) bboolldd trailing text OpenBSD July 9, 2012 OpenBSD diff --git a/regress/mdoc/Fo/font.out_markdown b/regress/mdoc/Fo/font.out_markdown index d36e0b8a..84393910 100644 --- a/regress/mdoc/Fo/font.out_markdown +++ b/regress/mdoc/Fo/font.out_markdown @@ -12,7 +12,7 @@ trailing text **prefix*name*suffix**(*type arg*) trailing text -**function**(*prefix**bold**suffix*) +**function**(*prefix**bold**suffix*) **bold** trailing text OpenBSD - July 9, 2012 diff --git a/regress/mdoc/Fo/punct.in b/regress/mdoc/Fo/punct.in index 0b407ffb..e1657ec7 100644 --- a/regress/mdoc/Fo/punct.in +++ b/regress/mdoc/Fo/punct.in @@ -1,9 +1,13 @@ -.Dd November 20, 2014 +.Dd May 20, 2017 .Dt FO-PUNCT 1 .Os OpenBSD .Sh NAME .Nm Fo-punct -.Nd punctuation on function name input lines +.Nd punctuation on function input lines .Sh DESCRIPTION .Ft double -.Fn sin , cos +.Fn sin "," cos "Em" italic +.Pp +.Fa x "," y "Sy" bold +.Pp +.Ft int "," float "Sy" bold diff --git a/regress/mdoc/Fo/punct.out_ascii b/regress/mdoc/Fo/punct.out_ascii index 4e8b1abe..febf646e 100644 --- a/regress/mdoc/Fo/punct.out_ascii +++ b/regress/mdoc/Fo/punct.out_ascii @@ -1,9 +1,13 @@ FO-PUNCT(1) General Commands Manual FO-PUNCT(1) NNAAMMEE - FFoo--ppuunncctt - punctuation on function name input lines + FFoo--ppuunncctt - punctuation on function input lines DDEESSCCRRIIPPTTIIOONN - _d_o_u_b_l_e ssiinn(), cos + _d_o_u_b_l_e ssiinn(), cos _i_t_a_l_i_c -OpenBSD November 20, 2014 OpenBSD + _x, _y bboolldd + + _i_n_t, _f_l_o_a_t bboolldd + +OpenBSD May 20, 2017 OpenBSD diff --git a/regress/mdoc/Fo/punct.out_markdown b/regress/mdoc/Fo/punct.out_markdown index 3128aeef..88524f6f 100644 --- a/regress/mdoc/Fo/punct.out_markdown +++ b/regress/mdoc/Fo/punct.out_markdown @@ -2,11 +2,15 @@ FO-PUNCT(1) - General Commands Manual # NAME -**Fo-punct** - punctuation on function name input lines +**Fo-punct** - punctuation on function input lines # DESCRIPTION *double* -**sin**(), cos +**sin**(), cos *italic* -OpenBSD - November 20, 2014 +*x*, *y* **bold** + +*int*, *float* **bold** + +OpenBSD - May 20, 2017 diff --git a/regress/mdoc/Ic/Makefile b/regress/mdoc/Ic/Makefile index 1be2a84a..33faa380 100644 --- a/regress/mdoc/Ic/Makefile +++ b/regress/mdoc/Ic/Makefile @@ -1,6 +1,6 @@ # $OpenBSD: Makefile,v 1.4 2014/07/02 20:18:42 schwarze Exp $ -REGRESS_TARGETS = noarg font +REGRESS_TARGETS = font noarg punct LINT_TARGETS = noarg .include <bsd.regress.mk> diff --git a/regress/mdoc/Ic/punct.in b/regress/mdoc/Ic/punct.in new file mode 100644 index 00000000..a62058b6 --- /dev/null +++ b/regress/mdoc/Ic/punct.in @@ -0,0 +1,42 @@ +.Dd August 21, 2014 +.Dt Ic-PUNCT 1 +.Os OpenBSD +.Sh NAME +.Nm Ic-punct +.Nd punctuation handling by the Ic macro +.Sh DESCRIPTION +closing punctuation +.Ic a ) +only one +.Ic ) +only more than one +.Ic ) ) +middle +.Ic a ) z +start +.Ic ) z +dot +.Ic . z +comma +.Ic , z +semicolon +.Ic ; z +colon +.Ic : z +quest +.Ic ? z +excl +.Ic ! z +paren +.Ic ) z +bracket +.Ic ] z +bar +.Ic | m +op paren +.Ic ( a +op bracket +.Ic [ a +.Pp +quoted punctuation: +.Ic a "(" b "|" c ")" d "," "Em" italic . diff --git a/regress/mdoc/Ic/punct.out_ascii b/regress/mdoc/Ic/punct.out_ascii new file mode 100644 index 00000000..4c370483 --- /dev/null +++ b/regress/mdoc/Ic/punct.out_ascii @@ -0,0 +1,13 @@ +Ic-PUNCT(1) General Commands Manual Ic-PUNCT(1) + +NNAAMMEE + IIcc--ppuunncctt - punctuation handling by the Ic macro + +DDEESSCCRRIIPPTTIIOONN + closing punctuation aa) only one ) only more than one )) middle aa) zz start + ) zz dot . zz comma , zz semicolon ; zz colon : zz quest ? zz excl ! zz paren ) + zz bracket ] zz bar | mm op paren (aa op bracket [aa + + quoted punctuation: aa (bb | cc) dd, _i_t_a_l_i_c. + +OpenBSD August 21, 2014 OpenBSD diff --git a/regress/mdoc/Ic/punct.out_markdown b/regress/mdoc/Ic/punct.out_markdown new file mode 100644 index 00000000..7fd2742f --- /dev/null +++ b/regress/mdoc/Ic/punct.out_markdown @@ -0,0 +1,45 @@ +Ic-PUNCT(1) - General Commands Manual + +# NAME + +**Ic-punct** - punctuation handling by the Ic macro + +# DESCRIPTION + +closing punctuation +**a**) +only one +) +only more than one +)) +middle +**a**) **z** +start +) **z** +dot +. **z** +comma +, **z** +semicolon +; **z** +colon +: **z** +quest +? **z** +excl +! **z** +paren +) **z** +bracket +] **z** +bar +| **m** +op paren +(**a** +op bracket +\[**a** + +quoted punctuation: +**a** (**b** | **c**) **d**, *italic*. + +OpenBSD - August 21, 2014 diff --git a/regress/mdoc/In/font.in b/regress/mdoc/In/font.in index e24ab18d..9399325b 100644 --- a/regress/mdoc/In/font.in +++ b/regress/mdoc/In/font.in @@ -6,5 +6,5 @@ .Nd changing the font inside the include macro .Sh DESCRIPTION normal text -.In prefix\\fBheader\\fPsuffix +.In prefix\\fBheader\\fPsuffix | after ":" punctuation "Sy" bold trailing text diff --git a/regress/mdoc/In/font.out_ascii b/regress/mdoc/In/font.out_ascii index 7d1948e4..d868a8cd 100644 --- a/regress/mdoc/In/font.out_ascii +++ b/regress/mdoc/In/font.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE IInn--ffoonntt - changing the font inside the include macro DDEESSCCRRIIPPTTIIOONN - normal text <_p_r_e_f_i_xhheeaaddeerr_s_u_f_f_i_x> trailing text + normal text <_p_r_e_f_i_xhheeaaddeerr_s_u_f_f_i_x> | after: punctuation bboolldd trailing text OpenBSD July 9, 2012 OpenBSD diff --git a/regress/mdoc/In/font.out_markdown b/regress/mdoc/In/font.out_markdown index e007a019..4b99b61e 100644 --- a/regress/mdoc/In/font.out_markdown +++ b/regress/mdoc/In/font.out_markdown @@ -7,7 +7,7 @@ IN-FONT(2) - System Calls Manual # DESCRIPTION normal text -<*prefix**header**suffix*> +<*prefix**header**suffix*> | after: punctuation **bold** trailing text OpenBSD - July 9, 2012 diff --git a/regress/mdoc/Li/punct.in b/regress/mdoc/Li/punct.in index 331e55da..02565770 100644 --- a/regress/mdoc/Li/punct.in +++ b/regress/mdoc/Li/punct.in @@ -7,7 +7,7 @@ .Sh DESCRIPTION Leading punctuation: .Li ( b -.Li [ b +.Li "[" b .Li | b .Li . b .Li , b @@ -23,7 +23,7 @@ Trailing punctuation: .Li a [ .Li a | .Li a . -.Li a , +.Li a "," .Li a ; .Li a : .Li a ? @@ -37,11 +37,11 @@ Middle punctuation: .Li a | b .Li a . b .Li a , b -.Li a ; b +.Li a ";" b .Li a : b .Li a ? b .Li a ! b -.Li a ) b +.Li a ")" b .Li a ] b .Pp Isolated punctuation: @@ -78,6 +78,6 @@ Multiple punctuation: .Li [ ( arg ) ] . .Pp Quoted: -.Li "a . b Nm" +.Li "a . b Nm" "Sy" bold .Li ". b Nm" .Li "." diff --git a/regress/mdoc/Li/punct.out_ascii b/regress/mdoc/Li/punct.out_ascii index ae7d3f62..d0de6c9a 100644 --- a/regress/mdoc/Li/punct.out_ascii +++ b/regress/mdoc/Li/punct.out_ascii @@ -21,6 +21,6 @@ DDEESSCCRRIIPPTTIIOONN Multiple punctuation: [(arg)]. - Quoted: a . b Nm . b Nm . + Quoted: a . b Nm bboolldd . b Nm . OpenBSD November 17, 2014 OpenBSD diff --git a/regress/mdoc/Li/punct.out_lint b/regress/mdoc/Li/punct.out_lint index 3abdf12f..bdce45c6 100644 --- a/regress/mdoc/Li/punct.out_lint +++ b/regress/mdoc/Li/punct.out_lint @@ -22,3 +22,4 @@ mandoc: punct.in:70:7: WARNING: skipping empty macro: Li mandoc: punct.in:71:7: WARNING: skipping empty macro: Li mandoc: punct.in:74:7: WARNING: skipping empty macro: Li mandoc: punct.in:75:7: WARNING: skipping empty macro: Li +mandoc: punct.in:83:2: WARNING: skipping empty macro: Li diff --git a/regress/mdoc/Li/punct.out_markdown b/regress/mdoc/Li/punct.out_markdown index fcfc83b3..97110e22 100644 --- a/regress/mdoc/Li/punct.out_markdown +++ b/regress/mdoc/Li/punct.out_markdown @@ -79,8 +79,8 @@ Multiple punctuation: \[(`arg`)]. Quoted: -`a . b Nm` +`a . b Nm` **bold** `. b Nm` -`.` +. OpenBSD - November 17, 2014 diff --git a/regress/mdoc/Ms/font.in b/regress/mdoc/Ms/font.in index dc841740..24c2c236 100644 --- a/regress/mdoc/Ms/font.in +++ b/regress/mdoc/Ms/font.in @@ -6,5 +6,5 @@ .Nd changing fonts inside the mathematical symbol macro .Sh DESCRIPTION normal text -.Ms bold\\fIemphasis\\fPback | after : punctuation +.Ms bold\\fIemphasis\\fPback | after ":" punctuation "Em" italic trailing text diff --git a/regress/mdoc/Ms/font.out_ascii b/regress/mdoc/Ms/font.out_ascii index 280aa407..50ca3b2a 100644 --- a/regress/mdoc/Ms/font.out_ascii +++ b/regress/mdoc/Ms/font.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE MMss--ffoonntt - changing fonts inside the mathematical symbol macro DDEESSCCRRIIPPTTIIOONN - normal text bboolldd_e_m_p_h_a_s_i_sbbaacckk | aafftteerr: ppuunnccttuuaattiioonn trailing text + normal text bboolldd_e_m_p_h_a_s_i_sbbaacckk | aafftteerr: ppuunnccttuuaattiioonn _i_t_a_l_i_c trailing text OpenBSD November 20, 2014 OpenBSD diff --git a/regress/mdoc/Ms/font.out_markdown b/regress/mdoc/Ms/font.out_markdown index 7b04400b..b554083a 100644 --- a/regress/mdoc/Ms/font.out_markdown +++ b/regress/mdoc/Ms/font.out_markdown @@ -7,7 +7,7 @@ MS-FONT(1) - General Commands Manual # DESCRIPTION normal text -**bold*emphasis*back** | **after**: **punctuation** +**bold*emphasis*back** | **after**: **punctuation** *italic* trailing text OpenBSD - November 20, 2014 diff --git a/regress/mdoc/Mt/simple.in b/regress/mdoc/Mt/simple.in index d9e36c3a..16afb2da 100644 --- a/regress/mdoc/Mt/simple.in +++ b/regress/mdoc/Mt/simple.in @@ -6,7 +6,7 @@ .Nd mailto .Sh DESCRIPTION Please send mail to -.Mt schwarze@openbsd.org . +.Mt schwarze@openbsd.org ";" "Sy" bold . .Pp Do not send mail to .Mt . diff --git a/regress/mdoc/Mt/simple.out_ascii b/regress/mdoc/Mt/simple.out_ascii index 65cde864..7b2ea545 100644 --- a/regress/mdoc/Mt/simple.out_ascii +++ b/regress/mdoc/Mt/simple.out_ascii @@ -4,7 +4,7 @@ NNAAMMEE MMtt--ssiimmppllee - mailto DDEESSCCRRIIPPTTIIOONN - Please send mail to _s_c_h_w_a_r_z_e_@_o_p_e_n_b_s_d_._o_r_g. + Please send mail to _s_c_h_w_a_r_z_e_@_o_p_e_n_b_s_d_._o_r_g; bboolldd. Do not send mail to _~. diff --git a/regress/mdoc/Mt/simple.out_markdown b/regress/mdoc/Mt/simple.out_markdown index 78c21be4..9281fee5 100644 --- a/regress/mdoc/Mt/simple.out_markdown +++ b/regress/mdoc/Mt/simple.out_markdown @@ -7,7 +7,7 @@ MT-SIMPLE(1) - General Commands Manual # DESCRIPTION Please send mail to -[schwarze@openbsd.org](mailto:schwarze@openbsd.org). +[schwarze@openbsd.org](mailto:schwarze@openbsd.org); **bold**. Do not send mail to [~](mailto:~). diff --git a/regress/mdoc/No/punct.in b/regress/mdoc/No/punct.in index b4d8ef73..c952c7c4 100644 --- a/regress/mdoc/No/punct.in +++ b/regress/mdoc/No/punct.in @@ -6,7 +6,7 @@ .Nd punctuation after the normal macro .Sh DESCRIPTION Leading punctuation: -.No ( b +.No "(" b .No [ b .No | b .No . b @@ -29,17 +29,17 @@ Trailing punctuation: .No a ? .No a ! .No a ) -.No a ] +.No a "]" .Pp Middle punctuation: .No a ( b -.No a [ b +.No a "[" b .No a | b .No a . b .No a , b .No a ; b .No a : b -.No a ? b +.No a "?" b .No a ! b .No a ) b .No a ] b @@ -78,6 +78,6 @@ Multiple punctuation: .No [ ( arg ) ] . .Pp Quoted: -.No "a . b Nm" +.No "a . b Nm" "Sy" bold .No ". b Nm" .No "." diff --git a/regress/mdoc/No/punct.out_ascii b/regress/mdoc/No/punct.out_ascii index eca39c42..94252d88 100644 --- a/regress/mdoc/No/punct.out_ascii +++ b/regress/mdoc/No/punct.out_ascii @@ -21,6 +21,6 @@ DDEESSCCRRIIPPTTIIOONN Multiple punctuation: [(arg)]. - Quoted: a . b Nm . b Nm . + Quoted: a . b Nm bboolldd . b Nm . OpenBSD November 17, 2014 OpenBSD diff --git a/regress/mdoc/No/punct.out_lint b/regress/mdoc/No/punct.out_lint index cd2fd00f..e46cd67f 100644 --- a/regress/mdoc/No/punct.out_lint +++ b/regress/mdoc/No/punct.out_lint @@ -22,3 +22,4 @@ mandoc: punct.in:70:7: WARNING: skipping empty macro: No mandoc: punct.in:71:7: WARNING: skipping empty macro: No mandoc: punct.in:74:7: WARNING: skipping empty macro: No mandoc: punct.in:75:7: WARNING: skipping empty macro: No +mandoc: punct.in:83:2: WARNING: skipping empty macro: No diff --git a/regress/mdoc/No/punct.out_markdown b/regress/mdoc/No/punct.out_markdown index 6861d214..6dd09c85 100644 --- a/regress/mdoc/No/punct.out_markdown +++ b/regress/mdoc/No/punct.out_markdown @@ -79,7 +79,7 @@ Multiple punctuation: \[(arg)]. Quoted: -a . b Nm +a . b Nm **bold** . b Nm . diff --git a/regress/mdoc/Ns/punct.in b/regress/mdoc/Ns/punct.in index d55cd322..20cfe5cc 100644 --- a/regress/mdoc/Ns/punct.in +++ b/regress/mdoc/Ns/punct.in @@ -8,6 +8,6 @@ Normal words: .No no Ns ns No no Opening punctuation: -.No no Ns ( ns No no +.No no Ns "(" ns No no Closing punctuation: -.No no Ns ns ) No no +.No no "Ns" ns ")" No no diff --git a/regress/mdoc/Oo/punct.in b/regress/mdoc/Oo/punct.in index c9e9d732..59ea4bb7 100644 --- a/regress/mdoc/Oo/punct.in +++ b/regress/mdoc/Oo/punct.in @@ -6,13 +6,13 @@ .Nd punctuation handling by the Oo macro .Sh DESCRIPTION at the beginning: -.Oo ( z +.Oo "(" z .Oo | z .Oo . z -.Oc Oc Oc +.Oc Oc "Sy" bold Oc .Pp in the middle: -.Oo a ( z +.Oo a "(" z .Oo a | z .Oo a . z .Oc Oc Oc diff --git a/regress/mdoc/Oo/punct.out_ascii b/regress/mdoc/Oo/punct.out_ascii index ca487cf6..68addf8d 100644 --- a/regress/mdoc/Oo/punct.out_ascii +++ b/regress/mdoc/Oo/punct.out_ascii @@ -4,7 +4,7 @@ NNAAMMEE OOoo--ppuunncctt - punctuation handling by the Oo macro DDEESSCCRRIIPPTTIIOONN - at the beginning: ([z [| z [. z]]] + at the beginning: ([z [| z [. z]] bboolldd] in the middle: [a (z [a | z [a. z]]] diff --git a/regress/mdoc/Oo/punct.out_markdown b/regress/mdoc/Oo/punct.out_markdown index befa71f3..e6525b1d 100644 --- a/regress/mdoc/Oo/punct.out_markdown +++ b/regress/mdoc/Oo/punct.out_markdown @@ -9,7 +9,7 @@ OO-PUNCT(1) - General Commands Manual at the beginning: (\[z \[| z -\[. z]]] +\[. z]] **bold**] in the middle: \[a (z diff --git a/regress/mdoc/Op/punct.in b/regress/mdoc/Op/punct.in index 02a25c9c..7bc99332 100644 --- a/regress/mdoc/Op/punct.in +++ b/regress/mdoc/Op/punct.in @@ -6,12 +6,12 @@ .Nd punctuation handling by the Op macro .Sh DESCRIPTION at the beginning: -.Op ( z +.Op "(" z .Op | z .Op . z .Pp in the middle: -.Op a ( z +.Op a "(" z .Op a | z .Op a . z .Pp diff --git a/regress/mdoc/Pa/punct.in b/regress/mdoc/Pa/punct.in index ea6c81ff..c243d742 100644 --- a/regress/mdoc/Pa/punct.in +++ b/regress/mdoc/Pa/punct.in @@ -37,3 +37,6 @@ op paren .Pa ( a op bracket .Pa [ a +.Pp +quoted punctuation: +.Pa a "(" b "|" c ")" d "," "Sy" bold . diff --git a/regress/mdoc/Pa/punct.out_ascii b/regress/mdoc/Pa/punct.out_ascii index 65b247e9..ee2a7ed6 100644 --- a/regress/mdoc/Pa/punct.out_ascii +++ b/regress/mdoc/Pa/punct.out_ascii @@ -8,4 +8,6 @@ DDEESSCCRRIIPPTTIIOONN start _~) _z dot _~. _z comma _~, _z semicolon _~; _z colon _~: _z quest _~? _z excl _~! _z paren _~) _z bracket _~] _z bar | _m op paren (_a op bracket [_a + quoted punctuation: _a (_b | _c) _d, bboolldd. + OpenBSD August 21, 2014 OpenBSD diff --git a/regress/mdoc/Pa/punct.out_markdown b/regress/mdoc/Pa/punct.out_markdown index e7b05033..3730d724 100644 --- a/regress/mdoc/Pa/punct.out_markdown +++ b/regress/mdoc/Pa/punct.out_markdown @@ -39,4 +39,7 @@ op paren op bracket \[*a* +quoted punctuation: +*a* (*b* | *c*) *d*, **bold**. + OpenBSD - August 21, 2014 diff --git a/regress/mdoc/Qq/empty.in b/regress/mdoc/Qq/empty.in index 58d6bf3d..81bd207e 100644 --- a/regress/mdoc/Qq/empty.in +++ b/regress/mdoc/Qq/empty.in @@ -8,7 +8,7 @@ An empty .Qq and a full -.Qq user@host +.Qq "(" user@host quotation. And another -.Qo full Qc one . +.Qo "(" full Qc one "Sy" bold . diff --git a/regress/mdoc/Qq/empty.out_ascii b/regress/mdoc/Qq/empty.out_ascii index 311f1e94..a191f455 100644 --- a/regress/mdoc/Qq/empty.out_ascii +++ b/regress/mdoc/Qq/empty.out_ascii @@ -4,6 +4,7 @@ NNAAMMEE QQqq--eemmppttyy - empty implicit enclosure macros DDEESSCCRRIIPPTTIIOONN - An empty "" and a full "user@host" quotation. And another "full" one. + An empty "" and a full ("user@host" quotation. And another ("full" one + bboolldd. OpenBSD October 21, 2010 OpenBSD diff --git a/regress/mdoc/Qq/empty.out_markdown b/regress/mdoc/Qq/empty.out_markdown index 262ae04d..beb8cb30 100644 --- a/regress/mdoc/Qq/empty.out_markdown +++ b/regress/mdoc/Qq/empty.out_markdown @@ -9,9 +9,9 @@ QQ-EMPTY(1) - General Commands Manual An empty "" and a full -"user@host" +("user@host" quotation. And another -"full" one. +("full" one **bold**. OpenBSD - October 21, 2010 diff --git a/regress/mdoc/Sq/empty.in b/regress/mdoc/Sq/empty.in index 00af9a27..4a8cd1e1 100644 --- a/regress/mdoc/Sq/empty.in +++ b/regress/mdoc/Sq/empty.in @@ -8,7 +8,7 @@ An empty .Sq and a full -.Sq user@host +.Sq "(" user@host quotation. And another -.So full Sc one . +.So "(" full Sc one "Sy" bold . diff --git a/regress/mdoc/Sq/empty.out_ascii b/regress/mdoc/Sq/empty.out_ascii index 4ca5e846..cf014420 100644 --- a/regress/mdoc/Sq/empty.out_ascii +++ b/regress/mdoc/Sq/empty.out_ascii @@ -4,6 +4,7 @@ NNAAMMEE SSqq--eemmppttyy - empty implicit enclosure macros DDEESSCCRRIIPPTTIIOONN - An empty `' and a full `user@host' quotation. And another `full' one. + An empty `' and a full (`user@host' quotation. And another (`full' one + bboolldd. OpenBSD October 21, 2010 OpenBSD diff --git a/regress/mdoc/Sq/empty.out_markdown b/regress/mdoc/Sq/empty.out_markdown index 34a3fcbf..1da780b4 100644 --- a/regress/mdoc/Sq/empty.out_markdown +++ b/regress/mdoc/Sq/empty.out_markdown @@ -9,9 +9,9 @@ SQ-EMPTY(1) - General Commands Manual An empty '' and a full -'user@host' +('user@host' quotation. And another -'full' one. +('full' one **bold**. OpenBSD - October 21, 2010 diff --git a/regress/mdoc/St/call.in b/regress/mdoc/St/call.in index 10a45d3a..26dc494a 100644 --- a/regress/mdoc/St/call.in +++ b/regress/mdoc/St/call.in @@ -6,7 +6,7 @@ .Nd the standard macro calling other macros .Sh STANDARDS calling another macro: -.St Fl called +.St "Fl" called .Pp valid argument: .St -p1003.1-2004 diff --git a/regress/mdoc/Sx/noarg.in b/regress/mdoc/Sx/noarg.in index 35c4a64e..f2126b7a 100644 --- a/regress/mdoc/Sx/noarg.in +++ b/regress/mdoc/Sx/noarg.in @@ -6,7 +6,7 @@ .Nd internal cross reference without a target .Sh DESCRIPTION with target: -.Sx DESCRIPTION +.Sx DESCRIPTION ";" "Em" italic no target: .Sx end of test document diff --git a/regress/mdoc/Sx/noarg.out_ascii b/regress/mdoc/Sx/noarg.out_ascii index 343ab007..e3adc0bc 100644 --- a/regress/mdoc/Sx/noarg.out_ascii +++ b/regress/mdoc/Sx/noarg.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE SSxx--nnooaarrgg - internal cross reference without a target DDEESSCCRRIIPPTTIIOONN - with target: _D_E_S_C_R_I_P_T_I_O_N no target: end of test document + with target: _D_E_S_C_R_I_P_T_I_O_N; _i_t_a_l_i_c no target: end of test document OpenBSD January 19, 2011 OpenBSD diff --git a/regress/mdoc/Sx/noarg.out_markdown b/regress/mdoc/Sx/noarg.out_markdown index 0271546f..d3184519 100644 --- a/regress/mdoc/Sx/noarg.out_markdown +++ b/regress/mdoc/Sx/noarg.out_markdown @@ -7,7 +7,7 @@ SX-NOARG(1) - General Commands Manual # DESCRIPTION with target: -*DESCRIPTION* +*DESCRIPTION*; *italic* no target: end of test document diff --git a/regress/mdoc/Sy/punct.in b/regress/mdoc/Sy/punct.in index 4f51886b..764e8aba 100644 --- a/regress/mdoc/Sy/punct.in +++ b/regress/mdoc/Sy/punct.in @@ -7,7 +7,7 @@ .Sh DESCRIPTION Leading punctuation: .Sy ( b -.Sy [ b +.Sy "[" b .Sy | b .Sy . b .Sy , b @@ -28,13 +28,13 @@ Trailing punctuation: .Sy a : .Sy a ? .Sy a ! -.Sy a ) +.Sy a ")" .Sy a ] .Pp Middle punctuation: .Sy a ( b .Sy a [ b -.Sy a | b +.Sy a "|" b .Sy a . b .Sy a , b .Sy a ; b @@ -78,5 +78,6 @@ Multiple punctuation: .Sy [ ( arg ) ] . .Pp Quoted: -.Sy "a . b Nm" +.Sy "a . b Nm" "Em" italic .Sy ". b Nm" +.Sy "." diff --git a/regress/mdoc/Sy/punct.out_ascii b/regress/mdoc/Sy/punct.out_ascii index 39bed0ba..2f368573 100644 --- a/regress/mdoc/Sy/punct.out_ascii +++ b/regress/mdoc/Sy/punct.out_ascii @@ -21,6 +21,6 @@ DDEESSCCRRIIPPTTIIOONN Multiple punctuation: [(aarrgg)]. - Quoted: aa .. bb NNmm .. bb NNmm + Quoted: aa .. bb NNmm _i_t_a_l_i_c .. bb NNmm . OpenBSD November 17, 2014 OpenBSD diff --git a/regress/mdoc/Sy/punct.out_lint b/regress/mdoc/Sy/punct.out_lint index 0073a308..31f1d565 100644 --- a/regress/mdoc/Sy/punct.out_lint +++ b/regress/mdoc/Sy/punct.out_lint @@ -22,3 +22,4 @@ mandoc: punct.in:70:7: WARNING: skipping empty macro: Sy mandoc: punct.in:71:7: WARNING: skipping empty macro: Sy mandoc: punct.in:74:7: WARNING: skipping empty macro: Sy mandoc: punct.in:75:7: WARNING: skipping empty macro: Sy +mandoc: punct.in:83:2: WARNING: skipping empty macro: Sy diff --git a/regress/mdoc/Sy/punct.out_markdown b/regress/mdoc/Sy/punct.out_markdown index 8d91555d..5e3a0c1c 100644 --- a/regress/mdoc/Sy/punct.out_markdown +++ b/regress/mdoc/Sy/punct.out_markdown @@ -79,7 +79,8 @@ Multiple punctuation: \[(**arg**)]. Quoted: -**a . b Nm** +**a . b Nm** *italic* **. b Nm** +. OpenBSD - November 17, 2014 diff --git a/regress/mdoc/Tn/noarg.in b/regress/mdoc/Tn/noarg.in index 1d18a95b..6465042b 100644 --- a/regress/mdoc/Tn/noarg.in +++ b/regress/mdoc/Tn/noarg.in @@ -6,7 +6,7 @@ .Nd trade name macro without argument .Sh DESCRIPTION with argument -.Tn IBM +.Tn IBM "," "Em" italic no argument .Tn end of test document diff --git a/regress/mdoc/Tn/noarg.out_ascii b/regress/mdoc/Tn/noarg.out_ascii index 1333a900..2fc5b4e4 100644 --- a/regress/mdoc/Tn/noarg.out_ascii +++ b/regress/mdoc/Tn/noarg.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE TTnn--nnooaarrgg - trade name macro without argument DDEESSCCRRIIPPTTIIOONN - with argument IBM no argument end of test document + with argument IBM, _i_t_a_l_i_c no argument end of test document OpenBSD January 19, 2011 OpenBSD diff --git a/regress/mdoc/Tn/noarg.out_markdown b/regress/mdoc/Tn/noarg.out_markdown index 64641d63..2ff512c7 100644 --- a/regress/mdoc/Tn/noarg.out_markdown +++ b/regress/mdoc/Tn/noarg.out_markdown @@ -7,7 +7,7 @@ TN-NOARG(1) - General Commands Manual # DESCRIPTION with argument -`IBM` +`IBM`, *italic* no argument end of test document diff --git a/regress/mdoc/Va/Makefile b/regress/mdoc/Va/Makefile index 3d426934..19a5ebb2 100644 --- a/regress/mdoc/Va/Makefile +++ b/regress/mdoc/Va/Makefile @@ -1,6 +1,6 @@ # $OpenBSD: Makefile,v 1.3 2014/07/02 20:18:42 schwarze Exp $ -REGRESS_TARGETS = basic font noarg +REGRESS_TARGETS = basic font noarg punct LINT_TARGETS = noarg .include <bsd.regress.mk> diff --git a/regress/mdoc/Va/punct.in b/regress/mdoc/Va/punct.in new file mode 100644 index 00000000..198e95ae --- /dev/null +++ b/regress/mdoc/Va/punct.in @@ -0,0 +1,42 @@ +.Dd August 21, 2014 +.Dt AR-PUNCT 1 +.Os OpenBSD +.Sh NAME +.Nm Va-punct +.Nd punctuation handling by the Va macro +.Sh DESCRIPTION +closing punctuation +.Va a ) +only one +.Va ) +only more than one +.Va ) ) +middle +.Va a ) z +start +.Va ) z +dot +.Va . z +comma +.Va , z +semicolon +.Va ; z +colon +.Va : z +quest +.Va ? z +excl +.Va ! z +paren +.Va ) z +bracket +.Va ] z +bar +.Va | m +op paren +.Va ( a +op bracket +.Va [ a +.Pp +quoted punctuation: +.Va a "(" b "|" c ")" d "," "Sy" bold . diff --git a/regress/mdoc/Va/punct.out_ascii b/regress/mdoc/Va/punct.out_ascii new file mode 100644 index 00000000..a333c7ee --- /dev/null +++ b/regress/mdoc/Va/punct.out_ascii @@ -0,0 +1,13 @@ +AR-PUNCT(1) General Commands Manual AR-PUNCT(1) + +NNAAMMEE + VVaa--ppuunncctt - punctuation handling by the Va macro + +DDEESSCCRRIIPPTTIIOONN + closing punctuation _a) only one ) only more than one )) middle _a) _z start + ) _z dot . _z comma , _z semicolon ; _z colon : _z quest ? _z excl ! _z paren ) + _z bracket ] _z bar | _m op paren (_a op bracket [_a + + quoted punctuation: _a (_b | _c) _d, bboolldd. + +OpenBSD August 21, 2014 OpenBSD diff --git a/regress/mdoc/Va/punct.out_markdown b/regress/mdoc/Va/punct.out_markdown new file mode 100644 index 00000000..772793f0 --- /dev/null +++ b/regress/mdoc/Va/punct.out_markdown @@ -0,0 +1,45 @@ +AR-PUNCT(1) - General Commands Manual + +# NAME + +**Va-punct** - punctuation handling by the Va macro + +# DESCRIPTION + +closing punctuation +*a*) +only one +) +only more than one +)) +middle +*a*) *z* +start +) *z* +dot +. *z* +comma +, *z* +semicolon +; *z* +colon +: *z* +quest +? *z* +excl +! *z* +paren +) *z* +bracket +] *z* +bar +| *m* +op paren +(*a* +op bracket +\[*a* + +quoted punctuation: +*a* (*b* | *c*) *d*, **bold**. + +OpenBSD - August 21, 2014 diff --git a/regress/mdoc/Xr/args.in b/regress/mdoc/Xr/args.in index 97e68202..3124ed51 100644 --- a/regress/mdoc/Xr/args.in +++ b/regress/mdoc/Xr/args.in @@ -8,13 +8,13 @@ One single .Xr echo 1 is fine, and so is an -.Xr echo 1 followed by something else. +.Xr echo 1 followed by something "Em" else . .Pp But listen for multiple .Xr echo 1 Ns s . .Pp A call, an -.Xr echo 1 , and +.Xr "(" echo 1 ")" , and another .Xr echo 1 . .Pp diff --git a/regress/mdoc/Xr/args.out_ascii b/regress/mdoc/Xr/args.out_ascii index 81fe8784..67e8b712 100644 --- a/regress/mdoc/Xr/args.out_ascii +++ b/regress/mdoc/Xr/args.out_ascii @@ -5,11 +5,11 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN One single echo(1) is fine, and so is an echo(1) followed by something - else. + _e_l_s_e. But listen for multiple echo(1)s. - A call, an echo(1), and another echo(1). + A call, an (echo(1)), and another echo(1). Finally, half an echo, no echo and no echo at all. diff --git a/regress/mdoc/Xr/args.out_markdown b/regress/mdoc/Xr/args.out_markdown index bc102f58..fdfaa8d3 100644 --- a/regress/mdoc/Xr/args.out_markdown +++ b/regress/mdoc/Xr/args.out_markdown @@ -9,13 +9,13 @@ XR-ARGS(1) - General Commands Manual One single echo(1) is fine, and so is an -echo(1) followed by something else. +echo(1) followed by something *else*. But listen for multiple echo(1)s. A call, an -echo(1), and +(echo(1)), and another echo(1). |