diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2010-03-22 05:59:32 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-03-22 05:59:32 +0000 |
| commit | f27e8dcec6089cf24702107e517e3c0c5950477d (patch) | |
| tree | 820e7552a3bbb4dec58c8f24329f3bce76140c82 /man.7 | |
| parent | b89219869bcc53798ee875bb243b8c4f60b23bda (diff) | |
| download | mandoc-f27e8dcec6089cf24702107e517e3c0c5950477d.tar.gz mandoc-f27e8dcec6089cf24702107e517e3c0c5950477d.tar.zst mandoc-f27e8dcec6089cf24702107e517e3c0c5950477d.zip | |
Accomodate (libman) for next-line macros followed by non-text macros `na', `sp', and `br'.
Based on a patch by Ingo Schwarze.
Diffstat (limited to 'man.7')
| -rw-r--r-- | man.7 | 26 |
1 files changed, 17 insertions, 9 deletions
@@ -1,4 +1,4 @@ -.\" $Id: man.7,v 1.55 2010/01/07 19:10:09 kristaps Exp $ +.\" $Id: man.7,v 1.56 2010/03/22 05:59:32 kristaps Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se> .\" @@ -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: January 7 2010 $ +.Dd $Mdocdate: March 22 2010 $ .Dt MAN 7 .Os . @@ -423,8 +423,8 @@ subsequent lines until closed by another block macro. .Ss Line Macros Line macros are generally scoped to the current line, with the body consisting of zero or more arguments. If a macro is scoped to the next -line and the line arguments are empty, the next line is used instead, -else the general syntax is used. Thus: +line and the line arguments are empty, the next line, which must be +text, is used instead. Thus: .Bd -literal -offset indent \&.I foo @@ -433,9 +433,15 @@ foo .Pp is equivalent to .Sq \&.I foo . -If next-line macros are invoked consecutively, only the last is used; in -other words, if a next-line macro is preceded by a block macro, it is -ignored. +If next-line macros are invoked consecutively, only the last is used. +If a next-line macro is followed by a non-next-line macro, an error is +raised (unless in the case of +.Sx \&br , +.Sx \&sp , +or +.Sx \&na ) . +.Pp +The syntax is as follows: .Bd -literal -offset indent \&.YO \(lBbody...\(rB \(lBbody...\(rB @@ -488,8 +494,10 @@ macros should not be used. They're included for compatibility. .Ss Block Macros Block macros are comprised of a head and body. Like for in-line macros, the head is scoped to the current line and, in one circumstance, the -next line; the body is scoped to subsequent lines and is closed out by a -subsequent block macro invocation. +next line (the next-line stipulations for line macros apply here as +well). +.Pp +The syntax is as follows: .Bd -literal -offset indent \&.YO \(lBhead...\(rB \(lBhead...\(rB |