gbranden pushed a commit to branch master
in repository groff.
commit b4eb1d84183a399eeb8d58cfc25b40fb47395427
Author: G. Branden Robinson <[email protected]>
AuthorDate: Sat Jan 3 20:42:12 2026 -0600
[doc,man]: Migrate .if, .ie, and .el to "input".
Also break input lines consistently between Texinfo and man pages.
Continues the long process of fixing Savannah #65976.
---
doc/groff.texi.in | 59 +++++++++++++++++++++++++++++++++++++++----------------
man/groff.7.man | 20 +++++++++----------
2 files changed, 52 insertions(+), 27 deletions(-)
diff --git a/doc/groff.texi.in b/doc/groff.texi.in
index 3181e5ef0..75330eae5 100644
--- a/doc/groff.texi.in
+++ b/doc/groff.texi.in
@@ -15115,16 +15115,32 @@ interpolations with @code{\n} and @code{\*} escape
sequences do.
@subsection if-then
@cindex if-then
-@Defreq {if, cond-expr anything}
-Evaluate the conditional expression @var{cond-expr}, and if it evaluates
-true (or to a positive value), interpret the remainder of the line
-@var{anything} as if it were an input line. Recall from @ref{Invoking
-Requests} that any quantity of spaces between arguments to requests
-serves only to separate them; leading spaces in @var{anything} are thus
-not seen. @var{anything} effectively @emph{cannot} be omitted; if
-@var{cond-expr} is true and @var{anything} is empty, the newline at the
-end of the control line is interpreted as a blank input line (and
-therefore a blank text line).
+@Defreq {if, cond-expr input}
+Evaluate the conditional expression
+@var{cond-expr},
+and if it evaluates true
+(or to a positive value),
+interpret the remainder of the line
+@var{input}
+as if it were an input line.
+Recall from @ref{Invoking Requests}
+that any quantity of spaces between arguments to requests
+serves only to separate them;
+leading spaces in
+@var{input}
+are thus not seen.
+@var{input}
+effectively
+@emph{cannot}
+be omitted;
+if
+@var{cond-expr}
+is true and
+@var{input}
+is empty,
+the formatter interprets the newline at the end of the control line
+as a blank input line
+(and therefore a blank text line).
@Example
super\c
@@ -15166,13 +15182,22 @@ a macro as a string to interpose a wrapper around the
macro @samp{MAC}
@subsection if-else
@cindex if-else
-@DefreqList {ie, cond-expr anything}
-@DefreqListEndx {el, anything}
-Use the @code{ie} and @code{el} requests to write an if-then-else. The
-first request is the ``if'' part and the latter is the ``else'' part.
-Unusually among programming languages, any number of non-conditional
-requests may be interposed between the @code{ie} branch and the
-@code{el} branch.
+@DefreqList {ie, cond-expr input}
+@DefreqListEndx {el, input}
+Use the
+@code{ie}
+and
+@code{el}
+requests to write an if-then-else.
+The first request is the ``if'' part
+and the latter is the ``else'' part.
+Unusually among programming languages,
+any number of non-conditional
+requests may be interposed between the
+@code{ie}
+branch and the
+@code{el}
+branch.
@Example
.nr a 0
diff --git a/man/groff.7.man b/man/groff.7.man
index bdf50fcd0..b2c39fe18 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -2154,23 +2154,23 @@ the request name is
followed by a conditional expression
.IR cond-expr ;
the remainder of the line,
-.IR anything ,
+.IR input ,
is interpreted as if it were an input line.
.
Any quantity of spaces between arguments to requests serves only to
separate them;
leading spaces in
-.I anything
+.I input
are therefore not seen.
.
-.I anything
+.I input
effectively
.I cannot
be omitted;
if
.I cond-expr
is true and
-.I anything
+.I input
is empty,
the newline at the end of the control line is interpreted as a blank
line
@@ -3571,9 +3571,9 @@ Interpolate a newline if the conditional expression of
the corresponding
request was false.
.
.TPx
-.REQ .el anything
+.REQ .el input
Interpret
-.I anything
+.I input
as if it were an input line if the conditional expression of the
corresponding
.request ie
@@ -3992,12 +3992,12 @@ otherwise skip to a corresponding
request.
.
.TPx
-.REQ .ie "cond-expr anything"
+.REQ .ie "cond-expr input"
If
.I cond-expr
is true,
interpret
-.I anything
+.I input
as if it were an input line,
otherwise skip to a corresponding
.request el
@@ -4010,12 +4010,12 @@ Interpolate a newline if
is true.
.
.TPx
-.REQ .if "cond-expr anything"
+.REQ .if "cond-expr input"
If
.I cond-expr
is true,
then interpret
-.I anything
+.I input
as if it were an input line.
.
.TPx
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
