From ecf3d7a66ad4080c5dabd04c50179340b4f39242 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 5 May 2017 02:31:35 +0000 Subject: Clean up docs after today's .br and .ft code cleanup; simpler. --- man.7 | 16 +++++----------- mdoc.7 | 14 ++------------ roff.7 | 14 ++++---------- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/man.7 b/man.7 index bfeec516..6e85b61f 100644 --- a/man.7 +++ b/man.7 @@ -1,4 +1,4 @@ -.\" $Id: man.7,v 1.132 2015/01/29 00:33:57 schwarze Exp $ +.\" $Id: man.7,v 1.133 2017/05/05 02:31:35 schwarze Exp $ .\" .\" Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons .\" Copyright (c) 2011-2015 Ingo Schwarze @@ -16,7 +16,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 29 2015 $ +.Dd $Mdocdate: May 5 2017 $ .Dt MAN 7 .Os .Sh NAME @@ -266,7 +266,6 @@ in the alphabetical reference below. .It Sx TP Ta tagged paragraph: Op Ar width .It Sx HP Ta hanged paragraph: Op Ar width .It Sx PD Ta set vertical paragraph distance: Op Ar height -.It Sx \&br Ta force output line break in text mode (no arguments) .It Sx \&sp Ta force vertical space: Op Ar height .It Sx fi , nf Ta fill mode and no-fill mode (no arguments) .It Sx in Ta additional indent: Op Ar width @@ -748,12 +747,10 @@ The argument is a scaling width as described in .Xr roff 7 . If 0, this is equivalent to the -.Sx \&br -macro. +.Xr roff 7 +.Ic \&br +request. Defaults to 1, if unspecified. -.Pp -See also -.Sx \&br . .Sh MACRO SYNTAX The .Nm @@ -778,8 +775,6 @@ is equivalent to 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, except for -.Sx \&br -and .Sx \&sp . .Pp The syntax is as follows: @@ -808,7 +803,6 @@ The syntax is as follows: .It Sx \&SM Ta n Ta next-line Ta \& .It Sx \&TH Ta >1, <6 Ta current Ta \& .It Sx \&UC Ta <=1 Ta current Ta \& -.It Sx \&br Ta 0 Ta current Ta compat .It Sx \&fi Ta 0 Ta current Ta compat .It Sx \&in Ta 1 Ta current Ta compat .It Sx \&nf Ta 0 Ta current Ta compat diff --git a/mdoc.7 b/mdoc.7 index 6d958877..00ed53ed 100644 --- a/mdoc.7 +++ b/mdoc.7 @@ -1,4 +1,4 @@ -.\" $Id: mdoc.7,v 1.262 2017/02/16 14:38:12 schwarze Exp $ +.\" $Id: mdoc.7,v 1.263 2017/05/05 02:31:35 schwarze Exp $ .\" .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons .\" Copyright (c) 2010, 2011, 2013-2017 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: February 16 2017 $ +.Dd $Mdocdate: May 5 2017 $ .Dt MDOC 7 .Os .Sh NAME @@ -476,7 +476,6 @@ in the alphabetical .It Sx \&Ap Ta apostrophe without surrounding whitespace (no arguments) .It Sx \&Sm Ta switch horizontal spacing mode: Op Cm on | off .It Sx \&Bk , \&Ek Ta keep block: Fl words -.It Sx \&br Ta force output line break in text mode (no arguments) .It Sx \&sp Ta force vertical space: Op Ar height .El .Ss Semantic markup for command line utilities: @@ -2736,14 +2735,6 @@ Examples: .Dl \&.Xr mandoc 1 .Dl \&.Xr mandoc 1 \&; .Dl \&.Xr mandoc 1 \&Ns s behaviour -.Ss \&br -Emits a line-break. -This macro should not be used; it is implemented for compatibility with -historical manuals. -.Pp -Consider using -.Sx \&Pp -in the event of natural paragraph breaks. .Ss \&sp Emits vertical space. This macro should not be used; it is implemented for compatibility with @@ -3043,7 +3034,6 @@ then the macro accepts an arbitrary number of arguments. .It Sx \&Va Ta Yes Ta Yes Ta n .It Sx \&Vt Ta Yes Ta Yes Ta >0 .It Sx \&Xr Ta Yes Ta Yes Ta 2 -.It Sx \&br Ta \&No Ta \&No Ta 0 .It Sx \&sp Ta \&No Ta \&No Ta 1 .El .Ss Delimiters diff --git a/roff.7 b/roff.7 index 7d26467e..fbb2ac8d 100644 --- a/roff.7 +++ b/roff.7 @@ -1,4 +1,4 @@ -.\" $Id: roff.7,v 1.76 2017/02/21 23:44:43 schwarze Exp $ +.\" $Id: roff.7,v 1.77 2017/05/05 02:31:35 schwarze Exp $ .\" .\" Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons .\" Copyright (c) 2010, 2011, 2013-2015 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: February 21 2017 $ +.Dd $Mdocdate: May 5 2017 $ .Dt ROFF 7 .Os .Sh NAME @@ -492,10 +492,6 @@ Define a frame and place a picture in it. This is a Heirloom extension and currently unsupported. .Ss \&br Break the output line. -See -.Xr man 7 -and -.Xr mdoc 7 . .Ss \&break Break out of a .Sx \&while @@ -950,10 +946,8 @@ switches to normal font switches back to the previous font .El .Pp -This request takes effect only locally, may be overridden by macros -and escape sequences, and is only supported in -.Xr man 7 -for now. +This request takes effect only locally and may be overridden +by macros and escape sequences. .Ss \&ftr Translate font name. This is a groff extension and currently ignored. -- cgit v1.2.3-56-ge451