Implement the first steps of equation parsing from within libmdoc.

[mandoc.git] / roff.7

diff --git a/roff.7 b/roff.7
index 109cda3bc6f756e180b6655c77a614dcf11cdc25..41837a1d3c88cf752e8b2f231adc6dfc1708635d 100644 (file)
--- a/roff.7
+++ b/roff.7
@@ -1,4 +1,4 @@
-.\"    $Id: roff.7,v 1.24 2011/01/24 23:17:19 schwarze Exp $
+.\"    $Id: roff.7,v 1.29 2011/05/24 15:22:14 kristaps Exp $

 .\"
 .\" Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
 .\"
 .\" Copyright (c) 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.
 .\"
 .\" 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 24 2011 $
+.Dd $Mdocdate: May 24 2011 $

 .Dt ROFF 7
 .Os
 .Sh NAME
 .Dt ROFF 7
 .Os
 .Sh NAME


@@ -57,10 +57,6 @@ To produce other characters in the output, use the escape sequences
 documented in the
 .Xr mandoc_char 7
 manual.
 documented in the
 .Xr mandoc_char 7
 manual.

-.Pp
-All manuals must have
-.Ux
-line terminators.

 .Sh REQUEST SYNTAX
 A request or macro line consists of:
 .Pp
 .Sh REQUEST SYNTAX
 A request or macro line consists of:
 .Pp


@@ -348,6 +344,15 @@ then false is assumed.
 The syntax of this request is similar to
 .Sx \&if
 except that the conditional is missing.
 The syntax of this request is similar to
 .Sx \&if
 except that the conditional is missing.

+.Ss \&EN
+End an equation block.
+See
+.Sx \&EQ .
+.Ss \&EQ
+Begin an equation block.
+See
+.Xr eqn 7
+for a description of the equation language.

 .Ss \&hy
 Set automatic hyphenation mode.
 This line-scoped request is currently ignored.
 .Ss \&hy
 Set automatic hyphenation mode.
 This line-scoped request is currently ignored.


@@ -443,15 +448,20 @@ than having the request or macro follow as
 The scope of a conditional is always parsed, but only executed if the
 conditional evaluates to true.
 .Pp
 The scope of a conditional is always parsed, but only executed if the
 conditional evaluates to true.
 .Pp

-Note that text following an
-.Sq \&.\e}
-escape sequence is discarded.
-Furthermore, if an explicit closing sequence
+Note that the

 .Sq \e}
 .Sq \e}

-is specified in a free-form line, the entire line is accepted within the
-scope of the prior request, not only the text preceding the close, with the
+is converted into a zero-width escape sequence if not passed as a
+standalone macro
+.Sq \&.\e} .
+For example,
+.Pp
+.D1 \&.Fl a \e} b
+.Pp
+will result in

 .Sq \e}
 .Sq \e}

-collapsing into a zero-width space.
+being considered an argument of the
+.Sq \&Fl
+macro.

 .Ss \&ig
 Ignore input.
 Its syntax can be either
 .Ss \&ig
 Ignore input.
 Its syntax can be either


@@ -541,6 +551,16 @@ section with the
 .Cm \&Sh
 macro will reset this register.
 .El
 .Cm \&Sh
 macro will reset this register.
 .El

+.Ss \&ns
+Turn on no-space mode.
+This line-scoped request is intended to take no arguments.
+Currently, it is ignored including its arguments,
+and the number of arguments is not checked.
+.Ss \&ps
+Change point size.
+This line-scoped request is intended to take one numerical argument.
+Currently, it is ignored including its arguments,
+and the number of arguments is not checked.

 .Ss \&so
 Include a source file.
 Its syntax is as follows:
 .Ss \&so
 Include a source file.
 Its syntax is as follows:


@@ -552,12 +572,16 @@ The
 will be read and its contents processed as input in place of the
 .Sq \&.so
 request line.
 will be read and its contents processed as input in place of the
 .Sq \&.so
 request line.

-To avoid inadvertant inclusion of unrelated files,
+To avoid inadvertent inclusion of unrelated files,

 .Xr mandoc 1
 only accepts relative paths not containing the strings
 .Qq ../
 and
 .Qq /.. .
 .Xr mandoc 1
 only accepts relative paths not containing the strings
 .Qq ../
 and
 .Qq /.. .

+.Ss \&ta
+Set tab stops.
+This line-scoped request can take an arbitrary number of arguments.
+Currently, it is ignored including its arguments.

 .Ss \&tr
 Output character translation.
 This request is intended to have one argument,
 .Ss \&tr
 Output character translation.
 This request is intended to have one argument,


@@ -589,6 +613,19 @@ refers to groff version 1.15.
 .Pp
 .Bl -dash -compact
 .It
 .Pp
 .Bl -dash -compact
 .It

+In mandoc, the
+.Sx \&EQ ,
+.Sx \&TE ,
+.Sx \&TS ,
+and
+.Sx \&T& ,
+macros are considered regular macros.
+In all other
+.Nm
+implementations, these are special macros that must be specified without
+spacing between the control character (which must be a period) and the
+macro name.
+.It

 The
 .Cm nS
 register is only compatible with OpenBSD's groff-1.15.
 The
 .Cm nS
 register is only compatible with OpenBSD's groff-1.15.


@@ -606,6 +643,7 @@ using the next-line syntax.
 .El
 .Sh SEE ALSO
 .Xr mandoc 1 ,
 .El
 .Sh SEE ALSO
 .Xr mandoc 1 ,

+.Xr eqn 7 ,

 .Xr man 7 ,
 .Xr mandoc_char 7 ,
 .Xr mdoc 7 ,
 .Xr man 7 ,
 .Xr mandoc_char 7 ,
 .Xr mdoc 7 ,