[latex3-commits] [latex3/latex2e] develop: re-indent for #1282, and improve some line breaks (#1297) (1eaaef50)

[github at latex-project.org]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/1eaaef502ded2eec7141b491fcd567ec47b59bd5

>---------------------------------------------------------------

commit 1eaaef502ded2eec7141b491fcd567ec47b59bd5
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Wed Mar 20 13:49:01 2024 +0000

    re-indent for #1282, and improve some line breaks (#1297)
    
    * re-indent for #1282, and improve spme line breaks
    
    * date
    
    * Additional words about relations @FrankMittelbach
    
    * 2024


>---------------------------------------------------------------

1eaaef502ded2eec7141b491fcd567ec47b59bd5
 base/doc/clsguide.tex | 34 +++++++++++++++++++---------------
 base/doc/usrguide.tex | 14 ++++++++++----
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/base/doc/clsguide.tex b/base/doc/clsguide.tex
index c23f0a55..0e192782 100644
--- a/base/doc/clsguide.tex
+++ b/base/doc/clsguide.tex
@@ -33,8 +33,8 @@
 \usepackage[T1]{fontenc}  % needed for \textbackslash in tt
 \usepackage{csquotes}
 
-\title{\LaTeX\ for package and class authors --- current version}
-\author{\copyright~Copyright 2023, \LaTeX\ Project Team.\\
+\title{\LaTeX\ for package and class authors\\current version}
+\author{\copyright~Copyright 2023--2024, \LaTeX\ Project Team.\\
    All rights reserved.%
    \footnote{This file may distributed and/or modified under the
      conditions of the \LaTeX{} Project Public License, either version 1.3c
@@ -42,7 +42,7 @@
     \texttt{clsguide.tex} for full details.}%
 }
 
-\date{2023-12-02}
+\date{2024-03-17}
 
 \NewDocumentCommand\cs{m}{\texttt{\textbackslash\detokenize{#1}}}
 \NewDocumentCommand\marg{m}{\arg{#1}}
@@ -64,7 +64,7 @@
 \section{Introduction}
 
 \LaTeXe{} was released in 1994 and added a number of then-new concepts to
-\LaTeX{}. For package and class authors, these are described in
+\LaTeX{}. For package and class authors, these are described in the document
 \texttt{clsguide-historic}, which has largely remained unchanged. Since then,
 the \LaTeX{} team have worked on a number of ideas, firstly a programming
 language for \LaTeX{} (L3 programming layer) and then a range of tools for
@@ -1104,11 +1104,13 @@ team strongly suggest using the L3 programming layer commands in the
 Suppose that you want to define an environment for displaying text that is
 numbered as an equation. A straightforward way to do this is as follows:
 \begin{verbatim}
-  \newenvironment{texteqn}
-    {\begin{equation}
-       \begin{minipage}{0.9\linewidth}}
-      {\end{minipage}
-     \end{equation}}
+  \newenvironment{texteqn}{%
+    \begin{equation}%
+      \begin{minipage}{0.9\linewidth}%
+  }{%
+      \end{minipage}%
+    \end{equation}%
+  }
 \end{verbatim}
 However, if you have tried this then you will probably have noticed that it
 does not work perfectly when used in the middle of a paragraph because an
@@ -1118,12 +1120,14 @@ environment.
 You can avoid this problem using |\ignorespacesafterend|; it should be
 inserted as shown here:
 \begin{verbatim}
-  \newenvironment{texteqn}
-    {\begin{equation}
-       \begin{minipage}{0.9\linewidth}}
-      {\end{minipage}
-     \end{equation}
-     \ignorespacesafterend}
+  \newenvironment{texteqn}{%
+    \begin{equation}%
+      \begin{minipage}{0.9\linewidth}%
+  }{%
+      \end{minipage}%
+    \end{equation}%
+    \ignorespacesafterend
+  }
 \end{verbatim}
 
 This command may also have other uses.
diff --git a/base/doc/usrguide.tex b/base/doc/usrguide.tex
index 1bd6e145..d201af97 100644
--- a/base/doc/usrguide.tex
+++ b/base/doc/usrguide.tex
@@ -34,8 +34,8 @@
 \usepackage{csquotes}
 \usepackage{url}
 
-\title{\LaTeX\ for authors --- current version}
-\author{\copyright~Copyright 2020-2023, \LaTeX\ Project Team.\\
+\title{\LaTeX\ for authors\\ current version}
+\author{\copyright~Copyright 2020--2024, \LaTeX\ Project Team.\\
    All rights reserved.%
    \footnote{This file may be distributed and/or modified under the
      conditions of the \LaTeX{} Project Public License, either version 1.3c
@@ -43,7 +43,7 @@
     \texttt{usrguide.tex} for full details.}%
 }
 
-\date{2023-12-02}
+\date{2024-03-17}
 
 \NewDocumentCommand\cs{m}{\texttt{\textbackslash\detokenize{#1}}}
 \NewDocumentCommand\marg{m}{\arg{#1}}
@@ -1064,11 +1064,17 @@ to give a purely numerical result.
 Briefly, the floating point expressions may comprise:
 \begin{itemize}
   \item Basic arithmetic: addition $x\fpbin{+}y$, subtraction $x\fpbin{-}y$,
-    multiplication $x\fpbin{*}y$, division $x\fpbin{/}y$, square root~$\sqrt{x}$,
+    multiplication $x\fpbin{*}y$, division $x\fpbin{/}y$, square root~$\fpop{sqrt}{x}$,
     and parentheses.
   \item Comparison operators: $x\fprel{<}y$,
     $x\fprel{<=}y$, $x\fprel{>?}y$,
     $x\fprel{!=}y$ \emph{etc.}
+    
+    The relation $x\fprel{?}y$ is true exactly if one or both operands is~\nan{} or is
+   a tuple, unless they are equal tuples. Each \meta{relation}
+   can be any (non-empty) combination of |<|, |=|, |>|, and~|?|, plus
+   an optional leading~|!| (which negates the \meta{relation}), with
+   the restriction that the negated \meta{relation} may not start with~|?|.
   \item Boolean logic: sign $\fpop{sign} x$,
     negation $\fpop{!}x$, conjunction
     $x\fprel{\&\&}y$, disjunction $x\fprel{\string|\string|}y$, ternary