From: schwarze <schwarze@openbsd.org>
Date: Sun, 1 Aug 2010 00:09:48 +0000 (+0000)
Subject: Sync to bsd.lv:
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0cfe274697d3d2e3645d07476fb2606a59a92dc4;p=openbsd

Sync to bsd.lv:
State that we parse and ignore \s and \m font size and colour control
sequences, and remove the detailed, irrelevant documentation.
---

diff --git a/usr.bin/mandoc/mdoc.7 b/usr.bin/mandoc/mdoc.7
index 80539686241..204066e617c 100644
--- a/usr.bin/mandoc/mdoc.7
+++ b/usr.bin/mandoc/mdoc.7
@@ -1,4 +1,4 @@
-.\"	$Id: mdoc.7,v 1.42 2010/07/31 22:07:11 schwarze Exp $
+.\"	$Id: mdoc.7,v 1.43 2010/08/01 00:09:48 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -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: July 31 2010 $
+.Dd $Mdocdate: August 1 2010 $
 .Dt MDOC 7
 .Os
 .Sh NAME
@@ -140,28 +140,7 @@ If
 is specified outside of any font scope, such as in unenclosed, free-form
 text, it will affect the remainder of the document.
 .Pp
-Text may also be sized with the
-.Sq \es
-escape, whose syntax is one of
-.Sq \es+-n
-for one-digit numerals;
-.Sq \es(+-nn
-or
-.Sq \es+-(nn
-for two-digit numerals; and
-.Sq \es[+-N] ,
-.Sq \es+-[N] ,
-.Sq \es'+-N' ,
-or
-.Sq \es+-'N'
-for arbitrary-digit numerals:
-.Pp
-.D1 \es+1bigger\es-1
-.D1 \es[+10]much bigger\es[-10]
-.D1 \es+(10much bigger\es-(10
-.D1 \es+'100'much much bigger\es-'100'
-.Pp
-Note these forms are
+Note this form is
 .Em not
 recommended for
 .Nm ,
@@ -2745,6 +2724,9 @@ macro in groff prints
 .Dq Epoch .
 In mandoc, it resolves to the current date.
 .It
+The \es (font size), \em (font colour), and \eM (font filling colour)
+font decoration escapes are all discarded in mandoc.
+.It
 Old groff fails to assert a newline before
 .Sx \&Bd Fl ragged compact .
 .It
@@ -2792,7 +2774,7 @@ pseudo-macro as a line macro.
 mandoc does.
 .It
 The comment syntax
-.Sq \e."
+.Sq \e\."
 is no longer accepted.
 .It
 In groff, the