From 53dfb28324429335ce7ec410f00c309b99d7841e Mon Sep 17 00:00:00 2001 From: Jason McIntyre Date: Tue, 30 Aug 2011 12:25:10 +0000 Subject: in column lists, enforce the following ordering: .Bl -column header1 header2 ... mixing things up confuses mandoc, and adding flags in can screw up the list. this hopefully just makes things a bit safer (and more consistent). (one more bit of work left and all column lists should format how we want) --- share/man/man4/ahd.4 | 6 +++--- share/man/man7/man.7 | 6 +++--- share/man/man7/mandoc_char.7 | 38 +++++++++++++++++++------------------- share/man/man7/mdoc.7 | 6 +++--- 4 files changed, 28 insertions(+), 28 deletions(-) (limited to 'share/man') diff --git a/share/man/man4/ahd.4 b/share/man/man4/ahd.4 index 5a8ea03663b..328db7ae99b 100644 --- a/share/man/man4/ahd.4 +++ b/share/man/man4/ahd.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ahd.4,v 1.15 2010/01/03 14:31:01 schwarze Exp $ +.\" $OpenBSD: ahd.4,v 1.16 2011/08/30 12:25:09 jmc Exp $ .\" .\" Copyright (c) 1995, 1996, 1997, 1998, 2000 .\" Justin T. Gibbs. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" $FreeBSD: /repoman/r/ncvs/src/share/man/man4/ahd.4,v 1.5 2004/07/04 14:17:41 simon Exp $ .\" -.Dd $Mdocdate: January 3 2010 $ +.Dd $Mdocdate: August 30 2011 $ .Dt AHD 4 .Os .Sh NAME @@ -98,7 +98,7 @@ console when .Dv AHD_DEBUG is enabled. Logically OR the following bits together: -.Bl -column -offset indent Value Function +.Bl -column Value Function -offset indent .It Em "Value Function" .It 0x0001 Show miscellaneous information .It 0x0002 Show sense data diff --git a/share/man/man7/man.7 b/share/man/man7/man.7 index 89aa07fcf52..b2d921f4962 100644 --- a/share/man/man7/man.7 +++ b/share/man/man7/man.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: man.7,v 1.20 2011/08/30 11:38:59 jmc Exp $ +.\" $OpenBSD: man.7,v 1.21 2011/08/30 12:25:09 jmc Exp $ .\" .\" Copyright (c) 2009, 2010 Kristaps Dzonsons .\" @@ -405,7 +405,7 @@ The syntax is as follows: \&.YO \(lBbody...\(rB \(lBbody...\(rB .Ed -.Bl -column -offset indent "MacroX" "ArgumentsX" "ScopeXXXXX" "CompatX" +.Bl -column "MacroX" "ArgumentsX" "ScopeXXXXX" "CompatX" -offset indent .It Em Macro Ta Em Arguments Ta Em Scope Ta Em Notes .It Sx \&AT Ta <=1 Ta current Ta \& .It Sx \&B Ta n Ta next-line Ta \& @@ -471,7 +471,7 @@ No closure refers to an explicit block closing macro. As a rule, block macros may not be nested; thus, calling a block macro while another block macro scope is open, and the open scope is not implicitly closed, is syntactically incorrect. -.Bl -column -offset indent "MacroX" "ArgumentsX" "Head ScopeX" "sub-sectionX" "compatX" +.Bl -column "MacroX" "ArgumentsX" "Head ScopeX" "sub-sectionX" "compatX" -offset indent .It Em Macro Ta Em Arguments Ta Em Head Scope Ta Em Body Scope Ta Em Notes .It Sx \&HP Ta <2 Ta current Ta paragraph Ta \& .It Sx \&IP Ta <3 Ta current Ta paragraph Ta \& diff --git a/share/man/man7/mandoc_char.7 b/share/man/man7/mandoc_char.7 index 0d873b1c210..b9c885dff91 100644 --- a/share/man/man7/mandoc_char.7 +++ b/share/man/man7/mandoc_char.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mandoc_char.7,v 1.10 2011/08/30 11:38:59 jmc Exp $ +.\" $OpenBSD: mandoc_char.7,v 1.11 2011/08/30 12:25:09 jmc Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons .\" @@ -74,7 +74,7 @@ It's guaranteed that each input symbol will correspond to a These are the preferred input symbols for producing special characters. .Pp Spacing: -.Bl -column -compact -offset indent "Input" "Description" +.Bl -column "Input" "Description" -offset indent -compact .It Em Input Ta Em Description .It \e~ Ta non-breaking, non-collapsing space .It \e Ta breaking, non-collapsing n-width space @@ -87,7 +87,7 @@ Spacing: .El .Pp Lines: -.Bl -column -compact -offset indent "Input" "Rendered" "Description" +.Bl -column "Input" "Rendered" "Description" -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(ba Ta \(ba Ta bar .It \e(br Ta \(br Ta box rule @@ -99,7 +99,7 @@ Lines: .El .Pp Text markers: -.Bl -column -compact -offset indent "Input" "Rendered" "Description" +.Bl -column "Input" "Rendered" "Description" -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(ci Ta \(ci Ta circle .It \e(bu Ta \(bu Ta bullet @@ -118,7 +118,7 @@ Text markers: .El .Pp Legal symbols: -.Bl -column -compact -offset indent "Input" "Rendered" "Description" +.Bl -column "Input" "Rendered" "Description" -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(co Ta \(co Ta copyright .It \e(rg Ta \(rg Ta registered @@ -126,7 +126,7 @@ Legal symbols: .El .Pp Punctuation: -.Bl -column -compact -offset indent "Input" "Rendered" "Description" +.Bl -column "Input" "Rendered" "Description" -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(em Ta \(em Ta em-dash .It \e(en Ta \(en Ta en-dash @@ -138,7 +138,7 @@ Punctuation: .El .Pp Quotes: -.Bl -column -compact -offset indent "Input" "Rendered" "Description" +.Bl -column "Input" "Rendered" "Description" -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(Bq Ta \(Bq Ta right low double-quote .It \e(bq Ta \(bq Ta right low single-quote @@ -155,7 +155,7 @@ Quotes: .El .Pp Brackets: -.Bl -column -compact -offset indent "xxbracketrightbpx" Rendered Description +.Bl -column "xxbracketrightbpx" Rendered Description -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(lB Ta \(lB Ta left bracket .It \e(rB Ta \(rB Ta right bracket @@ -194,7 +194,7 @@ Brackets: .El .Pp Arrows: -.Bl -column -compact -offset indent "Input" "Rendered" "Description" +.Bl -column "Input" "Rendered" "Description" -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(<- Ta \(<- Ta left arrow .It \e(-> Ta \(-> Ta right arrow @@ -211,7 +211,7 @@ Arrows: .El .Pp Logical: -.Bl -column -compact -offset indent "Input" "Rendered" "Description" +.Bl -column "Input" "Rendered" "Description" -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(AN Ta \(AN Ta logical and .It \e(OR Ta \(OR Ta logical or @@ -226,7 +226,7 @@ Logical: .El .Pp Mathematical: -.Bl -column -compact -offset indent "xxcoproductxx" "Rendered" "Description" +.Bl -column "xxcoproductxx" "Rendered" "Description" -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(pl Ta \(pl Ta plus .It \e(mi Ta \(mi Ta minus @@ -291,7 +291,7 @@ Mathematical: .El .Pp Ligatures: -.Bl -column -compact -offset indent "Input" "Rendered" "Description" +.Bl -column "Input" "Rendered" "Description" -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(ff Ta \(ff Ta ff ligature .It \e(fi Ta \(fi Ta fi ligature @@ -308,7 +308,7 @@ Ligatures: .El .Pp Accents: -.Bl -column -compact -offset indent "Input" "Rendered" "Description" +.Bl -column "Input" "Rendered" "Description" -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(a" Ta \(a" Ta Hungarian umlaut .It \e(a- Ta \(a- Ta macron @@ -330,7 +330,7 @@ Accents: .El .Pp Accented letters: -.Bl -column -compact -offset indent "Input" "Rendered" "Description" +.Bl -column "Input" "Rendered" "Description" -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e('A Ta \('A Ta acute A .It \e('E Ta \('E Ta acute E @@ -390,7 +390,7 @@ Accented letters: .El .Pp Special letters: -.Bl -column -compact -offset indent "Input" "Rendered" "Description" +.Bl -column "Input" "Rendered" "Description" -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(-D Ta \(-D Ta Eth .It \e(Sd Ta \(Sd Ta eth @@ -401,7 +401,7 @@ Special letters: .El .Pp Currency: -.Bl -column -compact -offset indent "Input" "Rendered" "Description" +.Bl -column "Input" "Rendered" "Description" -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(Do Ta \(Do Ta dollar .It \e(ct Ta \(ct Ta cent @@ -414,7 +414,7 @@ Currency: .El .Pp Units: -.Bl -column -compact -offset indent "Input" "Rendered" "Description" +.Bl -column "Input" "Rendered" "Description" -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(de Ta \(de Ta degree .It \e(%0 Ta \(%0 Ta per-thousand @@ -424,7 +424,7 @@ Units: .El .Pp Greek letters: -.Bl -column -compact -offset indent "Input" "Rendered" "Description" +.Bl -column "Input" "Rendered" "Description" -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(*A Ta \(*A Ta Alpha .It \e(*B Ta \(*B Ta Beta @@ -488,7 +488,7 @@ They are for use, as they differ across implementations. Manuals using these predefined strings are almost certainly not portable. -.Bl -column -offset indent "Input" "Rendered" "Description" +.Bl -column "Input" "Rendered" "Description" -offset indent .It Em Input Ta Em Rendered Ta Em Description .It \e*(Ba Ta \*(Ba Ta vertical bar .It \e*(Ne Ta \*(Ne Ta not equal diff --git a/share/man/man7/mdoc.7 b/share/man/man7/mdoc.7 index c6856b360b0..9218f733f76 100644 --- a/share/man/man7/mdoc.7 +++ b/share/man/man7/mdoc.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mdoc.7,v 1.80 2011/08/30 11:38:59 jmc Exp $ +.\" $OpenBSD: mdoc.7,v 1.81 2011/08/30 12:25:09 jmc Exp $ .\" .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons .\" Copyright (c) 2010 Ingo Schwarze @@ -650,7 +650,7 @@ contain a head. \(lBbody...\(rB \&.Yc .Ed -.Bl -column -offset indent "MacroX" "CallableX" "ParsedX" "closed by XXX" +.Bl -column "MacroX" "CallableX" "ParsedX" "closed by XXX" -offset indent .It Em Macro Ta Em Callable Ta Em Parsed Ta Em Scope .It Sx \&Bd Ta \&No Ta \&No Ta closed by Sx \&Ed .It Sx \&Bf Ta \&No Ta \&No Ta closed by Sx \&Ef @@ -682,7 +682,7 @@ has multiple heads. \&.Yo \(lB\-arg \(lBparm...\(rB\(rB \(lBhead... \(lBTa head...\(rB\(rB \(lBbody...\(rB .Ed -.Bl -column -offset indent "MacroX" "CallableX" "ParsedX" "closed by XXXXXXXXXXX" +.Bl -column "MacroX" "CallableX" "ParsedX" "closed by XXXXXXXXXXX" -offset indent .It Em Macro Ta Em Callable Ta Em Parsed Ta Em Scope .It Sx \&It Ta \&No Ta Yes Ta closed by Sx \&It , Sx \&El .It Sx \&Nd Ta \&No Ta \&No Ta closed by Sx \&Sh -- cgit v1.2.3