=================================================================== RCS file: /cvs/mandoc/man.7,v retrieving revision 1.34 retrieving revision 1.36 diff -u -p -r1.34 -r1.36 --- mandoc/man.7 2009/08/20 13:51:55 1.34 +++ mandoc/man.7 2009/08/22 09:10:37 1.36 @@ -1,4 +1,4 @@ -.\" $Id: man.7,v 1.34 2009/08/20 13:51:55 kristaps Exp $ +.\" $Id: man.7,v 1.36 2009/08/22 09:10:37 kristaps Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: August 20 2009 $ +.Dd $Mdocdate: August 22 2009 $ .Dt MAN 7 .Os . @@ -205,18 +205,14 @@ foo .Pp is equivalent to .Sq \&.I foo . -.\" PARAGRAPH -Consecutive next-line scope invocations are disallowed. +If next-line macros are invoked consecutively, only the last is used. +If a next-line macro is proceded by a block macro, it is ignored. .Bd -literal -offset indent \&.YO \(lBbody...\(rB \(lBbody...\(rB .Ed . .Pp -It is considered an error when next-line scope is open at the end of -file. -. -.Pp .Bl -column -compact -offset indent "MacroX" "ArgumentsX" "ScopeXXXXX" .It Em Macro Ta Em Arguments Ta Em Scope .It B Ta n Ta next-line @@ -232,6 +228,7 @@ file. .It SB Ta n Ta next-line .It SM Ta n Ta next-line .It TH Ta >1, <6 Ta current +.It UC Ta n Ta current .It br Ta 0 Ta current .It fi Ta 0 Ta current .It i Ta n Ta current @@ -245,6 +242,7 @@ file. The .Sq RS , .Sq RE , +.Sq UC , .Sq br , .Sq fi , .Sq i , @@ -253,9 +251,7 @@ The .Sq r , and .Sq sp -macros aren't historically part of -.Nm -and should not be used. They're included for compatibility. +macros should not be used. They're included for compatibility. . . .Ss Block Macros @@ -288,10 +284,6 @@ or No closure refers to an explicit block closing macro. . .Pp -It is considered an error when part or next-line scope is open at the -end of file. -. -.Pp .Bl -column "MacroX" "ArgumentsX" "Head ScopeX" "sub-sectionX" -compact -offset indent .It Em Macro Ta Em Arguments Ta Em Head Scope Ta Em Body Scope .It HP Ta <2 Ta current Ta paragraph @@ -311,6 +303,7 @@ If a block macro is next-line scoped, it may only be f macros (excluding .Sq DT , .Sq TH , +.Sq UC , .Sq br , .Sq na , .Sq sp , @@ -365,7 +358,7 @@ render in italics. Whitespace between arguments is om Text is rendered alternately in bold face and roman (the default font). Whitespace between arguments is omitted in output. .It DT -Re-set the tab spacing to 0.5 inches. +Has no effect. Included for compatibility. .It HP Begin a paragraph whose initial output line is left-justified, but subsequent output lines are indented, with the following syntax: @@ -474,6 +467,8 @@ buffer to the indentation width. Subsequent output li The indentation width may be set as follows: .Bd -literal -offset indent \&.TP [width] +.It UC +Has no effect. Included for compatibility. .Ed . .Pp @@ -492,7 +487,7 @@ End literal mode begun by Italicise arguments. If no arguments are specified, all subsequent text is italicised. .It na -Don't alignment the right margin. +Don't align to the right margin. .It nf Begin literal mode: all subsequent free-form lines have their end of line boundaries preserved. May be ended by