From 60dd10dead840994ee21087a8fcdcf92aa139c64 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Wed, 18 Jul 2012 10:36:21 +0000 Subject: The mdoc(7) \*(Ba predefined string actually forces roman font; that's stupid because it may break enclosing font changes, but let's do the same for groff bug compatibility. --> Never use \*(Ba, use just plain "|"! <-- Also, predefined strings are already expanded by the roff(7) parser, so the mdoc(7) parser has to look for the expanded string. Formatting improvements in ksh(1), less(1), atan2(3), hostapd.conf(5), snmpd.conf(5), and mknod(8). --- regress/usr.bin/mandoc/char/Makefile | 4 +-- regress/usr.bin/mandoc/char/bar/Makefile | 5 ++++ regress/usr.bin/mandoc/char/bar/man.in | 12 +++++++++ regress/usr.bin/mandoc/char/bar/man.out_ascii | 21 +++++++++++++++ regress/usr.bin/mandoc/char/bar/mdoc.in | 37 ++++++++++++++++++++++++++ regress/usr.bin/mandoc/char/bar/mdoc.out_ascii | 31 +++++++++++++++++++++ 6 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 regress/usr.bin/mandoc/char/bar/Makefile create mode 100644 regress/usr.bin/mandoc/char/bar/man.in create mode 100644 regress/usr.bin/mandoc/char/bar/man.out_ascii create mode 100644 regress/usr.bin/mandoc/char/bar/mdoc.in create mode 100644 regress/usr.bin/mandoc/char/bar/mdoc.out_ascii (limited to 'regress') diff --git a/regress/usr.bin/mandoc/char/Makefile b/regress/usr.bin/mandoc/char/Makefile index 1c764d0ec0f..a5f921786cc 100644 --- a/regress/usr.bin/mandoc/char/Makefile +++ b/regress/usr.bin/mandoc/char/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.5 2011/11/17 16:28:45 schwarze Exp $ +# $OpenBSD: Makefile,v 1.6 2012/07/18 10:36:20 schwarze Exp $ -SUBDIR+= hyphen space N +SUBDIR = hyphen bar space N ascii groff groff-clean obj-clean tman: _SUBDIRUSE diff --git a/regress/usr.bin/mandoc/char/bar/Makefile b/regress/usr.bin/mandoc/char/bar/Makefile new file mode 100644 index 00000000000..0245631cc7b --- /dev/null +++ b/regress/usr.bin/mandoc/char/bar/Makefile @@ -0,0 +1,5 @@ +# $OpenBSD: Makefile,v 1.1 2012/07/18 10:36:20 schwarze Exp $ + +REGRESS_TARGETS = man mdoc + +.include diff --git a/regress/usr.bin/mandoc/char/bar/man.in b/regress/usr.bin/mandoc/char/bar/man.in new file mode 100644 index 00000000000..acabf50175f --- /dev/null +++ b/regress/usr.bin/mandoc/char/bar/man.in @@ -0,0 +1,12 @@ +.TH bar-man 1 "July 17, 2012" OpenBSD +.SH NAME +\fBbar-man\fR - formatting the vertical bar symbol +.SH DESCRIPTION +.SS normal bar +Manually switching fonts: \fIitalic\fRroman|roman\fPitalic +.PP +.B prefix | suffix +.SS special character +Manually switching fonts: \fIitalic\fRroman\(baroman\fPitalic +.PP +.B prefix \(ba suffix diff --git a/regress/usr.bin/mandoc/char/bar/man.out_ascii b/regress/usr.bin/mandoc/char/bar/man.out_ascii new file mode 100644 index 00000000000..55b8a9ad636 --- /dev/null +++ b/regress/usr.bin/mandoc/char/bar/man.out_ascii @@ -0,0 +1,21 @@ +bar-man(1) OpenBSD Reference Manual bar-man(1) + + + +NNAAMMEE + bbaarr--mmaann - formatting the vertical bar symbol + +DDEESSCCRRIIPPTTIIOONN + nnoorrmmaall bbaarr + Manually switching fonts: _i_t_a_l_i_croman|roman_i_t_a_l_i_c + + pprreeffiixx || ssuuffffiixx + + ssppeecciiaall cchhaarraacctteerr + Manually switching fonts: _i_t_a_l_i_croman|roman_i_t_a_l_i_c + + pprreeffiixx || ssuuffffiixx + + + +OpenBSD July 17, 2012 bar-man(1) diff --git a/regress/usr.bin/mandoc/char/bar/mdoc.in b/regress/usr.bin/mandoc/char/bar/mdoc.in new file mode 100644 index 00000000000..5e9afa0ad2d --- /dev/null +++ b/regress/usr.bin/mandoc/char/bar/mdoc.in @@ -0,0 +1,37 @@ +.Dd July 17, 2012 +.Dt BAR-MDOC 1 +.Os OpenBSD +.Sh NAME +.Nm bar-mdoc +.Nd formatting the vertical bar symbol +.Sh DESCRIPTION +.Ss normal bar +Manually switching fonts: \fIitalic\fRroman|roman\fPitalic\fR +.Pp +.Fl isolated | em|bedded \fR|\fP formatted +.br +.Sy isolated | em|bedded \fR|\fP formatted +.br +.Ar isolated | em|bedded \fR|\fP formatted +.br +.Em isolated | em|bedded \fR|\fP formatted +.Ss special character +Manually switching fonts: \fIitalic\fRroman\(baroman\fPitalic\fR +.Pp +.Fl isolated \(ba em\(babedded \fR\(ba\fP formatted \fB\(ba\fP bold +.br +.Sy isolated \(ba em\(babedded \fR\(ba\fP formatted \fB\(ba\fP bold +.br +.Ar isolated \(ba em\(babedded \fR\(ba\fP formatted \fB\(ba\fP bold +.br +.Em isolated \(ba em\(babedded \fR\(ba\fP formatted \fB\(ba\fP bold +.Ss predefined string +Manually switching fonts: \fIitalic\fRroman\*(Baroman\fPbroken\fR +.Pp +.Fl isolated \*(Ba em\*(Babedded +.br +.Sy isolated \*(Ba em\*(Babedded +.br +.Ar isolated \*(Ba em\*(Babedded +.br +.Em isolated \*(Ba em\*(Babedded diff --git a/regress/usr.bin/mandoc/char/bar/mdoc.out_ascii b/regress/usr.bin/mandoc/char/bar/mdoc.out_ascii new file mode 100644 index 00000000000..24ccb400385 --- /dev/null +++ b/regress/usr.bin/mandoc/char/bar/mdoc.out_ascii @@ -0,0 +1,31 @@ +BAR-MDOC(1) OpenBSD Reference Manual BAR-MDOC(1) + +NNAAMMEE + bbaarr--mmddoocc - formatting the vertical bar symbol + +DDEESSCCRRIIPPTTIIOONN + nnoorrmmaall bbaarr + Manually switching fonts: _i_t_a_l_i_croman|roman_i_t_a_l_i_c + + --iissoollaatteedd | --eemm||bbeeddddeedd | --ffoorrmmaatttteedd + iissoollaatteedd | eemm||bbeeddddeedd | ffoorrmmaatttteedd + _i_s_o_l_a_t_e_d | _e_m_|_b_e_d_d_e_d | _f_o_r_m_a_t_t_e_d + _i_s_o_l_a_t_e_d | _e_m_|_b_e_d_d_e_d | _f_o_r_m_a_t_t_e_d + + ssppeecciiaall cchhaarraacctteerr + Manually switching fonts: _i_t_a_l_i_croman|roman_i_t_a_l_i_c + + --iissoollaatteedd --|| --eemm||bbeeddddeedd --| --ffoorrmmaatttteedd --|| --bboolldd + iissoollaatteedd || eemm||bbeeddddeedd | ffoorrmmaatttteedd || bboolldd + _i_s_o_l_a_t_e_d _| _e_m_|_b_e_d_d_e_d | _f_o_r_m_a_t_t_e_d || _b_o_l_d + _i_s_o_l_a_t_e_d _| _e_m_|_b_e_d_d_e_d | _f_o_r_m_a_t_t_e_d || _b_o_l_d + + pprreeddeeffiinneedd ssttrriinngg + Manually switching fonts: _i_t_a_l_i_croman|romanbroken + + --iissoollaatteedd | --eemm|bbeeddddeedd + iissoollaatteedd | eemm|bbeeddddeedd + _i_s_o_l_a_t_e_d | _e_m|_b_e_d_d_e_d + _i_s_o_l_a_t_e_d | _e_m|_b_e_d_d_e_d + +OpenBSD July 17, 2012 OpenBSD -- cgit v1.2.3