git: 1fa9712ce0ef - vendor/bc - bc: Vendor import new version 3.3.3
Stefan Eßer
se at FreeBSD.org
Fri Mar 5 10:33:41 UTC 2021
The branch vendor/bc has been updated by se:
URL: https://cgit.FreeBSD.org/src/commit/?id=1fa9712ce0ef8cecd4888a67f4a4179c9e19e294
commit 1fa9712ce0ef8cecd4888a67f4a4179c9e19e294
Author: Stefan Eßer <se at FreeBSD.org>
AuthorDate: 2021-03-05 10:30:11 +0000
Commit: Stefan Eßer <se at FreeBSD.org>
CommitDate: 2021-03-05 10:30:11 +0000
bc: Vendor import new version 3.3.3
---
Makefile.in | 2 +-
NEWS.md | 26 +++++++++
gen/lib2.bc | 2 +-
karatsuba.py | 10 ++--
manuals/bc.1.md.in | 61 +++++++++++----------
manuals/bc/A.1 | 71 ++++++++++++------------
manuals/bc/A.1.md | 59 ++++++++++----------
manuals/bc/E.1 | 69 ++++++++++++------------
manuals/bc/E.1.md | 55 ++++++++++---------
manuals/bc/EH.1 | 69 ++++++++++++------------
manuals/bc/EH.1.md | 55 ++++++++++---------
manuals/bc/EHN.1 | 69 ++++++++++++------------
manuals/bc/EHN.1.md | 55 ++++++++++---------
manuals/bc/EHNP.1 | 69 ++++++++++++------------
manuals/bc/EHNP.1.md | 55 ++++++++++---------
manuals/bc/EHP.1 | 69 ++++++++++++------------
manuals/bc/EHP.1.md | 55 ++++++++++---------
manuals/bc/EN.1 | 69 ++++++++++++------------
manuals/bc/EN.1.md | 55 ++++++++++---------
manuals/bc/ENP.1 | 69 ++++++++++++------------
manuals/bc/ENP.1.md | 55 ++++++++++---------
manuals/bc/EP.1 | 69 ++++++++++++------------
manuals/bc/EP.1.md | 55 ++++++++++---------
manuals/bc/H.1 | 71 ++++++++++++------------
manuals/bc/H.1.md | 59 ++++++++++----------
manuals/bc/HN.1 | 71 ++++++++++++------------
manuals/bc/HN.1.md | 59 ++++++++++----------
manuals/bc/HNP.1 | 71 ++++++++++++------------
manuals/bc/HNP.1.md | 59 ++++++++++----------
manuals/bc/HP.1 | 71 ++++++++++++------------
manuals/bc/HP.1.md | 59 ++++++++++----------
manuals/bc/N.1 | 71 ++++++++++++------------
manuals/bc/N.1.md | 59 ++++++++++----------
manuals/bc/NP.1 | 71 ++++++++++++------------
manuals/bc/NP.1.md | 59 ++++++++++----------
manuals/bc/P.1 | 71 ++++++++++++------------
manuals/bc/P.1.md | 59 ++++++++++----------
manuals/bcl.3 | 2 +-
manuals/bcl.3.md | 76 +++++++++++++-------------
manuals/dc.1.md.in | 38 ++++++-------
manuals/dc/A.1 | 53 +++++++++---------
manuals/dc/A.1.md | 38 ++++++-------
manuals/dc/E.1 | 53 +++++++++---------
manuals/dc/E.1.md | 38 ++++++-------
manuals/dc/EH.1 | 53 +++++++++---------
manuals/dc/EH.1.md | 38 ++++++-------
manuals/dc/EHN.1 | 53 +++++++++---------
manuals/dc/EHN.1.md | 38 ++++++-------
manuals/dc/EHNP.1 | 53 +++++++++---------
manuals/dc/EHNP.1.md | 38 ++++++-------
manuals/dc/EHP.1 | 53 +++++++++---------
manuals/dc/EHP.1.md | 38 ++++++-------
manuals/dc/EN.1 | 53 +++++++++---------
manuals/dc/EN.1.md | 38 ++++++-------
manuals/dc/ENP.1 | 53 +++++++++---------
manuals/dc/ENP.1.md | 38 ++++++-------
manuals/dc/EP.1 | 53 +++++++++---------
manuals/dc/EP.1.md | 38 ++++++-------
manuals/dc/H.1 | 53 +++++++++---------
manuals/dc/H.1.md | 38 ++++++-------
manuals/dc/HN.1 | 53 +++++++++---------
manuals/dc/HN.1.md | 38 ++++++-------
manuals/dc/HNP.1 | 53 +++++++++---------
manuals/dc/HNP.1.md | 38 ++++++-------
manuals/dc/HP.1 | 53 +++++++++---------
manuals/dc/HP.1.md | 38 ++++++-------
manuals/dc/N.1 | 53 +++++++++---------
manuals/dc/N.1.md | 38 ++++++-------
manuals/dc/NP.1 | 53 +++++++++---------
manuals/dc/NP.1.md | 38 ++++++-------
manuals/dc/P.1 | 53 +++++++++---------
manuals/dc/P.1.md | 38 ++++++-------
manuals/header_bc.txt | 2 +-
manuals/header_bcl.txt | 2 +-
manuals/header_dc.txt | 2 +-
src/num.c | 2 +-
tests/bc/length.txt | 3 ++
tests/bc/length_results.txt | 5 +-
tests/bc/lib2.txt | 6 +++
tests/bc/lib2_results.txt | 6 +++
tests/bc/scripts/bessel.bc | 9 +++-
tests/dc/all.txt | 1 +
tests/dc/length.txt | 129 ++++++++++++++++++++++++++++++++++++++++++++
tests/dc/length_results.txt | 129 ++++++++++++++++++++++++++++++++++++++++++++
84 files changed, 2130 insertions(+), 1871 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index dbb5debd44cc..db8e24967996 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,7 +29,7 @@
#
.POSIX:
-VERSION = 3.3.0
+VERSION = 3.3.3
SRC = %%SRC%%
OBJ = %%OBJ%%
diff --git a/NEWS.md b/NEWS.md
index 6a8899200f4a..3a3433077d50 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,31 @@
# News
+## 3.3.3
+
+This is a production release with one tweak and fixes for manuals.
+
+The tweak is that `length(0)` returns `1` instead of `0`. In `3.3.1`, I changed
+it so `length(0.x)`, where `x` could be any number of digits, returned the
+`scale`, but `length(0)` still returned `0` because I believe that `0` has `0`
+significant digits.
+
+After request of FreeBSD and considering the arguments of a mathematician,
+compatibility with other `bc`'s, and the expectations of users, I decided to
+make the change.
+
+The fixes for manuals fixed a bug where `--` was rendered as `-`.
+
+## 3.3.2
+
+This is a production release that fixes a divide-by-zero bug in `root()` in the
+[extended math library][16]. All previous versions with `root()` have the bug.
+
+## 3.3.1
+
+This is a production release that fixes a bug.
+
+The bug was in the reporting of number length when the value was 0.
+
## 3.3.0
This is a production release that changes one behavior and fixes documentation
diff --git a/gen/lib2.bc b/gen/lib2.bc
index b0e651eddcbd..399c7ad3d313 100644
--- a/gen/lib2.bc
+++ b/gen/lib2.bc
@@ -110,7 +110,7 @@ define root(x,n){
if(n<0)sqrt(n)
n=n$
if(n==0)x/n
- if(n==1)return x
+ if(x==0||n==1)return x
if(n==2)return sqrt(x)
s=scale
scale=0
diff --git a/karatsuba.py b/karatsuba.py
index f8087301f54c..cfab4c4f4fbf 100755
--- a/karatsuba.py
+++ b/karatsuba.py
@@ -121,20 +121,20 @@ else:
p = run([ "make", "clean" ])
-print("Testing \"make -j4\"")
+print("Testing \"make -j12\"")
if p.returncode != 0:
print("make returned an error ({}); exiting...".format(p.returncode))
sys.exit(p.returncode)
-p = run([ "make", "-j4" ])
+p = run([ "make", "-j12" ])
if p.returncode == 0:
- makecmd = [ "make", "-j4" ]
- print("Using \"make -j4\"")
+ makecmd = [ "make", "-j12" ]
+ print("Using \"make -j12\"")
else:
makecmd = [ "make" ]
- print("Not using \"make -j4\"")
+ print("Not using \"make -j12\"")
if test_num != 0:
mx2 = test_num
diff --git a/manuals/bc.1.md.in b/manuals/bc.1.md.in
index 1ce83b8237cd..661fcdd45ae4 100644
--- a/manuals/bc.1.md.in
+++ b/manuals/bc.1.md.in
@@ -34,8 +34,7 @@ bc - arbitrary-precision decimal arithmetic language and calculator
# SYNOPSIS
-**bc** [**-ghilPqsvVw**] [**--global-stacks**] [**--help**] [**--interactive**] [**--mathlib**] [**--no-prompt**] [**--quiet**] [**--standard**] [**--warn**] [**--version**] [**-e** *expr*] [**--expression**=*expr*...] [**-f** *file*...] [**-file**=*file*...]
-[*file*...]
+**bc** [**-ghilPqsvVw**] [**-\-global-stacks**] [**-\-help**] [**-\-interactive**] [**-\-mathlib**] [**-\-no-prompt**] [**-\-quiet**] [**-\-standard**] [**-\-warn**] [**-\-version**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...]
# DESCRIPTION
@@ -61,7 +60,7 @@ especially) the GNU bc(1).
The following are the options that bc(1) accepts.
-**-g**, **--global-stacks**
+**-g**, **-\-global-stacks**
{{ A H N P HN HP NP HNP }}
: Turns the globals **ibase**, **obase**, **scale**, and **seed** into stacks.
@@ -152,17 +151,17 @@ The following are the options that bc(1) accepts.
This is a **non-portable extension**.
-**-h**, **--help**
+**-h**, **-\-help**
: Prints a usage message and quits.
-**-i**, **--interactive**
+**-i**, **-\-interactive**
: Forces interactive mode. (See the **INTERACTIVE MODE** section.)
This is a **non-portable extension**.
-**-l**, **--mathlib**
+**-l**, **-\-mathlib**
: Sets **scale** (see the **SYNTAX** section) to **20** and loads the included
{{ A H N P HN HP NP HNP }}
@@ -178,7 +177,7 @@ The following are the options that bc(1) accepts.
To learn what is in the library, see the **LIBRARY** section.
{{ end }}
-**-P**, **--no-prompt**
+**-P**, **-\-no-prompt**
{{ A E H N EH EN HN EHN }}
: Disables the prompt in TTY mode. (The prompt is only enabled in TTY mode.
@@ -193,36 +192,36 @@ The following are the options that bc(1) accepts.
This is a **non-portable extension**.
-**-q**, **--quiet**
+**-q**, **-\-quiet**
: This option is for compatibility with the [GNU bc(1)][2]; it is a no-op.
Without this option, GNU bc(1) prints a copyright header. This bc(1) only
prints the copyright header if one or more of the **-v**, **-V**, or
- **--version** options are given.
+ **-\-version** options are given.
This is a **non-portable extension**.
-**-s**, **--standard**
+**-s**, **-\-standard**
: Process exactly the language defined by the [standard][1] and error if any
extensions are used.
This is a **non-portable extension**.
-**-v**, **-V**, **--version**
+**-v**, **-V**, **-\-version**
: Print the version information (copyright header) and exit.
This is a **non-portable extension**.
-**-w**, **--warn**
+**-w**, **-\-warn**
-: Like **-s** and **--standard**, except that warnings (and not errors) are
+: Like **-s** and **-\-standard**, except that warnings (and not errors) are
printed for non-standard extensions and execution continues normally.
This is a **non-portable extension**.
-**-e** *expr*, **--expression**=*expr*
+**-e** *expr*, **-\-expression**=*expr*
: Evaluates *expr*. If multiple expressions are given, they are evaluated in
order. If files are given as well (see below), the expressions and files are
@@ -232,14 +231,14 @@ The following are the options that bc(1) accepts.
If this option is given on the command-line (i.e., not in **BC_ENV_ARGS**,
see the **ENVIRONMENT VARIABLES** section), then after processing all
expressions and files, bc(1) will exit, unless **-** (**stdin**) was given
- as an argument at least once to **-f** or **--file**, whether on the
+ as an argument at least once to **-f** or **-\-file**, whether on the
command-line or in **BC_ENV_ARGS**. However, if any other **-e**,
- **--expression**, **-f**, or **--file** arguments are given after **-f-** or
- equivalent is given, bc(1) will give a fatal error and exit.
+ **-\-expression**, **-f**, or **-\-file** arguments are given after **-f-**
+ or equivalent is given, bc(1) will give a fatal error and exit.
This is a **non-portable extension**.
-**-f** *file*, **--file**=*file*
+**-f** *file*, **-\-file**=*file*
: Reads in *file* and evaluates it, line by line, as though it were read
through **stdin**. If expressions are also given (see above), the
@@ -248,8 +247,8 @@ The following are the options that bc(1) accepts.
If this option is given on the command-line (i.e., not in **BC_ENV_ARGS**,
see the **ENVIRONMENT VARIABLES** section), then after processing all
expressions and files, bc(1) will exit, unless **-** (**stdin**) was given
- as an argument at least once to **-f** or **--file**. However, if any other
- **-e**, **--expression**, **-f**, or **--file** arguments are given after
+ as an argument at least once to **-f** or **-\-file**. However, if any other
+ **-e**, **-\-expression**, **-f**, or **-\-file** arguments are given after
**-f-** or equivalent is given, bc(1) will give a fatal error and exit.
This is a **non-portable extension**.
@@ -304,8 +303,8 @@ Identifiers with more than one character (letter) are a
**ibase** is a global variable determining how to interpret constant numbers. It
is the "input" base, or the number base used for interpreting input numbers.
-**ibase** is initially **10**. If the **-s** (**--standard**) and **-w**
-(**--warn**) flags were not given on the command line, the max allowable value
+**ibase** is initially **10**. If the **-s** (**-\-standard**) and **-w**
+(**-\-warn**) flags were not given on the command line, the max allowable value
for **ibase** is **36**. Otherwise, it is **16**. The min allowable value for
**ibase** is **2**. The max allowable value for **ibase** can be queried in
bc(1) programs with the **maxibase()** built-in function.
@@ -512,7 +511,7 @@ The following arithmetic and logical operators can be used. They are listed in
order of decreasing precedence. Operators in the same group have the same
precedence.
-**++** **--**
+**++** **-\-**
: Type: Prefix and Postfix
@@ -617,7 +616,7 @@ precedence.
The operators will be described in more detail below.
-**++** **--**
+**++** **-\-**
: The prefix and postfix **increment** and **decrement** operators behave
exactly like they would in C. They require a named expression (see the
@@ -962,12 +961,12 @@ This is a **non-portable extension**.
{{ A H N P HN HP NP HNP }}
All of the functions below, including the functions in the extended math
library (see the *Extended Library* subsection below), are available when the
-**-l** or **--mathlib** command-line flags are given, except that the extended
+**-l** or **-\-mathlib** command-line flags are given, except that the extended
math library is not available when the **-s** option, the **-w** option, or
equivalents are given.
{{ end }}
{{ E EH EN EP EHN EHP ENP EHNP }}
-All of the functions below are available when the **-l** or **--mathlib**
+All of the functions below are available when the **-l** or **-\-mathlib**
command-line flags are given.
{{ end }}
@@ -1020,8 +1019,8 @@ The [standard][1] defines the following functions for the math library:
{{ A H N P HN HP NP HNP }}
## Extended Library
-The extended library is *not* loaded when the **-s**/**--standard** or
-**-w**/**--warn** options are given since they are not part of the library
+The extended library is *not* loaded when the **-s**/**-\-standard** or
+**-w**/**-\-warn** options are given since they are not part of the library
defined by the [standard][1].
The extended library is a **non-portable extension**.
@@ -1705,17 +1704,17 @@ The other statuses will only be returned when bc(1) is not in interactive mode
(see the **INTERACTIVE MODE** section), since bc(1) resets its state (see the
**RESET** section) and accepts more input when one of those errors occurs in
interactive mode. This is also the case when interactive mode is forced by the
-**-i** flag or **--interactive** option.
+**-i** flag or **-\-interactive** option.
These exit statuses allow bc(1) to be used in shell scripting with error
checking, and its normal behavior can be forced by using the **-i** flag or
-**--interactive** option.
+**-\-interactive** option.
# INTERACTIVE MODE
Per the [standard][1], bc(1) has an interactive mode and a non-interactive mode.
Interactive mode is turned on automatically when both **stdin** and **stdout**
-are hooked to a terminal, but the **-i** flag and **--interactive** option can
+are hooked to a terminal, but the **-i** flag and **-\-interactive** option can
turn it on in other cases.
In interactive mode, bc(1) attempts to recover from errors (see the **RESET**
diff --git a/manuals/bc/A.1 b/manuals/bc/A.1
index d1e80769c855..b38d8d35e71b 100644
--- a/manuals/bc/A.1
+++ b/manuals/bc/A.1
@@ -25,19 +25,18 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.TH "BC" "1" "February 2021" "Gavin D. Howard" "General Commands Manual"
+.TH "BC" "1" "March 2021" "Gavin D. Howard" "General Commands Manual"
.SH NAME
.PP
bc - arbitrary-precision decimal arithmetic language and calculator
.SH SYNOPSIS
.PP
-\f[B]bc\f[R] [\f[B]-ghilPqsvVw\f[R]] [\f[B]\[en]global-stacks\f[R]]
-[\f[B]\[en]help\f[R]] [\f[B]\[en]interactive\f[R]]
-[\f[B]\[en]mathlib\f[R]] [\f[B]\[en]no-prompt\f[R]]
-[\f[B]\[en]quiet\f[R]] [\f[B]\[en]standard\f[R]] [\f[B]\[en]warn\f[R]]
-[\f[B]\[en]version\f[R]] [\f[B]-e\f[R] \f[I]expr\f[R]]
-[\f[B]\[en]expression\f[R]=\f[I]expr\f[R]\&...] [\f[B]-f\f[R]
-\f[I]file\f[R]\&...] [\f[B]-file\f[R]=\f[I]file\f[R]\&...]
+\f[B]bc\f[R] [\f[B]-ghilPqsvVw\f[R]] [\f[B]--global-stacks\f[R]]
+[\f[B]--help\f[R]] [\f[B]--interactive\f[R]] [\f[B]--mathlib\f[R]]
+[\f[B]--no-prompt\f[R]] [\f[B]--quiet\f[R]] [\f[B]--standard\f[R]]
+[\f[B]--warn\f[R]] [\f[B]--version\f[R]] [\f[B]-e\f[R] \f[I]expr\f[R]]
+[\f[B]--expression\f[R]=\f[I]expr\f[R]\&...] [\f[B]-f\f[R]
+\f[I]file\f[R]\&...] [\f[B]--file\f[R]=\f[I]file\f[R]\&...]
[\f[I]file\f[R]\&...]
.SH DESCRIPTION
.PP
@@ -60,7 +59,7 @@ implementations.
.PP
The following are the options that bc(1) accepts.
.TP
-\f[B]-g\f[R], \f[B]\[en]global-stacks\f[R]
+\f[B]-g\f[R], \f[B]--global-stacks\f[R]
Turns the globals \f[B]ibase\f[R], \f[B]obase\f[R], \f[B]scale\f[R], and
\f[B]seed\f[R] into stacks.
.RS
@@ -152,10 +151,10 @@ is ignored.
This is a \f[B]non-portable extension\f[R].
.RE
.TP
-\f[B]-h\f[R], \f[B]\[en]help\f[R]
+\f[B]-h\f[R], \f[B]--help\f[R]
Prints a usage message and quits.
.TP
-\f[B]-i\f[R], \f[B]\[en]interactive\f[R]
+\f[B]-i\f[R], \f[B]--interactive\f[R]
Forces interactive mode.
(See the \f[B]INTERACTIVE MODE\f[R] section.)
.RS
@@ -163,7 +162,7 @@ Forces interactive mode.
This is a \f[B]non-portable extension\f[R].
.RE
.TP
-\f[B]-l\f[R], \f[B]\[en]mathlib\f[R]
+\f[B]-l\f[R], \f[B]--mathlib\f[R]
Sets \f[B]scale\f[R] (see the \f[B]SYNTAX\f[R] section) to \f[B]20\f[R]
and loads the included math library and the extended math library before
running any code, including any expressions or files specified on the
@@ -173,7 +172,7 @@ command line.
To learn what is in the libraries, see the \f[B]LIBRARY\f[R] section.
.RE
.TP
-\f[B]-P\f[R], \f[B]\[en]no-prompt\f[R]
+\f[B]-P\f[R], \f[B]--no-prompt\f[R]
Disables the prompt in TTY mode.
(The prompt is only enabled in TTY mode.
See the \f[B]TTY MODE\f[R] section) This is mostly for those users that
@@ -185,18 +184,18 @@ Most of those users would want to put this option in
This is a \f[B]non-portable extension\f[R].
.RE
.TP
-\f[B]-q\f[R], \f[B]\[en]quiet\f[R]
+\f[B]-q\f[R], \f[B]--quiet\f[R]
This option is for compatibility with the GNU
bc(1) (https://www.gnu.org/software/bc/); it is a no-op.
Without this option, GNU bc(1) prints a copyright header.
This bc(1) only prints the copyright header if one or more of the
-\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]\[en]version\f[R] options are given.
+\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given.
.RS
.PP
This is a \f[B]non-portable extension\f[R].
.RE
.TP
-\f[B]-s\f[R], \f[B]\[en]standard\f[R]
+\f[B]-s\f[R], \f[B]--standard\f[R]
Process exactly the language defined by the
standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html)
and error if any extensions are used.
@@ -205,15 +204,15 @@ and error if any extensions are used.
This is a \f[B]non-portable extension\f[R].
.RE
.TP
-\f[B]-v\f[R], \f[B]-V\f[R], \f[B]\[en]version\f[R]
+\f[B]-v\f[R], \f[B]-V\f[R], \f[B]--version\f[R]
Print the version information (copyright header) and exit.
.RS
.PP
This is a \f[B]non-portable extension\f[R].
.RE
.TP
-\f[B]-w\f[R], \f[B]\[en]warn\f[R]
-Like \f[B]-s\f[R] and \f[B]\[en]standard\f[R], except that warnings (and
+\f[B]-w\f[R], \f[B]--warn\f[R]
+Like \f[B]-s\f[R] and \f[B]--standard\f[R], except that warnings (and
not errors) are printed for non-standard extensions and execution
continues normally.
.RS
@@ -221,7 +220,7 @@ continues normally.
This is a \f[B]non-portable extension\f[R].
.RE
.TP
-\f[B]-e\f[R] \f[I]expr\f[R], \f[B]\[en]expression\f[R]=\f[I]expr\f[R]
+\f[B]-e\f[R] \f[I]expr\f[R], \f[B]--expression\f[R]=\f[I]expr\f[R]
Evaluates \f[I]expr\f[R].
If multiple expressions are given, they are evaluated in order.
If files are given as well (see below), the expressions and files are
@@ -234,17 +233,17 @@ If this option is given on the command-line (i.e., not in
\f[B]BC_ENV_ARGS\f[R], see the \f[B]ENVIRONMENT VARIABLES\f[R] section),
then after processing all expressions and files, bc(1) will exit, unless
\f[B]-\f[R] (\f[B]stdin\f[R]) was given as an argument at least once to
-\f[B]-f\f[R] or \f[B]\[en]file\f[R], whether on the command-line or in
+\f[B]-f\f[R] or \f[B]--file\f[R], whether on the command-line or in
\f[B]BC_ENV_ARGS\f[R].
-However, if any other \f[B]-e\f[R], \f[B]\[en]expression\f[R],
-\f[B]-f\f[R], or \f[B]\[en]file\f[R] arguments are given after
+However, if any other \f[B]-e\f[R], \f[B]--expression\f[R],
+\f[B]-f\f[R], or \f[B]--file\f[R] arguments are given after
\f[B]-f-\f[R] or equivalent is given, bc(1) will give a fatal error and
exit.
.PP
This is a \f[B]non-portable extension\f[R].
.RE
.TP
-\f[B]-f\f[R] \f[I]file\f[R], \f[B]\[en]file\f[R]=\f[I]file\f[R]
+\f[B]-f\f[R] \f[I]file\f[R], \f[B]--file\f[R]=\f[I]file\f[R]
Reads in \f[I]file\f[R] and evaluates it, line by line, as though it
were read through \f[B]stdin\f[R].
If expressions are also given (see above), the expressions are evaluated
@@ -255,9 +254,9 @@ If this option is given on the command-line (i.e., not in
\f[B]BC_ENV_ARGS\f[R], see the \f[B]ENVIRONMENT VARIABLES\f[R] section),
then after processing all expressions and files, bc(1) will exit, unless
\f[B]-\f[R] (\f[B]stdin\f[R]) was given as an argument at least once to
-\f[B]-f\f[R] or \f[B]\[en]file\f[R].
-However, if any other \f[B]-e\f[R], \f[B]\[en]expression\f[R],
-\f[B]-f\f[R], or \f[B]\[en]file\f[R] arguments are given after
+\f[B]-f\f[R] or \f[B]--file\f[R].
+However, if any other \f[B]-e\f[R], \f[B]--expression\f[R],
+\f[B]-f\f[R], or \f[B]--file\f[R] arguments are given after
\f[B]-f-\f[R] or equivalent is given, bc(1) will give a fatal error and
exit.
.PP
@@ -322,8 +321,8 @@ constant numbers.
It is the \[lq]input\[rq] base, or the number base used for interpreting
input numbers.
\f[B]ibase\f[R] is initially \f[B]10\f[R].
-If the \f[B]-s\f[R] (\f[B]\[en]standard\f[R]) and \f[B]-w\f[R]
-(\f[B]\[en]warn\f[R]) flags were not given on the command line, the max
+If the \f[B]-s\f[R] (\f[B]--standard\f[R]) and \f[B]-w\f[R]
+(\f[B]--warn\f[R]) flags were not given on the command line, the max
allowable value for \f[B]ibase\f[R] is \f[B]36\f[R].
Otherwise, it is \f[B]16\f[R].
The min allowable value for \f[B]ibase\f[R] is \f[B]2\f[R].
@@ -582,7 +581,7 @@ The following arithmetic and logical operators can be used.
They are listed in order of decreasing precedence.
Operators in the same group have the same precedence.
.TP
-\f[B]++\f[R] \f[B]\[en]\f[R]
+\f[B]++\f[R] \f[B]--\f[R]
Type: Prefix and Postfix
.RS
.PP
@@ -692,7 +691,7 @@ Description: \f[B]boolean or\f[R]
.PP
The operators will be described in more detail below.
.TP
-\f[B]++\f[R] \f[B]\[en]\f[R]
+\f[B]++\f[R] \f[B]--\f[R]
The prefix and postfix \f[B]increment\f[R] and \f[B]decrement\f[R]
operators behave exactly like they would in C.
They require a named expression (see the \f[I]Named Expressions\f[R]
@@ -1138,7 +1137,7 @@ This is a \f[B]non-portable extension\f[R].
.PP
All of the functions below, including the functions in the extended math
library (see the \f[I]Extended Library\f[R] subsection below), are
-available when the \f[B]-l\f[R] or \f[B]\[en]mathlib\f[R] command-line
+available when the \f[B]-l\f[R] or \f[B]--mathlib\f[R] command-line
flags are given, except that the extended math library is not available
when the \f[B]-s\f[R] option, the \f[B]-w\f[R] option, or equivalents
are given.
@@ -1199,7 +1198,7 @@ Functions\f[R] subsection below).
.SS Extended Library
.PP
The extended library is \f[I]not\f[R] loaded when the
-\f[B]-s\f[R]/\f[B]\[en]standard\f[R] or \f[B]-w\f[R]/\f[B]\[en]warn\f[R]
+\f[B]-s\f[R]/\f[B]--standard\f[R] or \f[B]-w\f[R]/\f[B]--warn\f[R]
options are given since they are not part of the library defined by the
standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html).
.PP
@@ -1957,11 +1956,11 @@ interactive mode (see the \f[B]INTERACTIVE MODE\f[R] section), since
bc(1) resets its state (see the \f[B]RESET\f[R] section) and accepts
more input when one of those errors occurs in interactive mode.
This is also the case when interactive mode is forced by the
-\f[B]-i\f[R] flag or \f[B]\[en]interactive\f[R] option.
+\f[B]-i\f[R] flag or \f[B]--interactive\f[R] option.
.PP
These exit statuses allow bc(1) to be used in shell scripting with error
checking, and its normal behavior can be forced by using the
-\f[B]-i\f[R] flag or \f[B]\[en]interactive\f[R] option.
+\f[B]-i\f[R] flag or \f[B]--interactive\f[R] option.
.SH INTERACTIVE MODE
.PP
Per the
@@ -1969,7 +1968,7 @@ standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html),
bc(1) has an interactive mode and a non-interactive mode.
Interactive mode is turned on automatically when both \f[B]stdin\f[R]
and \f[B]stdout\f[R] are hooked to a terminal, but the \f[B]-i\f[R] flag
-and \f[B]\[en]interactive\f[R] option can turn it on in other cases.
+and \f[B]--interactive\f[R] option can turn it on in other cases.
.PP
In interactive mode, bc(1) attempts to recover from errors (see the
\f[B]RESET\f[R] section), and in normal execution, flushes
diff --git a/manuals/bc/A.1.md b/manuals/bc/A.1.md
index 0cf7a4a0d70e..04f37c6bb724 100644
--- a/manuals/bc/A.1.md
+++ b/manuals/bc/A.1.md
@@ -34,8 +34,7 @@ bc - arbitrary-precision decimal arithmetic language and calculator
# SYNOPSIS
-**bc** [**-ghilPqsvVw**] [**--global-stacks**] [**--help**] [**--interactive**] [**--mathlib**] [**--no-prompt**] [**--quiet**] [**--standard**] [**--warn**] [**--version**] [**-e** *expr*] [**--expression**=*expr*...] [**-f** *file*...] [**-file**=*file*...]
-[*file*...]
+**bc** [**-ghilPqsvVw**] [**-\-global-stacks**] [**-\-help**] [**-\-interactive**] [**-\-mathlib**] [**-\-no-prompt**] [**-\-quiet**] [**-\-standard**] [**-\-warn**] [**-\-version**] [**-e** *expr*] [**-\-expression**=*expr*...] [**-f** *file*...] [**-\-file**=*file*...] [*file*...]
# DESCRIPTION
@@ -55,7 +54,7 @@ other implementations.
The following are the options that bc(1) accepts.
-**-g**, **--global-stacks**
+**-g**, **-\-global-stacks**
: Turns the globals **ibase**, **obase**, **scale**, and **seed** into stacks.
@@ -123,17 +122,17 @@ The following are the options that bc(1) accepts.
This is a **non-portable extension**.
-**-h**, **--help**
+**-h**, **-\-help**
: Prints a usage message and quits.
-**-i**, **--interactive**
+**-i**, **-\-interactive**
: Forces interactive mode. (See the **INTERACTIVE MODE** section.)
This is a **non-portable extension**.
-**-l**, **--mathlib**
+**-l**, **-\-mathlib**
: Sets **scale** (see the **SYNTAX** section) to **20** and loads the included
math library and the extended math library before running any code,
@@ -141,7 +140,7 @@ The following are the options that bc(1) accepts.
To learn what is in the libraries, see the **LIBRARY** section.
-**-P**, **--no-prompt**
+**-P**, **-\-no-prompt**
: Disables the prompt in TTY mode. (The prompt is only enabled in TTY mode.
See the **TTY MODE** section) This is mostly for those users that do not
@@ -151,36 +150,36 @@ The following are the options that bc(1) accepts.
This is a **non-portable extension**.
-**-q**, **--quiet**
+**-q**, **-\-quiet**
: This option is for compatibility with the [GNU bc(1)][2]; it is a no-op.
Without this option, GNU bc(1) prints a copyright header. This bc(1) only
prints the copyright header if one or more of the **-v**, **-V**, or
- **--version** options are given.
+ **-\-version** options are given.
This is a **non-portable extension**.
-**-s**, **--standard**
+**-s**, **-\-standard**
: Process exactly the language defined by the [standard][1] and error if any
extensions are used.
This is a **non-portable extension**.
-**-v**, **-V**, **--version**
+**-v**, **-V**, **-\-version**
: Print the version information (copyright header) and exit.
This is a **non-portable extension**.
-**-w**, **--warn**
+**-w**, **-\-warn**
-: Like **-s** and **--standard**, except that warnings (and not errors) are
+: Like **-s** and **-\-standard**, except that warnings (and not errors) are
printed for non-standard extensions and execution continues normally.
This is a **non-portable extension**.
-**-e** *expr*, **--expression**=*expr*
+**-e** *expr*, **-\-expression**=*expr*
: Evaluates *expr*. If multiple expressions are given, they are evaluated in
order. If files are given as well (see below), the expressions and files are
@@ -190,14 +189,14 @@ The following are the options that bc(1) accepts.
If this option is given on the command-line (i.e., not in **BC_ENV_ARGS**,
see the **ENVIRONMENT VARIABLES** section), then after processing all
expressions and files, bc(1) will exit, unless **-** (**stdin**) was given
- as an argument at least once to **-f** or **--file**, whether on the
+ as an argument at least once to **-f** or **-\-file**, whether on the
command-line or in **BC_ENV_ARGS**. However, if any other **-e**,
- **--expression**, **-f**, or **--file** arguments are given after **-f-** or
- equivalent is given, bc(1) will give a fatal error and exit.
+ **-\-expression**, **-f**, or **-\-file** arguments are given after **-f-**
+ or equivalent is given, bc(1) will give a fatal error and exit.
This is a **non-portable extension**.
-**-f** *file*, **--file**=*file*
+**-f** *file*, **-\-file**=*file*
: Reads in *file* and evaluates it, line by line, as though it were read
through **stdin**. If expressions are also given (see above), the
@@ -206,8 +205,8 @@ The following are the options that bc(1) accepts.
If this option is given on the command-line (i.e., not in **BC_ENV_ARGS**,
see the **ENVIRONMENT VARIABLES** section), then after processing all
expressions and files, bc(1) will exit, unless **-** (**stdin**) was given
- as an argument at least once to **-f** or **--file**. However, if any other
- **-e**, **--expression**, **-f**, or **--file** arguments are given after
+ as an argument at least once to **-f** or **-\-file**. However, if any other
+ **-e**, **-\-expression**, **-f**, or **-\-file** arguments are given after
**-f-** or equivalent is given, bc(1) will give a fatal error and exit.
This is a **non-portable extension**.
@@ -262,8 +261,8 @@ Identifiers with more than one character (letter) are a
**ibase** is a global variable determining how to interpret constant numbers. It
is the "input" base, or the number base used for interpreting input numbers.
-**ibase** is initially **10**. If the **-s** (**--standard**) and **-w**
-(**--warn**) flags were not given on the command line, the max allowable value
+**ibase** is initially **10**. If the **-s** (**-\-standard**) and **-w**
+(**-\-warn**) flags were not given on the command line, the max allowable value
for **ibase** is **36**. Otherwise, it is **16**. The min allowable value for
**ibase** is **2**. The max allowable value for **ibase** can be queried in
bc(1) programs with the **maxibase()** built-in function.
@@ -453,7 +452,7 @@ The following arithmetic and logical operators can be used. They are listed in
order of decreasing precedence. Operators in the same group have the same
precedence.
-**++** **--**
+**++** **-\-**
: Type: Prefix and Postfix
@@ -551,7 +550,7 @@ precedence.
The operators will be described in more detail below.
-**++** **--**
+**++** **-\-**
: The prefix and postfix **increment** and **decrement** operators behave
exactly like they would in C. They require a named expression (see the
@@ -882,7 +881,7 @@ This is a **non-portable extension**.
All of the functions below, including the functions in the extended math
library (see the *Extended Library* subsection below), are available when the
-**-l** or **--mathlib** command-line flags are given, except that the extended
+**-l** or **-\-mathlib** command-line flags are given, except that the extended
math library is not available when the **-s** option, the **-w** option, or
equivalents are given.
@@ -934,8 +933,8 @@ The [standard][1] defines the following functions for the math library:
## Extended Library
-The extended library is *not* loaded when the **-s**/**--standard** or
-**-w**/**--warn** options are given since they are not part of the library
+The extended library is *not* loaded when the **-s**/**-\-standard** or
+**-w**/**-\-warn** options are given since they are not part of the library
defined by the [standard][1].
The extended library is a **non-portable extension**.
@@ -1603,17 +1602,17 @@ The other statuses will only be returned when bc(1) is not in interactive mode
(see the **INTERACTIVE MODE** section), since bc(1) resets its state (see the
**RESET** section) and accepts more input when one of those errors occurs in
interactive mode. This is also the case when interactive mode is forced by the
-**-i** flag or **--interactive** option.
+**-i** flag or **-\-interactive** option.
These exit statuses allow bc(1) to be used in shell scripting with error
checking, and its normal behavior can be forced by using the **-i** flag or
-**--interactive** option.
+**-\-interactive** option.
# INTERACTIVE MODE
Per the [standard][1], bc(1) has an interactive mode and a non-interactive mode.
Interactive mode is turned on automatically when both **stdin** and **stdout**
-are hooked to a terminal, but the **-i** flag and **--interactive** option can
+are hooked to a terminal, but the **-i** flag and **-\-interactive** option can
turn it on in other cases.
In interactive mode, bc(1) attempts to recover from errors (see the **RESET**
diff --git a/manuals/bc/E.1 b/manuals/bc/E.1
index 597cde782788..9023b07c6b87 100644
--- a/manuals/bc/E.1
+++ b/manuals/bc/E.1
@@ -25,19 +25,18 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.TH "BC" "1" "February 2021" "Gavin D. Howard" "General Commands Manual"
+.TH "BC" "1" "March 2021" "Gavin D. Howard" "General Commands Manual"
.SH NAME
.PP
bc - arbitrary-precision decimal arithmetic language and calculator
.SH SYNOPSIS
.PP
-\f[B]bc\f[R] [\f[B]-ghilPqsvVw\f[R]] [\f[B]\[en]global-stacks\f[R]]
-[\f[B]\[en]help\f[R]] [\f[B]\[en]interactive\f[R]]
-[\f[B]\[en]mathlib\f[R]] [\f[B]\[en]no-prompt\f[R]]
-[\f[B]\[en]quiet\f[R]] [\f[B]\[en]standard\f[R]] [\f[B]\[en]warn\f[R]]
-[\f[B]\[en]version\f[R]] [\f[B]-e\f[R] \f[I]expr\f[R]]
-[\f[B]\[en]expression\f[R]=\f[I]expr\f[R]\&...] [\f[B]-f\f[R]
-\f[I]file\f[R]\&...] [\f[B]-file\f[R]=\f[I]file\f[R]\&...]
+\f[B]bc\f[R] [\f[B]-ghilPqsvVw\f[R]] [\f[B]--global-stacks\f[R]]
+[\f[B]--help\f[R]] [\f[B]--interactive\f[R]] [\f[B]--mathlib\f[R]]
+[\f[B]--no-prompt\f[R]] [\f[B]--quiet\f[R]] [\f[B]--standard\f[R]]
+[\f[B]--warn\f[R]] [\f[B]--version\f[R]] [\f[B]-e\f[R] \f[I]expr\f[R]]
+[\f[B]--expression\f[R]=\f[I]expr\f[R]\&...] [\f[B]-f\f[R]
+\f[I]file\f[R]\&...] [\f[B]--file\f[R]=\f[I]file\f[R]\&...]
[\f[I]file\f[R]\&...]
.SH DESCRIPTION
.PP
@@ -58,7 +57,7 @@ This bc(1) is a drop-in replacement for \f[I]any\f[R] bc(1), including
.PP
The following are the options that bc(1) accepts.
.PP
-\f[B]-g\f[R], \f[B]\[en]global-stacks\f[R]
+\f[B]-g\f[R], \f[B]--global-stacks\f[R]
.IP
.nf
\f[C]
@@ -115,10 +114,10 @@ This is a **non-portable extension**.
\f[R]
.fi
.TP
-\f[B]-h\f[R], \f[B]\[en]help\f[R]
+\f[B]-h\f[R], \f[B]--help\f[R]
Prints a usage message and quits.
.TP
-\f[B]-i\f[R], \f[B]\[en]interactive\f[R]
+\f[B]-i\f[R], \f[B]--interactive\f[R]
Forces interactive mode.
(See the \f[B]INTERACTIVE MODE\f[R] section.)
.RS
@@ -126,7 +125,7 @@ Forces interactive mode.
This is a \f[B]non-portable extension\f[R].
.RE
.TP
-\f[B]-l\f[R], \f[B]\[en]mathlib\f[R]
+\f[B]-l\f[R], \f[B]--mathlib\f[R]
Sets \f[B]scale\f[R] (see the \f[B]SYNTAX\f[R] section) to \f[B]20\f[R]
and loads the included math library before running any code, including
any expressions or files specified on the command line.
@@ -135,7 +134,7 @@ any expressions or files specified on the command line.
To learn what is in the library, see the \f[B]LIBRARY\f[R] section.
.RE
.TP
-\f[B]-P\f[R], \f[B]\[en]no-prompt\f[R]
+\f[B]-P\f[R], \f[B]--no-prompt\f[R]
Disables the prompt in TTY mode.
(The prompt is only enabled in TTY mode.
See the \f[B]TTY MODE\f[R] section) This is mostly for those users that
@@ -147,18 +146,18 @@ Most of those users would want to put this option in
This is a \f[B]non-portable extension\f[R].
.RE
.TP
-\f[B]-q\f[R], \f[B]\[en]quiet\f[R]
+\f[B]-q\f[R], \f[B]--quiet\f[R]
This option is for compatibility with the GNU
bc(1) (https://www.gnu.org/software/bc/); it is a no-op.
Without this option, GNU bc(1) prints a copyright header.
This bc(1) only prints the copyright header if one or more of the
-\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]\[en]version\f[R] options are given.
+\f[B]-v\f[R], \f[B]-V\f[R], or \f[B]--version\f[R] options are given.
.RS
.PP
This is a \f[B]non-portable extension\f[R].
.RE
.TP
-\f[B]-s\f[R], \f[B]\[en]standard\f[R]
+\f[B]-s\f[R], \f[B]--standard\f[R]
Process exactly the language defined by the
standard (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html)
and error if any extensions are used.
@@ -167,15 +166,15 @@ and error if any extensions are used.
This is a \f[B]non-portable extension\f[R].
.RE
.TP
-\f[B]-v\f[R], \f[B]-V\f[R], \f[B]\[en]version\f[R]
+\f[B]-v\f[R], \f[B]-V\f[R], \f[B]--version\f[R]
Print the version information (copyright header) and exit.
.RS
.PP
This is a \f[B]non-portable extension\f[R].
.RE
.TP
-\f[B]-w\f[R], \f[B]\[en]warn\f[R]
-Like \f[B]-s\f[R] and \f[B]\[en]standard\f[R], except that warnings (and
+\f[B]-w\f[R], \f[B]--warn\f[R]
+Like \f[B]-s\f[R] and \f[B]--standard\f[R], except that warnings (and
not errors) are printed for non-standard extensions and execution
continues normally.
.RS
@@ -183,7 +182,7 @@ continues normally.
This is a \f[B]non-portable extension\f[R].
.RE
.TP
-\f[B]-e\f[R] \f[I]expr\f[R], \f[B]\[en]expression\f[R]=\f[I]expr\f[R]
+\f[B]-e\f[R] \f[I]expr\f[R], \f[B]--expression\f[R]=\f[I]expr\f[R]
Evaluates \f[I]expr\f[R].
If multiple expressions are given, they are evaluated in order.
If files are given as well (see below), the expressions and files are
@@ -196,17 +195,17 @@ If this option is given on the command-line (i.e., not in
\f[B]BC_ENV_ARGS\f[R], see the \f[B]ENVIRONMENT VARIABLES\f[R] section),
then after processing all expressions and files, bc(1) will exit, unless
\f[B]-\f[R] (\f[B]stdin\f[R]) was given as an argument at least once to
-\f[B]-f\f[R] or \f[B]\[en]file\f[R], whether on the command-line or in
+\f[B]-f\f[R] or \f[B]--file\f[R], whether on the command-line or in
\f[B]BC_ENV_ARGS\f[R].
-However, if any other \f[B]-e\f[R], \f[B]\[en]expression\f[R],
-\f[B]-f\f[R], or \f[B]\[en]file\f[R] arguments are given after
+However, if any other \f[B]-e\f[R], \f[B]--expression\f[R],
+\f[B]-f\f[R], or \f[B]--file\f[R] arguments are given after
\f[B]-f-\f[R] or equivalent is given, bc(1) will give a fatal error and
exit.
.PP
This is a \f[B]non-portable extension\f[R].
.RE
.TP
-\f[B]-f\f[R] \f[I]file\f[R], \f[B]\[en]file\f[R]=\f[I]file\f[R]
+\f[B]-f\f[R] \f[I]file\f[R], \f[B]--file\f[R]=\f[I]file\f[R]
Reads in \f[I]file\f[R] and evaluates it, line by line, as though it
were read through \f[B]stdin\f[R].
If expressions are also given (see above), the expressions are evaluated
@@ -217,9 +216,9 @@ If this option is given on the command-line (i.e., not in
\f[B]BC_ENV_ARGS\f[R], see the \f[B]ENVIRONMENT VARIABLES\f[R] section),
then after processing all expressions and files, bc(1) will exit, unless
\f[B]-\f[R] (\f[B]stdin\f[R]) was given as an argument at least once to
-\f[B]-f\f[R] or \f[B]\[en]file\f[R].
-However, if any other \f[B]-e\f[R], \f[B]\[en]expression\f[R],
-\f[B]-f\f[R], or \f[B]\[en]file\f[R] arguments are given after
+\f[B]-f\f[R] or \f[B]--file\f[R].
+However, if any other \f[B]-e\f[R], \f[B]--expression\f[R],
+\f[B]-f\f[R], or \f[B]--file\f[R] arguments are given after
\f[B]-f-\f[R] or equivalent is given, bc(1) will give a fatal error and
exit.
.PP
@@ -284,8 +283,8 @@ constant numbers.
It is the \[lq]input\[rq] base, or the number base used for interpreting
input numbers.
\f[B]ibase\f[R] is initially \f[B]10\f[R].
-If the \f[B]-s\f[R] (\f[B]\[en]standard\f[R]) and \f[B]-w\f[R]
-(\f[B]\[en]warn\f[R]) flags were not given on the command line, the max
+If the \f[B]-s\f[R] (\f[B]--standard\f[R]) and \f[B]-w\f[R]
+(\f[B]--warn\f[R]) flags were not given on the command line, the max
allowable value for \f[B]ibase\f[R] is \f[B]36\f[R].
Otherwise, it is \f[B]16\f[R].
The min allowable value for \f[B]ibase\f[R] is \f[B]2\f[R].
@@ -445,7 +444,7 @@ The following arithmetic and logical operators can be used.
They are listed in order of decreasing precedence.
Operators in the same group have the same precedence.
.TP
*** 11304 LINES SKIPPED ***
More information about the dev-commits-src-all
mailing list