=================================================================== RCS file: /cvs/mandoc/mdoc.7,v retrieving revision 1.181 retrieving revision 1.184 diff -u -p -r1.181 -r1.184 --- mandoc/mdoc.7 2011/03/07 01:35:51 1.181 +++ mandoc/mdoc.7 2011/04/01 19:50:49 1.184 @@ -1,4 +1,4 @@ -.\" $Id: mdoc.7,v 1.181 2011/03/07 01:35:51 schwarze Exp $ +.\" $Id: mdoc.7,v 1.184 2011/04/01 19:50:49 kristaps Exp $ .\" .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons .\" Copyright (c) 2010 Ingo Schwarze @@ -15,7 +15,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: March 7 2011 $ +.Dd $Mdocdate: April 1 2011 $ .Dt MDOC 7 .Os .Sh NAME @@ -65,12 +65,14 @@ A macro line with only a control character and comment is also ignored. Macro lines with only a control character and optional whitespace are stripped from input. -.Ss Reserved Characters -Within a macro line, the following characters are reserved: +.Ss Reserved Terms +Within a macro line, the following terms are reserved: .Pp .Bl -tag -width Ds -offset indent -compact .It \&. .Pq period +.It \e. +.Pq escaped period .It \&, .Pq comma .It \&: @@ -91,14 +93,15 @@ Within a macro line, the following characters are rese .Pq exclamation .It \&| .Pq vertical bar +.It \e*(Ba +.Pq reserved-word vertical bar .El .Pp -Use of reserved characters is described in +Use of reserved terms is described in .Sx MACRO SYNTAX . -For general use in macro lines, these characters can either be escaped -with a non-breaking space -.Pq Sq \e& -or, if applicable, an appropriate escape sequence can be used. +For general use in macro lines, these can be escaped with a non-breaking +space +.Pq Sq \e& . .Ss Special Characters Special characters may occur in both macro and free-form lines. Sequences begin with the escape character @@ -706,7 +709,7 @@ and/or tail .El .Ss Block partial-implicit Like block full-implicit, but with single-line scope closed by -.Sx Reserved Characters +.Sx Reserved Terms or end of line. .Bd -literal -offset indent \&.Yo \(lB\-arg \(lBval...\(rB\(rB \(lBbody...\(rB \(lBres...\(rB @@ -739,7 +742,7 @@ section line, else it is .Sx In-line . .Ss In-line Closed by -.Sx Reserved Characters , +.Sx Reserved Terms , end of line, fixed argument lengths, and/or subsequent macros. In-line macros have only text children. If a number (or inequality) of arguments is @@ -799,7 +802,7 @@ then the macro accepts an arbitrary number of argument .It Sx \&Fx Ta Yes Ta Yes Ta n .It Sx \&Hf Ta \&No Ta \&No Ta n .It Sx \&Ic Ta Yes Ta Yes Ta >0 -.It Sx \&In Ta \&No Ta \&No Ta n +.It Sx \&In Ta \&No Ta \&No Ta 1 .It Sx \&Lb Ta \&No Ta \&No Ta 1 .It Sx \&Li Ta Yes Ta Yes Ta >0 .It Sx \&Lk Ta Yes Ta Yes Ta >0 @@ -1858,8 +1861,8 @@ are delimited by commas. If no arguments are specified, blank parenthesis are output. .Pp Examples: -.Dl \&.Fn "int funcname" "int arg0" "int arg1" -.Dl \&.Fn funcname "int arg0" +.Dl \&.Fn \*qint funcname\*q \*qint arg0\*q \*qint arg1\*q +.Dl \&.Fn funcname \*qint arg0\*q .Dl \&.Fn funcname arg0 .Bd -literal -offset indent -compact \&.Ft functype @@ -1889,7 +1892,7 @@ Invocations usually occur in the following context: .br .Pf \. Sx \&Fa Oo Cm argtype Oc Cm argname .br -\.\.\. +\&.\.\. .br .Pf \. Sx \&Fc .Ed