Release v2.14.0.0

The :-separated default CALCRC value has been reversed.
The default CALCRC was:

    ${CALC_SHAREDIR}/startup:~/.calcrc:./.calcinit

The default CALCRC is now:

    ./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup

See "help environment" for details.

Added engineering mode as per a GitHub pull request from
<GitHub user heitzmann>.  Thank you!  For example:

    ; config("mode","eng"),
    ; 10^41
	    100e39

or for example:

    ; base(1000),
    ; 2^23209-1
	    ~402.87411577898877818187e6984

For more information see:

    help base

Added regression test code for engineering mode.  Improved and
expanded regression test code related to the base() and base2()
builtin functions.

Fixed a critical bug in the above mentioned pull request where
a call to base2(1000) would make calc unstable and likely to
dump core.

.gitignore

@@ -33,6 +33,7 @@ custom/libcustcalc*
 endian
 endian_calc.h
 fposval.h
+have_ban_pragma.h
 have_const.h
 have_fpos.h
 have_fpos_pos.h
@@ -49,6 +50,8 @@ have_stdlib.h
 have_stdvs
 have_strdup.h
 have_string.h
+have_strlcat.h
+have_strlcpy.h
 have_times.h
 have_uid_t.h
 have_unistd.h
@@ -65,6 +68,7 @@ help/bugs
 help/builtin
 help/change
 help/changes
+help/contrib
 help/copy
 help/cscript
 help/custom_cal
@@ -76,6 +80,8 @@ help/funclist.c
 help/libcalc
 help/man
 help/new_custom
+help/question
+help/questions
 help/resource
 help/type
 help/usage
@@ -85,6 +91,7 @@ longbits
 longbits.h
 sample_many
 sample_rand
+tags
 terminal.h
 ver_calc
 

BUGS

@@ -1,12 +1,12 @@
 If you notice something wrong, strange or broken, try rereading:
 
-   README.FIRST
+    README.FIRST
-   HOWTO.INSTALL
+    HOWTO.INSTALL
-   BUGS (this file)
+    BUGS (this file)
 
 If that does not help, cd to the calc source directory and try:
 
-   make check
+    make check
 
 Look at the end of the output, it should say something like:
 
@@ -15,74 +15,113 @@ Look at the end of the output, it should say something like:
 
 If it does not, then something is really broken!
 
+To be sure that your version of calc is up to date, check out:
+
+    http://www.isthe.com/chongo/tech/comp/calc/calc-mirror.html
+
 If you made and modifications to calc beyond the simple Makefile
 configuration, try backing them out and see if things get better.
 
-To be sure that your version of calc is up to date, check out:
+If you have tried all of the above and things still are not right,
-
+then it may be time to send in a bug report.
-	http://www.isthe.com/chongo/tech/comp/calc/calc-download.html
-
-The calc web site is located at:
-
-	http://www.isthe.com/chongo/tech/comp/calc/index.html
 
 =-=
 
-If you have tried all of the above and things still are not right,
+The BEST WAY TO SEND IN A BUG REPORT is via calc GitHub issue URL:
-then it may be time to send in a bug report.  You can send bug
-and bug fixes reports to:
 
-	calc-bug-report at asthe dot com
+    https://github.com/lcn2/calc/issues
 
-	NOTE: Remove spaces and replace 'at' with @, 'dot' with .
+If you see an existing issue that matches your problem, look
+over the notes and if needed, add your own observation,
+even if you just add to an existing issue:
 
-    This replaces the old calc-bugs at asthe dot com address.
+    I have this issue too
 
-    To be sure we see your EMail reporting a calc bug, please use the
+If you don't see your issue addressed, then on the above
-    following phase in your EMail Subject line:
+GitHub web page, click on this button:
 
-	calc bug report
+    ((New Issue))
 
-    That phrase in your subject line will help ensure your request
+=-=
-    will get past our anti-spam filters.  You may have additional
-    words in your subject line.
 
-    However, you may find it more helpful to simply subscribe
+If you prefer to not use GitHub, then you
-    to the calc-tester mailing list (see below) and then to
+may send bug and bug fixes reports to:
-    send your report to that mailing list as a wider set calc
-    testers may be able to help you.
 
-When you send your report, please include the following information:
+    calc-bugrept-mail at asthe dot com
 
-    * a description of the problem
+    NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-    * the version of calc you are using (if you cannot get calc
-      to run, then send us the 4 #define lines from version.c)
-    * if you modified calc from an official patch, send me the mods you made
-    * the type of system you were using
-    * the type of compiler you were using
-    * any compiler warnings or errors that you saw
-    * cd to the calc source directory, and type:
 
-	make debug > debug.out 2>&1		(sh, ksh, bash users)
+    NOTE: This replaces the old calc-bugs at asthe dot com address.
-	make debug >& debug.out			(csh, tcsh users)
 
-      and send the contents of the 'debug.out' file.
+PLEASE put following the SPECIAL PHRASE somewhere in your Email Subject line:
 
-Stack traces from core dumps are useful to send as well.
+    calc bug report
 
-Fell free to use the above address to send in big fixes (in the form
+You may add additional words to your subject line.
+
+Suggestion:
+
+    From time to time, the Email address and Subject SPECIAL PHRASE
+    may change so verify you have the current info by visiting:
+
+	http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
+
+IMPORTANT:
+
+    PLEASE use the above SPECIAL PHRASE somewhere in the Subject line or
+    the mail system won't deliver your Email message.
+
+Keep in mind that the best way to report on a calc bug is
+via the above mentioned calc GitHub issue URL.
+
+Please be patient as we cannot always respond to Email messages quickly.
+
+=-=
+
+When you send your report, via the calc GitHub issue URL or Email,
+please include the following information:
+
+    * A description of the problem
+
+    * Version of calc you are using
+
+	If you cannot compile calc, then look at version.c
+	and report the #define that start with:
+
+	    #define MAJOR_VER
+	    #define MINOR_VER
+	    #define MAJOR_PATCH
+	    #define MINOR_PATCH
+
+    * If you modified calc from an official patch,
+      send us the mods you made
+
+    * Type and version of the operating system
+
+    * Type and version of compiler
+
+    * Send us all compiler warnings or errors you find
+
+    * If calc dumped core, try to send us a core dump stack trace
+
+    * cd to the calc source directory, and send the contents
+      of debug.out produced by this command:
+
+	make debug > debug.out 2>&1
+
+Fell free to use the above address to send in bug fixes (in the form
 of a context diff patch).
 
 =-=
 
-Known bugs:
+Known bugs in calc:
 
     The output of the alg_config.cal resource file is bogus.
     We would welcome a replacement for this code.
 
     We are sure some more bugs exist.  When you find them, please let
     us know!  See the above for details on how to report and were to
-    EMail your bug reports and hopefully patches to fix them.
+    Email your bug reports and hopefully patches to fix them.
 
 =-=
 
@@ -135,32 +174,7 @@ mis-features in calc:
 
 =-=
 
-To subscribe to the calc-tester mailing list, visit the following URL:
+## Copyright (C) 1999-2014,2021  Landon Curt Noll
-
-	http://www.isthe.com/chongo/tech/comp/calc/calc-tester.html
-
-    This is a low volume moderated mailing list.
-
-    This mailing list replaces calc-tester at asthe dot com list.
-
-    If you need a human to help you with your mailing list subscription,
-    please send EMail to our special:
-
-	calc-tester-maillist-help at asthe dot com
-
-	NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-
-    address.  To be sure we see your EMail asking for help with your
-    mailing list subscription, please use the following phase in your
-    EMail Subject line:
-
-	calc tester mailing list help
-
-    That phrase in your subject line will help ensure your
-    request will get past our anti-spam filters.  You may have
-    additional words in your subject line.
-
-## Copyright (C) 1999-2014  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

CHANGES

@@ -1,4 +1,551 @@
-The following are the changes from calc version 2.12.6.1 to date:
+The following are the changes from calc version 2.14.0.0 to date:
+
+    The :-separated default CALCRC value has been reversed.
+    The default CALCRC was:
+
+	${CALC_SHAREDIR}/startup:~/.calcrc:./.calcinit
+
+    The default CALCRC is now:
+
+	./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup
+
+    See "help environment" for details.
+
+    Added engineering mode as per a GitHub pull request from
+    <GitHub user heitzmann>.  Thank you!  For example:
+
+	; config("mode","eng"),
+	; 10^41
+		100e39
+
+    or for example:
+
+	; base(1000),
+	; 2^23209-1
+		~402.87411577898877818187e6984
+
+    For more information see:
+
+	help base
+
+    Added regression test code for engineering mode.  Improved and
+    expanded regression test code related to the base() and base2()
+    builtin functions.
+
+    Fixed a critical bug in the above mentioned pull request where
+    a call to base2(1000) would make calc unstable and likely to
+    dump core.
+
+
+The following are the changes from calc version 2.13.0.1 to 2.13.0.1:
+
+    Replaced /usr/local with the use of ${PREFIX} in calc Makefiles.
+
+    The ${PREFIX} is not the same as ${T}.  The ${T} specifies
+    a top level directory under which calc installs things.
+    While usually ${T} is empty, it can be specific path
+    as if calc where "chrooted" during an install.
+    The ${PREFIX} value, during install, is a path between
+    the top level ${T} install directory and the object
+    such as an include file.
+
+    Corrected a few more typos in Makefile comments.
+
+    Added Makefile.local, a file with a single comment.  The main
+    Makefile includes Makefile.local just before the first all rule.
+    One may override any Makefile setting by modifying Makefile.local.
+    For example, Makefile.local could force BLD_TYPE:
+
+	HAVE_STRING_H:= YES
+	HAVE_TIMES_H:= YES
+	SED:= /usr/local/bin/nsed
+
+    Added ${LOC_MKF} to specify the make of the file that is
+    included just before the all file.  So one could place
+    the above override lines into a different file and call
+    make changing the ${LOC_MKF} value.  For example:
+
+	make LOC_MKF=Makefile.private clobber all chk
+
+    Updated HOWTO.INSTALL to mention Makefile.local.
+
+
+The following are the changes from calc version 2.13.0.0 to 2.13.0.0:
+
+    Fixed typo (missing quotes) in the env rule.
+
+    Fixed intendation problem in CHANGES.
+
+    Combined 2.12.9.1 changes into the 2.12.8.2 to 2.12.9.0
+    range, and thus renamed the range to 2.12.8.2 to 2.12.9.1.
+
+    Fixed issues related to building Makefile.simple.
+
+    Fixed how the Makefile variable MANPATH is set for macOS.
+
+    Added a bunch of information to the near bottom of HOWTO.INSTALL
+    on calc Makefiles.  This information discusses the various
+    Makefiles found in the calc source.
+
+    Added comments in various calc Makefiles about their origin.
+    In particular, for Makefiles that are constructed such as
+    Makefile.simple, custom/Makefile and custom/Makefile.simple
+    there are comments about how they were made.
+
+    For all calc Makefiles, including those in sub-directories,
+    near the top there is now a line of the form:
+
+	# SRC: ... some message about the origin ...
+
+    Fixed how the calc(1) man page is installed under macOS.
+
+    Fixed how calc man page in ${CATDIR} is formed.
+
+    Fixed how Makefile.simple is formed.
+
+    Fixed the #! calc script argument processing.  The initial #!
+    line must end in a -f.  For example, if calc is in /usr/local/bin/calc,
+    then the following would be the first line of a calc script:
+
+	#!/usr/local/bin/calc -f
+	...
+
+    It is common that -q be usde with a calc script, so assuming the
+    same /usr/local/bin/calc path:
+
+	#!/usr/local/bin/calc -q -f
+	...
+
+    Use of -s in the #! first line of a calc script is not needed
+    since -f implies -f.
+
+    The argv() will now return values more typical of C's main().
+    Before it returned one less than the number of arguments.  Now,
+    for example, when calc is given 2 args, argv() will return 3.
+
+    The value of argv(0) will be the path to calc, or in the
+    case of a #! calc cscript, it will return the name of the script.
+
+    Updated the calc man page and help/argv to reflect the
+    above changes.
+
+    Improved the formatting of the calc man page.
+
+    Fixed the formation of the win32 sub-directory via the win32_hsrc
+    Makefile rule.
+
+    Due to incompatible changes to the argv() function, and #! calc
+    scripts, we are setting the version to the next minor number:
+
+	2.13.0.x
+
+    Updated BUGS file as per v2.13.0 fixes.
+
+
+The following are the changes from calc version 2.12.8.2 to 2.12.9.1:
+
+    Added notes to help/unexpected about:
+
+	display() will limit the number of digits printed after decimal point
+
+	%d will format after the decimal point for non-integer numeric values
+
+	%x will format as fractions for non-integer numeric values
+
+	fprintf(fd, "%d\n", huge_value) may need fflush(fd) to finish
+
+    Fixed Makefile dependencies for the args.h rule.
+
+    Fixed Makefile cases where echo with -n is used.  On some systems,
+    /bin/sh does not use -n, so we must call /bin/echo -n instead
+    via the ${ECHON} Makefile variable.
+
+    Add missing standard tools to sub-Makefiles to make them
+    easier to invoke directly.
+
+    Sort lists of standard tool Makefile variables and remove duplicates.
+
+    Declare the SHELL at the top of Makefiles.
+
+    Fixed the depend rule in the custom Makefile.
+
+    Improved the messages produced by the depend in the Makefiles.
+
+    Changed the UNUSED define in have_unused.h to be a macro with
+    a parameter.  Changed all use of UNUSED in *.c to be UNUSED(x).
+
+    Removed the need for HAVE_UNUSED in building the have_unused.h file.
+
+    CCBAN is given to ${CC} in order to control if banned.h is in effect.
+
+    The banned.h attempts to ban the use of certain dangerous functions
+    that, if improperly used, could compromise the computational integrity
+    if calculations.
+
+    In the case of calc, we are motivated in part by the desire for calc
+    to correctly calculate: even during extremely long calculations.
+
+    If UNBAN is NOT defined, then calling certain functions
+    will result in a call to a non-existent function (link error).
+
+    While we do NOT encourage defining UNBAN, there may be
+    a system / compiler environment where re-defining a
+    function may lead to a fatal compiler complication.
+    If that happens, consider compiling as:
+
+	make clobber all chk CCBAN=-DUNBAN
+
+    as see if this is a work-a-round.
+
+    If YOU discover a need for the -DUNBAN work-a-round, PLEASE tell us!
+    Please send us a bug report.  See the file:
+
+	BUGS
+
+    or the URL:
+
+	http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
+
+    for how to send us such a bug report.
+
+    Added the building of have_ban_pragma.h, which will determine
+    if "#pragma GCC poison func_name" is supported.  If it is not,
+    or of HAVE_PRAGMA_GCC_POSION=-DHAVE_NO_PRAGMA_GCC_POSION, then
+    banned.h will have no effect.
+
+    Fixed building of the have_getpgid.h file.
+    Fixed building of the have_getprid.h file.
+    Fixed building of the have_getsid.h file.
+    Fixed building of the have_gettime.h file.
+    Fixed building of the have_strdup.h file.
+    Fixed building of the have_ustat.h file.
+    Fixed building of the have_rusage.h file.
+
+    Added HAVE_NO_STRLCPY to control if we want to test if
+    the system has a strlcpy() function.  This in turn produces
+    the have_strlcpy.h file wherein the symbol HAVE_STRLCPY will
+    be defined, or not depending if the system comes with a
+    strlcpy() function.
+
+    If the system does not have a strlcpy() function, we
+    compile our own strlcpy() function.  See strl.c for details.
+
+     Added HAVE_NO_STRLCAT to control if we want to test if
+     the system has a strlcat() function.  This in turn produces
+     the have_strlcat.h file wherein the symbol HAVE_STRLCAT will
+     be defined, or not depending if the system comes with a
+     strlcat() function.
+
+     If the system does not have a strlcat() function, we
+     compile our own strlcat() function.  See strl.c for details.
+
+     Fixed places were <string.h>, using #ifdef HAVE_STRING_H
+     for legacy systems that do not have that include file.
+
+     Added ${H} Makefile symbol to control the announcement
+     of forming and having formed hsrc related files.  By default
+     H=@ (announce hsrc file formation) vs. H=@: to silence hsrc
+     related file formation.
+
+     Explicitly turn off quiet mode (set Makefile variable ${Q} to
+     be empty) when building rpms.
+
+     Improved and fixed the hsrc build process.
+
+     Forming rpms is performed in verbose mode to assist debugging
+     to the rpm build process.
+
+     Compile custom code, if needed, after main code is compiled.
+
+    Fixed a typo typo in help/Makefile that caused the build of
+    2.12.9.0 to fail in a number of cases.  Thanks to a report by
+    <GitHub user balducci>.
+
+    Pass form Makefile variables ${Q}, ${S}, ${E}, ${H} and ${V} down
+    to all sub-directory Makefiles from the top level Makefile.
+
+
+The following are the changes from calc version 2.12.8.1 to 2.12.8.2:
+
+    Fixed how the *.tar.bz2 are formed.  The calc-2.12.8.0.tar.bz2 file
+    that was formed for calc version 2.12.8.0 was missing most files.
+
+    Expanded 'make chk' to also verify that 'make distchk' and 'make
+    distlist' execute successfully.  This will help check a regression
+    of the bug that produced the bogus calc-2.12.8.0.tar.bz2 file.
+
+    Added additional regression tests related 0^(zero_expression)==1.
+
+    Calc can now correctly compile without CUSTOM being defined,
+    thanks to a report by <GitHub user barsnick>.
+
+
+
+The following are the changes from calc version 2.12.7.5 to 2.12.8.0:
+
+    Fixed a mistake in "help intro" where some inserted text changed
+    the value of "." and thus made the next result incorrect.
+
+    Clarified in "help factor" that 1 is returned if no
+    factor below the limit was found.
+
+    Removed Makefile variable ${MAKEFILE_REV}.
+
+    The missing cscript/square.calc file has been restored.
+
+    Fixed compiler errors and warnings related to GCC.  In particular,
+    gcc/9.3.1 and gcc/10.2.1 now compile calc without any compiler
+    errors or warnings, even with -Werror -Wextra -pedantic.
+
+    To print out information about the calc compilation
+    environment, we added the following make rule:
+
+	make calcinfo
+
+    Improved how 'make debug' operates.
+
+    Moved help/contrib to CONTRIB-CODE.  The help/contrib file
+    is now build from a copy of CONTRIB-CODE.
+
+    Created a new calc bug report Email address.  Created a new
+    calc question Email address.  Created a new calc contribution
+    Email address.  See the BUGS file for details.
+
+    Added "help questions" to print the QUESTIONS help file.
+
+    If the environment variable $CALCHELP is defined and is non-empty,
+    then calc help files will be in the directory by the $CALCHISTFILE
+    environment variable.
+
+    If the environment variable $CALCCUSTOMHELP is defined and is
+    non-empty, then custom calc help files will be in the directory
+    by the $CALCCUSTOMHELP environment variable.
+
+    Fixed a number of typos in text and in source code comments.
+
+    The calc-tester mailing list has been retired.  See:
+
+	* How to submit a calc bug report:
+
+	    http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
+
+	* How to contribute code to calc:
+
+	    http://www.isthe.com/chongo/tech/comp/calc/calc-contrib.html
+
+	* How to submit a question about calc:
+
+	    http://www.isthe.com/chongo/tech/comp/calc/calc-question.html
+
+
+The following are the changes from calc version 2.12.7.1 to 2.12.7.5:
+
+    Corrected CHANGES notes that were mixed up for TAB, VT, CR &
+    NL.  The code in 2.12.7.0 is correct.  The CHANGE notes should
+    have read:
+
+	The following is a partial list of escape sequences recognized
+	in strings and in printf formats:
+
+	    \a	audible bell	byte 0x07 in ASCII encoding
+	    \b	backspace	byte 0x08 in ASCII encoding
+	    \f	form feed	byte 0x0c in ASCII encoding
+	    \n	newline		byte 0x0a in ASCII encoding
+	    \r	return		byte 0x0d in ASCII encoding
+	    \t	tab		byte 0x09 in ASCII encoding
+	    \v	vertical tab	byte 0x0b in ASCII encoding
+
+    Fixed a segfault when getpwuid() returned NULL during initialization.
+    Thanks goes to baratharon GitHub user for reporting this issue.
+
+    Requiring calc shell scripts to use -s -f at the end of the
+    initial #! line.
+
+    Fixed /tmp/mersenne example in calc(1) man page.
+
+    Added make variable ${ARCH_CFLAGS}.  The ${ARCH_CFLAGS} is
+    added after ${CCMISC} and before ${EXTRA_CFLAGS} when building
+    the ${CFLAGS} for compiling C code.  are ${CC} when compiling
+    C files.  The default value is:
+
+	ARCH_CFLAGS= -march=native
+
+    which directs C compiler to compile for the native machine.
+    To disable use of '-march=native', set ARCH_CFLAGS to the empty
+    string as in:
+
+	make all ARCH_CFLAGS=
+
+    To make calc RPMs more portable, they are compiled with an
+    empty ARCH_CFLAGS.
+
+    Fixed issues relating to compiling on macOS.  Fixed issues
+    where <unistd.h> is needed.
+
+    Fixed typos in help/intro and README.md. <<GitHub guilhermgonzaga>>
+
+    Copied missing description lines from help/intro to README.md
+    "What is calc?" section.  <<GitHub guilhermgonzaga>>
+
+    GCC 7 added a warning on fall through in case statements.  It's
+    enabled by -Wextra and treated as an error due to -Wall so it
+    breaks compilation.  See -Wimplicit-fallthrough in the GCC
+    manual.  The default value is 3, which means a comment matching
+    some specific regexes is enough to disable the warning.
+    Fixed spaces vs tabs and use FALLTHRU as it's used elsewhere.
+    Fixed one FALLTHRU comment that was inconsistent with others.
+    <<GitHub jcul>>
+
+    Fixed minor typo on help/power. <<GitHub thegithubr>>
+
+    By default, the calc history file is located in ~/.calc_history.
+    Now, if the environment variable $CALCHISTFILE is defined
+    and is non-empty, then calc history file will be defined
+    by the $CALCHISTFILE environment variable.
+
+    Calc as defined 0^0 as 1.  However in the past, 0 raised to
+    an expression that evaluated to zero returned 1.  The result
+    was that 0^0 was different than 0^(6-6) or even 0^(0).
+    Now, calc will return 1 for 0^(0) and 0^zero when zero == 0.
+
+    The missing cscript/square.calc file has been restored.
+
+
+The following are the changes from calc version 2.12.6.10: to 2.12.7.0:
+
+    Added a patch to replaces the manual search for include files
+    in $(INCDIR) in the have_*.h targets with compiler invocations.
+    Thanks goes to Helmut Grohne (helmut at subdivi dot de) who
+    implemented the patch and posted it to the Debian bug tracker
+    and Martin Buck (m at rtin-buck dor de) for forwarding it to us.
+
+    The check_include make rule was fixed to not assume /usr/include.
+
+    The qprintnum() function now takes outdigits as a 3rd argument.
+    Most of the time, this 3rd argument is just conf->outdigits.
+    But when it comes to the experimental '%g', this value can
+    change.  This avoids having to modify conf->outdigits.
+
+    Fixed a problem where gcc complains about E_FUNC not being defined
+    for Linux systems as reported by Martin Buck (m at rtin-buck dor de).
+
+    Updated the help files help/config, help/display, help/epsilon,
+    help/fprint, help/printf, and help/strprintf to give more
+    examples of how display digits and epsilon precision interact
+    with displaying values.
+
+    Added more information about %g in the help file help/printf.
+
+    The '\a' is now recognized in a printf format string as the
+    single byte audible bell character (byte 0x07 in ASCII encoding).
+
+    The following is a partial list of escape sequences recognized
+    in strings and in printf formats:
+
+	\a	audible bell	byte 0x07 in ASCII encoding
+	\b	backspace	byte 0x08 in ASCII encoding
+	\f	form feed	byte 0x0c in ASCII encoding
+	\n	newline		byte 0x0a in ASCII encoding
+	\r	return		byte 0x0d in ASCII encoding
+	\t	tab		byte 0x09 in ASCII encoding
+	\v	vertical tab	byte 0x0b in ASCII encoding
+
+
+The following are the changes from calc version 2.12.6.9 to 2.12.6.9:
+
+    Fixed a number of core dump bugs related to the calculation of
+    tan(), cot(), sec(), csc(), tanh(), coth(), sech(), and csch(),
+    asin(), acos(), asinh(), acosh(), where when a call to an
+    underlying function produced an invalid value.  Thanks goes to
+    github user wuxiuheng for reporting this problem.
+
+    A number of trigonometric and hyperbolic functions that incorrectly
+    returned E_LOGINF, now return a new error code that is more
+    specific to the trigonometric or hyperbolic function.  The
+    following is a list of these new error codes: E_TAN3 E_TAN4
+    E_COT3 E_COT4 E_SEC3 E_CSC3 E_TANH3 E_TANH4 E_COTH3 E_COTH4
+    E_SECH3 E_CSCH3 E_ASIN3 E_ACOS3 E_ASINH3 E_ACOSH3 E_ATAN3 E_ACOT3
+    E_ASEC3 E_ACSC3 E_ATANH3 E_ACOTH3 E_ASECH3 E_ACSCH3.
+
+    Added regression tests 3729 thru 3732 to test E_TAN3, E_COT3,
+    E_SEC3 and E_CSC3 respectively.
+
+    Added experimental %g printf (and strprintf) format implementation
+    based on pull request from github user 10110111.
+
+    Made experimental changes to macOS builds to not require use of
+    /usr/include.  The INCDIR for macOS uses:
+
+	INCDIR= $(shell xcrun --show-sdk-path --sdk macosx)/usr/include
+
+    to determine the upper path of the /usr/include directory for macOS.
+    In some rare cases, the Darwin target seems to not automatically detected.
+    If you are running under macOS, and that happens, you can force
+    the target to be Darwin:
+
+	# for macOS users only, force the target to be darwin
+	#
+	make target=Darwin clobber
+	make target=Darwin all
+	make target=Darwin chk
+	make target=Darwin install
+
+
+The following are the changes from calc version 2.12.6.6 to 2.12.6.8:
+
+    For historical purposes, in lucas.cal, gen_v1(1, n) always returns 4.
+
+    Fixed some compiler warnings, thanks to a report by Mike
+    <michael dot d dot ince at gmail dot com>.
+
+    Added work around for a gcc warning bug, thanks to a report by Mike
+    <michael dot d dot ince at gmail dot com>.
+
+    Fixed errors in various help files such as:
+
+	mat randbit seed srandom types
+
+    Removed the MAXSTRING symbol because it was no longer used by calc.
+
+    Increased HIST_SIZE (depth of the history stack) from 10k to 32k.
+
+    Increased TTYSIZE (reallocation size for terminal buffers) from 100 to 8191.
+
+    Increased MAXDEPTH (maximum depth of input stack) from 10 to 255.
+
+    Increased interactive input buffer size from 1024 to 256k.  This has the
+    effect of increasing the maximum length of an input line from a tty.
+    This helps with an interactive bug that was reported by Ruslan Kabatsayev
+    (b7 dot 10110111 at gmail dot com).
+
+    The calc man page indicates that -d also disables the printing of the
+    leading tilde.
+
+    Added information to "help command" about how to silence messages
+    while reading calc resource files.
+
+    Fixed an error message buffer overflow thanks to a report by
+    Frank Peters <nlp at northernlightsphoto dot biz>.
+
+    Replaced all use of the C function sprintf() with snprintf().
+    Replaced all use of the C funcion vsprintf() with vsnprintf().
+    Replaced all DONT_HAVE_VSPRINTF with DONT_HAVE_VSNPRINTF.
+    Replaced all Makefile var ${HAVE_VSPRINTF} with ${HAVE_VSNPRINTF}.
+
+
+The following are the changes from calc version 2.12.6.4 to 2.12.6.5:
+
+    Fixed warning about undefined operations involving the qlink(q)
+    macro by replacing that macro with an inline-function.  Thanks goes
+    to David Haller <dnh at opensuse dot org> for this fix.
+
+    NOTE for Windows 10 users: Pavel Nemec <pane at seznam dot cz>
+    reported that calc version 2.12.6.4 has been successfully
+    compiled, installed and running on Windows 10.  See README.WINDOWS
+    for more details.
+
+
+The following are the changes from calc version 2.12.6.1 to 2.12.6.3:
 
     Improved gen_v1(h,n) in lucas.cal to use an even faster search method.
 
@@ -6,6 +553,22 @@ The following are the changes from calc version 2.12.6.1 to date:
     integers >= 1.  In the case of both rodseth_xhn(x, h, n) and gen_v1(h, n)
     h must be odd.
 
+    Fixed an C code indenting issue that was reported by Thomas Walter
+    <th dot walter42 at gmx dot de> in zfunc.c.
+
+    Fixed a man page warning about ./myfile where the leading dot
+    was mistook for an nroff macro.  Thanks goes to David Haller
+    <dnh at opensuse dot org> for providing the patch.
+
+    Improved gen_v1(h,n) in lucas.cal for cases where h is not a
+    multiple of 3. Optimized the search for v(1) when h is a
+    multiple of 3.
+
+    Fixed a Makefile problem, reported by Doug Hays <doughays6 at gmail
+    dot com>, where if a macOS user set BINDIR, LIBDIR, CALC_SHAREDIR
+    or INCDIR in the top section, their values will be overwritten by
+    the Darwin specific section.
+
 
 The following are the changes from calc version 2.12.6.0 to 2.12.6.0:
 
@@ -100,7 +663,7 @@ The following are the changes from calc version 2.12.5.4 to 2.12.5.6:
     The improved gen_v1() function is capable of returning a value
     for all valid values of h and n.  As a result, the trial tables
     used by gen_v1() have been changed to a short list of values
-    to try, in order ot likelyhood of success, before doing an
+    to try, in order ot likelihood of success, before doing an
     exhaustive search for a v1 value to return.
 
     Removed lucas_tbl.cal calc resource file.  This file was made
@@ -190,32 +753,6 @@ The following are the changes from calc version 2.12.5.1 to 2.12.5.2:
 
 The following are the changes from calc version 2.12.5.0 to 2.12.5.1:
 
-    Calc has a new calc-tester mailing list.  This list is for those
-    who are using/testing calc.  We also use this list to announce
-    new versions of calc.  To subscribe to the calc-tester mailing
-    list, visit the following URL:
-
-	    http://www.isthe.com/chongo/tech/comp/calc/calc-tester.html
-
-	This is a low volume moderated mailing list.
-
-	This mailing list replaces calc-tester at asthe dot com list.
-
-	If you need a human to help you with your mailing list subscription,
-	please send Email to our special:
-
-	    calc-tester-maillist-help at asthe dot com
-
-	address.  To be sure we see your Email asking for help with your
-	mailing list subscription, please use the following phase in your
-	Email Subject line:
-
-	    calc tester mailing list help
-
-	That phrase in your subject line will help ensure your
-	request will get past our anti-spam filters.  You may have
-	additional words in your subject line.
-
     There is a new calc bug report Email address:
 
 	    calc-bug-report at asthe dot com
@@ -430,7 +967,7 @@ The following are the changes from calc version 2.12.4.6 to version 2.12.4.10:
     Silenced annoying warning about unused variable 'intp'
     while compiling endian.c under some circumstances.
 
-    Fixed typo in redeclaration warnings.  Thanks to
+    Fixed typo in re-declaration warnings.  Thanks to
     Christoph Zurnieden <czurnieden at gmx dot de> for this report.
 
     Added a number of calc resource files by
@@ -2540,7 +3077,6 @@ The following are the changes from calc version 2.11.2t0 to 2.11.2t1.0:
     Using calc-bugs at asthe dot com for calc bug reports,
     calc-contrib at asthe dot com for calc contributions,
     calc-tester-request at asthe dot com for requests to join calc-tester and
-    calc-tester at asthe dot com for the calc tester mailing list.
 
     Replaced explicit Email addresses found this file with the <user at
     site dot domain> notation to reduce the potential for those folks
@@ -7280,7 +7816,7 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1:
 
     A small bug in the library file regress.cal was fixed.
 
-## Copyright (C) 2001-2017  Landon Curt Noll
+## Copyright (C) 2001-2017,2021  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

CONTRIB-CODE

@@ -0,0 +1,100 @@
+Calc is open source. Contributions of code are welcome.
+
+We welcome and encourage you to send us:
+
+    * calc resource files (cal/*.cal files)
+    * calc shell scripts (cscript/*.calc files)
+    * builtin functions that you have modified or written, i.e.:
+	assocfunc.c comfunc.c func.c func.h
+	listfunc.c matfunc.c qfunc.c zfunc.c
+    * custom functions that you have modified or written
+    * help files modified or written (help/*)
+    * Makefile improvements (Makefile, */Makefile)
+    * other source code modifications (*.c, *.h)
+    * etc. (* */* :) )
+
+In order to consider integrating your code, we need:
+
+    * calc version you are working with (please try use the latest version)
+    * new help files or help file patches, if applicable (documentation)
+    * proposed text for the CHANGES file (brief description of what it does)
+    * regress.cal test patch as needed
+    * your source code and/or source code changes (:-))
+
+If you add functionality to calc, please be sure to modify/patch/add
+Makefiles, help files, cal/regress.cal test code as well.
+Regression test cases are vital to maintaining calc's level
+of correctness and helps us avoid code bug regression.
+
+Please try to generate a patch against the most recent
+version of calc, and if you use GitHub, the top of the
+master branch:
+
+    https://github.com/lcn2/calc
+
+The best way contribute to calc bug is to generate calc
+GitHub pull request:
+
+    https://github.com/lcn2/calc/pulls
+
+Your code needs to be contributed under either the 2.1 of the GNU
+Lesser General Public License (LGPL 2.1) or in the public domain.
+
+If you do not want to use calc GitHub, then send Email to:
+
+    calc-contrib-mail at asthe dot com
+
+    NOTE: Remove spaces and replace 'at' with @, 'dot' with .
+
+You MUST use following SPECIAL PHRASE in your Email Subject line:
+
+    calc contribution
+
+You may add additional words to your subject line.
+
+Suggestion:
+
+    From time to time, the Email address and Subject SPECIAL PHRASE
+    may change so verify you have the current info by visiting:
+
+	http://www.isthe.com/chongo/tech/comp/calc/calc-contrib.html
+
+IMPORTANT: If your Email doesn't contain the above phrase,
+	   then we WILL NOT SEE your Email.
+
+PLEASE BE SURE you have that SPECIAL PHRASE somewhere in the subject line!
+
+Keep in mind that the best way to report on a calc bug is to use
+the above mentioned calc GitHub procedure.
+
+Please be patient as we cannot always respond to Email messages quickly.
+
+=-=
+
+See also the calc wishlist by running the calc command:
+
+    ; help wishlist
+
+=-=
+
+## Copyright (C) 1999,2014,2021  Landon Curt Noll
+##
+## Calc is open software; you can redistribute it and/or modify it under
+## the terms of the version 2.1 of the GNU Lesser General Public License
+## as published by the Free Software Foundation.
+##
+## Calc is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+## or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+## Public License for more details.
+##
+## A copy of version 2.1 of the GNU Lesser General Public License is
+## distributed with calc under the filename COPYING-LGPL.  You should have
+## received a copy with calc; if not, write to Free Software Foundation, Inc.
+## 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+##
+## Under source code control:	1997/03/09 16:33:22
+## File existed as early as:	1997
+##
+## chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

COPYING

@@ -6,7 +6,7 @@ This file is Copyrighted
 
     This file is covered under the following Copyright:
 
-	Copyright (C) 1999-2014  Landon Curt Noll
+	Copyright (C) 1999-2021  Landon Curt Noll
 	All rights reserved.
 
 	Everyone is permitted to copy and distribute verbatim copies
@@ -49,65 +49,6 @@ Calc is covered by the GNU Lesser General Public License
 	    Boston, MA  02110-1301
 	    USA
 
-    To subscribe to the calc-tester mailing list, visit the following URL:
-
-	    http://www.isthe.com/chongo/tech/comp/calc/calc-tester.html
-
-	This is a low volume moderated mailing list.
-
-	This mailing list replaces calc-tester at asthe dot com list.
-
-	If you need a human to help you with your mailing list subscription,
-	please send EMail to our special:
-
-	    calc-tester-maillist-help at asthe dot com
-
-	    NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-
-	address.  To be sure we see your EMail asking for help with your
-	mailing list subscription, please use the following phase in your
-	EMail Subject line:
-
-	    calc tester mailing list help
-
-	That phrase in your subject line will help ensure your
-	request will get past our anti-spam filters.  You may have
-	additional words in your subject line.
-
--=-
-
-    Calc bug reports and calc bug fixes should be sent to:
-
-	    calc-bug-report at asthe dot com
-
-	    NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-
-	This replaces the old calc-bugs at asthe dot com address.
-
-	To be sure we see your EMail reporting a calc bug, please use the
-	following phase in your EMail Subject line:
-
-	    calc bug report
-
-	That phrase in your subject line will help ensure your
-	request will get past our anti-spam filters.  You may have
-	additional words in your subject line.
-
-	However, you may find it more helpful to simply subscribe
-	to the calc-tester mailing list (see above) and then to
-	send your report to that mailing list as a wider set calc
-	testers may be able to help you.
-
--=-
-
-    The calc web site is located at:
-
-	http://www.isthe.com/chongo/tech/comp/calc/
-
-    NOTE: The EMail address uses 'asthe', while the web site uses 'isthe'.
-
--=-
-
 Calc's relationship to the GNU Lesser General Public License
 ------------------------------------------------------------
 

HOWTO.INSTALL

@@ -1,6 +1,10 @@
+
+IMPORTANT: Please see the section at the bottom of this file for
+	   some important information on Makefiles used in calc.
+
 Installing calc from the bzip2-ed tarball in 4 easy steps:
 
-    0)  If your platform supports i686 RPMs, you may want to go to:
+    (0)  If your platform supports i686 RPMs, you may want to go to:
 
 	    http://www.isthe.com/chongo/src/calc/
 
@@ -25,15 +29,25 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 		cd /var/tmp
 		bunzip2 -c /usr/src/redhat/SOURCES/calc-*.tar.bz2 | tar -xvf -
 
-    1)	Look at the makefile, and adjust it to suit your needs.
+    (1)	Look at the makefile, and adjust it to suit your needs.
 
-	The top level Makefile and the custom/Makefile require a GNU
+	The top level Makefile and the custom/Makefile require a modern
 	Make (such as gmake) or an equivalently advanced make.	On many
-	targets, the default make is sufficent.  On FreeBSD for example,
+	targets, the default make is sufficient.  On FreeBSD for example,
-	one must use gmake instead of make.
+	probably want to use gmake instead of make.
 
-	If your target system does not have GNU Make (or equivalent), then
+	Some report that under macOS, one has to declare the target
-	you should try using the Makefile.simple and custom/Makefile.simple
+	to be Darwin.  So for macOS, one might have to do:
+
+	    # for macOS users only, force the target to be Darwin
+	    #
+	    make target=Darwin clobber
+	    make target=Darwin all
+	    make target=Darwin chk
+	    make target=Darwin install
+
+	If your target system does not have a moderm Makefile (such as gmake),
+	then you should try using the Makefile.simple and custom/Makefile.simple
 	files:
 
 	    mv Makefile Makefile.gmake
@@ -46,6 +60,14 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 	values should work.  If in doubt, follow the 'When in doubt'
 	suggestion.
 
+	If you are using a modern make (such as gmake), you may override
+	any values set in the Mkefile by adding them to Makefile.local
+	using the := directive.  For example:
+
+	    HAVE_STRING_H:= YES
+	    HAVE_TIMES_H:= YES
+	    SED:= /usr/local/bin/nsed
+
 	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	! If you are building under Windoz or a Windoz-like environment !
 	! (such as Cygwin or DJGPP), read the README.WINDOWS file.      !
@@ -110,7 +132,7 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 	    found below, comment out the Linux set and comment in that
 	    set or edit the gcc set or the common cc set as needed.
 
-	You may want to change these Makrfile variables from their defaults:
+	You may want to change these Makefile variables from their defaults:
 
 	    RANLIB
 
@@ -138,11 +160,11 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 
 	   Adjust other Makefile variables as needed.
 
-    2)	build calc:
+    (2)	build calc:
 
 	The top level Makefile and the custom/Makefile require a GNU
 	Make (such as gmake) or an equivalently advanced make.	On many
-	targets, the default make is sufficent.  On FreeBSD for example,
+	targets, the default make is sufficient.  On FreeBSD for example,
 	one must use gmake instead of make.
 
 	If your target system does not have GNU Make (or equivalent), then
@@ -170,7 +192,7 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 		make clobber
 		make calc-dynamic-only BLD_TYPE=calc-dynamic-only
 
-    3)	test calc:
+    (3)	test calc:
 
 	make check
 
@@ -181,14 +203,223 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 
 		make chk
 
-    4)	install calc:
+    (4)	install calc:
 
 	make install
 
 We suggest that you might want to read the README.FIRST file and look at
 the calc help subsystem.  See also the README.md file.
 
-## Copyright (C) 1999-2007  Landon Curt Noll
+=-=
+
+On calc Makefiles:
+
+How to tell the origin of of a Makefile:
+
+    The "# SRC: ... - ..." comment line near the top
+    of the file indicates the origin of this file.
+    In each segment below, we indicate what the SRC
+    comment like will read.
+
+SHELL= ...
+
+    On some systems, /bin/sh is a rather reduced shell with
+    deprecated behavior.
+
+    If your system has a up to date, bash shell, then
+    you may wish to edit the Makefile to use:
+
+	    SHELL= /bin/bash
+
+    On some systems such as macOS, the bash shell is very
+    far behind to the point where is cannot be depended on.
+    On such systems, the zsh may be a much better alternative
+    shell for this Makefile to use:
+
+	    SHELL= /bin/zsh
+
+Makefile
+
+    # SRC: Makefile - Our calc build environment
+
+    This is our internal Makefile that drives how we build calc.
+    For critical rules in Makefile.ship, there is a corresponding
+    rule in Makefile that calls ${MAKE} -f Makefile.ship with,
+    additional commands, args and Makefile variables.  The ${XVAR}
+    Makefile variable, for example, is passed on each call to
+    ${MAKE} -f Makefile.ship so that the environment and parameters of
+    Makefile.ship may be managed for our build environment.
+
+    This Makefile is used to make the calc rpm.  In addition to these
+    comments, this Makefile differs from the non-rpm bzip2-ed tarball
+    source Makefile in at least the the following ways:
+
+	CCWERR= -Werror
+	USE_READLINE= -DUSE_READLINE
+	READLINE_LIB= -lreadline -lhistory -lncurses
+
+    If the Makefile is not suitable for you, then
+    you may wish to replace it with Makefile.ship:
+
+	mv -f -v Makefile.ship Makefile
+
+    This Makefile assumes you have a modern make command such as
+    the GNU make.  See Makefile.simple comment below if you do not
+    have such a modern make command.
+
+    In packages such as RPMs, and the tar.bz2 source tarball,
+    Makefile contains the contents of Makefile.ship.  If Makefile.ship
+    is missing it has likely moved to replace Makefile.
+
+    In the calc GitHub repo, Makefile is the calc build environment
+    and Makefile.ship is the top level Makefile:
+
+	https://github.com/lcn2/calc
+
+Makefile.ship
+
+    # SRC: Makefile.ship - top level Makefile
+
+    This is the main top level Makefile.
+
+    In calc packages such as RPMs, and the tar.bz2 source tarball,
+    Makefile.ship has been moved into Makefile.
+
+    In the calc GitHub repo, Makefile is the calc build environment
+    and Makefile.ship is the top level Makefile:
+
+	https://github.com/lcn2/calc
+
+    The Makefile.simple rule of Makefile.ship, when forming the
+    Makefile.simple file, removes lines from Makefile.ship between
+    pairs of '#if 0' AND '#endif':
+
+	#if 0
+	lines removed when forming Makefile.simple
+	...
+	lines removed when forming Makefile.simple
+	#endif
+
+    The '#if 0' AND '#endif' MUST be at the start of the line.
+    Any text after the '#if 0' OR '#endif' is ignored.
+
+    While they may look like a CPP directives, they are not.  The
+    inline awk script of the Makefile.simple rule does NOT allow
+    them to nest:
+
+	#if 0 /* DO NOT DO THIS */
+	lines removed when forming Makefile.simple
+	...
+	#if 0 /* DO NOT DO THIS */
+	...
+	#endif /* DO NOT DO THIS */
+	...
+	#endif /* DO NOT DO THIS */
+
+    The custom/Makefile rule of Makefile.ship is used to form
+    the custom/Makefile.  In particular the Makefile.ship lines:
+
+	# start of host target cut
+	... these go in between custom/Makefile.head and custom/Makefile.tail
+	# end of host target cut
+
+Makefile.simple
+
+    # SRC: non-GNU Makefile via make -f Makefile.ship Makefile.simple
+
+    This is a non-GNU or simple Makefile designed for environments
+    that do not have a modern make command.
+
+    If you have a Makefile.simple file, use these commands to
+    form a Makefile:
+
+	if [ -f Makefile ]; then mv -f Makefile Makefile.orig; fi
+	cp Makefile.simple Makefile
+
+    The Makefile.simple rule from Makefile.ship is used to construct
+    this file from the contents of Makefile.ship.
+
+    In calc packages such as RPMs, and the tar.bz2 source the
+    Makefile.simple exists.  In the calc GitHub repo:
+
+	https://github.com/lcn2/calc
+
+    this file does NOT exist and must be made via the Makefile.simple
+    make rule.  Therefore, non-GNU and simple make commands are NOT
+    supported by the calc GitHub repo master branch.  Instead, you
+    need to extract Makefile.simple from one of the calc tar.bz2
+    source tarball source from a calc source mirror:
+
+	http://www.isthe.com/chongo/tech/comp/calc/calc-mirror.html
+
+custom/Makefile.head
+
+    # SRC: custom/Makefile.head
+
+    This file forms the top part of the custom/Makefile.
+
+custom/Makefile.tail
+
+    # SRC: custom/Makefile.tail
+
+    This file forms the bottom part of the custom/Makefile.
+
+custom/Makefile
+
+    # SRC: Makefile via make -f Makefile custom/Makefile
+
+    This is the custom directory Makefile.
+
+    The custom/Makefile rule of Makefile.ship is used to form
+    the custom/Makefile.  In particular the Makefile.ship lines:
+
+	# start of host target cut
+	... these go in between custom/Makefile.head and custom/Makefile.tail
+	# end of host target cut
+
+    NOTE: The clobber rule does not remove this file. - XXX
+
+custom/Makefile.simple
+
+    # SRC: non-GNU Makefile via make -f Makefile custom/Makefile.simple
+
+    This is a non-GNU or simple Makefile for the custom directory
+    that is designed for environments that do not have a modern make
+    command.
+
+    In calc packages such as RPMs, and the tar.bz2 source the
+    Makefile.simple exists.  In the calc GitHub repo:
+
+	https://github.com/lcn2/calc
+
+    this file does NOT exist and must be made via the
+    custom/Makefile.simple make rule.  Therefore, non-GNU and simple
+    make commands are NOT supported by the calc GitHub repo master
+    branch.  Instead, you need to extract custom/Makefile.simple
+    from one of the calc tar.bz2 source tarball source from a calc
+    source mirror:
+
+	http://www.isthe.com/chongo/tech/comp/calc/calc-mirror.html
+
+cal/Makefile
+
+    # SRC: cal/Makefile
+
+    The Makefile for the cal sub-directory.
+
+cscript/Makefile
+
+    # SRC: cscript/Makefile
+
+    The Makefile for the cscript sub-directory.
+
+help/Makefile
+
+    # SRC: help/Makefile
+
+    The Makefile for the help sub-directory.
+
+## Copyright (C) 1999-2007,2021  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

Makefile

@@ -2,32 +2,15 @@
 #
 # calc - arbitrary precision calculator
 #
-# (Linux calc rpm building makefile)
+# Copyright (C) 1999-2018,2021  Landon Curt Noll
 #
-#  NOTE: This Makefile is used to make the calc rpm.  In addition to these
+# SRC: Makefile - Our calc build environment
-#	 comments, this Makefile differs from the non-rpm bzip2-ed tarball
-#	 source Makefile in the following ways:
 #
-#	 MAKEFILE_REV= $$Revision: 30.26 $$
+#	The "# SRC: ... - ..." comment line above indicates
-#	 CCWERR= -Werror
+#	the origin of this file.
-#	 USE_READLINE= -DUSE_READLINE
-#	 READLINE_LIB= -lreadline -lhistory -lncurses
 #
-# The Makefile.ship makefile becomes the Makefile found in the
+# IMPORTANT: Please see the section on Makefiles near the
-# calc-*.tar.bz2 bzip2 source tarball.
+#	     bottom of the HOWTO.INSTALL file.
-#
-# This Makefile drives the makefile: Makefile.ship.
-#
-# This makefile mostly contains critical variables (such as SHELL, MAKE, etc.)
-# as well as those which we choose to override defaults found in
-# Makefile.ship.  Make variables unique to this Makefile start with X.
-#
-# This makefile contains only those critical rules (such as all, clean, etc.)
-# and the common rules needed in development (such as chk, check, etc.).
-# This makefiile has a few special rules that are used to set the version
-# string in the shipped makefiles (such as Makefile.ship).
-
-# Copyright (C) 1999-2008,2014  Landon Curt Noll
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -52,16 +35,90 @@
 # calculator by David I. Bell with help/mods from others
 # Makefile by Landon Curt Noll
 
-# Try uname -s if the target was not alreadhy set on the make command line
+# Try uname -s if the target was not already set on the make command line
 #
 ifeq ($(target),)
 target=$(shell uname -s 2>/dev/null)
 endif
 
+# The shell used by this Makefile
+#
+# On some systems, /bin/sh is a rather reduced shell with
+# deprecated behavior.
+#
+# If your system has a up to date, bash shell, then
+# you may wish to use:
+#
+#	SHELL= /bin/bash
+#
+# On some systems such as macOS, the bash shell is very
+# far behind to the point wehre is cannot be depended on.
+# On such systems, the zsh may be a much better alternative
+# shell for this Makefile to use:
+#
+#	SHELL= /bin/zsh
+#
+ifeq ($(target),Darwin)
+SHELL= /bin/zsh
+else
+SHELL= /bin/bash
+endif
+
 ##############################################################################
 #-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
 ##############################################################################
 
+# PREFIX - Top level location for calc
+#
+# The PREFIX is often prepended to paths within calc and calc Makefiles.
+#
+# Starting with calc v2.13.0.1, nearly all Makefile places that used
+# /usr/local now use ${PREFIX}.  An exception is the olduninstall rule
+# and, of course, this section. :-)
+#
+# When in doubt, try:
+#
+#	PREFIX= /usr/local
+#
+PREFIX= /usr/local
+#PREFIX= /usr
+#PREFIX= /usr/global
+
+# CCBAN is given to ${CC} in order to control if banned.h is in effect.
+#
+# The banned.h attempts to ban the use of certain dangerous functions
+# that, if improperly used, could compromise the computational integrity
+# if calculations.
+#
+# In the case of calc, we are motivated in part by the desire for calc
+# to correctly calculate: even durings extremely long calculations.
+#
+# If UNBAN is NOT defined, then calling certain functions
+# will result in a call to a non-existent function (link error).
+#
+# While we do NOT encourage defining UNBAN, there may be
+# a system / compiler environment where re-defining a
+# function may lead to a fatal compiler complication.
+# If that happens, consider compiling as:
+#
+#	make clobber all chk CCBAN=-DUNBAN
+#
+# as see if this is a work-a-round.
+#
+# If YOU discover a need for the -DUNBAN work-a-round, PLEASE tell us!
+# Please send us a bug report.  See the file:
+#
+#	BUGS
+#
+# or the URL:
+#
+#	http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
+#
+# for how to send us such a bug report.
+#
+CCBAN= -UUNBAN
+#CCBAN= -DUNBAN
+
 # Determine of the GNU-readline facility will be used instead of the
 # built-in calc binding method.
 #
@@ -70,22 +127,22 @@ USE_READLINE= -DUSE_READLINE
 #
 #READLINE_LIB=
 #READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -lncurses
-#READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -lncurses
+#READLINE_LIB= -L${PREFIX}/lib -lreadline -lhistory -lncurses
 ifeq ($(target),Darwin)
-# homebrew installs readline & history libs in /usr/local/opt/readline/lib
+# homebrew installs readline & history libs in ${PREFIX}/opt/readline/lib
-READLINE_LIB= -L/usr/local/opt/readline/lib -lreadline -lhistory -lncurses
+READLINE_LIB= -L${PREFIX}/opt/readline/lib -lreadline -lhistory -lncurses
 else
 READLINE_LIB= -lreadline -lhistory -lncurses
 endif
 #
 ifeq ($(target),Darwin)
-# homebrew installs readline & history *.h under /usr/local/opt/readline/include
+# homebrew installs readline & history *.h under ${PREFIX}/opt/readline/include
-READLINE_INCLUDE= -I/usr/local/opt/readline/include
+READLINE_INCLUDE= -I${PREFIX}/opt/readline/include
 else
 READLINE_INCLUDE=
 endif
 #READLINE_INCLUDE= -I/usr/gnu/include
-#READLINE_INCLUDE= -I/usr/local/include
+#READLINE_INCLUDE= -I${PREFIX}/include
 
 # Normally certain files depend on the Makefile.  If the Makefile is
 # changed, then certain steps should be redone.	 If MAKE_FILE is
@@ -109,7 +166,7 @@ TOP_MAKE_FILE= Makefile
 EXT=
 #EXT=.exe
 
-# This value is configured for chongo@theta.mellis.com.
+# This value is configured for chongo for his laptop
 #
 RPM_TOP= ${HOME}/rpm/calc
 
@@ -135,7 +192,6 @@ endif
 
 # standard utilities used during make
 #
-SHELL= /bin/sh
 MAKE= make
 SED= sed
 GREP= egrep
@@ -153,11 +209,30 @@ CI= ci
 # Q=@	do not echo internal Makefile actions (quiet mode)
 # Q=	echo internal Makefile actions (debug / verbose mode)
 #
+# H=@:	do not report hsrc file formation progress
+# H=@	do echo hsrc file formation progress
+#
+# S= >/dev/null 2>&1	slience ${CC} output during hsrc file formation
+# S=			full ${CC} output during hsrc file formation
+#
+# E= 2>/dev/null	slience command stderr during hsrc file formation
+# E=			full command stderr during hsrc file formation
+#
 # V=@:	do not echo debug statements (quiet mode)
 # V=@	do echo debug statements (debug / verbose mode)
 #
 #Q=
 Q=@
+#
+S= >/dev/null 2>&1
+#S=
+#
+E= 2>/dev/null
+#E=
+#
+#H=@:
+H=@
+#
 V=@:
 #V=@
 
@@ -169,23 +244,28 @@ V=@:
 #
 XARG=
 
-# We pass these make varaibles to the end of each make command line
+# We pass these make variables to the end of each make command line
 # that invokes the ${MAKE_FILE}.
 #
 XVAR= \
-	target=${target} \
+	CCBAN='${CCBAN}' \
-	USE_READLINE='${USE_READLINE}' \
-	READLINE_LIB='${READLINE_LIB}' \
-	READLINE_INCLUDE='${READLINE_INCLUDE}' \
-	RPM_TOP='${RPM_TOP}' \
-	MAKE_FILE='${MAKE_FILE}' \
-	EXT='${EXT}' \
-	DARWIN_ARCH='${DARWIN_ARCH}' \
 	CCWERR='${CCWERR}' \
-	NROFF='${NROFF}' \
 	COMMON_ADD='${COMMON_ADD}' \
+	DARWIN_ARCH='${DARWIN_ARCH}' \
+	E='${E}' \
+	EXT='${EXT}' \
+	H='${H}' \
+	MAKE_FILE='${MAKE_FILE}' \
+	NROFF='${NROFF}' \
 	Q='${Q}' \
-	V='${V}'
+	PREFIX='${PREFIX}' \
+	READLINE_INCLUDE='${READLINE_INCLUDE}' \
+	READLINE_LIB='${READLINE_LIB}' \
+	RPM_TOP='${RPM_TOP}' \
+	S='${S}' \
+	USE_READLINE='${USE_READLINE}' \
+	V='${V}' \
+	target=${target}
 
 # We update the calc version string in these makefiles
 #
@@ -201,36 +281,15 @@ XMKVER= ${MAKE_FILE} custom/Makefile.head
 #
 ###
 
-all: fix_version check_include
+all: fix_version
 	${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='
 	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
 	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
 
 check_include:
-	$(Q) if [ ! -d /usr/include ]; then \
+	${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='
-	    echo "ERROR: critical directory missing: /usr/include" 1>&2; \
+	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
-	    echo "Without this critical directory, we cannot compile." 1>&2; \
+	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
-	    echo 1>&2; \
-	    echo "Perhaps your system isn't setup to compile C source?" 1>&2; \
-	    echo "For example, Apple OS X / darwin requres that XCode" 1>&2; \
-	    echo "must be installed and that you run the command:" 1>&2; \
-	    echo 1>&2; \
-	    echo "    xcode-select --install" 1>&2; \
-	    echo 1>&2; \
-	    exit 1; \
-	fi
-	$(Q) if [ ! -f /usr/include/stdio.h ]; then \
-	    echo "ERROR: critical include files are missing" 1>&2; \
-	    echo "Without this critical directory, we cannot compile." 1>&2; \
-	    echo 1>&2; \
-	    echo "Perhaps your system isn't setup to compile C source?" 1>&2; \
-	    echo "For example, Apple OS X / darwin requres that XCode" 1>&2; \
-	    echo "must be installed and that you run the command:" 1>&2; \
-	    echo 1>&2; \
-	    echo "    xcode-select --install" 1>&2; \
-	    echo 1>&2; \
-	    exit 1; \
-	fi
 
 calc-dynamic-only:
 	${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='
@@ -517,6 +576,20 @@ have_unused.h:
 	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
 	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
 
+have_ban_pragma.h:
+	${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='
+	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
+	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
+
+have_strlcpy.h:
+	${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='
+	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
+	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
+
+have_strlcat.h:
+	${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='
+	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
+	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
 
 ##
 #
@@ -532,34 +605,6 @@ win32_hsrc:
 	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
 	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
 
-
-##
-#
-# These rules are used in the process of building the BUILD_H_SRC.
-#
-##
-
-endian.o:
-	${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='
-	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
-	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
-
-endian${EXT}:
-	${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='
-	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
-	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
-
-longbits.o:
-	${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='
-	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
-	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
-
-longbits${EXT}:
-	${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='
-	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
-	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
-
-
 ##
 #
 # These two .all rules are used to determine of the lower level
@@ -594,7 +639,7 @@ custom/.all:
 
 ###
 #
-# building calc-static and static lib*.a libraires
+# building calc-static and static lib*.a libraries
 #
 ###
 
@@ -623,7 +668,7 @@ libcustcalc.a:
 # Home grown make dependency rules.  Your system make not support
 # or have the needed tools.  You can ignore this section.
 #
-# We will form a skelaton tree of *.c files containing only #include "foo.h"
+# We will form a skeleton tree of *.c files containing only #include "foo.h"
 # lines and .h files containing the same lines surrounded by multiple include
 # prevention lines.  This allows us to build a static depend list that will
 # satisfy all possible cpp symbol definition combinations.
@@ -703,6 +748,11 @@ Makefile.simple:
 	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
 	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
 
+custom/Makefile.simple:
+	${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='
+	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
+	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
+
 
 ##
 #
@@ -731,6 +781,9 @@ chk:
 #
 # debug
 #
+# make calcinfo:
+#       * print information about the host and compile environment
+#
 # make env:
 #	* print major Makefile variables
 #
@@ -748,6 +801,11 @@ chk:
 #	* compile without optimizers to make debugging easier
 ##
 
+calcinfo:
+	${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='
+	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
+	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
+
 env:
 	${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='
 	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
@@ -848,7 +906,7 @@ inst_files:
 	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
 	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
 
-# The olduninstall rule will remove calc files from the older, histroic
+# The olduninstall rule will remove calc files from the older, historic
 # locations under the /usr/local directory.  If you are using the
 # new default values for ${BINDIR}, ${CALC_SHAREDIR}, ${INCDIR} and ${LIBDIR}
 # then you can use this rule to clean out the older calc stuff under
@@ -906,7 +964,7 @@ strip:
 	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
 	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
 
-# calc-symlink - setup symlinks from stardard locations into the ${T} tree
+# calc-symlink - setup symlinks from standard locations into the ${T} tree
 #
 calc-symlink:
 	${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='

Makefile.local

@@ -0,0 +1 @@
+# Add below to override Makefile values (using :=) as in: HAVE_STRING_H:= YES

QUESTIONS

@@ -0,0 +1,54 @@
+If you have a simple general question about calc, send Email to:
+
+    calc-quest-mail at asthe dot com
+
+    NOTE: Remove spaces and replace 'at' with @, and 'dot' with .
+
+PLEASE put following the SPECIAL PHRASE somewhere in your Email Subject line:
+
+    calc question
+
+You may add additional words to your subject line.
+
+IMPORTANT: If your Email doesn't contain the above phrase,
+	   then we WILL NOT SEE your Email.
+
+PLEASE BE SURE you have that SPECIAL PHRASE somewhere in the subject line!
+
+Suggestion:
+
+    From time to time, the Email address and Subject SPECIAL PHRASE
+    may change so verify you have the current info by visiting:
+
+	http://www.isthe.com/chongo/tech/comp/calc/calc-question.html
+
+Please limit your questions to general questions about calc.  We
+cannot go into great detail in our answers, nor can we do your
+homework, nor can we do much more than answer short general questions
+about calc.
+
+Please be patient as we cannot always respond to Email messages quickly.
+
+=-=
+
+## Copyright (C) 2021  Landon Curt Noll
+##
+## Calc is open software; you can redistribute it and/or modify it under
+## the terms of the version 2.1 of the GNU Lesser General Public License
+## as published by the Free Software Foundation.
+##
+## Calc is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+## or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+## Public License for more details.
+##
+## A copy of version 2.1 of the GNU Lesser General Public License is
+## distributed with calc under the filename COPYING-LGPL.  You should have
+## received a copy with calc; if not, write to Free Software Foundation, Inc.
+## 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+##
+## Under source code control:	2021/02/10 00:15:05
+## File existed as early as:	2021
+##
+## chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

README.FIRST

@@ -32,30 +32,30 @@ something that you type in.
 
 For list of help topics:
 
-    > help
+    ; help
 
 For overview of calc overview:
 
-    > help intro
+    ; help intro
-    > help overview
+    ; help overview
-    > help command
+    ; help command
-    > help define
+    ; help define
-    > help statement
+    ; help statement
-    > help variable
+    ; help variable
-    > help usage
+    ; help usage
 
 For list of builtin functions:
 
-    > help builtin
+    ; help builtin
 
 C programmers should note some unexpected differences in the calc syntax:
 
-    > help unexpected
+    ; help unexpected
 
 Calc is shipped with a standard collection of calc resource files.
 For a list of calc standard resource files see:
 
-    > help resource
+    ; help resource
 
 =-=
 
@@ -71,66 +71,33 @@ or run:
 
 for a wish/todo list.  Code contributions are welcome.
 
-=-=
+-=-
 
-To subscribe to the calc-tester mailing list, visit the following URL:
+If you you notice something wrong, strange or broken, see the file:
 
-	http://www.isthe.com/chongo/tech/comp/calc/calc-tester.html
+    BUGS
 
-    This is a low volume moderated mailing list.
+or run:
 
-    This mailing list replaces calc-tester at asthe dot com list.
+    calc help bugs
 
-    If you need a human to help you with your mailing list subscription,
+for information about how to report a bug.
-    please send EMail to our special:
-
-	calc-tester-maillist-help at asthe dot com
-
-	NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-
-    address.  To be sure we see your EMail asking for help with your
-    mailing list subscription, please use the following phase in your
-    EMail Subject line:
-
-	calc tester mailing list help
-
-    That phrase in your subject line will help ensure your
-    request will get past our anti-spam filters.  You may have
-    additional words in your subject line.
 
 -=-
 
-Calc bug reports and calc bug fixes should be sent to:
+If you have a general question about calc, see the file:
 
-	calc-bug-report at asthe dot com
+    QUESTIONS
 
-	NOTE: Remove spaces and replace 'at' with @, 'dot' with .
+or run:
 
-    This replaces the old calc-bugs at asthe dot com address.
+    calc help questions
 
-    To be sure we see your EMail reporting a calc bug, please use the
+for information about how to ask a question.
-    following phase in your EMail Subject line:
-
-	calc bug report
-
-    That phrase in your subject line will help ensure your
-    request will get past our anti-spam filters.  You may have
-    additional words in your subject line.
-
-    However, you may find it more helpful to simply subscribe
-    to the calc-tester mailing list (see above) and then to
-    send your report to that mailing list as a wider set calc
-    testers may be able to help you.
 
 -=-
 
-The calc web site is located at:
+## Copyright (C) 1999,2014,2017,2021  Landon Curt Noll
-
-    http://www.isthe.com/chongo/tech/comp/calc/
-
-NOTE: The EMail address uses 'asthe', while the web site uses 'isthe'.
-
-## Copyright (C) 1999,2014,2017  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

README.WINDOWS

@@ -10,6 +10,21 @@ NOTE: The main developers do not have access to a Windoz based platform.
       Of course you are welcome to send us any patches that fix your
       Windoz build environment.
 
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+=-= compiling with Windows Subsystem for Linux (WSL) =-Cygwin =-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+It has been reported that calc version 2.12.6.4 has been successfully
+compiled, installed and running on Windows 10 on 2018 Jan 21.
+
+We were told:
+
+  "The Windows Subsystem for Linux (WSL) is a new Windows 10 feature that
+   enables you to run native Linux command-line tools directly on Windows"
+
+   https://docs.microsoft.com/cs-cz/windows/wsl/about
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 =-= compiling with Cygwin =-=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -111,7 +126,7 @@ recommends the following settings:
 	CATDIR= /dev/env/DJDIR/man/cat1
 	NROFF= groff
 	CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR}
-	CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
+	CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup
 	CALCPAGER= less.exe -ci
 	DEBUG= -O2 -gstabs+ -DWINDOZ
 

README.md

@@ -1,6 +1,9 @@
 # What is calc?
 
 Calc is an interactive calculator which provides for easy large
+numeric calculations, but which also can be easily programmed
+for difficult or long calculations.	 It can accept a command line
+argument, in which case it executes that single command and exits.
 Otherwise, it enters interactive mode.  In this mode, it accepts
 commands one at a time, processes them, and displays the answers.
 In the simplest case, commands are simply expressions which are
@@ -16,7 +19,7 @@ and the calculator will print:
 15
 ```
 
-Calc as the usual collection of arithmetic operators +, -, /, * as
+Calc has the usual collection of arithmetic operators +, -, /, * as
 well as ^ (exponentiation), % (modulus) and // (integer divide).
 For example:
 
@@ -257,4 +260,4 @@ help unexpected
 ```
 
 It contains information about differences between C and calc
-that may surprize C programmers.
+that may surprise C programmers.

addop.c

@@ -1,7 +1,7 @@
 /*
  * addop - add opcodes to a function being compiled
  *
- * Copyright (C) 1999-2007  David I. Bell and Ernest Bowen
+ * Copyright (C) 1999-2007,2021  David I. Bell and Ernest Bowen
  *
  * Primary author:  David I. Bell
  *
@@ -28,6 +28,7 @@
 
 #include <stdio.h>
 #include "calc.h"
+#include "alloc.h"
 #include "opcodes.h"
 #include "str.h"
 #include "func.h"
@@ -36,6 +37,9 @@
 #include "symbol.h"
 
 
+#include "banned.h"	/* include after system header <> includes */
+
+
 #define FUNCALLOCSIZE	20	/* reallocate size for functions */
 #define OPCODEALLOCSIZE 100	/* reallocate size for opcodes in functions */
 

align32.c

@@ -1,7 +1,7 @@
 /*
  * align32 - determine if 32 bit accesses must be aligned
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -34,6 +34,10 @@
 #include <unistd.h>
 #endif
 
+
+#include "banned.h"	/* include after system header <> includes */
+
+
 static void buserr(void);	/* catch alignment errors */
 
 

assocfunc.c

@@ -1,7 +1,7 @@
 /*
  * assocfunc - association table routines
  *
- * Copyright (C) 1999-2007  David I. Bell
+ * Copyright (C) 1999-2007,2021  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -36,6 +36,9 @@
 #include "value.h"
 
 
+#include "banned.h"	/* include after system header <> includes */
+
+
 #define MINHASHSIZE	31	/* minimum size of hash tables */
 #define GROWHASHSIZE	50	/* approximate growth for hash tables */
 #define CHAINLENGTH	10	/* desired number of elements on a hash chain */

banned.h

@@ -0,0 +1,180 @@
+/*
+ * banned - optionally ban dqngerious functions
+ *
+ * Unless UNBAN is defined, this file will turn the use
+ * of certain dangerous functions into syntax errors.
+ *
+ * In the case of calc, we are motivated in part by the desire for
+ * calc to correctly calculate: even durings extremely long calculations.
+ *
+ * If UNBAN is NOT defined, then calling certain functions
+ * will result in a syntaxc error.
+ *
+ * If we define UNBAN, then the effect of this file is disabled.
+ *
+ * The banned.h attempts to ban the use of certain dangerous functions
+ * that, if improperly used, could compromise the computational integrity
+ * if calculations.
+ *
+ * In the case of calc, we are motivated in part by the desire for calc
+ * to correctly calculate: even durings extremely long calculations.
+ *
+ * If UNBAN is NOT defined, then calling certain functions
+ * will result in a call to a non-existent function (link error).
+ *
+ * While we do NOT encourage defining UNBAN, there may be
+ * a system / compiler environment where re-defining a
+ * function may lead to a fatal compiler complication.
+ * If that happens, consider compiling as:
+ *
+ *	make clobber all chk CCBAN=-DUNBAN
+ *
+ * as see if this is a work-a-round.
+ *
+ * If YOU discover a need for the -DUNBAN work-a-round, PLEASE tell us!
+ * Please send us a bug report.  See the file:
+ *
+ *	BUGS
+ *
+ * or the URL:
+ *
+ *	http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
+ *
+ * for how to send us such a bug report.
+ *
+ * Copyright (C) 2021  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Under source code control:	2021/03/06 21:07:31
+ * File existed as early as:	2021
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+#if !defined(PRE_HAVE_BAN_PRAGMA_H)
+#include "have_ban_pragma.h"
+#endif /* ! PRE_HAVE_BAN_PRAGMA_H */
+
+
+#if !defined(INCLUDE_BANNED_H)
+#define INCLUDE_BANNED_H
+
+/*
+ * If we define UNBAN, then the effect of this file is disabled.
+ */
+#if !defined(UNBAN)
+
+/*
+ * In the spirit of:
+ *
+ *	https://github.com/git/git/blob/master/banned.h
+ *
+ * we will ban the use of certain unsafe functions by turning
+ * then into function calls that do not exist.
+ *
+ * In the case of calc, we are motivated in part by the desire
+ * for calc to correctly calculate: even durings extremely long
+ * calculations.
+ *
+ * If UNBAN is NOT defined, then calling certain functions
+ * will result in a syntaxc error.
+ *
+ * Unlike the above URL, we suggest an alternative function.
+ * In many cases, additional logic is required to use the
+ * alternative function, we cannot simply replace one function
+ * with another.
+ */
+
+/*
+ * If one is not careful, strcpy() can lead to buffer overflows.
+ * Use strlcpy() instead.
+ */
+#if defined(HAVE_PRAGMA_GCC_POSION)
+#undef strcpy
+#pragma GCC poison strcpy
+#endif /* HAVE_PRAGMA_GCC_POSION */
+
+/*
+ * If one is not careful, strcat() can lead to buffer overflows.
+ * Use strlcat() instead.
+ */
+#if defined(HAVE_PRAGMA_GCC_POSION)
+#undef strcat
+#pragma GCC poison strcat
+#endif /* HAVE_PRAGMA_GCC_POSION */
+
+/*
+ * If one is not careful, strncpy() can lead to buffer overflows.
+ * Use memccpy() instead.
+ */
+#if defined(HAVE_PRAGMA_GCC_POSION)
+#undef strncpy
+#pragma GCC poison strncpy
+#endif /* HAVE_PRAGMA_GCC_POSION */
+
+/*
+ * If one is not careful, strncat() can lead to buffer overflows.
+ * Use memccpy() instead.
+ */
+#if defined(HAVE_PRAGMA_GCC_POSION)
+#undef strncat
+#pragma GCC poison strncat
+#endif /* HAVE_PRAGMA_GCC_POSION */
+
+/*
+ * If one is not careful, sprintf() can lead to buffer overflows.
+ * Use snprintf() instead.
+ */
+#if defined(HAVE_PRAGMA_GCC_POSION)
+#undef sprintf
+#pragma GCC poison sprintf
+#endif /* HAVE_PRAGMA_GCC_POSION */
+
+/*
+ * If one is not careful, vsprintf() can lead to buffer overflows.
+ * Use vsnprintf() instead.
+ */
+#if defined(HAVE_PRAGMA_GCC_POSION)
+#undef vsprintf
+#pragma GCC poison vsprintf
+#endif /* HAVE_PRAGMA_GCC_POSION */
+
+/*
+ * XXX - As of 2021, functions such as:
+ *
+ *	gmtime_s
+ *	localtime_s
+ *	ctime_s
+ *	asctime_s
+ *
+ * are not universal.  We cannot yet ban the following
+ * functions because we do not have a portable AND
+ * widely available alternative.  Therefore we just
+ * have to be extra careful when using:
+ *
+ *	gmtime
+ *	localtime
+ *	ctime
+ *	ctime_r
+ *	asctime
+ *	asctime_r
+ */
+
+#endif /* !UNBAN */
+
+#endif /* !INCLUDE_BANNED_H */

blkcpy.c

@@ -1,7 +1,7 @@
 /*
  * blkcpy - general values and related routines used by the calculator
  *
- * Copyright (C) 1999-2007  Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2007,2021  Landon Curt Noll and Ernest Bowen
  *
  * Primary author:  Landon Curt Noll
  *
@@ -29,12 +29,16 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include "calc.h"
+#include "alloc.h"
 #include "value.h"
 #include "file.h"
 #include "blkcpy.h"
 #include "str.h"
 
 
+#include "banned.h"	/* include after system header <> includes */
+
+
 /*
  * copystod - copy num indexed items from source value to destination value
  *
@@ -1040,7 +1044,7 @@ copyblk2num(BLOCK *sblk, long ssi, long num, NUMBER *dnum, long dsi,
 	NUMBER *ret;		/* cloned and modified numerator */
 #if CALC_BYTE_ORDER == BIG_ENDIAN
 	HALF *swapped;		/* byte swapped input data */
-	unsigned long halflen;	/* length of the input ounded up to HALFs */
+	unsigned long halflen;	/* length of the input rounded up to HALFs */
 	HALF *h;		/* copy byteswap pointer */
 	unsigned long i;
 #endif

block.c

@@ -1,7 +1,7 @@
 /*
  * block - fixed, dynamic, fifo and circular memory blocks
  *
- * Copyright (C) 1999-2007  Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2007,2021  Landon Curt Noll and Ernest Bowen
  *
  * Primary author:  Landon Curt Noll
  *
@@ -28,6 +28,11 @@
 
 
 #include <stdio.h>
+#include "have_string.h"
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#include "alloc.h"
 #include "value.h"
 #include "zmath.h"
 #include "config.h"
@@ -36,6 +41,10 @@
 #include "str.h"
 #include "calcerr.h"
 
+
+#include "banned.h"	/* include after system header <> includes */
+
+
 #define NBLOCKCHUNK 16
 
 STATIC long nblockcount = 0;
@@ -291,7 +300,7 @@ blkrealloc(BLOCK *blk, int newlen, int newchunk)
 	 * Set the data length
 	 *
 	 * We also know that the new block is not empty since we have
-	 * already dealth with that case above.
+	 * already dealt with that case above.
 	 *
 	 * After this section of code, limit and datalen will be
 	 * correct in terms of the new type.

block.h

@@ -1,7 +1,7 @@
 /*
  * block - fixed, dynamic, fifo and circular memory blocks
  *
- * Copyright (C) 1999-2007,2014  Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2007,2014,2021  Landon Curt Noll and Ernest Bowen
  *
  * Primary author:  Landon Curt Noll
  *
@@ -55,7 +55,7 @@
  *		blkchunk defaults to BLK_CHUNKSIZE
  *
  *	blkfree(x)
- *		Reduce storage down to 0 octetes.
+ *		Reduce storage down to 0 octets.
  *
  *	size(x)
  *		The length of data stored in the block.
@@ -88,7 +88,7 @@
  *	blkmove(dest, src, length [, dest_offset [, src_offset]])
  *		0 <= length <= blksize(x)
  *		offset's are restricted in value by block type
- *		overlapping moves are handeled correctly
+ *		overlapping moves are handled correctly
  *
  *	blkccpy(dest, src, stopval, length [, dest_offset [, src_offset]])
  *		0 <= length <= blksize(x)
@@ -104,7 +104,7 @@
  *		b = a*k for some integer k >= 1
  *
  *	scatter(src, dest1, dest2 [, dest3 ] ...)
- *		copy sucessive octets from src into dest1, dest2, ...
+ *		copy successive octets from src into dest1, dest2, ...
  *		    restarting with dest1 after end of list
  *		stops at end of src
  *
@@ -184,7 +184,7 @@ EXTERN int blk_debug;	/* 0 => debug off */
 /* length of data stored in a block */
 #define blklen(blk) ((blk)->datalen)
 
-/* block footpint in memory */
+/* block footprint in memory */
 #define blksizeof(blk) ((blk)->maxsize)
 
 /* block allocation chunk size */

byteswap.c

@@ -1,7 +1,7 @@
 /*
  * byteswap - byte swapping routines
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -29,6 +29,9 @@
 #include "byteswap.h"
 
 
+#include "banned.h"	/* include after system header <> includes */
+
+
 /*
  * swap_b8_in_HALFs - swap 8 and if needed, 16 bits in an array of HALFs
  *
@@ -77,7 +80,7 @@ swap_b8_in_HALFs(HALF *dest, HALF *src, LEN len)
  *		  NULL to allocate the storage
  *	src	- pointer to a ZVALUE to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
- *		  multiprecision storage
+ *		  multi-precision storage
  *
  * returns:
  *	pointer to where the swapped src has been put
@@ -123,8 +126,8 @@ swap_b8_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all)
 	 * swap or copy the rest of the ZVALUE elements
 	 */
 	if (all) {
-		dest->len = (LEN)SWAP_B8_IN_LEN(&dest->len, &src->len);
+		SWAP_B8_IN_LEN(&dest->len, &src->len);
-		dest->sign = (BOOL)SWAP_B8_IN_BOOL(&dest->sign, &src->sign);
+		SWAP_B8_IN_BOOL(&dest->sign, &src->sign);
 	} else {
 		dest->len = src->len;
 		dest->sign = src->sign;
@@ -145,7 +148,7 @@ swap_b8_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all)
  *		  NULL to allocate the storage
  *	src	- pointer to a NUMBER to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
- *		  multiprecision storage
+ *		  multi-precision storage
  *
  * returns:
  *	pointer to where the swapped src has been put
@@ -189,7 +192,7 @@ swap_b8_in_NUMBER(NUMBER *dest, NUMBER *src, BOOL all)
 	 * swap or copy the rest of the NUMBER elements
 	 */
 	if (all) {
-		dest->links = (long)SWAP_B8_IN_LONG(&dest->links, &src->links);
+		SWAP_B8_IN_LONG(&dest->links, &src->links);
 	} else {
 		dest->links = src->links;
 	}
@@ -209,7 +212,7 @@ swap_b8_in_NUMBER(NUMBER *dest, NUMBER *src, BOOL all)
  *		  NULL to allocate the storage
  *	src	- pointer to a COMPLEX to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
- *		  multiprecision storage
+ *		  multi-precision storage
  *
  * returns:
  *	pointer to where the swapped src has been put
@@ -253,7 +256,7 @@ swap_b8_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all)
 	 * swap or copy the rest of the NUMBER elements
 	 */
 	if (all) {
-		dest->links = (long)SWAP_B8_IN_LONG(&dest->links, &src->links);
+		SWAP_B8_IN_LONG(&dest->links, &src->links);
 	} else {
 		dest->links = src->links;
 	}
@@ -313,7 +316,7 @@ swap_b16_in_HALFs(HALF *dest, HALF *src, LEN len)
  *		  NULL to allocate the storage
  *	src	- pointer to a ZVALUE to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
- *		  multiprecision storage
+ *		  multi-precision storage
  *
  * returns:
  *	pointer to where the swapped src has been put
@@ -358,8 +361,8 @@ swap_b16_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all)
 	 * swap or copy the rest of the ZVALUE elements
 	 */
 	if (all) {
-		dest->len = (LEN)SWAP_B16_IN_LEN(&dest->len, &src->len);
+		SWAP_B16_IN_LEN(&dest->len, &src->len);
-		dest->sign = (BOOL)SWAP_B16_IN_BOOL(&dest->sign, &src->sign);
+		SWAP_B16_IN_BOOL(&dest->sign, &src->sign);
 	} else {
 		dest->len = src->len;
 		dest->sign = src->sign;
@@ -380,7 +383,7 @@ swap_b16_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all)
  *		  NULL to allocate the storage
  *	src	- pointer to a NUMBER to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
- *		  multiprecision storage
+ *		  multi-precision storage
  *
  * returns:
  *	pointer to where the swapped src has been put
@@ -424,7 +427,7 @@ swap_b16_in_NUMBER(NUMBER *dest, NUMBER *src, BOOL all)
 	 * swap or copy the rest of the NUMBER elements
 	 */
 	if (all) {
-		dest->links = (long)SWAP_B16_IN_LONG(&dest->links, &src->links);
+		SWAP_B16_IN_LONG(&dest->links, &src->links);
 	} else {
 		dest->links = src->links;
 	}
@@ -444,7 +447,7 @@ swap_b16_in_NUMBER(NUMBER *dest, NUMBER *src, BOOL all)
  *		  NULL to allocate the storage
  *	src	- pointer to a COMPLEX to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
- *		  multiprecision storage
+ *		  multi-precision storage
  *
  * returns:
  *	pointer to where the swapped src has been put
@@ -488,7 +491,7 @@ swap_b16_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all)
 	 * swap or copy the rest of the NUMBER elements
 	 */
 	if (all) {
-		dest->links = (long)SWAP_B16_IN_LONG(&dest->links, &src->links);
+		SWAP_B16_IN_LONG(&dest->links, &src->links);
 	} else {
 		dest->links = src->links;
 	}
@@ -508,7 +511,7 @@ swap_b16_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all)
  *		  NULL to allocate the storage
  *	src	- pointer to a ZVALUE to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
- *		  multiprecision storage
+ *		  multi-precision storage
  *
  * returns:
  *	pointer to where the swapped src has been put
@@ -554,8 +557,8 @@ swap_HALF_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all)
 	 * swap or copy the rest of the ZVALUE elements
 	 */
 	if (all) {
-		dest->len = (LEN)SWAP_HALF_IN_LEN(&dest->len, &src->len);
+		SWAP_HALF_IN_LEN(&dest->len, &src->len);
-		dest->sign = (BOOL)SWAP_HALF_IN_BOOL(&dest->sign, &src->sign);
+		SWAP_HALF_IN_BOOL(&dest->sign, &src->sign);
 	} else {
 		dest->len = src->len;
 		dest->sign = src->sign;
@@ -576,7 +579,7 @@ swap_HALF_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all)
  *		  NULL to allocate the storage
  *	src	- pointer to a NUMBER to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
- *		  multiprecision storage
+ *		  multi-precision storage
  *
  * returns:
  *	pointer to where the swapped src has been put
@@ -620,7 +623,7 @@ swap_HALF_in_NUMBER(NUMBER *dest, NUMBER *src, BOOL all)
 	 * swap or copy the rest of the NUMBER elements
 	 */
 	if (all) {
-		dest->links = (long)SWAP_HALF_IN_LONG(&dest->links,&src->links);
+		SWAP_HALF_IN_LONG(&dest->links, &src->links);
 	} else {
 		dest->links = src->links;
 	}
@@ -640,7 +643,7 @@ swap_HALF_in_NUMBER(NUMBER *dest, NUMBER *src, BOOL all)
  *		  NULL to allocate the storage
  *	src	- pointer to a COMPLEX to swap
  *	all	- TRUE => swap every element, FALSE => swap only the
- *		  multiprecision storage
+ *		  multi-precision storage
  *
  * returns:
  *	pointer to where the swapped src has been put
@@ -684,7 +687,7 @@ swap_HALF_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all)
 	 * swap or copy the rest of the NUMBER elements
 	 */
 	if (all) {
-		dest->links = (long)SWAP_HALF_IN_LONG(&dest->links,&src->links);
+		SWAP_HALF_IN_LONG(&dest->links, &src->links);
 	} else {
 		dest->links = src->links;
 	}

cal/Makefile

@@ -2,7 +2,15 @@
 #
 # cal - makefile for calc standard resource files
 #
-# Copyright (C) 1999-2006,2017  Landon Curt Noll
+# Copyright (C) 1999-2006,2017,2021  Landon Curt Noll
+#
+# SRC: cal/Makefile
+#
+#	The "# SRC: ... - ..." comment line above indicates
+#	the origin of this file.
+#
+# IMPORTANT: Please see the section on Makefiles near the
+#	     bottom of the HOWTO.INSTALL file.
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -27,15 +35,64 @@
 # calculator by David I. Bell with help/mods from others
 # Makefile by Landon Curt Noll
 
-# required vars
+
+# The shell used by this Makefile
+#
+# On some systems, /bin/sh is a rather reduced shell with
+# deprecated behavior.
+#
+# If your system has a up to date, bash shell, then
+# you may wish to use:
+#
+#	SHELL= /bin/bash
+#
+# On some systems such as macOS, the bash shell is very
+# far behind to the point where is cannot be depended on.
+# On such systems, the zsh may be a much better alternative
+# shell for this Makefile to use:
+#
+#	SHELL= /bin/zsh
 #
 SHELL= /bin/sh
+#SHELL= /bin/bash
+#SHELL= /bin/zsh
+
 
 ####
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
 ####
 
+# PREFIX - Top level location for calc
+#
+# The PREFIX is often prepended to paths within calc and calc Makefiles.
+#
+# Starting with calc v2.13.0.1, nearly all Makefile places that used
+# /usr/local now use ${PREFIX}.  An exception is the olduninstall rule
+# and, of course, this section. :-)
+#
+# NOTE: The ${PREFIX} is not the same as ${T}.  The ${T} specifies
+#	a top level directory under which calc installs things.
+#	While usually ${T} is empty, it can be specific path
+#	as if calc where "chrooted" during an install.
+#	The ${PREFIX} value, during install, is a path between
+#	the top level ${T} install directory and the object
+#	such as an include file.
+#
+# NOTE: See also, ${T}, below.
+#
+# There are some paths that do NOT call under ${PREFIX}, such as
+# ${CALCPATH}, that include paths not under ${PREFIX}, but those
+# too are exceptions to this general rule.
+#
+# When in doubt, try:
+#
+#	PREFIX= /usr/local
+#
+PREFIX= /usr/local
+#PREFIX= /usr
+#PREFIX= /usr/global
+
 # Normally certain files depend on the Makefile.  If the Makefile is
 # changed, then certain steps should be redone.  If MAKE_FILE is
 # set to Makefile, then these files will depend on Makefile.  If
@@ -65,11 +122,11 @@ TOP_MAKE_FILE= Makefile
 #	INCDIR= /usr/include
 #
 
-#INCDIR= /usr/local/include
+#INCDIR= ${PREFIX}/include
 #INCDIR= /dev/env/DJDIR/include
 INCDIR= /usr/include
 
-# where to install calc realted things
+# where to install calc related things
 #
 # ${BINDIR}		where to install calc binary files
 # ${LIBDIR}		where calc link library (*.a) files are installed
@@ -91,15 +148,15 @@ INCDIR= /usr/include
 #	LIBDIR= /usr/lib
 #	CALC_SHAREDIR= /usr/share/calc
 #
-#BINDIR= /usr/local/bin
+#BINDIR= ${PREFIX}/bin
 #BINDIR= /dev/env/DJDIR/bin
 BINDIR= /usr/bin
 
-#LIBDIR= /usr/local/lib
+#LIBDIR= ${PREFIX}/lib
 #LIBDIR= /dev/env/DJDIR/lib
 LIBDIR= /usr/lib
 
-#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= ${PREFIX}/lib/calc
 #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
 CALC_SHAREDIR= /usr/share/calc
 
@@ -157,55 +214,78 @@ T=
 
 # Makefile debug
 #
-# Q=@	do not echo internal makefile actions (quiet mode)
+# Q=@	do not echo internal Makefile actions (quiet mode)
-# Q=	echo internal makefile actions (debug / verbose mode)
+# Q=	echo internal Makefile actions (debug / verbose mode)
+#
+# H=@:	do not report hsrc file formation progress
+# H=@	do echo hsrc file formation progress
+#
+# S= >/dev/null 2>&1	slience ${CC} output during hsrc file formation
+# S=			full ${CC} output during hsrc file formation
+#
+# E= 2>/dev/null	slience command stderr during hsrc file formation
+# E=			full command stderr during hsrc file formation
+#
+# V=@:	do not echo debug statements (quiet mode)
+# V=@	do echo debug statements (debug / verbose mode)
 #
 #Q=
 Q=@
+#
+S= >/dev/null 2>&1
+#S=
+#
+E= 2>/dev/null
+#E=
+#
+#H=@:
+H=@
+#
+V=@:
+#V=@
 
 # standard tools
 #
 CHMOD= chmod
 CMP= cmp
-RM= rm
-MKDIR= mkdir
-RMDIR= rmdir
-CP= cp
-MV= mv
 CO= co
-TRUE= true
+CP= cp
-TOUCH= touch
+FMT= fmt
+MKDIR= mkdir
+MV= mv
+RM= rm
+RMDIR= rmdir
 SED= sed
 SORT= sort
-FMT= fmt
+TOUCH= touch
+TRUE= true
 
 # The calc files to install
 #
-# This list is prodiced by the detaillist rule when no WARNINGS are detected.
+# This list is produced by the detaillist rule when no WARNINGS are detected.
 #
 # Please use:
 #
 #	make calc_files_list
 #
-# to keep this list in nice sorted order and to check that these
+# to keep this list in nice sorted order.
-# deailed help files are under RCS control.
 #
 CALC_FILES= README alg_config.cal beer.cal bernoulli.cal \
 	bernpoly.cal bigprime.cal bindings brentsolve.cal chi.cal chrem.cal \
 	constants.cal deg.cal dms.cal dotest.cal ellip.cal factorial.cal \
-	factorial2.cal gvec.cal hello.cal hms.cal infinities.cal \
+	factorial2.cal gvec.cal hello.cal hms.cal infinities.cal intfile.cal \
-	intfile.cal intnum.cal lambertw.cal linear.cal lnseries.cal \
+	intnum.cal lambertw.cal linear.cal lnseries.cal lucas.cal \
-	lucas.cal lucas_chk.cal mersenne.cal mfactor.cal \
+	lucas_chk.cal mersenne.cal mfactor.cal mod.cal natnumset.cal pell.cal \
-	mod.cal natnumset.cal pell.cal pi.cal pix.cal pollard.cal poly.cal \
+	pi.cal pix.cal pollard.cal poly.cal prompt.cal psqrt.cal qtime.cal \
-	prompt.cal psqrt.cal qtime.cal quat.cal randbitrun.cal randmprime.cal \
+	quat.cal randbitrun.cal randmprime.cal randombitrun.cal randomrun.cal \
-	randombitrun.cal randomrun.cal randrun.cal regress.cal repeat.cal \
+	randrun.cal regress.cal repeat.cal screen.cal seedrandom.cal \
-	screen.cal seedrandom.cal set8700.cal set8700.line smallfactors.cal \
+	set8700.cal set8700.line smallfactors.cal solve.cal \
-	solve.cal specialfunctions.cal statistics.cal strings.cal sumsq.cal \
+	specialfunctions.cal statistics.cal strings.cal sumsq.cal sumtimes.cal \
-	sumtimes.cal surd.cal test1700.cal test2300.cal test2600.cal \
+	surd.cal test1700.cal test2300.cal test2600.cal test2700.cal \
-	test2700.cal test3100.cal test3300.cal test3400.cal test3500.cal \
+	test3100.cal test3300.cal test3400.cal test3500.cal test4000.cal \
-	test4000.cal test4100.cal test4600.cal test5100.cal test5200.cal \
+	test4100.cal test4600.cal test5100.cal test5200.cal test8400.cal \
-	test8400.cal test8500.cal test8600.cal test8900.cal toomcook.cal \
+	test8500.cal test8600.cal test8900.cal toomcook.cal unitfrac.cal \
-	unitfrac.cal varargs.cal xx_print.cal zeta2.cal
+	varargs.cal xx_print.cal zeta2.cal
 
 # These calc files are now obsolete and are removed by the install rule.
 #
@@ -236,7 +316,7 @@ all: ${CALC_FILES} ${MAKE_FILE} .all
 # sub-directory called calc/cal.
 #
 # NOTE: Due to bogus shells found on one common system we must have
-#	an non-emoty else clause for every if condition.  *sigh*
+#	an non-empty else clause for every if condition.  *sigh*
 #
 ##
 
@@ -261,19 +341,13 @@ calcliblist:
 #
 calc_files_list:
 	${Q} -(find .  -mindepth 1 -maxdepth 1 -type f -name '*.cal' -print | \
-	   while read i; do \
+	    while read i; do \
-		if [ X"$$i" != X"/dev/null" ]; then \
+		echo $$i; \
-		    if [ ! -f RCS/$$i,v ]; then \
+	    done; \
-			echo "WARNING: $$i not under RCS control" 1>&2; \
+	    echo '--first_line--'; \
-		    else \
+	    echo README; \
-			echo $$i; \
+	    echo set8700.line; \
-		    fi; \
+	    echo bindings) | \
-		fi; \
-	done; \
-	echo '--first_line--'; \
-	echo README; \
-	echo set8700.line; \
-	echo bindings) | \
 	    ${SED} -e 's:^\./::' | LANG=C ${SORT} | ${FMT} -70 | \
 	    ${SED} -e '1s/--first_line--/CALC_FILES=/' -e '2,$$s/^/	/' \
 		   -e 's/$$/ \\/' -e '$$s/ \\$$//'
@@ -391,7 +465,7 @@ uninstall:
 		if [ -f "${T}${CALC_SHAREDIR}/$$i" ]; then \
 		   echo "cannot uninstall ${T}${CALC_SHAREDIR}/$$i"; \
 		else \
-		   echo "uninstalled ${T}${CALC_SHAREDIR}/$$i"; \
+		   echo "un-installed ${T}${CALC_SHAREDIR}/$$i"; \
 		fi; \
 	    fi; \
 	done

cal/README

@@ -38,43 +38,6 @@ Calc resource file files are provided because they serve as examples of
 how use the calc language, and/or because the authors thought them to
 be useful!
 
-If you write something that you think is useful, please join the
-low volume calc mailing list calc-tester.  Then send your contribution
-to the calc-tester mailing list.
-
-To subscribe to the calc-tester mailing list, visit the following URL:
-
-	https://www.listbox.com/subscribe/?list_id=239342
-
-    To help determine you are a human and not just a spam bot,
-    you will be required to provide the following additional info:
-
-	Your Name
-	Calc Version
-	Operating System
-	The date 7 days ago
-
-    This is a low volume moderated mailing list.
-
-    This mailing list replaces calc-tester at asthe dot com list.
-
-    If you need a human to help you with your mailing list subscription,
-    please send EMail to our special:
-
-	calc-tester-maillist-help at asthe dot com
-
-	NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-
-    address.  To be sure we see your EMail asking for help with your
-    mailing list subscription, please use the following phase in your
-    EMail Subject line:
-
-	calc tester mailing list help
-
-    That phrase in your subject line will help ensure your
-    request will get past our anti-spam filters.  You may have
-    additional words in your subject line.
-
 =-=
 
 By convention, a resource file only defines and/or initializes functions,
@@ -250,12 +213,12 @@ brentsolve.cal
 
     brentsolve(low, high,eps)
 
-    A root-finder implementwed with the Brent-Dekker trick.
+    A root-finder implemented with the Brent-Dekker trick.
 
     brentsolve2(low, high,which,eps)
 
     The second function, brentsolve2(low, high,which,eps) has some lines
-    added to make it easier to hardcode the name of the helper function
+    added to make it easier to hard-code the name of the helper function
     different from the obligatory "f".
 
     See:
@@ -429,7 +392,7 @@ factorial2.cal
 
     bigcatalan(n)
 
-    Calculates the n-th Catalan number for n large. It is usefull
+    Calculates the n-th Catalan number for n large. It is useful
     above n~50,000 but defaults to the builtin function for smaller
     values.Meant as a complete replacement for catalan(n) with only a
     very small overhead.  See:
@@ -470,9 +433,9 @@ factorial2.cal
                       k = 0
 
     The other function stirling2caching(n,m) does it by way of the
-    reccurence relation and keeps all earlier results. This function
+    re-occurrence relation and keeps all earlier results. This function
     is much slower for computing a single value than stirling2(n,m) but
-    is very usefull if many Stirling numbers are needed, for example in
+    is very useful if many Stirling numbers are needed, for example in
     a series.  See:
 
         http://en.wikipedia.org/wiki/Stirling_numbers_of_the_second_kind
@@ -583,7 +546,7 @@ infinities.cal
     pinf()
 
     The symbolic handling of infinities. Needed for intnum.cal but might be
-    usefull elsewhere, too.
+    useful elsewhere, too.
 
 
 intfile.cal
@@ -632,13 +595,13 @@ intnum.cal
     This file offers some methods for numerical integration. Implemented are
     the Gauss-Legendre and the tanh-sinh quadrature.
 
-    All functions are usefull to some extend but the main function for
+    All functions are useful to some extend but the main function for
     quadrature is quad(), which is not much more than an abstraction layer.
 
-    The main workers are quadgl() for Gauss-legendre and quadts() for the
+    The main workers are quadgl() for Gauss-Legendre and quadts() for the
     tanh-sinh quadrature. The limits of the integral can be anything in the
     complex plane and the extended real line. The latter means that infinite
-    limits are supported by way of the smbolic infinities implemented in the
+    limits are supported by way of the symbolic infinities implemented in the
     file infinities.cal (automatically linked in by intnum.cal).
 
     Integration in parts and contour is supported by the "points" argument
@@ -698,7 +661,7 @@ intnum.cal
 
     The quad*core functions do not offer anything fancy but the third parameter
     controls the so called "order" which is just the number of nodes computed.
-    This can be quite usefull in some circumstances.
+    This can be quite useful in some circumstances.
 
         ; quadgldeletenodes()
         ; define f(x){ return exp(x);}
@@ -760,7 +723,7 @@ lambertw.cal
      ProductLog[branch,z] with the tested values.
 
      The series is only valid for the branches 0,-1, real z, converges
-     for values of z _very_ near the branchpoint -exp(-1) only, and must
+     for values of z _very_ near the branch-point -exp(-1) only, and must
      be given the branches explicitly.  See the code in lambertw.cal
      for further information.
 
@@ -783,7 +746,7 @@ lnseries.cal
     does so by computing the prime factorization of all of the number
     sequence 1,2,3...n, calculates the natural logarithms of the primes
     in 1,2,3...n and uses the above factorization to build the natural
-    logarithms of the rest of the sequence by sadding the logarithms of
+    logarithms of the rest of the sequence by adding the logarithms of
     the primes in the factorization.  This is faster for high precision
     of the logarithms and/or long sequences.
 
@@ -843,7 +806,7 @@ mfactor.cal
     at 2*start_k*n+1.  Skips values that are multiples of primes <= p_elim.
     By default, start_k == 1, rept_loop = 10000 and p_elim = 17.
 
-    The p_elim == 17 overhead takes ~3 minutes on an 200 Mhz r4k CPU and
+    The p_elim == 17 overhead takes ~3 minutes on an 200 MHz r4k CPU and
     requires about ~13 Megs of memory.	The p_elim == 13 overhead
     takes about 3 seconds and requires ~1.5 Megs of memory.
 
@@ -1354,7 +1317,7 @@ specialfunctions.cal
 	http://en.wikipedia.org/wiki/Polygamma
         http://dlmf.nist.gov/5
 
-    for information on the n-th derivative ofthe Euler gamma function. This
+    for information on the n-th derivative of the Euler gamma function. This
     function depends on the script zeta2.cal.
 
 
@@ -1371,7 +1334,7 @@ specialfunctions.cal
 
     zeta(s)
 
-    Calculates the value of the Rieman Zeta function at s.  See:
+    Calculates the value of the Riemann Zeta function at s.  See:
 
 	http://en.wikipedia.org/wiki/Riemann_zeta_function
         http://dlmf.nist.gov/25.2
@@ -1390,7 +1353,7 @@ statistics.cal
     invbetainc(x,a,b)
 
     Computes the inverse of the regularized beta function. Does so the
-    brute-force way wich makes it a bit slower.
+    brute-force way which makes it a bit slower.
 
     betapdf(x,a,b)
     betacdf(x,a,b)
@@ -1470,7 +1433,7 @@ sumtimes.cal
     Give the user CPU time for various ways of evaluating sums, sums of
     squares, etc, for large lists and matrices.  N is the size of
     the list or matrix to use.  The doalltimes() function will run
-    all fo the sumtimes tests.  For example:
+    all of the sumtimes tests.  For example:
 
     	doalltimes(1e6);
 
@@ -1816,7 +1779,7 @@ zeta2.cal
     for information on this special zeta function.
 
 
-## Copyright (C) 2000,2014,2017  David I. Bell and Landon Curt Noll
+## Copyright (C) 2000,2014,2017,2021  David I. Bell and Landon Curt Noll
 ##
 ## Primary author: Landon Curt Noll
 ##

cal/alg_config.cal

@@ -1,7 +1,7 @@
 /*
  * alg_config - help determine optimal values for algorithm levels
  *
- * Copyright (C) 2006,2014  Landon Curt Noll
+ * Copyright (C) 2006,2014,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -33,7 +33,7 @@ static test_time;	/* try for this many seconds in loop test */
  * given:
  *	ratio	the ratio of time between two algorithms
  *
- * retuns:
+ * returns:
  *	1	When ratio is near 1.0
  *	0	otherwise
  *
@@ -354,7 +354,7 @@ define best_mul2()
     local high;		/* high loop value tested */
     local mid;		/* between low and high */
     local best_val;	/* value found with ratio closest to unity */
-    local best_ratio;	/* cloest ratio found to unity */
+    local best_ratio;	/* closest ratio found to unity */
     local expand;	/* how fast to expand the length */
 
     /*
@@ -363,7 +363,7 @@ define best_mul2()
     printf("WARNING: This tool may not be computing the correct best value\n");
     test_time = 5.0;
     printf("The best_mul2() function will take a LONG time to run!\n");
-    printf("It is important that best_mul2() run on an othwewise idle host!\n");
+    printf("It is important that best_mul2() run on an otherwise idle host!\n");
     if (config("user_debug") <= 0) {
 	printf("To monitor progress, set user_debug to 2: "
 	       "config(\"user_debug\", 2)\n");
@@ -392,7 +392,7 @@ define best_mul2()
      */
     do {
 	/*
-	 * determine the paramters of the next ratio test
+	 * determine the parameters of the next ratio test
 	 *
 	 * We will multiplicatively expand our test level until
 	 * the ratio drops below 1.0.
@@ -419,7 +419,7 @@ define best_mul2()
 	    best_val = high;
 	    best_ratio = ratio;
 	    if (config("user_debug") > 1) {
-		printf("    len %d has a new cloest ratio to unity: %.6f\n",
+		printf("    len %d has a new closest ratio to unity: %.6f\n",
 		       best_val, best_ratio);
 	    }
 	}
@@ -442,7 +442,7 @@ define best_mul2()
 	    high /= 2;
 	    low = high / 2;
 	    if (config("user_debug") > 0) {
-		printf("retesting multiply alg1/alg2 ratio for len = %d\n",
+		printf("re-testing multiply alg1/alg2 ratio for len = %d\n",
 		       high);
 	    }
 	    ratio = mul_ratio(high);
@@ -450,7 +450,8 @@ define best_mul2()
 		best_val = high;
 		best_ratio = ratio;
 		if (config("user_debug") > 1) {
-		    printf("    len %d has a new cloest ratio to unity: %.6f\n",
+		    printf("    len %d has a new closest ratio "
+			   "to unity: %.6f\n",
 			   best_val, best_ratio);
 		}
 	    }
@@ -483,7 +484,7 @@ define best_mul2()
 	    best_val = mid;
 	    best_ratio = ratio;
 	    if (config("user_debug") > 1) {
-		printf("    len %d has a new cloest ratio to unity: %.6f\n",
+		printf("    len %d has a new closest ratio to unity: %.6f\n",
 		       best_val, best_ratio);
 	    }
 	}
@@ -535,7 +536,7 @@ define best_mul2()
 	printf("config(\"mul2\", %d),;\n", best_val);
 	printf("WARNING: It is believed that the output "
 	       "of this resource file is bogus!\n");
-	printf("WARNING: You may NOT wish to follow the above suggeston.\n");
+	printf("WARNING: You may NOT wish to follow the above suggestion.\n");
     }
     return mid;
 }
@@ -835,7 +836,7 @@ define best_sq2()
     local high;		/* high loop value tested */
     local mid;		/* between low and high */
     local best_val;	/* value found with ratio closest to unity */
-    local best_ratio;	/* cloest ratio found to unity */
+    local best_ratio;	/* closest ratio found to unity */
     local expand;	/* how fast to expand the length */
 
     /*
@@ -844,7 +845,7 @@ define best_sq2()
     printf("WARNING: This tool may not be computing the correct best value\n");
     test_time = 5.0;
     printf("The best_sq2() function will take a LONG time to run!\n");
-    printf("It is important that best_sq2() run on an othwewise idle host!\n");
+    printf("It is important that best_sq2() run on an otherwise idle host!\n");
     if (config("user_debug") <= 0) {
 	printf("To monitor progress, set user_debug to 2: "
 	       "config(\"user_debug\", 2)\n");
@@ -873,7 +874,7 @@ define best_sq2()
      */
     do {
 	/*
-	 * determine the paramters of the next ratio test
+	 * determine the parameters of the next ratio test
 	 *
 	 * We will multiplicatively expand our test level until
 	 * the ratio drops below 1.0.
@@ -900,7 +901,7 @@ define best_sq2()
 	    best_val = high;
 	    best_ratio = ratio;
 	    if (config("user_debug") > 1) {
-		printf("    len %d has a new cloest ratio to unity: %.6f\n",
+		printf("    len %d has a new closest ratio to unity: %.6f\n",
 		       best_val, best_ratio);
 	    }
 	}
@@ -923,7 +924,7 @@ define best_sq2()
 	    high /= 2;
 	    low = high / 2;
 	    if (config("user_debug") > 0) {
-		printf("retesting multiply alg1/alg2 ratio for len = %d\n",
+		printf("re-testing multiply alg1/alg2 ratio for len = %d\n",
 		       high);
 	    }
 	    ratio = mul_ratio(high);
@@ -931,7 +932,8 @@ define best_sq2()
 		best_val = high;
 		best_ratio = ratio;
 		if (config("user_debug") > 1) {
-		    printf("    len %d has a new cloest ratio to unity: %.6f\n",
+		    printf("    len %d has a new closest ratio "
+			   "to unity: %.6f\n",
 			   best_val, best_ratio);
 		}
 	    }
@@ -964,7 +966,7 @@ define best_sq2()
 	    best_val = mid;
 	    best_ratio = ratio;
 	    if (config("user_debug") > 1) {
-		printf("    len %d has a new cloest ratio to unity: %.6f\n",
+		printf("    len %d has a new closest ratio to unity: %.6f\n",
 		       best_val, best_ratio);
 	    }
 	}
@@ -1017,7 +1019,7 @@ define best_sq2()
 	printf("config(\"sq2\", %d),;\n", best_val);
 	printf("WARNING: It is believed that the output "
 	       "of this resource file is bogus!\n");
-	printf("WARNING: You may NOT wish to follow the above suggeston.\n");
+	printf("WARNING: You may NOT wish to follow the above suggestion.\n");
     }
     return mid;
 }
@@ -1337,7 +1339,7 @@ define best_pow2()
     local high;		/* high loop value tested */
     local mid;		/* between low and high */
     local best_val;	/* value found with ratio closest to unity */
-    local best_ratio;	/* cloest ratio found to unity */
+    local best_ratio;	/* closest ratio found to unity */
     local expand;	/* how fast to expand the length */
     local looped;	/* 1 ==> we have expanded lengths before */
 
@@ -1347,7 +1349,7 @@ define best_pow2()
     printf("WARNING: This tool may not be computing the correct best value\n");
     test_time = 60.0;
     printf("The best_pow2() function will take a LONG time to run!\n");
-    printf("It is important that best_pow2() run on an othwewise idle host!\n");
+    printf("It is important that best_pow2() run on an otherwise idle host!\n");
     if (config("user_debug") <= 0) {
 	printf("To monitor progress, set user_debug to 2: "
 	       "config(\"user_debug\", 2)\n");
@@ -1358,7 +1360,7 @@ define best_pow2()
      * firewall - must have a >1.02 ratio for the initial length
      *
      * We select 1.02 because of the precision of the CPU timing.  We
-     * want to firt move into an area where the 1st algoritm clearly
+     * want to first move into an area where the 1st algorithm clearly
      * dominates.
      */
     low = 4;
@@ -1375,7 +1377,7 @@ define best_pow2()
 	    best_val = high;
 	    best_ratio = ratio;
 	    if (config("user_debug") > 1) {
-		printf("    len %d has a new cloest ratio to unity: %.6f\n",
+		printf("    len %d has a new closest ratio to unity: %.6f\n",
 		       best_val, best_ratio);
 	    }
 	}
@@ -1397,7 +1399,7 @@ define best_pow2()
     looped = 0;
     do {
 	/*
-	 * determine the paramters of the next ratio test
+	 * determine the parameters of the next ratio test
 	 *
 	 * We will multiplicatively expand our test level until
 	 * the ratio drops below 1.0.
@@ -1435,7 +1437,7 @@ define best_pow2()
 	    best_val = high;
 	    best_ratio = ratio;
 	    if (config("user_debug") > 1) {
-		printf("    len %d has a new cloest ratio to unity: %.6f\n",
+		printf("    len %d has a new closest ratio to unity: %.6f\n",
 		       best_val, best_ratio);
 	    }
 	}
@@ -1463,7 +1465,7 @@ define best_pow2()
 	    best_val = mid;
 	    best_ratio = ratio;
 	    if (config("user_debug") > 1) {
-		printf("    len %d has a new cloest ratio to unity: %.6f\n",
+		printf("    len %d has a new closest ratio to unity: %.6f\n",
 		       best_val, best_ratio);
 	    }
 	}
@@ -1516,7 +1518,7 @@ define best_pow2()
 	printf("config(\"pow2\", %d),;\n", best_val);
 	printf("WARNING: It is believed that the output "
 	       "of this resource file is bogus!\n");
-	printf("WARNING: You may NOT wish to follow the above suggeston.\n");
+	printf("WARNING: You may NOT wish to follow the above suggestion.\n");
     }
     return mid;
 }

cal/bernoulli.cal

@@ -1,7 +1,7 @@
 /*
- * bernoulli - clculate the Nth Bernoulli number B(n)
+ * bernoulli - calculate the Nth Bernoulli number B(n)
  *
- * Copyright (C) 2000  David I. Bell and Landon Curt Noll
+ * Copyright (C) 2000,2021  David I. Bell and Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -26,9 +26,9 @@
 /*
  * Calculate the Nth Bernoulli number B(n).
  *
- * NOTE: This is now a bulitin function.
+ * NOTE: This is now a builtin function.
  *
- * The non-buildin code used the following symbolic formula to calculate B(n):
+ * The non-builtin code used the following symbolic formula to calculate B(n):
  *
  *	(b+1)^(n+1) - b^(n+1) = 0
  *
@@ -42,7 +42,7 @@
  *	B(3) = -(6*B(2) + 4*B(1) + 1) / 4
  *
  * The combinatorial factors in the expansion of the above formula are
- * calculated interatively, and we use the fact that B(2i+1) = 0 if i > 0.
+ * calculated interactively, and we use the fact that B(2i+1) = 0 if i > 0.
  * Since all previous B(n)'s are needed to calculate a particular B(n), all
  * values obtained are saved in an array for ease in repeated calculations.
  */

cal/bernpoly.cal

@@ -1,7 +1,7 @@
 /*
- * bernpoly - Bernoully polynomials B_n(z) for arbitrary n,z..
+ * bernpoly - Bernoulli polynomials B_n(z) for arbitrary n,z..
  *
- * Copyright (C) 2013 Christoph Zurnieden
+ * Copyright (C) 2013,2021 Christoph Zurnieden
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License

cal/brentsolve.cal

@@ -1,7 +1,7 @@
 /*
  * brentsolve - Root finding with the Brent-Dekker trick
  *
- * Copyright (C) 2013 Christoph Zurnieden
+ * Copyright (C) 2013,2021 Christoph Zurnieden
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -143,7 +143,7 @@ define brentsolve2(low, high,which,eps){
 
   switch(param(0)){
     case 0:
-    case 1: return newerror("brentsolve2: not enough argments");
+    case 1: return newerror("brentsolve2: not enough arguments");
     case 2: eps = epsilon(epsilon()*1e-2);
             which = 0;break;
     case 3: eps = epsilon(epsilon()*1e-2);break;

cal/chi.cal

@@ -1,7 +1,7 @@
 /*
  * chi - chi^2 probabilities with degrees of freedom for null hypothesis
  *
- * Copyright (C) 2001  Landon Curt Noll
+ * Copyright (C) 2001,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -51,7 +51,7 @@ define Z(x, eps_term)
 
 
 /*
- * P(x[, eps]) asymtotic P(x) expansion for x>0 to an given epsilon error term
+ * P(x[, eps]) asymptotic P(x) expansion for x>0 to an given epsilon error term
  *
  * NOTE: If eps is omitted, the stored epsilon value is used.
  *
@@ -99,7 +99,7 @@ define P(x, eps_term)
     }
 
     /*
-     * aproximate sum(n=0; n < infinity){x^(2*n+1)/(1*3*5*...(2*n+1)}
+     * approximate sum(n=0; n < infinity){x^(2*n+1)/(1*3*5*...(2*n+1)}
      */
     x2 = x*x;
     x_term = x;
@@ -130,7 +130,7 @@ define P(x, eps_term)
  *
  *    The chi_prob() function does not work well with odd degrees of freedom.
  *    It is reasonable with even degrees of freedom, although one must give
- *    a sifficently small error term as the degress gets large (>100).
+ *    a sufficiently small error term as the degrees gets large (>100).
  *
  * NOTE: This function does not work well with odd degrees of freedom.
  *	 Can somebody help / find a bug / provide a better method of
@@ -186,7 +186,7 @@ define chi_prob(chi_sq, v, eps_term)
     local r;		/* index in finite sum */
     local r_lim;	/* limit value for r */
     local s;		/* sum */
-    local d;		/* demoninator (2*4*6*... or 1*3*5...) */
+    local d;		/* denominator (2*4*6*... or 1*3*5...) */
     local chi_term;	/* chi_sq^r */
     local ret;		/* return value */
 

cal/chrem.cal

@@ -1,7 +1,7 @@
 /*
- * chrem - chinese remainder theorem/problem solver
+ * chrem - Chinese remainder theorem/problem solver
  *
- * Copyright (C) 1999  Ernest Bowen and Landon Curt Noll
+ * Copyright (C) 1999,2021  Ernest Bowen and Landon Curt Noll
  *
  * Primary author:  Ernest Bowen
  *
@@ -26,7 +26,7 @@
  */
 
 /*
- * When possible, chrem finds solutions for x of a set of congruences
+ * When possible, chrem finds solutions for x of a set of congruence
  * of the form:
  *
  *			x = r1 (mod m1)
@@ -35,7 +35,7 @@
  *
  * where the residues r1, r2, ... and the moduli m1, m2, ... are
  * given integers.  The Chinese remainder theorem states that if
- * m1, m2, ... are relatively prime in pairs, the above congruences
+ * m1, m2, ... are relatively prime in pairs, the above congruence
  * have a unique solution modulo  m1 * m2 * ...	  If m1, m2, ...
  * are not relatively prime in pairs, it is possible that no solution
  * exists.  If solutions exist, the general solution is expressible as:

cal/dms.cal

@@ -1,7 +1,7 @@
 /*
  * dms - calculate in degrees, minutes, and seconds (based on deg)
  *
- * Copyright (C) 1999,2010  David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999,2010,2021  David I. Bell and Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -53,7 +53,7 @@ define dms_add(a, b)
 {
     local obj dms ans;		/* return value */
 
-    /* initalize value to 1st arg */
+    /* initialize value to 1st arg */
     if (istype(a, ans)) {
 	/* 1st arg is dms object, load it */
 	ans.deg = a.deg;
@@ -110,7 +110,7 @@ define dms_sub(a, b)
 {
     local obj dms ans;		/* return value */
 
-    /* initalize value to 1st arg */
+    /* initialize value to 1st arg */
     if (istype(a, ans)) {
 	/* 1st arg is dms object, load it */
 	ans.deg = a.deg;
@@ -352,11 +352,11 @@ define fixdms(a)
 	quit "attempt to fix a non dms object";
     }
 
-    /* force minutes to be intergral */
+    /* force minutes to be integral */
     a.min += frac(a.deg) * 60;
     a.deg = int(a.deg);
 
-    /* force degrees to be intergral */
+    /* force degrees to be integral */
     a.sec += frac(a.min) * 60;
     a.min = int(a.min);
 

cal/dotest.cal

@@ -8,8 +8,8 @@
  * copyright this dotest_code.
  *
  * ERNEST BOWEN AND LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS	 SOFTWARE,  INCLUDING  ALL IMPLIED WARRANTIES OF MER-
+ * THIS         SOFTWARE,  INCLUDING  ALL IMPLIED WARRANTIES OF MER-
- * CHANTABILITY AND FITNESS.  IN NO EVENT SHALL	 LANDON	 CURT
+ * CHANTABILITY AND FITNESS.  IN NO EVENT SHALL         LANDON  CURT
  * NOLL	 BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
  * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM  LOSS  OF
  * USE,	 DATA  OR  PROFITS, WHETHER IN AN ACTION OF CONTRACT,
@@ -173,7 +173,7 @@ define dotest(dotest_file, dotest_code = 0, dotest_maxcond = -1)
     }
 
     /*
-     * preppare to return to the caller environment
+     * prepare to return to the caller environment
      *
      * We increase the caller's error count by the number
      * of line tests that failed, not the number of internal

cal/factorial2.cal

@@ -1,7 +1,7 @@
 /*
  * factorial2 - implementation of different factorial related functions
  *
- * Copyright (C) 2013 Christoph Zurnieden
+ * Copyright (C) 2013,2021 Christoph Zurnieden
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -281,10 +281,10 @@ define __CZ__multiply_factored_factorial(matrix,stop){
 }
 
 /*
-    Compute binomial coeficients n!/(k!(n-k)!)
+    Compute binomial coefficients n!/(k!(n-k)!)
 
     One of the rare cases where a formula once meant to ease manual computation
-    is actually the (aymptotically) fastest way to do it (in July 2013) for
+    is actually the (asymptotically) fastest way to do it (in July 2013) for
     the extreme case binomial(2N,N) but for a high price, the memory
     needed is pi(N)--theoretically.
 */
@@ -626,7 +626,7 @@ define subfactorialrecursive(n){
   return n * subfactorialrecursive(n-1) + (-1)^n;
 }
 
-/* This is, quite amusingely, faster than the very same algorithm in
+/* This is, quite amusingly, faster than the very same algorithm in
    PARI/GP + GMP*/
 define subfactorialiterative(n){
   local k temp1 temp2 ret;

cal/hms.cal

@@ -1,7 +1,7 @@
 /*
  * hms - calculate in hours, minutes, and seconds
  *
- * Copyright (C) 2010  Landon Curt Noll
+ * Copyright (C) 2010,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -53,7 +53,7 @@ define hms_add(a, b)
 {
     local obj hms ans;		/* return value */
 
-    /* initalize value to 1st arg */
+    /* initialize value to 1st arg */
     if (istype(a, ans)) {
 	/* 1st arg is hms object, load it */
 	ans.hour = a.hour;
@@ -110,7 +110,7 @@ define hms_sub(a, b)
 {
     local obj hms ans;		/* return value */
 
-    /* initalize value to 1st arg */
+    /* initialize value to 1st arg */
     if (istype(a, ans)) {
 	/* 1st arg is hms object, load it */
 	ans.hour = a.hour;
@@ -352,11 +352,11 @@ define fixhms(a)
 	quit "attempt to fix a non hms object";
     }
 
-    /* force minutes to be intergral */
+    /* force minutes to be integral */
     a.min += frac(a.hour) * 60;
     a.hour = int(a.hour);
 
-    /* force hours to be intergral */
+    /* force hours to be integral */
     a.sec += frac(a.min) * 60;
     a.min = int(a.min);
 

cal/intfile.cal

@@ -1,7 +1,7 @@
 /*
  * intfile - integer to file and file to integer conversion
  *
- * Copyright (C) 2001  Landon Curt Noll
+ * Copyright (C) 2001,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -27,20 +27,20 @@
 
 /*
  * NOTE: Because leading HALF values are trimmed from integer, a file
- *	 that begins with lots of 0 bits (in the case of big endian)
+ *	 that begins with lots of 0 bits (in the case of big Endian)
- *	 or that ends with lots of 0 bits (in the case of little endian)
+ *	 or that ends with lots of 0 bits (in the case of little Endian)
  *	 will be changed when the subsequent integer is written back.
  */
 
 
 /*
- * file2be - convert a file into an big endian integer
+ * file2be - convert a file into an big Endian integer
  *
  * given:
  *	filename	filename to read
  *
  * returns:
- *	integer read from its contents on big endian order
+ *	integer read from its contents on big Endian order
  */
 define file2be(filename)
 {
@@ -75,13 +75,13 @@ define file2be(filename)
 
 
 /*
- * file2le - convert a file into an little endian integer
+ * file2le - convert a file into an little Endian integer
  *
  * given:
  *	filename	filename to read
  *
  * returns:
- *	integer read from its contents on little endian order
+ *	integer read from its contents on little Endian order
  */
 define file2le(filename)
 {
@@ -118,7 +118,7 @@ define file2le(filename)
 
 
 /*
- * be2file - convert a big endian integer into a file
+ * be2file - convert a big Endian integer into a file
  *
  * given:
  *	v		integer to write to the file
@@ -168,7 +168,7 @@ define be2file(v, filename)
 
 
 /*
- * le2file - convert a little endian integer into a file
+ * le2file - convert a little Endian integer into a file
  *
  * given:
  *	v		integer to write to the file

cal/intnum.cal

@@ -1,7 +1,7 @@
 /*
  * intnum - implementation of tanhsinh- and Gauss-Legendre quadrature
  *
- * Copyright (C) 2013 Christoph Zurnieden
+ * Copyright (C) 2013,2021 Christoph Zurnieden
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -295,7 +295,7 @@ define quadts(a, b, points)
                  * as the number of equally spaced intervals on a straight line
                  * connecting a and b. Computing the segments here is a bit
                  * more complicated but not much, it should have been taught in
-                 * highschool.
+                 * high school.
 		 * Other contours by way of a list of points */
 		slope = (im(b) - im(a)) / (re(b) - re(a));
 		C = (im(a) + slope) * re(a);

cal/lambertw.cal

@@ -1,7 +1,7 @@
 /*
  * lambertw - Lambert's W-function
  *
- * Copyright (C) 2013 Christoph Zurnieden
+ * Copyright (C) 2013,2021 Christoph Zurnieden
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -83,7 +83,7 @@ define __CZ__lambertw_m1(z,eps){
   or by using the function lambertw_series_print() after running
   lambertw_series(z,eps,branch,terms) at least once with the wanted number of
   terms and z = 1 (which might throw an error because the series will not
-  converge in anybodies lifetime for something that far from the branchpoint).
+  converge in anybodies lifetime for something that far from the branch point).
 
 
 */
@@ -105,7 +105,7 @@ define lambertw_series_print(){
 }
 
 /*
-   The series is fast but only if _very_ close to the branchpoint
+   The series is fast but only if _very_ close to the branch point
    The exact branch must be given explicitly, e.g.:
 
 ; lambertw(-exp(-1)+.001)-lambertw_series(-exp(-1)+.001,epsilon()*1e-10,0)

cal/linear.cal

@@ -1,7 +1,7 @@
 /*
  * linear - perform a simple two point 2D linear interpolation
  *
- * Copyright (C) 2005-2007  Landon Curt Noll
+ * Copyright (C) 2005-2007,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -29,7 +29,7 @@
  *
  * given:
  *	x0, y0		first known point on the line
- *	x1, y1		second knonw point on the line
+ *	x1, y1		second known point on the line
  *	x		a given point to interpolate on
  *
  * returns:

cal/lucas.cal

@@ -1,7 +1,7 @@
 /*
  * lucas - perform a Lucas primality test on h*2^n-1
  *
- * Copyright (C) 1999,2017  Landon Curt Noll
+ * Copyright (C) 1999,2017,2018,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -28,6 +28,10 @@
  * For a general tutorial on how to find a new largest known prime, see:
  *
  *	http://www.isthe.com/chongo/tech/math/prime/prime-tutorial.pdf
+ *
+ * Also see the reference code, available both C and go:
+ *
+ *	https://github.com/arcetri/goprime
  */
 
 /*
@@ -154,6 +158,12 @@
  *
  * Finally, one should eliminate all values of 'h*2^n-1' where
  * 'h*2^n+1' is divisible by a small primes.
+ *
+ * NOTE: Today, for world record sized h*2^n-1 primes, one might
+ *	 search for factors < 2^46 or more.  By excluding h*2^n-1
+ *	 with prime factors < 2^46, where h*2^n-1 is a bit larger
+ *	 than the largest known prime, one may exclude about 96.5%
+ *	 of candidates that have "small" prime factors.
  */
 
 pprod256 = 0;	/* product of  "primes up to 256" / "primes up to 46" */
@@ -363,41 +373,53 @@ lucas(h, n)
 		return 1;		/* 239 is prime */
 	}
 
+	/*
+	 * Verify that h*2^n-1 is not a multiple of 3
+	 *
+	 * The case for h*2^n-1 == 3 is handled above.
+	 */
+	if (((h % 3 == 1) && (n % 2 == 0)) || ((h % 3 == 2) && (n % 2 == 1))) {
+		/* no need to test h*2^n-1, it is a multiple of 3 */
+		ldebug("lucas","not-prime: != 3 and is a multiple of 3");
+		return 0;
+	}
+
 	/*
 	 * Avoid any numbers divisible by small primes
 	 */
 	/*
-	 * check for 3 <= prime factors < 29
+	 * check for 5 <= prime factors < 31
-	 * pfact(28)/2 = 111546435
+	 * pfact(30)/6 = 1078282205
 	 */
 	testval = h*2^n - 1;
-	if (gcd(testval, 111546435) > 1) {
+	if (gcd(testval, 1078282205) > 1) {
-		/* a small 3 <= prime < 29 divides h*2^n-1 */
+		/* a small 5 <= prime < 31 divides h*2^n-1 */
-		ldebug("lucas","not-prime: 3<=prime<29 divides h*2^n-1");
+		ldebug("lucas",\
+		    "not-prime: a small 5<=prime<31 divides h*2^n-1");
 		return 0;
 	}
 	/*
-	 * check for 29 <= prime factors < 47
+	 * check for 31 <= prime factors < 53
-	 * pfact(46)/pfact(28) = 5864229
+	 * pfact(52)/pfact(30) = 95041567
 	 */
-	if (gcd(testval, 58642669) > 1) {
+	if (gcd(testval, 95041567) > 1) {
-		/* a small 29 <= prime < 47 divides h*2^n-1 */
+		/* a small 31 <= prime < 53 divides h*2^n-1 */
-		ldebug("lucas","not-prime: 29<=prime<47 divides h*2^n-1");
+		ldebug("lucas","not-prime: 31<=prime<53 divides h*2^n-1");
 		return 0;
 	}
 	/*
-	 * check for prime 47 <= factors < 257, if h*2^n-1 is large
+	 * check for prime 53 <= factors < 257, if h*2^n-1 is large
-	 * 2^282 > pfact(256)/pfact(46) > 2^281
+	 * 2^276 > pfact(256)/pfact(52) > 2^275
 	 */
 	bits = highbit(testval);
-	if (bits >= 281) {
+	if (bits >= 275) {
 		if (pprod256 <= 0) {
-			pprod256 = pfact(256)/pfact(46);
+			pprod256 = pfact(256)/pfact(52);
 		}
 		if (gcd(testval, pprod256) > 1) {
-			/* a small 47 <= prime < 257 divides h*2^n-1 */
+			/* a small 53 <= prime < 257 divides h*2^n-1 */
 			ldebug("lucas",\
-			    "not-prime: 47<=prime<257 divides h*2^n-1");
+			    "not-prime: 53<=prime<257 divides h*2^n-1");
 			return 0;
 		}
 	}
@@ -413,7 +435,9 @@ lucas(h, n)
 	 * generate a test for h*2^n-1.	 The legacy function,
 	 * legacy_gen_v1() used by the Amdahl 6 could have returned
 	 * -1. The new gen_v1() based on the method outlined in Ref4
-	 * will never return -1.
+	 * will never return -1 if h*2^n-1 is not a multiple of 3.
+	 * Because the "multiple of 3" case is handled above, the
+	 * call below to gen_v1() will never return -1.
 	 */
 	v1 = gen_v1(h, n);
 	if (v1 < 0) {
@@ -739,7 +763,7 @@ rodseth_xhn(x, h, n)
  * We can show that X > 2.  See the comments in the rodseth_xhn(x,h,n) above.
  *
  * Some values of X satisfy more often than others. For example a large sample
- * of odd h, h odd multiple of 3 and large n (some around 1e4, some near 1e6,
+ * of h*2^n-1, h odd multiple of 3, and large n (some around 1e4, some near 1e6,
  * others near 3e7) where the sample size was 66 973 365, here is the count of
  * the smallest value of X that satisfies conditions in Ref4, condition 1:
  *
@@ -805,82 +829,155 @@ rodseth_xhn(x, h, n)
  *
  * The above distribution was found to hold fairly well over many values of
  * odd h that are also a multiple of 3 and for many values of n where h < 2^n.
- * For example for in a sample size of 835823 numbers of the form h*2^n-1
- * where odd h >= 12996351 is a multiple of 3, n >= 12996351, these are the
- * smallest v(1) values that were found:
  *
- *  smallest percentage
+ * For example for in a sample size of 1000000 numbers of the form h*2^n-1
- *	v(1) used
+ * where h is an odd multiple of 3, 12996351 <= h <= 13002351,
- *  -------------------
+ * 4331116 <= n <= 4332116, these are the smallest v(1) values that were found:
- *	   3 40.000%
- *	   5 25.683%
- *	   9 11.693%
- *	  11 10.452%
- *	  15 4.806%
- *	  17 2.348%
- *	  21 1.656%
- *	  29 1.281%
- *	  27 0.6881%
- *	  35 0.4536%
- *	  39 0.3121%
- *	  41 0.1760%
- *	  31 0.1414%
- *	  45 0.1173%
- *	  51 0.05576%
- *	  55 0.03300%
- *	  49 0.03185%
- *	  59 0.02090%
- *	  69 0.00980%
- *	  65 0.009367%
- *	  71 0.007205%
- *	  57 0.006341%
- *	  85 0.004611%
- *	  81 0.004179%
- *	  95 0.002882%
- *	  99 0.001873%
- *	  77 0.001153%
- *	  53 0.0007205%
- *	  67 0.0005764%
- *	 125 0.0005764%
- *	 105 0.0005764%
- *	  87 0.0004323%
- *	 111 0.0004323%
- *	 101 0.0002882%
- *	  83 0.0001441%
- *	 127 0.0001196%
  *
- * When h * 2^n-1 is prime and h is an odd multiple of 3, a smallest v(1) that
+ *  smallest  percentage
- * is even is extremely rate.  Of the list of 127287 known primes of the form
+ *	v(1)     used
- * h*2^n-1 when h was a multiple of 3, none has an smallest v(1) that was even.
+ *  --------  ---------
+ *	  3   40.0000 %
+ *	  5   25.6833 %
+ *	  9   11.6924 %
+ *	 11   10.4528 %
+ *	 15    4.8048 %
+ *	 17    2.3458 %
+ *	 21    1.3734 %
+ *	 29    1.0527 %
+ *	 20    0.8595 %
+ *	 27    0.5758 %
+ *	 35    0.4420 %
+ *	 36    0.2433 %
+ *	 39    0.1779 %
+ *	 41    0.0885 %
+ *	 45    0.0571 %
+ *	 32    0.0337 %
+ *	 51    0.0289 %
+ *	 44    0.0205 %
+ *	 49    0.0176 %
+ *	 56    0.0137 %
+ *	 59    0.0108 %
+ *	 57    0.0053 %
+ *	 65    0.0047 %
+ *	 55    0.0045 %
+ *	 69    0.0031 %
+ *	 71    0.0024 %
+ *	 66    0.0011 %
+ *	 95    0.0008 %
+ *	 81    0.0008 %
+ *	 77    0.0006 %
+ *	 72    0.0005 %
+ *	 99    0.0004 %
+ *	 80    0.0003 %
+ *	 74    0.0003 %
+ *	 84    0.0002 %
+ *	 67    0.0002 %
+ *	 87    0.0001 %
+ *	104    0.0001 %
+ *	129    0.0001 %
  *
- * About 1 out of 835000 cases when h is a multiple of 3 use v(1) > 127 as the
+ * However, a case can be made for considering only odd values for v(1)
- * smallest value of v(1).
+ * candidates.  When h * 2^n-1 is prime and h is an odd multiple of 3,
+ * a smallest v(1) that is even is extremely rate.  Of the list of 146553
+ * known primes of the form h*2^n-1 when h is an odd a multiple of 3,
+ * none has an smallest v(1) that was even.
+ *
+ * See:
+ *
+ *	https://github.com/arcetri/verified-prime
+ *
+ * for that list of 146553 known primes of the form h*2^n-1.
+ *
+ * That same example for in a sample size of 1000000 numbers of the
+ * form h*2^n-1 where h is an odd multiple of 3, 12996351 <= h <= 13002351,
+ * 4331116 <= n <= 4332116, these are the smallest odd v(1) values that were
+ * found:
+ *
+ *  smallest    percentage
+ *  odd v(1)       used
+ *  --------    ---------
+ *	  3	40.0000 %
+ *	  5	25.6833 %
+ *	  9	11.6924 %
+ *	 11	10.4528 %
+ *	 15	 4.8048 %
+ *	 17	 2.3458 %
+ *	 21	 1.6568 %
+ *	 29	 1.6174 %
+ *	 35	 0.4529 %
+ *	 27	 0.3546 %
+ *	 39	 0.3470 %
+ *	 41	 0.2159 %
+ *	 45	 0.1173 %
+ *	 31	 0.0661 %
+ *	 51	 0.0619 %
+ *	 55	 0.0419 %
+ *	 59	 0.0250 %
+ *	 49	 0.0170 %
+ *	 69	 0.0110 %
+ *	 65	 0.0098 %
+ *	 71	 0.0078 %
+ *	 85	 0.0048 %
+ *	 81	 0.0044 %
+ *	 95	 0.0038 %
+ *	 99	 0.0021 %
+ *	125	 0.0009 %
+ *	 57	 0.0007 %
+ *	111	 0.0005 %
+ *	 77	 0.0003 %
+ *	165	 0.0003 %
+ *	155	 0.0002 %
+ *	129	 0.0002 %
+ *	101	 0.0002 %
+ *	 53	 0.0001 %
+ *
+ * Moreover when evaluating odd candidates for v(1), one may cache Jacobi
+ * symbol evaluations to reduce the number of Jacobi symbol evaluations to
+ * a minimum. For example, if one tests 5 and finds that the 2nd case fails:
+ *
+ *	jacobi(5+2, h*2^n-1) != -1
+ *
+ * Then if one is later testing 9, the Jacobi symbol value for the first
+ * 1st case:
+ *
+ *	jacobi(7-2, h*2^n-1)
+ *
+ * is already known.
+ *
+ * Without Jacobi symbol value caching, it requires on average
+ * 4.851377 Jacobi symbol evaluations.  With Jacobi symbol value caching
+ * cacheing, an average of 4.348820 Jacobi symbol evaluations is needed.
  *
  * Given this information, when odd h is a multiple of 3 we try, in order,
- * these sorted values of X:
+ * these odd values of X:
  *
- *      3, 5, 9, 11, 15, 17, 21, 27, 29, 31, 35, 39, 41, 45, 49, 51, 53, 55,
+ *	3, 5, 9, 11, 15, 17, 21, 29, 27, 35, 39, 41, 31, 45, 51, 55, 49, 59,
- *	57, 59, 65, 67, 69, 71, 77, 81, 83, 85, 87, 95, 99, 101, 105, 111, 125
+ *	69, 65, 71, 57, 85, 81, 95, 99, 77, 53, 67, 125, 111, 105, 87, 129,
+ *	101, 83, 165, 155, 149, 141, 121, 109
  *
  * And stop on the first value of X where:
  *
  *      jacobi(X-2, h*2^n-1) == 1
  *      jacobi(X+2, h*2^n-1) == -1
  *
- * If no value in that list works, we start simple search starting with X = 12/
+ * Less than 1 case out of 1000000 will not be satisfied by the above list.
+ * If no value in that list works, we start simple search starting with X = 167
  * and incrementing by 2 until a value of X is found.
  *
- * The x_tbl[] matrix contains those common values of X to try in order.
+ * The x_tbl[] matrix contains those values of X to try in order.
- * If all x_tbl_len fail to satisfy Ref4 condition 1, then we begin a
+ * If all x_tbl_len fail to satisfy Ref4 condition 1 (this happens less than
- * linear search at next_x until we find a proper X value.
+ * 1 in 1000000 cases), then we begin a linear search of odd values starting at
+ * next_x until we find a proper X value.
  */
-x_tbl_len = 35;
+x_tbl_len = 42;
 mat x_tbl[x_tbl_len];
 x_tbl = {
-    3, 5, 9, 11, 15, 17, 21, 27, 29, 31, 35, 39, 41, 45, 49, 51, 53, 55,
+    3, 5, 9, 11, 15, 17, 21, 29, 27, 35, 39, 41, 31, 45, 51, 55, 49, 59,
-    57, 59, 65, 67, 69, 71, 77, 81, 83, 85, 87, 95, 99, 101, 105, 111, 125
+    69, 65, 71, 57, 85, 81, 95, 99, 77, 53, 67, 125, 111, 105, 87, 129,
+    101, 83, 165, 155, 149, 141, 121, 109
 };
-next_x = 127;
+next_x = 167;	/* must be 2 more than the largest value in x_tbl[] */
 
 /*
  * gen_v1 - compute the v(1) for a given h*2^n-1 if we can
@@ -938,12 +1035,22 @@ next_x = 127;
  *
  *	u(2) = v(h)				 (NOTE: some call this u(2))
  *
- * so we simply return
+ * so we can always return
  *
  *	v(1) = alpha^1 + alpha^(-1)
  *	     = (2+sqrt(3)) + (2-sqrt(3))
  *	     = 4
  *
+ * In 40% of the cases when h is not a multiple of 3, 3 is a valid value
+ * for v(1).  We can test if 3 is a valid value for v(1) in this case:
+ *
+ *	if jacobi(1, h*2^n-1) == 1 and jacobi(5, h*2^n-1) == -1, then
+ *	    v(1) = 3
+ *	else
+ *	    v(1) = 4
+ *
+ * NOTE: The above "if then else" works only of h is not a multiple of 3.
+ *
  ***
  *
  * Case 2:	(h mod 3 == 0)
@@ -1039,13 +1146,18 @@ next_x = 127;
  *	n	n as in h*2^n-1	(must be >= 1)
  *
  * output:
- *	returns v(1), or -1 is there is no quick way
+ *	returns v(1), or
+ *		-1 when h*2^n-1 is a multiple of 3
  */
 define
 gen_v1(h, n)
 {
 	local x;	/* potential v(1) to test */
 	local i;	/* x_tbl index */
+	local v1m2;	/* X-2 1st case */
+	local v1p2;	/* X+2 2nd case */
+	local testval;	/* h*2^n-1 - value we are testing if prime */
+	local mat cached_v1[next_x];	/* cached Jacobi symbol values or 0 */
 
 	/*
 	 * check arg types
@@ -1066,51 +1178,114 @@ gen_v1(h, n)
 		quit "bad args: n must be an integer >= 1";
 	}
 
+	/*
+	 * pretest: Verify that h*2^n-1 is not a multiple of 3
+	 */
+	if (((h % 3 == 1) && (n % 2 == 0)) || ((h % 3 == 2) && (n % 2 == 1))) {
+		/* no need to test h*2^n-1, it is not prime */
+		return -1;
+	}
+
+	/*
+	 * Common Mersenne number case:
+	 *
+	 * For Mersenne numbers:
+	 *
+	 *	2^n-1
+	 *
+	 * we can use, 40% of the time, v(1) == 3.  However nearly all code that
+	 * implements the Lucas-Lehmer test uses v(1) == 4.  Whenever for
+	 * h != 0 mod 3, and particular the Mersenne number case of when h == 1:
+	 *
+	 *	1*2^n-1
+	 *
+	 * v(1) == 4 always works.  For this reason, we return 4 when h == 1.
+	 */
+	if (h == 1) {
+		/* v(1) == 4 always works for the Mersenne number case */
+		return 4;
+	}
+
 	/*
 	 * check for Case 1:      (h mod 3 != 0)
 	 */
 	if (h % 3 != 0) {
-		/* v(1) is easy to compute */
+		if (rodseth_xhn(3, h, n) == 1) {
-		return 4;
+			/* 40% of the time, 3 works when h mod 3 != 0 */
+			return 3;
+		} else {
+			/* otherwise 4 always works when h mod 3 != 0 */
+			return 4;
+		}
 	}
 
 	/*
 	 * What follow is Case 2:      (h mod 3 == 0)
 	 */
 
+	/*
+	 * clear cache
+	 */
+	matfill(cached_v1, 0);
+
 	/*
 	 * We will look for x that satisfies conditions in Ref4, condition 1:
 	 *
 	 *	jacobi(X-2, h*2^n-1) == 1		part 1
 	 *	jacobi(X+2, h*2^n-1) == -1		part 2
 	 *
-	 * NOTE: If we wanted to be super optimial, we would cache
+	 * NOTE: If we wanted to be super optimal, we would cache
 	 *	 jacobi(X+2, h*2^n-1) that that when we increment X
 	 *	 to the next odd value, the now jacobi(X-2, h*2^n-1)
-	 *	 does not need to be re-evaluted.
+	 *	 does not need to be re-evaluated.
 	 */
+	testval = h*2^n-1;
 	for (i=0; i < x_tbl_len; ++i) {
 
 		/*
-		 * test Ref4 condition 1:
+		 * obtain the next test candidate
 		 */
 		x = x_tbl[i];
-		if (rodseth_xhn(x, h, n) == 1) {
 
-			/*
+		/*
-			 * found a x that satisfies Ref4 condition 1
+		 * Check x for condition 1 part 1
-			 */
+		 *
-			ldebug("gen_v1", "h= " + str(h) + " n= " + str(n) +
+		 *	jacobi(x-2, h*2^n-1) == 1
-				" v1= " + str(x) + " using tbl[ " +
+		 */
-				str(i) + " ]");
+		v1m2 = x-2;
-			return x;
+		if (cached_v1[v1m2] == 0) {
+			cached_v1[v1m2] = jacobi(v1m2, testval);
 		}
+		if (cached_v1[v1m2] != 1) {
+			continue;
+		}
+
+		/*
+		 * Check x for condition 1 part 2
+		 *
+		 *	jacobi(x+2, h*2^n-1) == -1
+		 */
+		v1p2 = x+2;
+		if (cached_v1[v1p2] == 0) {
+			cached_v1[v1p2] = jacobi(v1p2, testval);
+		}
+		if (cached_v1[v1p2] != -1) {
+			continue;
+		}
+
+		/*
+		 * found a x that satisfies Ref4 condition 1
+		 */
+		ldebug("gen_v1", "h= " + str(h) + " n= " + str(n) +
+			" v1= " + str(x) + " using tbl[ " +
+			str(i) + " ]");
+		return x;
 	}
 
 	/*
-	 * We are in that rare case (about 1 in 835 000) where none of the
+	 * We are in that rare case (less than 1 in 1 000 000) where none of the
 	 * common X values satisfy Ref4 condition 1.  We start a linear search
-	 * of odd vules at next_x from here on.
+	 * of odd values at next_x from here on.
 	 */
 	x = next_x;
 	while (rodseth_xhn(x, h, n) != 1) {

cal/lucas_chk.cal

@@ -1,7 +1,7 @@
 /*
  * lucas_chk - test all primes of the form h*2^n-1, 1<=h<200 and n <= high_n
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -303,7 +303,7 @@ read -once "lucas.cal";
  *	[quiet] if given and != 0, then do not print individual test results
  *
  * returns:
- *	1	all is ok
+ *	1	all is OK
  *	0	something went wrong
  */
 define

cal/mfactor.cal

@@ -1,7 +1,7 @@
 /*
  * mfactor - return the lowest factor of 2^n-1, for n > 0
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -79,7 +79,7 @@
  *		hindx = 0;
  *	} while (test_factor < some_limit);
  *
- * The test, mfactor(67, 1, 10000) took on an 200 Mhz r4k (user CPU seconds):
+ * The test, mfactor(67, 1, 10000) took on an 200 MHz r4k (user CPU seconds):
  *
  *	210.83	(prior to use of hset[])
  *	 78.35	(hset[] for p_elim = 7)
@@ -99,7 +99,7 @@
  *	 57.78	(hset[] for p_elim = 17)
  *	 p_elim == 19 rejected because of memory size
  *
- * The p_elim == 17 overhead takes ~3 minutes on an 200 Mhz r4k CPU and
+ * The p_elim == 17 overhead takes ~3 minutes on an 200 MHz r4k CPU and
  * requires about ~13 Megs of memory.  The p_elim == 13 overhead
  * takes about 3 seconds and requires ~1.5 Megs of memory.
  *
@@ -256,7 +256,7 @@ define mfactor(n, start_k, rept_loop, p_elim)
 		return q;
 	} else {
 		/* report this loop */
-		printf("at 2*%d*%d+1, cpu: %f\n",
+		printf("at 2*%d*%d+1, CPU: %f\n",
 			(q-1)/(2*n), n, usertime());
 		fflush(files(1));
 		loop = 0;
@@ -269,14 +269,14 @@ define mfactor(n, start_k, rept_loop, p_elim)
 		 */
 		if (rept_loop <= ++loop) {
 			/* report this loop */
-			printf("at 2*%d*%d+1, cpu: %f\n",
+			printf("at 2*%d*%d+1, CPU: %f\n",
 				(q-1)/(2*n), n, usertime());
 			fflush(files(1));
 			loop = 0;
 		}
 
 		/*
-		 * skip if divisable by a prime <= 449
+		 * skip if divisible by a prime <= 449
 		 *
 		 * The value 281 was determined by timing loops
 		 * which found that 281 was at or near the
@@ -285,7 +285,7 @@ define mfactor(n, start_k, rept_loop, p_elim)
 		 * The addition of the do { ... } while (factor(q, 449)>1);
 		 * loop reduced the factoring loop time (36504 k values with
 		 * the hset[] initialization time removed) from 25.69 sec to
-		 * 15.62 sec of CPU time on a 200Mhz r4k.
+		 * 15.62 sec of CPU time on a 200MHz r4k.
 		 */
 		do {
 			/*

cal/natnumset.cal

@@ -1,7 +1,7 @@
 /*
  * natnumset - functions for sets of natural numbers not exceeding a fixed bound
  *
- * Copyright (C) 1999  Ernest Bowen
+ * Copyright (C) 1999,2021  Ernest Bowen
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -76,7 +76,7 @@
  *	A \ B = set difference, integers in A but not in B
  *
  *	~A	= complement of A, integers not in A
- *	#A	= number ofintegers in A
+ *	#A	= number of integers in A
  *	!A	= 1 or 0 according as A is empty or not empty
  *	+A	= sum of the members of A
  *
@@ -100,7 +100,7 @@
  *	A >= B = (B <= A)
  *	A > B = (B < A)
  *
- * Expresssions may be formed from the above "arithmetic" operations in
+ * Expressions may be formed from the above "arithmetic" operations in
  * the usual way, with parentheses for variations from the usual precedence
  * rules.  For example
  *

cal/pell.cal

@@ -1,7 +1,7 @@
 /*
  * pell - solve Pell's equation
  *
- * Copyright (C) 1999  David I. Bell
+ * Copyright (C) 1999,2021  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -25,7 +25,7 @@
 
 /*
  * Solve Pell's equation; Returns the solution X to: X^2 - D * Y^2 = 1.
- * Type the solution to pells equation for a particular D.
+ * Type the solution to Pell's equation for a particular D.
  */
 
 

cal/poly.cal

@@ -1,7 +1,7 @@
 /*
  * poly - calculate with polynomials of one variable
  *
- * Copyright (C) 1999  Ernest Bowen
+ * Copyright (C) 1999,2021  Ernest Bowen
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -35,7 +35,7 @@
  *	variable has only one name.  For some purposes, a name like
  *	"sin(t)" or "(a + b)" or "\lambda" might be useful;
  *	names like "*" or "-27" are legal but might give expressions
- *	that are difficult to intepret.
+ *	that are difficult to interpret.
  *
  * Polynomial expressions may be constructed from numbers and the
  *	independent variable and other polynomials by the algebraic
@@ -43,7 +43,7 @@
  *	The operations // and % are defined to have the quotient and
  *	remainder meanings as usually defined for polynomials.
  *
- * When polynomials are assigned to idenfifiers, it is convenient to
+ * When polynomials are assigned to identifiers, it is convenient to
  *	think of the polynomials as values.  For example, p = (x - 1)^2
  *	assigns to p a polynomial value in the same way as q = (7 - 1)^2
  *	would assign to q a number value.  As with number expressions

cal/prompt.cal

@@ -1,7 +1,7 @@
 /*
- * prompt - eemonstration of some uses of prompt() and eval()
+ * prompt - demonstration of some uses of prompt() and eval()
  *
- * Copyright (C) 1999  Ernest Bowen
+ * Copyright (C) 1999,2021  Ernest Bowen
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -61,9 +61,9 @@
  * nothing to sum.  The last line returns the value 3, i.e. the last
  * non-null value found for the expressions separated by semicolons,
  * so sum will be increased by 3 after the "print sum^2;" command
- * is executed.	 xxx The terminating semicolon is essential in the
+ * is executed.	 XXX The terminating semicolon is essential in the
  * last two lines.  A command like eval("print 7;") is acceptable to
- * calc but eval("print 7") causes an exit from calc. xxx)
+ * calc but eval("print 7") causes an exit from calc. XXX)
  *
  * If the value returned is not a number (e.g. the name of a list or matrix,
  * or if the string has syntax errors as in "2 + ", in which case the
@@ -75,7 +75,7 @@
  *	"sin(x)", "x^2 + 3*x", "exp(x, 1e-5)".
  *
  * Values of the function so defined are returned for values of x
- * entered in reponse to the ? prompt.	Operation is terminated by
+ * entered in response to the ? prompt.	Operation is terminated by
  * entering "end", "exit" or "quit".
  */
 

cal/quat.cal

@@ -1,7 +1,7 @@
 /*
- * quat - alculate using quaternions of the form: a + bi + cj + dk
+ * quat - calculate using quaternions of the form: a + bi + cj + dk
  *
- * Copyright (C) 1999  David I. Bell
+ * Copyright (C) 1999,2021  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License

cal/randmprime.cal

@@ -1,7 +1,7 @@
 /*
  * randmprime - generate a random prime of the form h*2^n-1
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -45,9 +45,9 @@ randmprime(bits, seed, dbg)
     local n;		/* n as in h*2^n-1 */
     local h;		/* h as in h*2^n-1 */
     local plush;	/* value added to h since the beginning */
-    local init;		/* initial cpu time */
+    local init;		/* initial CPU time */
-    local start;	/* cpu time before last test */
+    local start;	/* CPU time before last test */
-    local stop;		/* cpu time afte last test */
+    local stop;		/* CPU time after last test */
     local tmp;		/* just a tmp place holder value */
     local ret;		/* h*2^n-1 that is prime */
 

cal/regress.cal

@@ -1,7 +1,7 @@
 /*
  * regress - calc regression and correctness test suite
  *
- * Copyright (C) 1999-2017  David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999-2017,2021  David I. Bell and Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -43,7 +43,7 @@ global prob;				/* libregress.cal problem counter */
 prob = 0;				/* clear problem counter */
 
 errcount(0),;				/* clear error count */
-errmax(-1),;				/* prevent errcount from abouting */
+errmax(-1),;				/* prevent errcount from aborting */
 
 global ecnt;				/* expected value of errcount() */
 ecnt = 0;				/* clear expected errcount() value */
@@ -356,8 +356,18 @@ define test_arithmetic()
 	vrfy(-16^-2 == -1/256,	'447: -16^-2 == -1/256');
 	vrfy(-7^2 == -49,	'448: -7^2 == -49');
 	vrfy(-3! == -6,		'449: -3! == -6');
+	vrfy(0^(0-0) == 1,	'450: 0^(0-0) == 1');
+	vrfy(0^(2-2) == 1,	'451: 0^(2-2) == 1');
+	vrfy(2^0 == 1,		'452: 2^0 == 1');
+	vrfy(2^(0-0) == 1,	'453: 2^(0-0) == 1');
+	vrfy(2^(2-2) == 1,	'454: 2^(2-2) == 1');
+	vrfy((2^23209-1)^0 == 1,	'455: (2^23209-1)^0 == 1');
+	vrfy((2^23209-1)^(0-0) == 1,	'456: (2^23209-1)^(0-0) == 1');
+	vrfy((2^23209-1)^(2-2) == 1,	'457: (2^23209-1)^(2-2) == 1');
+	vrfy((2^23209-1)^((2^23209-1)-(2^23209-1)) == 1,
+			'458: (2^23209-1)^((2^23209-1)-(2^23209-1)) == 1');
 
-	print '450: Ending test_arithmetic';
+	print '459: Ending test_arithmetic';
 }
 print '009: parsed test_arithmetic()';
 
@@ -453,7 +463,7 @@ define test_config()
 					'539: config("more", ">> ") == ";; "');
 	vrfy(config("all") == oldcfg,	'540: config("all") == oldcfg');
 
-	/* restore the configation at the start of this function */
+	/* restore the configuration at the start of this function */
 	vrfy(config("all",callcfg) == oldcfg,
 					'541: config("all",callcfg) == oldcfg');
 
@@ -1871,96 +1881,298 @@ define test_mode()
 	vrfy(tmp == "octal",		'1620: tmp == "octal"');
 	vrfy(base() == 2,		'1621: base() == 2');
 
-	tmp = config("mode", "real");
+	tmp = config("mode", "eng");
-	print				'1622: tmp = config("mode", "real")';
+	print				'1622: tmp = config("mode", "eng")';
 	vrfy(tmp == "binary",		'1623: tmp == "binary"');
+	vrfy(base() == 1000,		'1624: base() == 1000');
+
+	tmp = config("mode", "real");
+	print				'1625: tmp = config("mode", "real")';
+	vrfy(tmp == "engineering",	'1626: tmp == "engineering"');
 
 	tmp = base(1/3);
-	print				'1624: tmp = base(1/3)';
+	print				'1627: tmp = base(1/3)';
 	vrfy(config("mode") == "fraction",
-					'1625: config("mode") == "fraction"');
+					'1628: config("mode") == "fraction"');
 
 	tmp = base(-10);
-	print				'1626: tmp = base(-10)';
+	print				'1629: tmp = base(-10)';
 	vrfy(config("mode") == "integer",
-					'1627: config("mode") == "integer"');
+					'1630: config("mode") == "integer"');
 
 	tmp = base(10);
-	print				'1628: tmp = base(10)';
+	print				'1631: tmp = base(10)';
-	vrfy(config("mode") == "real",	'1629: config("mode") == "real"');
+	vrfy(config("mode") == "real",	'1632: config("mode") == "real"');
 
 	tmp = base(1e20);
-	print				'1630: tmp = base(1e20)';
+	print				'1633: tmp = base(1e20)';
 	vrfy(config("mode") == "scientific",
-					'1631: config("mode") == "scientific"');
+					'1634: config("mode") == "scientific"');
 
 	tmp = base(16);
-	print				'1632: tmp = base(16)';
+	print				'1635: tmp = base(16)';
 	vrfy(config("mode") == "hexadecimal", \
-		'1633: config("mode") == "hexadecimal"');
+		'1636: config("mode") == "hexadecimal"');
 
 	tmp = base(8);
-	print				'1634: tmp = base(8)';
+	print				'1637: tmp = base(8)';
-	vrfy(config("mode") == "octal", '1635: config("mode") == "octal"');
+	vrfy(config("mode") == "octal", '1638: config("mode") == "octal"');
 
 	tmp = base(2);
-	print				'1636: tmp = base(2)';
+	print				'1639: tmp = base(2)';
-	vrfy(config("mode") == "binary",'1637: config("mode") == "binary"');
+	vrfy(config("mode") == "binary",'1640: config("mode") == "binary"');
+
+	tmp = base(1000);
+	print				'1641: tmp = base(1000)';
+	vrfy(config("mode") == "engineering",
+		'1642: config("mode") == "engineering"');
+
+	tmp = base(1/3);
+	print				'1643: tmp = base(1/3)';
+	vrfy(str(0x80000000) == "2147483648", \
+		'1644: str(0x8000000) == \"2147483648\"');
+	vrfy(str(0xffffffff) == "4294967295", \
+		'1645: str(0xffffffff) == \"4294967295\"');
+	vrfy(str(3e9) == "3000000000", \
+		'1646: str(3e9) == \"3000000000\"');
+	vrfy(str(1/3) == "1/3", \
+		'1647: str(1/3) == \"1/3\"');
+	vrfy(str(2e8) == "200000000", \
+		'1648: str(2e8) == \"200000000"');
+	vrfy(str(200e6) == "200000000", \
+		'1649: str(200e6) == \"200000000"');
+	vrfy(str(0b100111) == "39", \
+		'1650: str(0b100111) == \"39"');
+	vrfy(str(07543) == "3939", \
+		'1651: str(07543) == \"3939"');
+	vrfy(str(7543) == "7543", \
+		'1652: str(7543) == \"7543"');
 
 	tmp = base(8);
-	print				'1638: tmp = base(8)';
+	print				'1653: tmp = base(8)';
 	vrfy(str(0x80000000) == "020000000000", \
-		'1639: str(0x8000000) == \"020000000000\"');
+		'1654: str(0x8000000) == \"020000000000\"');
 	vrfy(str(0xffffffff) == "037777777777", \
-		'1640: str(0xffffffff) == \"037777777777\"');
+		'1655: str(0xffffffff) == \"037777777777\"');
 	vrfy(str(3e9) == "026264057000", \
-		'1641: str(3e9) == \"026264057000\"');
+		'1656: str(3e9) == \"026264057000\"');
+	vrfy(str(1/3) == "1/3", \
+		'1657: str(1/3) == \"1/3\"');
+	vrfy(str(2e8) == "01372741000", \
+		'1658: str(2e8) == \"01372741000"');
+	vrfy(str(200e6) == "01372741000", \
+		'1659: str(200e6) == \"01372741000"');
+	vrfy(str(0b100111) == "047", \
+		'1660: str(0b100111) == \"047"');
+	vrfy(str(07543) == "07543", \
+		'1661: str(07543) == \"07543"');
+	vrfy(str(7543) == "016567", \
+		'1662: str(7543) == \"016567"');
 
 	tmp = base(16);
-	print				'1642: tmp = base(16)';
+	print				'1663: tmp = base(16)';
 	vrfy(str(0x80000000) == "0x80000000", \
-		'1643: str(0x8000000) == \"0x80000000\"');
+		'1664: str(0x8000000) == \"0x80000000\"');
 	vrfy(str(0xffffffff) == "0xffffffff", \
-		'1644: str(0xffffffff) == \"0xffffffff\"');
+		'1665: str(0xffffffff) == \"0xffffffff\"');
 	vrfy(str(3e9) == "0xb2d05e00", \
-		'1645: str(3e9) == \"0xb2d05e00\"');
+		'1666: str(3e9) == \"0xb2d05e00\"');
+	vrfy(str(1/3) == "1/3", \
+		'1667: str(1/3) == \"1/3\"');
+	vrfy(str(2e8) == "0xbebc200", \
+		'1668: str(2e8) == \"0xbebc200"');
+	vrfy(str(200e6) == "0xbebc200", \
+		'1669: str(200e6) == \"0xbebc200"');
+	vrfy(str(0b100111) == "0x27", \
+		'1670: str(0b100111) == \"0x27"');
+	vrfy(str(07543) == "0xf63", \
+		'1671: str(07543) == \"0xf63"');
+	vrfy(str(7543) == "0x1d77", \
+		'1672: str(7543) == \"0x1d77"');
+
+	tmp = base(2);
+	print				'1673: tmp = base(2)';
+	vrfy(str(0x80000000) == "0b10000000000000000000000000000000", \
+	    '1674: str(0x8000000) == \"0b10000000000000000000000000000000\"');
+	vrfy(str(0xffffffff) == "0b11111111111111111111111111111111", \
+	    '1675: str(0xffffffff) == \"0b11111111111111111111111111111111\"');
+	vrfy(str(3e9) == "0b10110010110100000101111000000000", \
+	    '1676: str(3e9) == \"0b10110010110100000101111000000000\"');
+	vrfy(str(1/3) == "1/0b11", \
+		'1677: str(1/3) == \"1/0b11\"');
+	vrfy(str(2e8) == "0b1011111010111100001000000000", \
+		'1678: str(2e8) == \"0b1011111010111100001000000000"');
+	vrfy(str(200e6) == "0b1011111010111100001000000000", \
+		'1679: str(200e6) == \"0b1011111010111100001000000000"');
+	vrfy(str(0b100111) == "0b100111", \
+		'1680: str(0b100111) == \"0b100111"');
+	vrfy(str(07543) == "0b111101100011", \
+		'1681: str(07543) == \"0b111101100011"');
+	vrfy(str(7543) == "0b1110101110111", \
+		'1682: str(7543) == \"0b1110101110111"');
+
+	tmp = base(1e20);
+	print				'1683: tmp = base(1e20)';
+	vrfy(str(0x80000000) == "2.147483648e9", \
+		'1684: str(0x8000000) == \"2.147483648e9\"');
+	vrfy(str(0xffffffff) == "4.294967295e9", \
+		'1685: str(0xffffffff) == \"4.294967295e9\"');
+	vrfy(str(3e9) == "3e9", \
+		'1686: str(3e9) == \"3e9\"');
+	vrfy(str(1/3) == "~3.33333333333333333333e-1", \
+		'1687: str(1/3) == \"~3.33333333333333333333e-1\"');
+	vrfy(str(2e8) == "2e8", \
+		'1688: str(2e8) == \"2e8"');
+	vrfy(str(200e6) == "2e8", \
+		'1689: str(200e6) == \"2e8"');
+	vrfy(str(0b100111) == "3.9e1", \
+		'1690: str(0b100111) == \"3.9e1"');
+	vrfy(str(07543) == "3.939e3", \
+		'1691: str(07543) == \"3.939e3"');
+	vrfy(str(7543) == "7.543e3", \
+		'1692: str(7543) == \"7.543e3"');
+
+	tmp = base(1000);
+	print				'1693: tmp = base(1000)';
+	vrfy(str(0x80000000) == "2.147483648e9", \
+		'1694: str(0x8000000) == \"2.147483648e9"');
+	vrfy(str(0xffffffff) == "4.294967295e9", \
+		'1695: str(0xffffffff) == \"4.294967295e9\"');
+	vrfy(str(3e9) == "3e9", \
+		'1696: str(3e9) == \"3e9\"');
+	vrfy(str(1/3) == "~333.33333333333333333333e-3", \
+		'1697: str(1/3) == \"~333.33333333333333333333e-3\"');
+	vrfy(str(2e8) == "200e6", \
+		'1698: str(2e8) == \"200e6"');
+	vrfy(str(200e6) == "200e6", \
+		'1699: str(200e6) == \"200e6"');
+	vrfy(str(0b100111) == "39", \
+		'1700: str(0b100111) == \"39"');
+	vrfy(str(07543) == "3.939e3", \
+		'1701: str(07543) == \"3.939e3"');
+	vrfy(str(7543) == "7.543e3", \
+		'1702: str(7543) == \"7.543e3"');
+
+	tmp = base(-10);
+	print				'1703: tmp = base(-10)';
+	vrfy(str(0x80000000) == "2147483648", \
+		'1704: str(0x8000000) == \"2147483648\"');
+	vrfy(str(0xffffffff) == "4294967295", \
+		'1705: str(0xffffffff) == \"4294967295\"');
+	vrfy(str(3e9) == "3000000000", \
+		'1706: str(3e9) == \"3000000000\"');
+	vrfy(str(1/3) == "~0", \
+		'1707: str(1/3) == \"~0\"');
+	vrfy(str(2e8) == "200000000", \
+		'1708: str(2e8) == \"200000000"');
+	vrfy(str(200e6) == "200000000", \
+		'1709: str(200e6) == \"200000000"');
+	vrfy(str(0b100111) == "39", \
+		'1710: str(0b100111) == \"39"');
+	vrfy(str(07543) == "3939", \
+		'1711: str(07543) == \"3939"');
+	vrfy(str(7543) == "7543", \
+		'1712: str(7543) == \"7543"');
 
 	tmp = base(10);
-	print				'1646: tmp = base(10)';
+	print				'1713: tmp = base(10)';
-	vrfy(config("mode") == "real", \
-		'1647: config("mode") == "real"');
-
 	vrfy(str(0x80000000) == "2147483648", \
-		'1648: str(0x80000000) == \"2147483648\"');
+		'1714: str(0x8000000) == \"2147483648\"');
 	vrfy(str(0xffffffff) == "4294967295", \
-		'1649: str(0xffffffff) == \"4294967295\"');
+		'1715: str(0xffffffff) == \"4294967295\"');
 	vrfy(str(3e9) == "3000000000", \
-		'1650: str(3e9) == \"3000000000\"');
+		'1716: str(3e9) == \"3000000000\"');
+	vrfy(str(1/3) == "~0.33333333333333333333", \
+		'1717: str(1/3) == \"~0.33333333333333333333"');
+	vrfy(str(2e8) == "200000000", \
+		'1718: str(2e8) == \"200000000"');
+	vrfy(str(200e6) == "200000000", \
+		'1719: str(200e6) == \"200000000"');
+	vrfy(str(0b100111) == "39", \
+		'1720: str(0b100111) == \"39"');
+	vrfy(str(07543) == "3939", \
+		'1721: str(07543) == \"3939"');
+	vrfy(str(7543) == "7543", \
+		'1722: str(7543) == \"7543"');
 
 	/* test base2() functionality */
-	vrfy(base2() == 0,		'1651: base2() == 0');
+	vrfy(base2() == 0,		'1723: base2() == 0');
-	vrfy(base2(0) == 0,		'1652: base2(0) == 0');
+	vrfy(base2(0) == 0,		'1724: base2(0) == 0');
-	vrfy(base2() == 0,		'1653: base2() == 0');
+	vrfy(base2() == 0,		'1725: base2() == 0');
-	vrfy(base2(16) == 0,		'1654: base2(16) == 0');
-	vrfy(base2() == 16,		'1655: base2() == 16');
-	vrfy(str(3e9) == "3000000000 /* 0xb2d05e00 */",
-		'1656: str(3e9) == "3000000000 /* 0xb2d05e00 */"');
-	vrfy(base2(1/3) == 16,		'1657: base2(16) == 16');
-	vrfy(str(23209) == "23209 /* 23209 */",
-		'1658: str(23209) == "23209 /* 23209 */"');
-	vrfy(str(3/2) == "1.5 /* 3/2 */",
-		'1659: str(3/2) == "1.5 /* 3/2 */"');
-	vrfy(base() == 10,		'1660: base() == 10');
-	vrfy(base2(0) == 1/3,		'1661: base2(0) == 1/3');
 
-	print '1662: Ending mode/base test';
+	vrfy(base2(16) == 0,		'1726: base2(16) == 0');
+	vrfy(base2() == 16,		'1727: base2() == 16');
+	vrfy(str(3e9) == "3000000000 /* 0xb2d05e00 */",
+		'1728: str(3e9) == "3000000000 /* 0xb2d05e00 */"');
+
+	vrfy(base2(1/3) == 16,		'1728: base2(16) == 16');
+	vrfy(base2() == 1/3,		'1729: base2() == 1/3');
+	vrfy(str(23209) == "23209 /* 23209 */",
+		'1730: str(23209) == "23209 /* 23209 */"');
+	vrfy(str(3/2) == "1.5 /* 3/2 */",
+		'1731: str(3/2) == "1.5 /* 3/2 */"');
+
+	vrfy(base2(8) == 1/3,		'1732: base2(8) == 1/3');
+	vrfy(base2() == 8,		'1733: base2() == 8');
+	vrfy(str(23209) == "23209 /* 055251 */",
+		'1734: str(23209) == "23209 /* 055251 */"');
+	vrfy(str(3/2) == "1.5 /* 3/2 */",
+		'1735: str(3/2) == "1.5 /* 3/2 */"');
+
+	vrfy(base2(2) == 8,		'1736: base2(2) == 8');
+	vrfy(base2() == 2,		'1737: base2() == 2');
+	vrfy(str(23209) == "23209 /* 0b101101010101001 */",
+		'1738: str(23209) == "23209 /* 0b101101010101001 */"');
+	vrfy(str(3/2) == "1.5 /* 0b11/0b10 */",
+		'1739: str(3/2) == "1.5 /* 0b11/0b10 */"');
+
+	vrfy(base2(1e20) == 2,		'1740: base2(1e20) == 2');
+	vrfy(base2() == 1e20,		'1741: base2() == 1e20');
+	vrfy(str(23209) == "23209 /* 2.3209e4 */",
+		'1742: str(23209) == "23209 /* 2.3209e4 */"');
+	vrfy(str(3/2) == "1.5 /* 1.5 */",
+		'1743: str(3/2) == "1.5 /* 1.5 */"');
+
+	vrfy(base2(-10) == 1e20,	'1744: base2(-10) == 1e20');
+	vrfy(base2() == -10,		'1745: base2() == -10');
+	vrfy(str(23209) == "23209 /* 23209 */",
+		'1746: str(23209) == "23209 /* 23209 */"');
+	vrfy(str(3/2) == "1.5 /* ~2 */",
+		'1747: str(3/2) == "1.5 /* ~2 */"');
+
+	vrfy(base2(1000) == -10,	'1748: base2(1000) == -1000');
+	vrfy(base2() == 1000,		'1749: base2() == 1000');
+	vrfy(str(23209) == "23209 /* 23.209e3 */",
+		'1750: str(23209) == "23209 /* 23.209e3 */"');
+	vrfy(str(3/2) == "1.5 /* 1.5 */",
+		'1751: str(3/2) == "1.5 /* 1.5 */"');
+
+	vrfy(base2(10) == 1000,		'1752: base2(10) == 1000');
+	vrfy(base2() == 10,		'1753: base2() == 10');
+	vrfy(str(23209) == "23209 /* 23209 */",
+		'1754: str(23209) == "23209 /* 23209 */"');
+	vrfy(str(3/2) == "1.5 /* 1.5 */",
+		'1755: str(3/2) == "1.5 /* 1.5 */"');
+
+	vrfy(base2(0) == 10,		'1756: base2(0) == 10');
+	vrfy(base2() == 0,		'1757: base2() == 0');
+	vrfy(str(23209) == "23209",
+		'1758: str(23209) == "23209"');
+	vrfy(str(3/2) == "1.5",
+		'1759: str(3/2) == "1.5"');
+
+	vrfy(base() == 10,		'1760: base() == 10');
+	vrfy(base2() == 0,		'1761: base2() == 0');
+
+	print '1762: Ending mode/base test';
 }
 print '026: parsed test_mode()';
 
 
 /*
- * The 1700's contain tests for reading resource files.	 These tests are
+ * The 1780's and 1790's contain tests for reading resource files.
- * done inline near the bottom.
+ *
+ * These tests are done inline near the bottom.
  */
 
 
@@ -3156,7 +3368,7 @@ print '047: parsed test_poly()';
 
 
 /*
- * test_det - more determinent testing
+ * test_det - more determinant testing
  */
 read -once "test3300";
 print '048: read -once test3300';
@@ -3227,9 +3439,9 @@ define test_error()
 
 	print '3600: Beginning test_error';
 
-	/* bump ecnt up by 148 */
+	/* bump ecnt up by 156 */
-	ecnt += 148;
+	ecnt += 156;
-	print				'3601: ecnt += 148';
+	print				'3601: ecnt += 156';
 
 	strx = "x";
 	print				'3602: strx = "x"';
@@ -3418,11 +3630,15 @@ define test_error()
 	n = 8191;
 	print				'3727: n = 8191';
 	/* test 3728 removed due to non-portable strerror() output */
+	vrfy(tan(2e9i) == error(10435),	'3729: tan(2e9i) == error(10435)');
+	vrfy(cot(2e9i) == error(10437),	'3730: cot(2e9i) == error(10437)');
+	vrfy(sec(2e9i) == error(10439),	'3731: sec(2e9i) == error(10439)');
+	vrfy(csc(2e9i) == error(10440),	'3732: csc(2e9i) == error(10440)');
 
 	/* errmax and errcount should be bumped up the 148 errors above */
-	vrfy(errcount() == ecnt,	'3729: errcount() == ecnt');
+	vrfy(errcount() == ecnt,	'3733: errcount() == ecnt');
 
-	print '3730: Ending test_error';
+	print '3734: Ending test_error';
 }
 print '054: parsed test_error()';
 
@@ -3469,7 +3685,7 @@ print '065: parsed test_param()';
 
 
 /*
- * test_noarg - test missing argment functionality
+ * test_noarg - test missing argument functionality
  */
 define test_noarg()
 {
@@ -4102,38 +4318,46 @@ define test_strprintf()
 			'4821: strprintf("%b", 27/29) == "0b11011/0b11101"');
 	vrfy(strprintf("%e", 12345) == "~1.23e4",
 			'4822: strprintf("%e", 12345) == "~1.23e4"');
+	vrfy(strprintf("%g", .385) == "~.38",
+			'4823: strprintf("%g", .385) == "~.38"');
+	vrfy(strprintf("%g", 385) == "~3.8e2",
+			'4824: strprintf("%g", 385) == "~3.8e2"');
 
 	/* mode tests with tilde == 0 */
 	c = config("tilde", 0);
-	print		'4823: c = config("tilde", 0)';
+	print		'4825: c = config("tilde", 0)';
 	vrfy(strprintf("%e", 12345) == "1.23e4",
-			'4824: strprintf("%e", 12345) == "1.23e4"');
+			'4826: strprintf("%e", 12345) == "1.23e4"');
 	vrfy(strprintf("%.3e", 12345) == "1.234e4",
-			'4825: strprintf("%.3e", 12345) == "1.234e4"');
+			'4827: strprintf("%.3e", 12345) == "1.234e4"');
 	vrfy(strprintf("%e", .00012345) == "1.23e-4",
-			'4826: strprintf("%e", .00012345) == "1.23e-4"');
+			'4828: strprintf("%e", .00012345) == "1.23e-4"');
 	vrfy(strprintf("%d %d", 27) == "27 ",
-			'4827: strprintf("%d %d", 27) == "27 "');
+			'4829: strprintf("%d %d", 27) == "27 "');
 	vrfy(strprintf("%d", 27, 29) == "27",
-			'4828: strprintf("%d", 27, 29) == "27"');
+			'4830: strprintf("%d", 27, 29) == "27"');
 	vrfy(strprintf("%r = %f", 27/29, 27/29) == "27/29 = .93",
-		'4829: strprintf("%r = %f", 27/29, 27/29) == "27/29 = .93"');
+		'4831: strprintf("%r = %f", 27/29, 27/29) == "27/29 = .93"');
 	vrfy(strprintf("%s", "abc") == "abc",
-		'4830: strprintf("%s", "abc") == "abc"');
+		'4832: strprintf("%s", "abc") == "abc"');
 	vrfy(strprintf("%f", "abc") == "abc",
-		'4831: strprintf("%f", "abc") == "abc"');
+		'4833: strprintf("%f", "abc") == "abc"');
 	vrfy(strprintf("%e", "abc") == "abc",
-		'4832: strprintf("%e", "abc") == "abc"');
+		'4834: strprintf("%e", "abc") == "abc"');
 	vrfy(strprintf("%5s", "abc") == "  abc",
-		'4833: strprintf("%5s", "abc") == "  abc"');
+		'4835: strprintf("%5s", "abc") == "  abc"');
 	vrfy(strprintf("%-5s", "abc") == "abc  ",
-		'4834: strprintf("%-5s", "abc") == "abc	 "');
+		'4836: strprintf("%-5s", "abc") == "abc	 "');
+	vrfy(strprintf("%g", .385) == ".38",
+			'4837: strprintf("%g", .385) == ".38"');
+	vrfy(strprintf("%g", 385) == "3.8e2",
+			'4838: strprintf("%g", 385) == "3.8e2"');
 
 	/* restore config */
 	c = config("all", callcfg);
-	print				    '4835: c = config("all", callcfg)';
+	print				    '4839: c = config("all", callcfg)';
 
-	print '4836: Ending test_strprintf';
+	print '4840: Ending test_strprintf';
 }
 print '088: parsed test_fileop()';
 
@@ -5171,7 +5395,7 @@ define test_size()
 			'5715: sizeof(17^139 + 674)*2 == sizeof(q)');
 
 	/*
-	 * recipricals are the same size of their integer inverses
+	 * reciprocals are the same size of their integer inverses
 	 */
 	q = 1/13;
 	print				  '5716: q = 1/13';
@@ -5249,7 +5473,7 @@ define test_size()
 
 	/*
 	 * size of a matrix is the sum of the sizes of the elements
-	 * sizeof of a matrix is the sum of the sizeofs of the elements
+	 * sizeof of a matrix is the sum of the sizeof's of the elements
 	 */
 	mat m[] = {z,q,c};
 	print				  '5752: mat m[] = {z,q,c}';
@@ -5369,7 +5593,7 @@ define test_is()
 {
 	local loc;	/* unassigned local variable */
 	local a;	/* assoc */
-	local ofd;	/* open file desriptor */
+	local ofd;	/* open file descriptor */
 	local cfd;	/* closed file descriptor */
 	local blk;	/* unnamed block */
 	local nblk;	/* named block */
@@ -5386,7 +5610,7 @@ define test_is()
 	local object;	/* object */
 	local rand;	/* rand seed */
 	local random;	/* random seed */
-	local real;	/* real non-intger value */
+	local real;	/* real non-integer value */
 	local prime;	/* odd prime */
 	local square;	/* square of an odd prime */
 	local string;	/* string */
@@ -7470,7 +7694,7 @@ print '190: parsed test_somenew()';
 
 
 /*
- * test_exponentiation - test new exponentiation functionaltiy
+ * test_exponentiation - test new exponentiation functionality
  */
 define test_exponentiation()
 {
@@ -7561,7 +7785,7 @@ define test_quit()
 	quit;
 	prob('quit did not end the test_quit() function');
 
-	/* 8400 serise continued after return, do not print end here */
+	/* 8400 series continued after return, do not print end here */
 }
 print '191: parsed test_quit()';
 
@@ -7613,31 +7837,31 @@ print;
 return test_mode();
 print;
 
-print '1700: Beginning read test';
+print '1780: Beginning read test';
 value = 0;
-vrfy(value == 0,		  '1701: value == 0');
+vrfy(value == 0,		  '1781: value == 0');
 read "test1700";
-print				  '1702: read "test1700";';
+print				  '1782: read "test1700";';
-vrfy(value == 1,		  '1703: value == 1');
+vrfy(value == 1,		  '1783: value == 1');
 read -once "test1700";
-print				  '1704: read -once "test1700";';
+print				  '1784: read -once "test1700";';
-vrfy(value == 1,		  '1705: value == 1');
+vrfy(value == 1,		  '1785: value == 1');
 read "test1700.cal";
-print				  '1706: read "test1700.cal";';
+print				  '1786: read "test1700.cal";';
-vrfy(value == 2,		  '1707: value == 2');
+vrfy(value == 2,		  '1787: value == 2');
-read -once "test1700.cal";
+read -once "test1700.cal"
-print				  '1708: read -once "test1700.cal";';
+print				  '1788: read -once "test1700.cal";';
-vrfy(value == 2,		  '1709: value == 2');
+vrfy(value == 2,		  '1789: value == 2');
 read "test1700.cal";
-print				  '1710: read "test1700.cal";';
+print				  '1790: read "test1700.cal";';
-vrfy(value == 3,		  '1711: value == 3');
+vrfy(value == 3,		  '1791: value == 3');
 {++value;} read "test1700.cal";
-print				  '1712: {++value;} read "test1700.cal";';
+print				  '1792: {++value;} read "test1700.cal";';
-vrfy(value == 5,		  '1713: value == 5');
+vrfy(value == 5,		  '1793: value == 5');
 {++value;} read -once "test1700.cal";
-print				  '1714: {++value;} read -once "test1700.cal";';
+print				  '1794: {++value;} read -once "test1700.cal";';
-vrfy(value == 6,		  '1715: value == 6');
+vrfy(value == 6,		  '1795: value == 6');
-print '1716: Ending read test';
+print '1796: Ending read test';
 
 print;
 return test_obj();
@@ -7862,7 +8086,7 @@ print	'8406: Ending test_quit';
 
 
 /*
- * test_divmod - psuedo-random tests on the // and % with various rounding modes
+ * test_divmod - pseudo-random tests on the // and % with various rounding modes
  */
 print;
 print '8500: Starting test of divmod'
@@ -7888,7 +8112,7 @@ vrfy(config("redecl_warn",0),	  '8651: config("redecl_warn",0)');
 vrfy(config("dupvar_warn",0),	  '8652: config("dupvar_warn",0)');
 vrfy(u_glob == 6,		  '8653: u_glob == 6');
 global u_glob = 555;
-print 				  '8654: reclare u_glob';
+print 				  '8654: declare u_glob';
 vrfy(u_glob == 555,		  '8655: u_glob == 555');
 define func_8650(u_glob) { local u_glob; return u_glob; }
 print				  '8656: u_glob as both local and parameter';
@@ -7916,7 +8140,7 @@ vrfy(dotest("set8700.line", 8703) == 0,
 
 
 /*
- * new exponentiation functionaltiy
+ * new exponentiation functionality
  */
 print;
 return test_exponentiation();
@@ -7932,8 +8156,8 @@ print '8901: read -once "test8900"';
 read -once "test8900";
 print '8902: about to run test8900(1,,8903)';
 testnum = test8900(1,,8903);
-print '8999: ecnt = 203;'
+print '8999: ecnt = 211;'
-ecnt = 203;
+ecnt = 211;
 /* 89xx: test calc resource functions by Christoph Zurnieden */
 
 
@@ -8062,7 +8286,7 @@ return test_functions2();
  *
  *	beer.cal	- prints a bunch of things when loaded
  *	hello.cal	- designed to go into an infinite loop
- *	lucal.cal	- already read by this file
+ *	lucas.cal	- already read by this file
  *	lucas_chk.cal	- already read by this file
  *	regress.cal	- this file
  *	surd.cal	- already read by this file

cal/specialfunctions.cal

@@ -1,7 +1,7 @@
 /*
  * specialfunctions - special functions (e.g.: gamma, zeta, psi)
  *
- * Copyright (C) 2013 Christoph Zurnieden
+ * Copyright (C) 2013,2021 Christoph Zurnieden
  *
  * Calc is open software; you can redistribute it and/or modify
  * it under the terms of the version 2.1 of the GNU Lesser General Public
@@ -442,8 +442,8 @@ define lngamma(z)
 			if (tmp2 < tmp) {
 			    return
 				newerror(strcat
-					 ("lngamma(1): something happend that ",
+					 ("lngamma(1): something happened ",
-					  "should not have happend"));
+					  "that shouldn't have happened"));
 			}
 		    }
 		}
@@ -519,8 +519,8 @@ define lngamma(z)
 			    if (tmp2 < tmp) {
 				return
 				    newerror(strcat
-					     ("lngamma(1): something happend ",
+					     ("lngamma(1): something happened ",
-					      "that should not have happend"));
+					      "that should not have happened"));
 			    }
 			}
 		    }
@@ -576,8 +576,8 @@ define lngamma(z)
 			    if (tmp2 < tmp) {
 				return
 				    newerror(strcat
-					     ("lngamma(1): something happend ",
+					     ("lngamma(1): something happened ",
-					      "that should not have happend"));
+					      "that should not have happened"));
 			    }
 			}
 		    }
@@ -1047,7 +1047,7 @@ define __CZ__ibeta_cf_var_dm(a, b, z, max)
 	}
     }
     if (m > max) {
-	return newerror("ibeta: continous fraction does not converge");
+	return newerror("ibeta: continuous fraction does not converge");
     }
     return f;
 }
@@ -1290,7 +1290,7 @@ define __CZ__erfinvapprox(x)
 	     - (2 / (pi() * a) + (ln(1 - x ^ 2)) / 2));
 }
 
-/* complementary inverse errror function, faster at about x < 1-.91
+/* complementary inverse error function, faster at about x < 1-.91
    Henry E. Fettis. "A stable algorithm for computing the inverse error function
    in the 'tail-end' region" Math. Comp., 28:585-587, 1974.
 */
@@ -1324,7 +1324,7 @@ define __CZ__fettiscf(y, n)
     return t / (1 + r);
 }
 
-/* inverse errror function, faster at about x<=.91*/
+/* inverse error function, faster at about x<=.91*/
 define __CZ__inverfbin(x)
 {
     local places approx flow fhigh eps high low mid fmid epsilon;
@@ -1370,7 +1370,7 @@ define erfinv(x)
 	x = -x;
 	flag = 1;
     }
-    /* No need for full pecision */
+    /* No need for full precision */
     eps = epsilon(1e-20);
     if (eps >= 1e-40) {
 	/* Winitzki, Sergei (6 February 2008). "A handy approximation for the

cal/statistics.cal

@@ -1,7 +1,7 @@
 /*
  * statistics - Some assorted statistics functions.
  *
- * Copyright (C) 2013 Christoph Zurnieden
+ * Copyright (C) 2013,2021 Christoph Zurnieden
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -106,7 +106,7 @@ define invbetainc_slow(x,a,b){
     GW Cran, KJ Martin, GE Thomas,
     Remark AS R19 and Algorithm AS 109:
     A Remark on Algorithms AS 63: The Incomplete Beta Integral
-    and AS 64: Inverse of the Incomplete Beta Integeral,
+    and AS 64: Inverse of the Incomplete Beta integral,
     Applied Statistics,
     Volume 26, Number 1, 1977, pages 111-114.
 

cal/test2600.cal

@@ -1,7 +1,7 @@
 /*
  * test2600 - 2600 series of the regress.cal test suite
  *
- * Copyright (C) 1999  Ernest Bowen and Landon Curt Noll
+ * Copyright (C) 1999,2021  Ernest Bowen and Landon Curt Noll
  *
  * Primary author:  Ernest Bowen
  *
@@ -50,7 +50,7 @@
  * of b in power(a, b, eps) is large, the computation required for
  * a test may be very heavy.
  *
- * Test funcations are called as:
+ * Test functions are called as:
  *
  *	testabc(str, ..., verbose)
  *

cal/test2700.cal

@@ -1,7 +1,7 @@
 /*
  * test2700 - 2700 series of the regress.cal test suite
  *
- * Copyright (C) 1999  Ernest Bowen and Landon Curt Noll
+ * Copyright (C) 1999,2021  Ernest Bowen and Landon Curt Noll
  *
  * Primary author:  Ernest Bowen
  *
@@ -84,7 +84,7 @@ define mkfrac() = rand(2) ? mkposfrac() : -mkposfrac();
 define mksquarereal() = mknonnegreal()^2;
 
 /*
- * We might be able to do better than the following.  For nonsquare
+ * We might be able to do better than the following.  For non-square
  * positive integer less than 1e6, could use:
  *		 x = rand(1, 1000);
  *		 return rand(x^2 + 1, (x + 1)^2);

cal/test5100.cal

@@ -1,7 +1,7 @@
 /*
  * test5100 - 5100 series of the regress.cal test suite
  *
- * Copyright (C) 1999  Ernest Bowen and Landon Curt Noll
+ * Copyright (C) 1999,2021  Ernest Bowen and Landon Curt Noll
  *
  * Primary author:  Ernest Bowen
  *
@@ -35,7 +35,7 @@ defaultverbose = 1;	/* default verbose value */
  * with zero value, when the definition is read.
  *
  * The variable a5100 is initialized with the value x if and when this
- * function is first called with a positive even x. The varable b5100
+ * function is first called with a positive even x. The variable b5100
  * is similarly initialized if and when this function is first called positive
  * odd x.
  *

cal/test8500.cal

@@ -1,7 +1,7 @@
 /*
  * test8500 - 8500 series of the regress.cal test suite
  *
- * Copyright (C) 1999  Ernest Bowen and Landon Curt Noll
+ * Copyright (C) 1999,2021  Ernest Bowen and Landon Curt Noll
  *
  * Primary author:  Ernest Bowen
  *
@@ -169,7 +169,7 @@ define divmod_8500(N = 10, M1 = 2^128, M2 = 2^64, testnum = 0)
 		}
 
 		/*
-		 * seelect one of the 32 rounding modes at random
+		 * select one of the 32 rounding modes at random
 		 */
 		rnd = rand(32);
 

cal/test8900.cal

@@ -1,7 +1,7 @@
 /*
  * test8900 - 8900 series of the regress.cal test suite
  *
- * Copyright (C) 2013 Christoph Zurnieden
+ * Copyright (C) 2013,2021 Christoph Zurnieden
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -26,7 +26,7 @@ static __CZ__eps = 1e-20;
 
 
 /*
- * load once, the calc resource functions contribued by Christoph Zurnieden
+ * load once, the calc resource functions contributed by Christoph Zurnieden
  */
 read -once bernpoly.cal;
 read -once brentsolve.cal;
@@ -45,7 +45,7 @@ read -once intnum.cal;
 /*
  * tests of correctness of the functions implemented by the above listed
  * author. All values tested against have been computed with at least two
- * independant algorithms where possible (indicated if not).
+ * independent algorithms where possible (indicated if not).
  */
 define t01()
 {
@@ -1649,7 +1649,7 @@ define t03()
 /*  test 04 tests polygamma(m,z) for the following values (m==0 gets computed
  *  by psi()).
  *  Values tested against were computed with Mathematica(TM) only
- *  (z in the left complex halfplane does not get computed yet)
+ *  (z in the left complex half plane does not get computed yet)
  */
 define t04()
 {
@@ -2057,7 +2057,12 @@ define t010()
 	epsilon(eps);
 	return 5;
     }
-    if ((stirling2(10, 5) - (42525)) != 0) {
+    /*
+     * Once, when an expression such as 0^(6-6) returned 0,
+     * then stirling2(10, 5) == 42525.  However when we made9
+     * 0^(6-6) == 0^0 == 1, then stirling2(10, 5) == 5102999/120.
+     */
+    if ((stirling2(10, 5) - (5102999/120)) != 0) {
 	epsilon(eps);
 	return 6;
     }

cal/toomcook.cal

@@ -1,7 +1,7 @@
 /*
  * toomcook - implementation of Toom-Cook(3,4) multiplication algorithm
  *
- * Copyright (C) 2013 Christoph Zurnieden
+ * Copyright (C) 2013,2021 Christoph Zurnieden
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -320,16 +320,16 @@ define toomcook4square(a){
 }
 
 /*
-  TODO: Implement the asymmetric variations
+ * TODO: Implement the asymmetric variations
-*/
+ */
 
 /*
-  produce_long_random_number(n) returns large pseudorandom numbers. Really large
+ * produce_long_random_number(n) returns large pseudo-random numbers.
-  numbers, e.g.:
+ * Really large numbers, e.g.:
-      produce_long_random_number(16)
+ *     produce_long_random_number(16)
-  is ca 4,128,561 bits (ca 1,242,821 dec. digits) large. Exact length is not
+ * is ca 4,128,561 bits (ca 1,242,821 dec. digits) large. Exact length is not
-  predeterminable because of the chaotic output of the function random().
+ * pre-determinable because of the chaotic output of the function random().
-*/
+ */
 define __CZ__produce_long_random_number(n)
 {
   local ret k;

cal/unitfrac.cal

@@ -1,7 +1,7 @@
 /*
- * unixfrac - represent a fraction as a sum of distince unit fractions
+ * unixfrac - represent a fraction as a sum of distance unit fractions
  *
- * Copyright (C) 1999  David I. Bell
+ * Copyright (C) 1999,2021  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License

cal/zeta2.cal

@@ -34,7 +34,7 @@ define hurwitzzeta(s,a){
   /*
     According to Linas Vepstas' "An efficient algorithm for accelerating
     the convergence of oscillatory series, useful for computing the
-    polylogarithm and Hurwitz zeta functions" the Euler-Maclaurin series
+    poly-logarithm and Hurwitz zeta functions" the Euler-Maclaurin series
     is the fastest in most cases.
 
     With a lot of help of the PARI/GP implementation by Prof. Henri Cohen,
@@ -78,7 +78,7 @@ define hurwitzzeta(s,a){
      print "limit = " limit;
      print "prec = " precision;
   }
-  /* Full precison plus 5 digits angstzuschlag*/
+  /* Full precision plus 5 digits angstzuschlag*/
   epsilon( (10^(-precision)) * 1e-5);
   tmp3=(a+limit_function+0.)^(-s);
   sum3 = tmp3/2;

calc.c

@@ -1,7 +1,8 @@
 /*
  * calc - arbitrary precision calculator
  *
- * Copyright (C) 1999-2013  David I. Bell, Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2013,2021  David I. Bell, Landon Curt Noll
+ *				 and Ernest Bowen
  *
  * Primary author:  David I. Bell
  *
@@ -25,7 +26,6 @@
  * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
  */
 
-
 #include <stdio.h>
 #include <signal.h>
 
@@ -65,6 +65,7 @@
 #include "lib_calc.h"
 #include "args.h"
 #include "zmath.h"
+#include "strl.h"
 
 #include "have_unistd.h"
 #if defined(HAVE_UNISTD_H)
@@ -84,6 +85,9 @@
 #include "have_unused.h"
 
 
+#include "banned.h"	/* include after system header <> includes */
+
+
 /*
  * S_FUNC definitions and functions
  */
@@ -104,6 +108,8 @@ main(int argc, char **argv)
 	int c;			/* option */
 	int index;
 	int maxindex;
+	/* fix gcc warning bug */
+	int unusedint = 0;
 	char *cp;
 	char *endcp;
 	char *bp;
@@ -117,6 +123,11 @@ main(int argc, char **argv)
 	 * parse args
 	 */
 	program = argv[0];
+	script_name = strdup(argv[0]);
+	if (script_name == NULL) {
+		fprintf(stderr, "%s: failed to strdup(argv[0])\n", program);
+		exit(1);
+	}
 
 	cmdbuf[0] = '\0';
 	cmdlen = 0;
@@ -278,7 +289,9 @@ main(int argc, char **argv)
 						    exit(6);
 						}
 						calc_debug = cp;
-						(void) strtol(cp, &endcp, 10);
+						/* fix gcc warning bug */
+						unusedint =
+						    strtol(cp, &endcp, 10);
 						cp = endcp;
 						if (*cp != '\0' &&
 						    *cp != ' ' && *cp != ':') {
@@ -310,7 +323,9 @@ main(int argc, char **argv)
 						    exit(9);
 						}
 						resource_debug = cp;
-						(void) strtol(cp, &endcp, 10);
+						/* fix gcc warning bug */
+						unusedint =
+						    strtol(cp, &endcp, 10);
 						cp = endcp;
 						if (*cp != '\0' &&
 						    *cp != ' ' && *cp != ':') {
@@ -340,7 +355,8 @@ main(int argc, char **argv)
 					    exit(12);
 					}
 					user_debug = cp;
-					(void) strtol(cp, &endcp, 10);
+					/* unusedint avoids gcc warning bug */
+					unusedint = strtol(cp, &endcp, 10);
 					cp = endcp;
 					if (*cp != '\0' && *cp != ' ') {
 						fprintf(stderr, "Bad syntax in"
@@ -365,14 +381,20 @@ main(int argc, char **argv)
 					havearg = TRUE;
 					if (cmdlen > 0)
 						cmdbuf[cmdlen++] = ' ';
-					strcpy(cmdbuf + cmdlen, "read ");
+					strlcpy(cmdbuf + cmdlen, "read ",
-					cmdlen += 5;
+						sizeof("read "));
-					if (strncmp(cp, "-once", 5) == 0 &&
+					cmdlen += sizeof("read ")-1;
-					    (cp[5] == '\0' || cp[5] == ' ')) {
+					cmdbuf[cmdlen] = '\0';
-						cp += 5;
+					if (strncmp(cp, "-once",
+						    sizeof("-once")) == 0 &&
+					    (cp[sizeof("-once")-1] == '\0' ||
+					     cp[sizeof("-once")-1] == ' ')) {
+						cp += sizeof("-once")-1;
 						haveendstr = (*cp == '\0');
-						strcpy(cmdbuf+cmdlen, "-once ");
+						strlcpy(cmdbuf+cmdlen, "-once ",
-						cmdlen += 6;
+							sizeof("-once "));
+						cmdlen += sizeof("-once ")-1;
+						cmdbuf[cmdlen] = '\0';
 						if (nextcp(&cp, &index, argc,
 							   argv, haveendstr)) {
 						    fprintf(stderr, "-f -once"
@@ -382,23 +404,39 @@ main(int argc, char **argv)
 						}
 					}
 					bp = cmdbuf + cmdlen;
+					/*
+					 * duplicate -f filename arg
+					 * as a new script_name value
+					 */
+					if (script_name != NULL) {
+						free(script_name);
+					}
+					script_name = NULL;
+					script_name = strdup(cp);
+					if (script_name == NULL) {
+						fprintf(stderr,
+							"strdup(-f argument)"
+							"failed\n");
+						exit(17);
+					}
+					/* process -f filename arg */
 					if (haveendstr) {
 						len = strlen(cp);
 						if (len == 0) {
 							fprintf(stderr,
 								"Null"
-								" filename!");
+								" filename!\n");
-							exit(17);
+							exit(18);
 						}
 						if (cmdlen + len + 2 > MAXCMD) {
 							fprintf(stderr,
 								"Commands too"
-								" long");
+								" long\n");
-							exit(18);
+							exit(19);
 						}
-						/* XXX What if *cp = '\''? */
+						/* XXX - what if *cp = '\''? */
 						*bp++ = '\'';
-						strncpy(bp, cp, len+1);
+						strlcpy(bp, cp, len+1);
 						bp += len;
 						*bp++ = '\'';
 						cp += len;
@@ -406,10 +444,10 @@ main(int argc, char **argv)
 					} else {
 						do {
 							if (cmdlen > MAXCMD) {
-								fprintf(stderr,
+							    fprintf(stderr,
-								   "Commands"
+							       "Commands"
-								   " too long");
+							       " too long\n");
-								exit(19);
+							    exit(20);
 							}
 							*bp++ =  *cp++;
 							cmdlen++;
@@ -420,8 +458,12 @@ main(int argc, char **argv)
 					if (*cp == ';')
 						cp++;
 					*bp++ = ';';
+					*bp = '\0';
 					cmdlen++;
-					s_flag = TRUE;	/* -f implies -s */
+
+					/* -f implies -s */
+					s_flag = TRUE;
+					maxindex = index + 1;
 					break;
 
 				case 's':
@@ -442,9 +484,9 @@ main(int argc, char **argv)
 		"\t[-O] [-p] [-q] [-s] [-u] [-v] "
 		"[--] [calc_cmd ...]\n"
 		"usage: %s ... -f filename\n"
-		"1st cscript line: #/path/to/calc ... -f\n",
+		"1st cscript line: #/path/to/calc ... -s -f\n",
 		program, program);
-					exit(20);
+					exit(21);
 			}
 			if (havearg)
 				break;
@@ -470,9 +512,10 @@ main(int argc, char **argv)
 			fprintf(stderr,
 				"%s: commands too long\n",
 				program);
-			exit(21);
+			exit(22);
 		}
-		strncpy(cmdbuf + cmdlen, cp, cplen+1);
+		strlcpy(cmdbuf + cmdlen, cp, cplen+1);
+		cmdbuf[newcmdlen] = '\0';
 		cmdlen = newcmdlen;
 		index++;
 		if (index < maxindex)
@@ -492,7 +535,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	argc_value = argc - maxindex;
+	argc_value = argc - maxindex + 1;
 	argv_value = argv + maxindex;
 
 	/*
@@ -721,8 +764,10 @@ main(int argc, char **argv)
 		printf("main: run_state = %s\n", run_state_name(run_state));
 
 	/*
-	 * all done
+	 * All done! - Jessica Noll, Age 2
 	 */
+	/* fix gcc warning bug */
+	unusedint++;
 	libcalc_call_me_last();
 	return (run_state == RUN_EXIT_WITH_ERROR ||
 		run_state == RUN_ZERO) ? 1 : 0;
@@ -737,7 +782,7 @@ main(int argc, char **argv)
  */
 /*ARGSUSED*/
 S_FUNC void
-intint(int UNUSED arg)
+intint(int UNUSED(arg))
 {
 	(void) signal(SIGINT, intint);
 	if (inputwait || (++abortlevel >= ABORT_NOW)) {
@@ -766,7 +811,7 @@ calc_interrupt(char *fmt, ...)
 	va_start(ap, fmt);
 	vsnprintf(calc_err_msg, MAXERROR, fmt, ap);
 	va_end(ap);
-	calc_err_msg[MAXERROR] = '\0';
+	calc_err_msg[MAXERROR] = '\0';	/* paranoia */
 	fprintf(stderr, "%s\n\n", calc_err_msg);
 	funcname = NULL;
 	if (calc_use_scanerr_jmpbuf != 0) {
@@ -778,7 +823,7 @@ calc_interrupt(char *fmt, ...)
 		 * don't call libcalc_call_me_last() -- we might loop
 		 * and besides ... this is an unusual internal error case
 		 */
-		exit(22);
+		exit(24);
 	}
 }
 

calc.h

@@ -1,7 +1,7 @@
 /*
  * calc - definitions for calculator program
  *
- * Copyright (C) 1999-2007,2014  David I. Bell
+ * Copyright (C) 1999-2007,2014,2021  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -48,6 +48,9 @@
 #define HOME		"HOME"		/* environment variable for home dir */
 #define PAGER		"PAGER"		/* environment variable for help */
 #define SHELL		"SHELL"		/* environment variable for shell */
+#define CALCHISTFILE	"CALCHISTFILE"	/* history file environment variable */
+#define CALCHELP	"CALCHELP"	/* help directory env variable */
+#define CALCCUSTOMHELP	"CALCCUSTOMHELP"/* custom help directory env variable */
 #define DEFAULTCALCBINDINGS "bindings"	/* default calc bindings file */
 #define DEFAULTCALCHELP "help"		/* help file that -h prints */
 #define DEFAULTSHELL	"sh"		/* default shell to use */
@@ -65,7 +68,6 @@
 
 #define SYMBOLSIZE	256	/* maximum symbol name size */
 #define MAXLABELS	100	/* maximum number of user labels in function */
-#define MAXSTRING	1024	/* maximum size of string constant */
 #define MAXSTACK	2048	/* maximum depth of evaluation stack */
 #define MAXFILES	20	/* maximum number of opened files */
 #define PROMPT1		"> "	/* default normal prompt*/
@@ -214,6 +216,7 @@ EXTERN int havecommands;	/* TRUE if have cmd args) */
 EXTERN char *program;	/* our name */
 EXTERN char *base_name;	/* basename of our name */
 EXTERN char cmdbuf[];	/* command line expression */
+EXTERN char *script_name;	/* program name or -f filename arg or NULL */
 
 EXTERN int abortlevel;	/* current level of aborts */
 EXTERN BOOL inputwait;	/* TRUE if in a terminal input wait */
@@ -230,8 +233,8 @@ EXTERN int no_env;	/* TRUE (-e) => ignore env vars on startup */
 EXTERN long errmax;	/* if >= 0, error when errcount exceeds errmax */
 EXTERN int use_old_std;	/* TRUE (-O) => use classic configuration */
 
-EXTERN int allow_read;	/* FALSE => dont open any files for reading */
+EXTERN int allow_read;	/* FALSE => don't open any files for reading */
-EXTERN int allow_write; 	/* FALSE => dont open any files for writing */
+EXTERN int allow_write; 	/* FALSE => don't open any files for writing */
 EXTERN int allow_exec;	/* FALSE => may not execute any commands */
 
 /*

calc.man

@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (C) 1999-2007,2014	Landon Curt Noll
+.\" Copyright (C) 1999-2007,2014,2018,2021	Landon Curt Noll
 .\"
 .\" Calc is open software; you can redistribute it and/or modify it under
 .\" the terms of the version 2.1 of the GNU Lesser General Public License
@@ -24,7 +24,7 @@
 .\" calculator by David I. Bell
 .\" man page by Landon Noll
 .\"
-.TH calc 1 "^..^" "2007-02-06"
+.TH calc 1 "^..^" "Share and enjoy!  :-)"
 .SH NAME
 calc \- arbitrary precision calculator
 .SH SYNOPSIS
@@ -37,6 +37,7 @@ calc \- arbitrary precision calculator
 .RB [ -D\ \&calc_debug[:resource_debug[:user_debug]] ]
 .br
 .RB [ \-e ]
+.RB [ \-f\ \&filename ]
 .RB [ \-h ]
 .RB [ \-i ]
 .RB [ \-m\ \&mode ]
@@ -50,11 +51,12 @@ calc \- arbitrary precision calculator
 .RB [ [\-\-]\ calc_cmd\ \&.\|.\|. ]
 .in -5n
 .sp
-\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-f\fP
+\fI#!${BINDIR}/calc\fP\ [optional_other_flags\ \&...] \fB\-f\fP
+
+.PP
+
 .SH DESCRIPTION
-\&
+
-.br
-CALC OPTIONS
 .PP
 
 .TP
@@ -138,7 +140,7 @@ calc -d "read qtime; qtime(2)"
 .fi
 .in -5n
 .sp 1
-will just say:
+will just print:
 .sp 1
 .in +5n
 .nf
@@ -148,6 +150,41 @@ It's nearly ten past six.
 .sp 1
 This flag disables the reporting of missing calc
 startup resource files.
+.sp 1
+
+This flag also disables the printing the leading tilde. For example:
+.sp 1
+.in +5n
+.nf
+calc 2/3
+.fi
+.in -5n
+.sp 1
+will print:
+.sp 1
+.in +5n
+.nf
+~0.66666666666666666667
+.fi
+.in -5n
+.sp 1
+.sp 1
+whereas:
+.sp 1
+.in +5n
+.nf
+calc -d 2/3
+.fi
+.in -5n
+.sp 1
+will just print:
+.sp 1
+.in +5n
+.nf
+0.66666666666666666667
+.fi
+.in -5n
+.sp 1
 
 .TP
 .BR -D " calc_debug[:resource_debug[:user_debug]]"
@@ -183,43 +220,55 @@ Ignore any environment variables on startup.
 The getenv() builtin will still return values, however.
 
 .TP
-.B \-f
+.BR \-f " filename"
+This flag is normally only with calc shell scripts.
+.sp 1
 This flag is required when using calc in
 .BR "shell script mode" .
 It must be at the end of the initial
 .B #!
-line of the script.
+line of the script, as in:
-.sp 1
-This flag is normally only at the end of a calc shell script.
-If the first line of an executable file begins
-.B #!
-followed by the absolute pathname of the
-.B calc
-program and the flag
-.B \-f
-as in:
 .sp 1
 .in +5n
 .nf
-\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-f\fP
+\fI#!${BINDIR}/calc\fP\ [optional_other_flags\ \&...] \fB\-f\fP
 .fi
 .in -5n
 .sp 1
 the rest of the file will be processed in
 .BR "shell script mode" .
+
+.sp 1
+A common flag to use, prior to the
+.B \-f
+on the #! line is the
+.B \-q
+flag.
+For example:
+.sp 1
+.in +5n
+.nf
+\fI#!${BINDIR}/calc\fP \fB\-q\fP \fB\-f\fP
+.fi
+.in -5n
+.sp 1
+This allows the script to run independely of
+startup scripts.
+
+.sp 1
 See
 .B "SHELL SCRIPT MODE"
 section of this man page
 below for details.
 .sp 1
-The actual form of this flag is:
+While the actual form of this flag is:
 .sp 1
 .in +5n
-.B \-f
+.BR \-f
 filename
 .in -5n
 .sp 1
-On systems that treat an executable that begins with
+for systems that treat an executable that begins with
 .B #!
 as a script, the path of the executable is appended by the kernel
 as the final argument to the exec() system call.
@@ -230,12 +279,13 @@ flag at the very end of the
 line.
 .sp 1
 It is possible use
-.B \-f\ filename
+.B \-f
+filename
 on the command line:
 .sp 1
 .in +5n
 .nf
-\fIcalc\fP\ [other_flags\ \&...] \fB\-f\fP filename
+\fIcalc\fP\ [optional_other_flags\ \&...] \fB\-f\fP filename
 .fi
 .in -5n
 .sp 1
@@ -243,18 +293,14 @@ This will cause calc to process lines in
 .B filename
 in
 .BR "shell script mode" .
+
 .sp 1
-Use of
+The use of
 .B \-f
-implies
+filename
-.BR \-s .
+implies the
-In addition,
+.B \-s
-.B \-d
+flag.
-and
-.B \-p
-are implied if
-.B \-i
-is not given.
 
 .TP
 .B \-h
@@ -441,16 +487,16 @@ This is useful when entering negative values on the command line as in:
 .in +5n
 .nf
 calc \-p \-\- \-1 - -7
-.sp 1
 .fi
 .in -5n
+.sp 1
 
 .PP
 
-\&
+.SH CALC COMMAND LINE
-.br
+
-CALC COMMAND LINE
 .PP
+
 With no
 .I calc_cmd
 arguments,
@@ -588,10 +634,10 @@ to parse interactive commands, flushes data on standard input.
 
 .PP
 
-\&
+.SH CALC STARTUP FILES
-.br
+
-CALC STARTUP FILES
 .PP
+
 Normally on startup,
 if the environment variable
 .B $CALCRC
@@ -628,10 +674,12 @@ files is also disabled as if
 .B \-q
 was given.
 
-\&
-.br
-CALC FILE SEARCH PATH
 .PP
+
+.SH CALC FILE SEARCH PATH
+
+.PP
+
 If the environment variable
 .B $CALCPATH
 is undefined, or if it
@@ -657,8 +705,8 @@ searches in succession:
 .sp 1
 .in +5n
 .nf
-./myfile
+\a./myfile
-./myfile.cal
+\a./myfile.cal
 ${LIBDIR}/myfile
 ${LIBDIR}/myfile.cal
 ${CUSTOMCALDIR}/myfile
@@ -708,36 +756,39 @@ help config
 .fi
 .in -5n
 .sp 1
+
 .PP
 
-\&
+.SH SHELL SCRIPT MODE
-.br
+
-SHELL SCRIPT MODE
 .PP
+
 If the first line of an executable file begins
 .B #!
 followed by the absolute pathname of the
 .B calc
-program and the flag
+program and the first line ends with the flag
 .B \-f
 as in:
 .sp 1
 .in +5n
 .nf
-\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-f\fP
+\fI#!${BINDIR}/calc\fP\ [optional_other_flags\ \&...] \fB\-f\fP
 .fi
 .in -5n
 .sp 1
 the rest of the file will be processed in
 .BR "shell script mode" .
 Note that
+.B \-s
 .B \-f
 must at the end of the initial ``#!'' line.
 Any other optional
-.B "other_flags"
+.B "optional_other_flags"
 must come before
 the
-.BR \-f .
+.B \-f
+flag.
 .sp 1
 In
 .B "shell script mode"
@@ -746,7 +797,7 @@ executed as if they were in a file being processed by a read
 command, except that a "command" beginning with '#' followed by
 whitespace and ending at the next newline is treated as a comment.
 Any optional
-.B "other_flags"
+.B "optional_other_flags"
 will be parsed first followed by
 the later lines within the script itself.
 .sp 1
@@ -769,17 +820,25 @@ the file
 .in +5n
 .nf
 \fI#!${BINDIR}/calc\fP\ \&\fB\-q\fP \fB\-f\fP
-#
+
-# mersenne - an example of a calc \fBshell script file\fP
+/* setup */
+argc = argv();
+program = argv(0);
+stderr = files(2);
 
 /* parse args */
-if (argv() != 1) {
+if (argc != 2) {
-    fprintf(files(2), "usage: %s exp\\n", config("program"));
+    fprintf(stderr, "usage: %s exp\n", program);
+    abort "must give one exponent arg";
+}
+exp = eval(argv(1));
+if (!isint(exp) || exp < 0) {
+    fprintf(stderr, "%s: exp must be non-negative integer\n", program);
     abort "must give one exponent arg";
 }
 
 /* print the mersenne number */
-print "2^": argv(0) : "-1 =", 2^eval(argv(0))-1;
+print "2^": exp : "-1 =", 2^exp-1;
 .fi
 .in -5n
 .sp 1
@@ -809,9 +868,9 @@ will print:
 .sp 1
 Note that because
 .B \-s
-is assumed in
+is required in
 .B "shell script mode"
-and non-dashed args are made available as
+non-dashed args are made available as
 strings via the
 .BR argv ()
 builtin function.
@@ -819,26 +878,27 @@ Therefore:
 .sp 1
 .in +5n
 .nf
-2^eval(argv(0))-1
+2^eval(argv(1))-1
 .fi
 .in -5n
 .sp 1
 will print the decimal value of 2^n-1
-but
+whereas
 .sp 1
 .in +5n
 .nf
-2^argv(0)-1
+2^argv(1)-1
 .fi
 .in -5n
 .sp 1
 will not.
+
 .PP
 
-\&
+.SH DATA TYPES
-.br
+
-DATA TYPES
 .PP
+
 Fundamental builtin data types include integers, real numbers,
 rational numbers, complex numbers and strings.
 .PP
@@ -861,12 +921,13 @@ help obj
 .br
 show objfuncs
 .in -1.0i
+
 .PP
 
-\&
+.SH VARIABLES
-.br
+
-VARIABLES
 .PP
+
 Variables in \fIcalc\fP are typeless.
 In other words, the fundamental type of a variable is determined by its content.
 Before a variable is assigned a value it has the value of zero.
@@ -889,12 +950,13 @@ help list
 .br
 show globals
 .in -1.0i
+
 .PP
 
-\&
+.SH INPUT/OUTPUT
-.br
+
-INPUT/OUTPUT
 .PP
+
 A leading ``0x'' implies a hexadecimal value,
 a leading ``0b'' implies a binary value,
 and a ``0'' followed by a digit implies an octal value.
@@ -924,12 +986,13 @@ command:
 .in 1.0i
 help file
 .in -1.0i
+
 .PP
 
-\&
+.SH CALC LANGUAGE
-.br
+
-CALC LANGUAGE
 .PP
+
 The \fIcalc\fP language is a C-like language.
 The language includes commands such as variable declarations,
 expressions, tests, labels, loops, file operations, function calls.
@@ -956,10 +1019,13 @@ help operator
 .br
 help config
 .in -1.0i
+
 .PP
+
 .SH FILES
-\&
+
-.br
+.PP
+
 .PD 0
 .TP 5
 ${BINDIR}/calc
@@ -1001,9 +1067,13 @@ custom resource files
 ${CUSTOMHELPDIR}/*
 custom help files
 .sp 1
+
+.PP
+
 .SH ENVIRONMENT
-\&
+
-.br
+.PP
+
 .PD 0
 .TP 5
 CALCPATH
@@ -1042,16 +1112,40 @@ Default value: binding
 This variable is not used if calc was compiled with GNU-readline support.
 In that case, the standard readline mechanisms (see readline(3)) are used.
 .sp
+.TP 5
+CALCHISTFILE
+Location of the calc history file.
+.sp
+Default value: ~/.calc_history
+.sp
+This variable is not used if calc was compiled with GNU-readline support.
+.sp
+.TP 5
+CALCHELP
+Location of the calc help directory.
+.sp
+Default value: ${HELPDIR}
+.sp
+.TP 5
+CALCCUSTOMHELP
+Location of the calc custom help directory.
+.sp
+Default value: ${CUSTOMHELPDIR}
+.sp
+
+.PP
+
 .SH CREDIT
-\&
+
-.br
+.PP
+
 The main chunk of
 .B calc
 was written by David I. Bell.
 .sp
 The
 .B calc
-primary mirror, calc mailing list and calc bug report
+primary mirror, and calc bug report
 processing is performed by Landon Curt Noll.
 .sp
 Landon Curt Noll maintains the master reference source, performs
@@ -1073,10 +1167,13 @@ public domain arbitrarily precision routines which was posted
 to the net around 1984.
 By now, there is almost no recognizable
 code left from that original source.
-.sp
+
+.PP
+
 .SH "COPYING / CALC GNU LESSER GENERAL PUBLIC LICENSE"
-\&
+
-.sp
+.PP
+
 Calc is open software, and is
 covered under version 2.1 of the GNU Lesser General Public License.
 You are
@@ -1130,107 +1227,130 @@ This man page is:
 .sp
 .in +0.5i
 .nf
-Copyright (C) 1999  Landon Curt Noll
+Copyright (C) 1999-2021  Landon Curt Noll
 .fi
 .in -0.5i
 .sp
 and is covered under version 2.1 GNU Lesser General
 Public License.
+
+.PP
+
+.SH "CALC QUESTIONS"
+
+.PP
+
+If you have a simple general question about calc, send Email to:
 .sp
-.SH "CALC MAILING LIST / CALC UPDATES / ENHANCEMENTS"
+.in +0.5i
-\&
+calc-quest-mail at asthe dot com
-.br
 .sp
-To contribute comments, suggestions, enhancements
+NOTE: Remove spaces and replace 'at' with @, and 'dot' with .
-and interesting
+.in -0.5i
-.B calc
-resource files, and
-shell scripts please join the calc-tester
-low volume moderated calc mailing list.
 .sp
-To the calc-tester mailing list, visit the following URL:
+.in +0.5i
+NOTE: Yes, the Email address uses 'asthe',
+while the web site uses 'isthe'.
+.in -0.5i
+.sp
+.B PLEASE
+put following the
+.B SPECIAL PHRASE
+somewhere in your Email Subject line:
+.sp
+.in +0.5i
+.B calc question
+.in -0.5i
+.sp
+You may add additional words to your subject line.
+.sp
+.B IMPORTANT:
+If your Email doesn't contain the above phrase,
+then we
+.B WILL NOT SEE
+your Email.
+.sp
+.B PLEASE BE SURE
+you have that
+.B SPECIAL PHRASE
+somewhere in the subject line!
+.sp
+.B Suggestion:
+.sp
+.in +0.5i
+From time to time, the Email address and Subject
+.B SPECIAL PHRASE
+may change so verify you have the current info by visiting:
 .sp
 .in +0.5i
 .nf
-https://www.listbox.com/subscribe/?list_id=239342
+http://www.isthe.com/chongo/tech/comp/calc/calc-question.html
 .fi
 .in -0.5i
-.sp
-To help determine you are a human and not just a spam bot,
-you will be required to provide the following additional information:
-.sp
-.in +0.5i
-.nf
-Your Name
-
-Calc Version
-   For example, the current version is: ${VERSION}
-
-Operating System
-   If you don't know your operating system, enter: unknown
-
-The date 7 days ago
-   Consult a calendar :-)
-.fi
 .in -0.5i
 .sp
-If you need a human to help you with your mailing list subscription,
+Please limit your questions to general questions about calc.
-or if you have problems with the above procedure, please
+We cannot go into great detail in our answers,
-send EMail to our special address:
+nor can we do your homework, nor can
+we do much more than answer short general questions about calc.
 .sp
-.in +0.5i
+Please be patient as we cannot always respond to Email messages quickly.
-.nf
-calc-tester-maillist-help at asthe dot com
 
-NOTE: Remove spaces and replace 'at' with @, 'dot' with .
+.PP
 
-NOTE: Yes, the EMail address uses 'asthe',
-      while the web site uses 'isthe'.
-.fi
-.in -0.5i
-.sp
-To be sure we see your EMail asking for help with your mailing list
-subscription, please use the following phase in your EMail Subject line
-your subject must contain the words:
-.sp
-.in +0.5i
-.nf
-calc tester mailing list help
-.fi
-.in -0.5i
-.sp
-You may have additional words in your subject line.
-.sp
 .SH "BUG REPORTS / BUG FIXES"
-\&
+
-.br
+.PP
-.sp
+
 Send bug reports and bug fixes to:
 .sp
 .in +0.5i
 .nf
-calc-bug-report at asthe dot com
+calc-bugrept at asthe dot com
-
-NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-
-NOTE: Yes, the EMail address uses 'asthe',
-      while the web site uses 'isthe'.
 .fi
+.sp
+NOTE: Remove spaces and replace 'at' with @, 'dot' with .
+.sp
+NOTE: Yes, the Email address uses 'asthe',
+while the web site uses 'isthe'.
 .in -0.5i
 .sp
-Your subject must contain the words:
+You
+.B MUST
+use following
+.B SPECIAL PHRASE
+in your Email Subject line:
+.sp
+.in +0.5i
+.B calc bug report
+.in -0.5i
+.sp
+You may add additional words to your subject line.
+.sp
+.B Suggestion:
+.sp
+.in +0.5i
+From time to time, the Email address and Subject
+.B SPECIAL PHRASE
+may change so verify you have the current info by visiting:
 .sp
 .in +0.5i
 .nf
-calc bug report
+http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
 .fi
 .in -0.5i
+.in -0.5i
 .sp
-You may have additional words in your subject line.
+.B IMPORTANT:
-.in
+If your Email doesn't contain the above phrase,
-However, you may find it more helpful to simply subscribe to the
+then we
-calc-tester mailing list (see above) and then to send your report
+.B WILL NOT SEE
-to that mailing list as a wider set calc testers may be able to help you.
+your Email.
+.sp
+.B PLEASE BE SURE
+you have that
+.B SPECIAL PHRASE
+somewhere in the subject line!
 .sp
 See the
 .I BUGS
@@ -1246,9 +1366,143 @@ help bugs
 .sp
 for more information about bug reporting.
 .sp
+Please be patient as we cannot always respond to Email messages quickly.
+
+.PP
+
+.SH "CONTRIBUTING CODE TO CALC"
+
+.PP
+
+.I Calc
+is open source.
+Contributions of code are welcome.
+.sp
+We welcome and encourage you to send us:
+.sp
+.sp
+.in +0.5i
+.nf
+* calc resource files (cal/*.cal)
+* calc shell scripts (cscript/*.calc)
+* builtin functions that you have modified or written, i.e.:
+  assocfunc.c comfunc.c func.c func.h
+  listfunc.c matfunc.c qfunc.c zfunc.c
+* custom functions that you have modified or written (custom/*)
+* help files modified or written (help/*)
+* brief description of you added, fixed, improved in CHANGES
+* regression test cases (cal/regress.cal)
+* Makefile improvements (Makefile, */Makefile)
+* other source code modifications (*.c, *.h)
+* etc. (* */* :) )
+.fi
+.in -0.5i
+.sp
+If you add functionality to calc, please be sure to modify/patch/add
+Makefiles, help files, cal/regress.cal test code as well.
+Regression test cases are vital to maintaining calc's level
+of correctness and helps us avoid code bug regression.
+.sp
+In order to consider integrating your code, we need:
+.sp
+.nf
+.in +0.5i
+* calc version you are working with (please try use the latest version)
+* new help files or help file patches, if applicable (documentation)
+* proposed text for the CHANGES file (brief description of what it does)
+* regress.cal test patch as needed
+* your source code and/or source code changes (:-))
+.in -0.5i
+.fi
+.sp
+The best way to send us new code, if your changes are small, is
+via a patch (diff -c from the latest alpha code to your code).
+If your change is large, you should send entire files (either
+as a diff -c /dev/null your-file patch, or as a uuencoded and
+gziped (or compressed) tar file).
+.sp
+Please try to generate a patch against the most recent
+version of calc, and if you use GitHub, the top of the
+master branch:
+.sp
+.nf
+.in +0.5i
+https://github.com/lcn2/calc
+.in -0.5i
+.fi
+.sp
+.sp
+The best way contribute to calc bug is to generate calc
+GitHub pull request:
+.sp
+.nf
+.in +0.5i
+https://github.com/lcn2/calc/pulls
+.in -0.5i
+.fi
+.sp
+Your code needs to be contributed under either the 2.1 of the
+.B GNU Lesser General Public License (LGPL 2.1)
+or be in the public domain.
+.sp
+If you do not want to use calc GitHub, then send EMail to:
+.sp
+.in +0.5i
+.nf
+calc-contrib at asthe dot com
+.fi
+.sp
+NOTE: Remove spaces and replace 'at' with @, 'dot' with .
+.sp
+NOTE: Yes, the Email address uses 'asthe',
+while the web site uses 'isthe'.
+.in -0.5i
+.sp
+You
+.B MUST
+use following
+.B SPECIAL PHRASE
+in your Email Subject line:
+.sp
+.in +0.5i
+.B calc contribution
+.in -0.5i
+.sp
+You may add additional words to your subject line.
+.sp
+.B Suggestion:
+.sp
+.in +0.5i
+From time to time, the Email address and Subject
+.B SPECIAL PHRASE
+may change so verify you have the current info by visiting:
+.sp
+.in +0.5i
+.nf
+http://www.isthe.com/chongo/tech/comp/calc/calc-contrib.html
+.fi
+.in -0.5i
+.in -0.5i
+.sp
+.B IMPORTANT:
+If your Email doesn't contain the above phrase,
+then we
+.B WILL NOT SEE
+your Email.
+.sp
+.B PLEASE BE SURE
+you have that
+.B SPECIAL PHRASE
+somewhere in the subject line!
+.sp
+Please be patient as we cannot always respond to Email messages quickly.
+
+.PP
+
 .SH "CALC WEB SITE"
-\&
+
-.br
+.PP
+
 Landon Noll maintains the
 .B calc
 web site is located at:

calc.spec.in

@@ -32,7 +32,7 @@
 Summary: Arbitrary precision calculator.
 Name: calc
 Version: <<<PROJECT_VERSION>>>
-Release: 12
+Release: 13
 License: LGPL
 Group: Applications/Engineering
 Source: http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.bz2
@@ -76,48 +76,48 @@ For the latest calc release, see the project home page:
 
 %build
 echo '-=- calc.spec beginning make clobber -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
      CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
      MANDIR=%{_mandir}/man1 EXT= V=@ clobber
 echo '-=- calc.spec ending make clobber -=-'
 echo '-=- calc.spec beginning make calc-static-only -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
      CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
      MANDIR=%{_mandir}/man1 EXT= V=@ calc-static-only BLD_TYPE=calc-static-only
 echo '-=- calc.spec ending make calc-static-only -=-'
 echo '-=- calc.spec beginning make rpm-hide-static -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
      CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
      MANDIR=%{_mandir}/man1 EXT= V=@ rpm-hide-static
 echo '-=- calc.spec ending make rpm-hide-static -=-'
 echo '-=- calc.spec beginning make clobber (again) -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
      CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
      MANDIR=%{_mandir}/man1 EXT= V=@ clobber
 echo '-=- calc.spec ending make clobber (again) -=-'
 echo '-=- calc.spec beginning make calc-dynamic-only -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
      CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
      MANDIR=%{_mandir}/man1 EXT= V=@ calc-dynamic-only \
      BLD_TYPE=calc-dynamic-only LD_SHARE=
 echo '-=- calc.spec ending make calc-dynamic-only -=-'
 echo '-=- calc.spec beginning make chk -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
      CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
      MANDIR=%{_mandir}/man1 EXT= V=@ chk
 echo '-=- calc.spec ending make chk -=-'
 echo '-=- calc.spec beginning make rpm-unhide-static -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
      CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
      MANDIR=%{_mandir}/man1 EXT= V=@ rpm-unhide-static
 echo '-=- calc.spec ending make rpm-unhide-static -=-'
 echo '-=- calc.spec beginning make rpm-clean-static -=-'
-make -j1 BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
      CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
      MANDIR=%{_mandir}/man1 EXT= V=@ rpm-clean-static
 echo '-=- calc.spec ending make rpm-clean-static -=-'
 echo '-=- calc.spec beginning make rpm-chk-static -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
      CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
      MANDIR=%{_mandir}/man1 EXT= V=@ rpm-chk-static
 echo '-=- calc.spec ending make rpm-chk-static -=-'
@@ -125,7 +125,7 @@ echo '-=- calc.spec ending make rpm-chk-static -=-'
 %install
 echo '-=- calc.spec beginning make install -=-'
 mkdir -p %{_buildroot}
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
      CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
      MANDIR=%{_mandir}/man1 EXT= V=@ install
 echo '-=- calc.spec ending make install -=-'
@@ -165,6 +165,12 @@ echo '-=- calc.spec beginning make clean -=-'
 %attr(644, root, root) %{_libdir}/libcustcalc.a
 
 %changelog
+* Sun Mar 24 2019 cLandon Curt Noll http://www.isthe.com/chongo
+- Release: 13
+- Disable compiling with the default ARCH_CFLAGS= -march=native
+  by clearking the ARCH_CFLAGS value in order to maximize
+  the RPM binary protability.
+
 * Mon Sep 01 2014 Landon Curt Noll http://www.isthe.com/chongo
 - Release: 12
 - Removed use of %{?_smp_mflags}.  On Ubuntu 14.04, the -j2

calcerr.tbl

@@ -451,6 +451,7 @@ E_FPATHOPEN1	Non-string arguments for fpathopen
 E_FPATHOPEN2	Unrecognized mode for fpathopen
 E_LOG1		Bad epsilon argument for log
 E_LOG2		Non-numeric first argument for log
+E_LOG3		Cannot calculate log for this value
 E_FGETFILE1	Non-file argument for fgetfile
 E_FGETFILE2	File argument for fgetfile not open for reading
 E_FGETFILE3	Unable to set file position in fgetfile
@@ -471,3 +472,27 @@ E_ISSPACE	Bad argument for isspace
 E_ISXDIGIT	Bad argument for isxdigit
 E_STRTOUPPER    Bad argument type for strtoupper
 E_STRTOLOWER    Bad argument type for strtolower
+E_TAN3		Invalid value for calculating the sin numerator for tan
+E_TAN4		Invalid value for calculating the cos denominator for tan
+E_COT3		Invalid value for calculating the sin numerator for cot
+E_COT4		Invalid value for calculating the cos denominator for cot
+E_SEC3		Invalid value for calculating the cos reciprocal for sec
+E_CSC3		Invalid value for calculating the sin reciprocal for csc
+E_TANH3		Invalid value for calculating the sinh numerator for tanh
+E_TANH4		Invalid value for calculating the cosh denominator for tanh
+E_COTH3		Invalid value for calculating the sinh numerator for coth
+E_COTH4		Invalid value for calculating the cosh denominator for coth
+E_SECH3		Invalid value for calculating the cosh reciprocal for sech
+E_CSCH3		Invalid value for calculating the sinh reciprocal for csch
+E_ASIN3		Invalid value for calculating asin
+E_ACOS3		Invalid value for calculating acos
+E_ASINH3	Invalid value for calculating asinh
+E_ACOSH3	Invalid value for calculating acosn
+E_ATAN3		Invalid value for calculating atan
+E_ACOT3		Invalid value for calculating acot
+E_ASEC3		Invalid value for calculating asec
+E_ACSC3		Invalid value for calculating acsc
+E_ATANH3	Invalid value for calculating atan
+E_ACOTH3	Invalid value for calculating acot
+E_ASECH3	Invalid value for calculating asec
+E_ACSCH3	Invalid value for calculating acsc

calcerr_c.awk

@@ -28,6 +28,8 @@ BEGIN {
     printf("#include <stdio.h>\n");
     printf("#include \"calcerr.h\"\n\n");
     printf("#include \"have_const.h\"\n\n");
+    printf("#include \"banned.h\"\t");
+    printf("/* include after system header <> includes */\n\n");
     printf("/*\n");
     printf(" * names of calc error values\n");
     printf(" */\n");

codegen.c

@@ -1,7 +1,7 @@
 /*
  * codegen - module to generate opcodes from the input tokens
  *
- * Copyright (C) 1999-2007,2017  David I. Bell and Ernest Bowen
+ * Copyright (C) 1999-2007,2017,2021  David I. Bell and Ernest Bowen
  *
  * Primary author:  David I. Bell
  *
@@ -34,6 +34,7 @@
 
 #include "lib_calc.h"
 #include "calc.h"
+#include "alloc.h"
 #include "token.h"
 #include "symbol.h"
 #include "label.h"
@@ -41,11 +42,16 @@
 #include "str.h"
 #include "func.h"
 #include "conf.h"
+#include "strl.h"
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
 # include <direct.h>
 #endif
 
+
+#include "banned.h"	/* include after system header <> includes */
+
+
 STATIC BOOL rdonce;	/* TRUE => do not reread this file */
 
 FUNC *curfunc;
@@ -144,11 +150,9 @@ getcommands(BOOL toplevel)
 				case 1:
 				case -1:
 					if(i == 1) {
-						strncpy(name,
+						strlcpy(name,
 							DEFAULTCALCHELP,
-							MAXCMD);
+							MAXCMD+1);
-						/* paranoia */
-						name[MAXCMD] = '\0';
 						givehelp(name);
 					}
 					break;
@@ -1021,7 +1025,7 @@ getstatement(LABEL *contlabel, LABEL *breaklabel,
 			return;
 		}
 		reread();
-		/* fall into default case */
+		/*FALLTHRU*/
 
 	default:
 		rescantoken();
@@ -1384,6 +1388,7 @@ creatematrix(void)
 		switch (gettoken()) {
 		case T_RIGHTBRACKET:
 			rescantoken();
+			/*FALLTHRU*/
 		case T_COMMA:
 			addop(OP_ONE);
 			addop(OP_SUB);
@@ -1394,6 +1399,7 @@ creatematrix(void)
 			switch(gettoken()) {
 			case T_RIGHTBRACKET:
 				rescantoken();
+				/*FALLTHRU*/
 			case T_COMMA:
 				continue;
 			}
@@ -2211,6 +2217,7 @@ getterm(void)
 				scanerror(T_NULL,
 					  "Function calls not allowed "
 					  "as expressions");
+				/*FALLTHRU*/
 			default:
 				rescantoken();
 			return type;
@@ -2248,7 +2255,7 @@ getidexpr(BOOL okmat, int autodef)
 		if (autodef != T_GLOBAL && autodef != T_LOCAL &&
 				autodef != T_STATIC)
 			autodef = 1;
-		/* fall into default case */
+		/*FALLTHRU*/
 	default:
 		rescantoken();
 		usesymbol(name, autodef);
@@ -2277,6 +2284,7 @@ getidexpr(BOOL okmat, int autodef)
 			scanerror(T_NULL,
 				  "Function calls not allowed "
 				  "as expressions");
+			/*FALLTHRU*/
 		default:
 			rescantoken();
 			return type;
@@ -2350,8 +2358,7 @@ getfilename(char *name, size_t namelen, BOOL *once)
 
 			/* use the value of the literal string */
 			s = findstring(tokenstring());
-			strncpy(name, s->s_str, namelen-1);
+			strlcpy(name, s->s_str, namelen);
-			name[namelen-1] = '\0';
 			sfree(s);
 			break;
 
@@ -2388,8 +2395,7 @@ getfilename(char *name, size_t namelen, BOOL *once)
 			}
 
 			/* return symbol name or value of global var string */
-			strncpy(name, symstr, namelen-1);
+			strlcpy(name, symstr, namelen);
-			name[namelen-1] = '\0';
 			break;
 
 		case T_NEWLINE:
@@ -2427,7 +2433,7 @@ getshowstatement(void)
 
 	switch (gettoken()) {
 	case T_SYMBOL:
-		strncpy(name, tokensymbol(), 4);
+		strlcpy(name, tokensymbol(), sizeof(name));
 		name[4] = '\0';
 		/* Yuck! */
 		arg = stringindex("buil\000"
@@ -2591,8 +2597,7 @@ getid(char *buf)
 		*buf = '\0';
 		return FALSE;
 	}
-	strncpy(buf, tokensymbol(), SYMBOLSIZE);
+	strlcpy(buf, tokensymbol(), SYMBOLSIZE+1);
-	buf[SYMBOLSIZE] = '\0';
 	return TRUE;
 }
 
@@ -2603,7 +2608,7 @@ getid(char *buf)
  * global or if symtype is static and the old variable is at the same
  * level.  Warnings are issued when a global or local variable is
  * redeclared and when in the same body the variable will be accessible only
- ^ with the appropriate specfier.
+ ^ with the appropriate specifier.
  */
 S_FUNC void
 definesymbol(char *name, int symtype)

comfunc.c

@@ -1,7 +1,7 @@
 /*
  * comfunc - extended precision complex arithmetic non-primitive routines
  *
- * Copyright (C) 1999-2007  David I. Bell and Ernest Bowen
+ * Copyright (C) 1999-2007,2021  David I. Bell and Ernest Bowen
  *
  * Primary author:  David I. Bell
  *
@@ -29,6 +29,10 @@
 #include "config.h"
 #include "cmath.h"
 
+
+#include "banned.h"	/* include after system header <> includes */
+
+
 /*
  * cache the natural logarithm of 10
  */
@@ -553,7 +557,7 @@ c_log(COMPLEX *c, NUMBER *epsilon)
 		/* first time call */
 		cln_10_epsilon = qcopy(epsilon);
 	} else if (qcmp(cln_10_epsilon, epsilon) == TRUE) {
-		/* replaced cacheed value with epsilon arg */
+		/* replaced cached value with epsilon arg */
 		qfree(cln_10_epsilon);
 		cln_10_epsilon = qcopy(epsilon);
 	} else if (cln_10 != NULL) {
@@ -1182,7 +1186,7 @@ comprint(COMPLEX *c)
 		return;
 	}
 	if (!qiszero(c->real) || qiszero(c->imag))
-		qprintnum(c->real, MODE_DEFAULT);
+		qprintnum(c->real, MODE_DEFAULT, conf->outdigits);
 	qtmp = c->imag[0];
 	if (qiszero(&qtmp))
 		return;
@@ -1192,7 +1196,7 @@ comprint(COMPLEX *c)
 		math_chr('-');
 		qtmp.num.sign = 0;
 	}
-	qprintnum(&qtmp, MODE_DEFAULT);
+	qprintnum(&qtmp, MODE_DEFAULT, conf->outdigits);
 	math_chr('i');
 }
 

commath.c

@@ -1,7 +1,7 @@
 /*
  * commath - extended precision complex arithmetic primitive routines
  *
- * Copyright (C) 1999-2007  David I. Bell
+ * Copyright (C) 1999-2007,2021  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -27,6 +27,9 @@
 #include "cmath.h"
 
 
+#include "banned.h"	/* include after system header <> includes */
+
+
 COMPLEX _czero_ =		{ &_qzero_, &_qzero_, 1 };
 COMPLEX _cone_ =		{ &_qone_, &_qzero_, 1 };
 COMPLEX _conei_ =		{ &_qzero_, &_qone_, 1 };

config.c

@@ -1,7 +1,7 @@
 /*
  * config - configuration routines
  *
- * Copyright (C) 1999-2007  David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999-2007,2021  David I. Bell and Landon Curt Noll
  *
  * Primary author:  David I. Bell
  *
@@ -46,6 +46,7 @@
 #endif
 
 #include "calc.h"
+#include "alloc.h"
 #include "token.h"
 #include "zrand.h"
 #include "block.h"
@@ -53,12 +54,17 @@
 #include "config.h"
 #include "str.h"
 #include "custom.h"
+#include "strl.h"
 
 #include "have_strdup.h"
 #if !defined(HAVE_STRDUP)
 # define strdup(x) calc_strdup((CONST char *)(x))
 #endif /* HAVE_STRDUP */
 
+
+#include "banned.h"	/* include after system header <> includes */
+
+
 /*
  * deal with systems that lack a defined CLK_TCK
  */
@@ -268,12 +274,15 @@ STATIC NAMETYPE modes[] = {
 	{"scientific",	MODE_EXP},
 	{"sci",		MODE_EXP},
 	{"exp",		MODE_EXP},
+	{"engineering",	MODE_ENG},
+	{"eng",		MODE_ENG},
 	{"hexadecimal", MODE_HEX},
 	{"hex",		MODE_HEX},
 	{"octal",	MODE_OCTAL},
 	{"oct",		MODE_OCTAL},
 	{"binary",	MODE_BINARY},
 	{"bin",		MODE_BINARY},
+	{"float-auto",	MODE_REAL_AUTO},
 	{"off",		MODE2_OFF},
 	{NULL,		0}
 };
@@ -756,7 +765,7 @@ setconfig(int type, VALUE *vp)
 			math_error("Cannot duplicate new prompt");
 			/*NOTREACHED*/
 		}
-		strncpy(p, vp->v_str->s_str, vp->v_str->s_len + 1);
+		strlcpy(p, vp->v_str->s_str, vp->v_str->s_len + 1);
 		free(conf->prompt1);
 		conf->prompt1 = p;
 		break;
@@ -771,7 +780,7 @@ setconfig(int type, VALUE *vp)
 			math_error("Cannot duplicate new more prompt");
 			/*NOTREACHED*/
 		}
-		strncpy(p, vp->v_str->s_str, vp->v_str->s_len + 1);
+		strlcpy(p, vp->v_str->s_str, vp->v_str->s_len + 1);
 		free(conf->prompt2);
 		conf->prompt2 = p;
 		break;
@@ -908,34 +917,42 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_PROGRAM:
 		math_error("The program config parameter is read-only");
 		/*NOTREACHED*/
+		abort();
 
 	case CONFIG_BASENAME:
 		math_error("The basename config parameter is read-only");
 		/*NOTREACHED*/
+		abort();
 
 	case CONFIG_WINDOWS:
 		math_error("The windows config parameter is read-only");
 		/*NOTREACHED*/
+		abort();
 
 	case CONFIG_CYGWIN:
 		math_error("The cygwin config parameter is read-only");
 		/*NOTREACHED*/
+		abort();
 
 	case CONFIG_COMPILE_CUSTOM:
 		math_error("The custom config parameter is read-only");
 		/*NOTREACHED*/
+		abort();
 
 	case CONFIG_ALLOW_CUSTOM:
 		math_error("The allow_custom config parameter is read-only");
 		/*NOTREACHED*/
+		abort();
 
 	case CONFIG_VERSION:
 		math_error("The version config parameter is read-only");
 		/*NOTREACHED*/
+		abort();
 
 	case CONFIG_BASEB:
 		math_error("The baseb config parameter is read-only");
 		/*NOTREACHED*/
+		abort();
 
 	case CONFIG_REDECL_WARN:
 		if (vp->v_type == V_NUM) {
@@ -970,10 +987,12 @@ setconfig(int type, VALUE *vp)
 	case CONFIG_HZ:
 		math_error("The clock tick rate config parameter is read-only");
 		/*NOTREACHED*/
+		abort();
 
 	default:
 		math_error("Setting illegal config parameter");
 		/*NOTREACHED*/
+		abort();
 	}
 }
 

config.h

@@ -1,7 +1,7 @@
 /*
  * config - configuration routines
  *
- * Copyright (C) 1999-2007,2014  Landon Curt Noll and David I. Bell
+ * Copyright (C) 1999-2007,2014,2021  Landon Curt Noll and David I. Bell
  *
  * Primary author:  Landon Curt Noll
  *
@@ -130,7 +130,7 @@ struct config {
 	LEN sq2;		/* size of number to use square algorithm 2 */
 	LEN pow2;		/* size of modulus to use REDC for powers */
 	LEN redc2;		/* size of modulus to use REDC algorithm 2 */
-	BOOL tilde_ok;		/* ok to print a tilde on aproximations */
+	BOOL tilde_ok;		/* ok to print a tilde on approximations */
 	BOOL tab_ok;		/* ok to print tab before numeric values */
 	LEN quomod;		/* quomod() default rounding mode */
 	LEN quo;		/* quotient // default rounding mode */
@@ -163,7 +163,7 @@ struct config {
 	BOOL *allow_custom;	/* ptr to if custom functions are allowed */
 	char *version;		/* calc version string */
 	int baseb;		/* base for calculations */
-	BOOL redecl_warn;	/* TRUE => warn of redeclating variables */
+	BOOL redecl_warn;	/* TRUE => warn of redeclaring variables */
 	BOOL dupvar_warn;	/* TRUE => warn of var name collisions */
 };
 typedef struct config CONFIG;

const.c

@@ -1,7 +1,7 @@
 /*
  * const - constant number storage module
  *
- * Copyright (C) 1999-2007  David I. Bell
+ * Copyright (C) 1999-2007,2021  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -28,6 +28,10 @@
 #include "calc.h"
 #include "qmath.h"
 
+
+#include "banned.h"	/* include after system header <> includes */
+
+
 #define CONSTALLOCSIZE 400	/* number of constants to allocate */
 
 STATIC unsigned long constcount;/* number of constants defined */

cscript/4dsphere.calc

@@ -1,7 +1,9 @@
-#!/usr/local/src/bin/calc/calc -q -s -f
+#!/usr/local/src/bin/calc/calc -q -f
 /*
  * 4dsphere - determine if 6 points lie on the surface of a sphere in R^4
  *
+ * Copyright (C) 2001,2014,2019,2021  Landon Curt Noll
+ *
  * usage:
  *      4dsphere x0 y0 z0 w0 x1 y1 z1 w1 ... x5 y5 z5 w5
  *
@@ -10,8 +12,6 @@
  *	...		...
  *      x5 y5 z5 w5	point 5 in R^4
  *
- * Copyright (C) 2001,2014  Landon Curt Noll
- *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
  * as published by the Free Software Foundation.
@@ -37,9 +37,11 @@
  * parse args
  */
 argc = argv();
-if (argc != 25) {
+stderr = files(2);
-    fprintf(files(2), "usage: %s x0 y0 z0 w0 x1 y1 z1 w1 ... x5 y5 z5 w5\n",
+program = argv(0);
-	argv(0));
+if (argc != 24) {
+    fprintf(stderr, "usage: %s x0 y0 z0 w0 x1 y1 z1 w1 ... x5 y5 z5 w5\n",
+		    program);
     exit;
 }
 x0 = eval(argv(1));

cscript/Makefile

@@ -1,7 +1,15 @@
 #
 # cscript - makefile for calc shell script files
 #
-# Copyright (C) 1999-2006,2014,2017  Landon Curt Noll
+# Copyright (C) 1999-2006,2014,2017,2021  Landon Curt Noll
+#
+# SRC: cscript/Makefile
+#
+#	The "# SRC: ... - ..." comment line above indicates
+#	the origin of this file.
+#
+# IMPORTANT: Please see the section on Makefiles near the
+#	     bottom of the HOWTO.INSTALL file.
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -27,15 +35,63 @@
 # Makefile by Landon Curt Noll
 
 
-# required vars
+# The shell used by this Makefile
+#
+# On some systems, /bin/sh is a rather reduced shell with
+# deprecated behavior.
+#
+# If your system has a up to date, bash shell, then
+# you may wish to use:
+#
+#	SHELL= /bin/bash
+#
+# On some systems such as macOS, the bash shell is very
+# far behind to the point where is cannot be depended on.
+# On such systems, the zsh may be a much better alternative
+# shell for this Makefile to use:
+#
+#	SHELL= /bin/zsh
 #
 SHELL= /bin/sh
+#SHELL= /bin/bash
+#SHELL= /bin/zsh
+
 
 ####
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
 ####
 
+# PREFIX - Top level location for calc
+#
+# The PREFIX is often prepended to paths within calc and calc Makefiles.
+#
+# Starting with calc v2.13.0.1, nearly all Makefile places that used
+# /usr/local now use ${PREFIX}.  An exception is the olduninstall rule
+# and, of course, this section. :-)
+#
+# NOTE: The ${PREFIX} is not the same as ${T}.  The ${T} specifies
+#	a top level directory under which calc installs things.
+#	While usually ${T} is empty, it can be specific path
+#	as if calc where "chrooted" during an install.
+#	The ${PREFIX} value, during install, is a path between
+#	the top level ${T} install directory and the object
+#	such as an include file.
+#
+# NOTE: See also, ${T}, below.
+#
+# There are some paths that do NOT call under ${PREFIX}, such as
+# ${CALCPATH}, that include paths not under ${PREFIX}, but those
+# too are exceptions to this general rule.
+#
+# When in doubt, try:
+#
+#	PREFIX= /usr/local
+#
+PREFIX= /usr/local
+#PREFIX= /usr
+#PREFIX= /usr/global
+
 # Normally certain files depend on the Makefile.  If the Makefile is
 # changed, then certain steps should be redone.  If MAKE_FILE is
 # set to Makefile, then these files will depend on Makefile.  If
@@ -65,11 +121,11 @@ TOP_MAKE_FILE= Makefile
 #	INCDIR= /usr/include
 #
 
-#INCDIR= /usr/local/include
+#INCDIR= ${PREFIX}/include
 #INCDIR= /dev/env/DJDIR/include
 INCDIR= /usr/include
 
-# where to install calc realted things
+# where to install calc related things
 #
 # ${BINDIR}		where to install calc binary files
 # ${LIBDIR}		where calc link library (*.a) files are installed
@@ -91,15 +147,15 @@ INCDIR= /usr/include
 #	LIBDIR= /usr/lib
 #	CALC_SHAREDIR= /usr/share/calc
 #
-#BINDIR= /usr/local/bin
+#BINDIR= ${PREFIX}/bin
 #BINDIR= /dev/env/DJDIR/bin
 BINDIR= /usr/bin
 
-#LIBDIR= /usr/local/lib
+#LIBDIR= ${PREFIX}/lib
 #LIBDIR= /dev/env/DJDIR/lib
 LIBDIR= /usr/lib
 
-#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= ${PREFIX}/lib/calc
 #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
 CALC_SHAREDIR= /usr/share/calc
 
@@ -157,28 +213,59 @@ T=
 
 # Makefile debug
 #
-# Q=@	do not echo internal makefile actions (quiet mode)
+# Q=@	do not echo internal Makefile actions (quiet mode)
-# Q=	echo internal makefile actions (debug / verbose mode)
+# Q=	echo internal Makefile actions (debug / verbose mode)
+#
+# H=@:	do not report hsrc file formation progress
+# H=@	do echo hsrc file formation progress
+#
+# S= >/dev/null 2>&1	slience ${CC} output during hsrc file formation
+# S=			full ${CC} output during hsrc file formation
+#
+# E= 2>/dev/null	slience command stderr during hsrc file formation
+# E=			full command stderr during hsrc file formation
+#
+# V=@:	do not echo debug statements (quiet mode)
+# V=@	do echo debug statements (debug / verbose mode)
 #
 #Q=
 Q=@
+#
+S= >/dev/null 2>&1
+#S=
+#
+E= 2>/dev/null
+#E=
+#
+#H=@:
+H=@
+#
+V=@:
+#V=@
 
 # standard tools
 #
+CAT= cat
 CHMOD= chmod
+CMP= cmp
+CO= co
+CP= cp
+FMT= fmt
+MKDIR= mkdir
+MV= mv
+RM= rm
+RMDIR= rmdir
 SED= sed
 SORT= sort
-FMT= fmt
-CMP= cmp
-MKDIR= mkdir
-RMDIR= rmdir
-RM= rm
 TOUCH= touch
-MV= mv
-CP= cp
-CO= co
 TRUE= true
 
+# NOTE: On some shells, echo is a builtin that does
+#	not understand -n, so we call /bin/echo -n
+#	directly to get around such shells.
+#
+ECHON= /bin/echo -n
+
 # The ${SCRIPT} list is the list of calc shell script files (without the .calc
 # extension) which will be installed.
 #
@@ -188,18 +275,17 @@ TRUE= true
 # To add a script:
 #
 #	1) Name the file with a .calc filename extension
-#	2) Place that file under RCS control
+#	2) Add the name, without the .calc extension to the ${SCRIPT} below
-#	3) Add the name, without the .calc extension to the ${SCRIPT} below
+#	3) Write out this Makefile
-#	4) Write out this Makefile
+#	4) Replace the SCRIPT= and SCRIPT_SRC= lines with the output of:
-#	5) Replace the ${SCRIPT} and ${SCRIPT_SRC} lines with the output of:
 #
 #		make detaillist
 #
-SCRIPT= 4dsphere fproduct mersenne piforever plus powerterm \
+SCRIPT= 4dsphere fproduct mersenne piforever plus powerterm simple \
-	simple square
+	square
 
-SCRIPT_SRC= 4dsphere.calc fproduct.calc mersenne.calc \
+SCRIPT_SRC= 4dsphere.calc fproduct.calc mersenne.calc piforever.calc \
-	piforever.calc plus.calc powerterm.calc simple.calc square.calc
+	plus.calc powerterm.calc simple.calc square.calc
 
 # These files are found (but not built) in the distribution
 #
@@ -263,11 +349,7 @@ detaillist:
 	${Q} -(echo "xxxxxxx"; \
 	   for i in ${SCRIPT} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
-		if [ ! -f RCS/$$i.calc,v ]; then \
+		echo $$i; \
-		    echo "WARNING: $$i.calc not under RCS control" 1>&2; \
-		else \
-		    echo $$i; \
-		fi; \
 	    fi; \
 	done | LANG=C ${SORT}) | ${FMT} -70 | \
 	    ${SED} -e '1s/xxxxxxx/SCRIPT=/' -e '2,$$s/^/	/' \
@@ -276,11 +358,7 @@ detaillist:
 	${Q} -(echo "xxxxxxxxxxx"; \
 	    for i in ${SCRIPT} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
-		if [ ! -f RCS/$$i.calc,v ]; then \
+		echo $$i.calc; \
-		    echo "WARNING: $$i.calc not under RCS control" 1>&2; \
-		else \
-		    echo $$i.calc; \
-		fi; \
 	    fi; \
 	done | LANG=C ${SORT}) | ${FMT} -70 | \
 	    ${SED} -e '1s/xxxxxxxxxxx/SCRIPT_SRC=/' -e '2,$$s/^/	/' \
@@ -291,7 +369,7 @@ detaillist:
 # Home grown make dependency rules.  Your system make not support
 # or have the needed tools.  You can ignore this section.
 #
-# We will form a skelaton tree of *.c files containing only #include "foo.h"
+# We will form a skeleton tree of *.c files containing only #include "foo.h"
 # lines and .h files containing the same lines surrounded by multiple include
 # prevention lines.  This allows us to build a static depend list that will
 # satisfy all possible cpp symbol definition combinations.
@@ -311,7 +389,7 @@ depend:
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo "$$i: $$i.calc"; \
 		echo '	@$${RM} -f $$@'; \
-		echo -n '	@$${SED} -e "1s:^#!/usr/local/src/bin/'; \
+		${ECHON} '	@$${SED} -e "1s:^#!/usr/local/src/bin/'; \
 		echo 'calc/calc:#!$${BINDIR}/calc:" $$?>$$@'; \
 		echo '	@$${CHMOD} +x $$@'; \
 	    fi; \
@@ -326,20 +404,13 @@ depend:
 	${Q} ${CAT} makedep.out >> ${MAKE_FILE}
 	${Q} ${RM} -f makedep.out
 	-${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \
-	    echo 'sample ${MAKE_FILE} was already up to date'; \
+	    echo 'cscript/${MAKE_FILE} was already up to date'; \
+	    echo 'restoring original cscript/${MAKE_FILE}'; \
 	    ${MV} -f ${MAKE_FILE}.bak ${MAKE_FILE}; \
 	else \
-	    ${RM} -f ${MAKE_FILE}.tmp; \
+	    echo 'old cscript/${MAKE_FILE} is now cscript/${MAKE_FILE}.bak'; \
-	    ${MV} ${MAKE_FILE} ${MAKE_FILE}.tmp; \
+	    echo 'new cscript/${MAKE_FILE} formed'; \
-	    if [ -d RCS -a ! -w "${MAKE_FILE}" ]; then \
+	    echo 'try: diff -u cscript/${MAKE_FILE}.bak cscript/${MAKE_FILE}'; \
-		${CO} -l ${MAKE_FILE}; \
-	    fi; \
-	    ${MV} ${MAKE_FILE}.tmp ${MAKE_FILE}; \
-	    if [ -d RCS ]; then \
-		echo '******************************************************'; \
-		echo 'new cscript ${MAKE_FILE} formed -- need to check it in'; \
-		echo '******************************************************'; \
-	    fi; \
 	fi
 
 ##

cscript/README.src

@@ -52,37 +52,6 @@ For more info, see:
 
 #####
 
-If you write something that you think is useful, please join the
-low volume calc mailing list calc-tester.  Then send your contribution
-to the calc-tester mailing list.
-
-To subscribe to the calc-tester mailing list, visit the following URL:
-
-	http://www.isthe.com/chongo/tech/comp/calc/calc-tester.html
-
-    This is a low volume moderated mailing list.
-
-    This mailing list replaces calc-tester at asthe dot com list.
-
-    If you need a human to help you with your mailing list subscription,
-    please send EMail to our special:
-
-	calc-tester-maillist-help at asthe dot com
-
-	NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-
-    address.  To be sure we see your EMail asking for help with your
-    mailing list subscription, please use the following phase in your
-    EMail Subject line:
-
-	calc tester mailing list help
-
-    That phrase in your subject line will help ensure your
-    request will get past our anti-spam filters.  You may have
-    additional words in your subject line.
-
-=-=
-
 4dsphere
 
     Determine if 6 points lie on the surface of a 4-dimensional sphere in R^4.
@@ -107,7 +76,7 @@ mersenne exp
 
 piforever
 
-    Print the value of pi forever, or as long as you cpu / memory allows.
+    Print the value of pi forever, or as long as you CPU / memory allows.
 
 
 plus arg ...
@@ -125,7 +94,7 @@ simple
 
     A trivial example of a calc shell script.
 
-## Copyright (C) 1999,2014  Landon Curt Noll
+## Copyright (C) 1999,2014,2021  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

cscript/fproduct.calc

@@ -1,15 +1,15 @@
-#!/usr/local/src/bin/calc/calc -q -s -f
+#!/usr/local/src/bin/calc/calc -q -f
 /*
  * fproduct - write the big Endian product of terms to a file
  *
+ * Copyright (C) 2001,2014,2019,2021  Landon Curt Noll
+ *
  * usage:
  *	fproduct filename term [term ...]
  *
  *	filename	where to write the product, use - for stdout
  *	term ...	terms to multiply
  *
- * Copyright (C) 2001,2014  Landon Curt Noll
- *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
  * as published by the Free Software Foundation.
@@ -35,8 +35,10 @@
  * parse args
  */
 argc = argv();
+stderr = files(2);
+program = argv(0);
 if (argc < 2) {
-    fprintf(files(2), "usage: %s term [term ...]\n", argv(0));
+    fprintf(stderr, "usage: %s term [term ...]\n", program);
     exit;
 }
 filename = argv(1);

cscript/mersenne.calc

@@ -1,8 +1,8 @@
-#!/usr/local/src/bin/calc/calc -q -s -f
+#!/usr/local/src/bin/calc/calc -q -f
 /*
  * mersenne - print the value of a mersenne number
  *
- * Copyright (C) 1999-2007,2014  Landon Curt Noll
+ * Copyright (C) 1999-2007,2014,2019,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -32,16 +32,19 @@
 /*
  * parse args
  */
-if (argv() != 2) {
+argc = argv();
-	/* we include the name of this script in the error message */
+stderr = files(2);
-	fprintf(files(2), "usage: %s exp\n", config("program"));
+program = argv(0);
-	abort "wrong number of args";
+if (argc != 2) {
+    /* we include the name of this script in the error message */
+    fprintf(stderr, "usage: %s exp\n", program);
+    abort "wrong number of args";
 }
 
-global n = eval(argv(1));
+n = eval(argv(1));
 
 if (!isint(n) || n <= 0) {
-	quit "Argument to be a positive integer";
+    quit "Argument to be a positive integer";
 }
 
 /*

cscript/piforever.calc

@@ -1,8 +1,8 @@
 #!/usr/local/src/bin/calc/calc -q -f
 /*
- * piforever - print digits of pi forever (or as long as your mem/cpu allow)
+ * piforever - print digits of pi forever (or as long as your mem/CPU allow)
  *
- * Copyright (C) 1999-2007,2014  Landon Curt Noll
+ * Copyright (C) 1999-2007,2014,2019,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License

cscript/plus.calc

@@ -2,7 +2,7 @@
 /*
  * plus - add two or more arguments together
  *
- * Copyright (C) 1999-2007,2014  Landon Curt Noll
+ * Copyright (C) 1999-2007,2014,2019,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -32,10 +32,13 @@
 /*
  * parse args
  */
-if (argv() < 2) {
+argc = argv();
-	/* we include the name of this script in the error message */
+stderr = files(2);
-	fprintf(files(2), "usage: %s value ...\n", config("program"));
+program = argv(0);
-	abort "not enough args";
+if (argc < 2) {
+    /* we include the name of this script in the error message */
+    fprintf(stderr, "usage: %s value ...\n", program);
+    abort "not enough args";
 }
 
 /*
@@ -44,7 +47,7 @@ if (argv() < 2) {
  * Since args are strings, we must eval them before using them numerically.
  */
 sum = 0;
-for (i=1; i < argv(); ++i) {
+for (i=1; i < argc; ++i) {
-	sum += eval(argv(i));
+    sum += eval(argv(i));
 }
 print sum;

cscript/powerterm.calc

@@ -1,14 +1,22 @@
-#!/usr/local/src/bin/calc/calc -q -s -f
+#!/usr/local/src/bin/calc/calc -q -f
 /*
  * powerterm - print the argument as a sum of powers of integers
  *
+ * Copyright (C) 2001,2014,2019,2021  Landon Curt Noll
+ *
  * usage:
  *      powerterm [base_limit] value
  *
  *	base_limit	largest base we will consider (def: 10000)
  *      value		value to convert into sums of powers of integers
  *
- * Copyright (C) 2001,2014  Landon Curt Noll
+ * Example:
+ *
+ *	powerterm 5 1000000
+ *
+ * prints:
+ *
+ *	4^10 - 3^10 + 5^6 - 4^6 - 4^5 - 2^5
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the powerterm of the version 2.1 of the GNU Lesser General Public License
@@ -35,28 +43,31 @@
 /*
  * parse args
  */
+argc = argv();
+stderr = files(2);
+program = argv(0);
 config("verbose_quit", 0),;
 base_lim = 10000;		/* default: highest base we will consider */
-if (argv() < 2 || argv() > 3) {
+if (argc < 2 || argc > 3) {
-    fprintf(files(2), "usage: %s [base_limit] value\n", argv(0));
+    fprintf(stderr, "usage: %s [base_limit] value\n", program);
     exit;
 }
-if (argv() == 3) {
+if (argc == 3) {
     x = eval(argv(2));
     base_lim = eval(argv(1));
 } else {
     x = eval(argv(1));
 }
 if (! isint(x)) {
-    fprintf(files(2), "%s: value must be an integer\n");
+    fprintf(stderr, "%s: value must be an integer\n", program);
     exit;
 }
 if (! isint(base_lim)) {
-    fprintf(files(2), "%s: base limit must be an integer\n");
+    fprintf(stderr, "%s: base limit must be an integer\n", program);
     exit;
 }
 if (base_lim <= 1) {
-    fprintf(files(2), "%s: base limit is too small\n");
+    fprintf(stderr, "%s: base limit is too small\n", program);
     exit;
 }
 ++base_lim;

cscript/simple.calc

@@ -2,7 +2,7 @@
 /*
  * simple - an example of a simple calc shell script
  *
- * Copyright (C) 1999-2007,2014  Landon Curt Noll
+ * Copyright (C) 1999-2007,2014,2019,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -30,3 +30,9 @@
  * This is an example of a simple calc shell script.
  */
 print "This simple calc shell script works!"
+print "config(\"program\")=", config("program");
+print "argv()=", argv();
+argc = argv();
+for (i=0; i < argc; ++i) {
+    print "argv(":i:")=", argv(i);
+}

cscript/square.calc

@@ -1,8 +1,8 @@
-#!/usr/local/src/bin/calc/calc -q -f
+#!/usr/local/src/bin/calc/calc -q -p -f
 /*
  * sqaure - print the squares of input values
  *
- * Copyright (C) 2000-2007,2014  Ernest Bowen
+ * Copyright (C) 2000-2007,2014,2019,2021  Ernest Bowen
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -33,10 +33,6 @@
  *               cat file | ./square
  *               echo "123" | ./square
  *
- *       Within calc:
- *
- *               > read square
- *
  *  With input from a terminal, there is no prompt but each non-empty
  *  line of input is evaluated as a calc expression and if it can be
  *  calculated, the square of the value of that expression is displayed.
@@ -52,6 +48,8 @@
  *               1522756
  *       ln(2)
  *               ~.48045301391820142467
+ *	 2i
+ *		 -4
  *       config("mode","frac"), bernoulli(10)
  *               25/4356
  *       config("mode", "hex"), 0xff
@@ -59,6 +57,6 @@
  */
 
 
-global s;
+while (s = fgetline(files(0))) {
-while ((s = prompt("")))
 	print "\t":eval(s)^2;
+}

custom.c

@@ -1,7 +1,7 @@
 /*
  * custom - interface for custom software and hardware interfaces
  *
- * Copyright (C) 1999-2006  Landon Curt Noll
+ * Copyright (C) 1999-2006,2018,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -47,6 +47,10 @@
 
 #endif /* CUSTOM */
 
+
+#include "banned.h"	/* include after system header <> includes */
+
+
 BOOL allow_custom = FALSE;	 /* TRUE => custom builtins allowed */
 
 
@@ -109,7 +113,7 @@ custom(char *name, int count, VALUE **vals)
 
 
 /*
- * showcustom - display the names and brief descriptins of custom functions
+ * showcustom - display the names and brief descriptions of custom functions
  */
 /*ARGSUSED*/
 void
@@ -180,6 +184,7 @@ customhelp(char *name)
 #if defined(CUSTOM)
 
 	char *customname;	/* a string of the form: custom/name */
+	size_t snprintf_len;	/* malloced snprintf buffer length */
 
 	/*
 	 * firewall
@@ -191,12 +196,14 @@ customhelp(char *name)
 	/*
 	 * form the custom help name
 	 */
-	customname = (char *)malloc(sizeof("custhelp")+1+strlen(name)+1);
+	snprintf_len = sizeof("custhelp")+1+strlen(name)+1;
+	customname = (char *)malloc(snprintf_len+1);
 	if (customname == NULL) {
 		math_error("bad malloc of customname");
 		/*NOTREACHED*/
 	}
-	sprintf(customname, "custhelp/%s", name);
+	snprintf(customname, snprintf_len, "custhelp/%s", name);
+	customname[snprintf_len] = '\0';	/* paranoia */
 
 	/*
 	 * give help directly to the custom file

custom.h

@@ -1,7 +1,7 @@
 /*
  * custom - interface for custom software and hardware interfaces
  *
- * Copyright (C) 1999-2007  Landon Curt Noll
+ * Copyright (C) 1999-2007,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -35,7 +35,7 @@
  *
  * before they include this file.
  *
- * Keep this file down to a minimum.   Don't put custom builtin funcion
+ * Keep this file down to a minimum.   Don't put custom builtin function
  * stuff in this file!
  */
 
@@ -45,7 +45,7 @@
 
 
 /*
- * arg count definitons
+ * arg count definitions
  */
 #define MAX_CUSTOM_ARGS 100	/* maximum number of custom arguments */
 

custom/HOW_TO_ADD

@@ -220,7 +220,7 @@ Step 5: Write your custom function
 	   NOTE: If you do not use any of the 3 function parameters,
 	   then you should declare that function parameter to be UNUSED.
 	   For example, if the count and vals parameters were not used
-	   in your custom function, then your declaraction should be:
+	   in your custom function, then your declaration should be:
 
 		/*ARGSUSED*/
 		VALUE
@@ -645,7 +645,7 @@ Step 12: Contribute
     and consider submitting your custom function for possible
     inclusion in later versions of calc.
 
-## Copyright (C) 1999-2007  Landon Curt Noll
+## Copyright (C) 1999-2007,2021  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

custom/Makefile

@@ -2,7 +2,15 @@
 #
 # custom - makefile for calc custom routines
 #
-# Copyright (C) 1999-2006,2014,2017  Landon Curt Noll
+# Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
+#
+# SRC: Makefile via make -f Makefile.ship custom/Makefile
+#
+#	The "# SRC: ... - ..." comment line above indicates
+#	the origin of this file.
+#
+# IMPORTANT: Please see the section on Makefiles near the
+#	     bottom of the HOWTO.INSTALL file.
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -27,6 +35,115 @@
 # calculator by David I. Bell with help/mods from others
 # Makefile by Landon Curt Noll
 
+####################################################
+# NOTE: Start of section from custom/Makefile.head #
+####################################################
+
+#.###############################################################.#
+#.#								#.#
+#.# WARNING: This Makefile is generated from a combination of	#.#
+#.#	   custom/Makefile.head, Makefile.ship, and		#.#
+#.#	   custom/Makefile.tail.  We recommend that you NOT	#.#
+#.#	   edit this file, but instead edit the proper source	#.#
+#.#	   file and then make custom/Makefile:			#.#
+#.#								#.#
+#.#		make custom/Makefile				#.#
+#.#								#.#
+#.#	   See the '# NOTE .. section from ..' lines for	#.#
+#.#	   where the source file for the lines are from.	#.#
+#.#								#.#
+#.###############################################################.#
+
+
+# The shell used by this Makefile
+#
+# On some systems, /bin/sh is a rather reduced shell with
+# deprecated behavior.
+#
+# If your system has a up to date, bash shell, then
+# you may wish to use:
+#
+#	SHELL= /bin/bash
+#
+# On some systems such as macOS, the bash shell is very
+# far behind to the point where is cannot be depended on.
+# On such systems, the zsh may be a much better alternative
+# shell for this Makefile to use:
+#
+#	SHELL= /bin/zsh
+#
+SHELL= /bin/sh
+#SHELL= /bin/bash
+#SHELL= /bin/zsh
+
+
+# PREFIX - Top level location for calc
+#
+# The PREFIX is often prepended to paths within calc and calc Makefiles.
+#
+# Starting with calc v2.13.0.1, nearly all Makefile places that used
+# /usr/local now use ${PREFIX}.  An exception is the olduninstall rule
+# and, of course, this section. :-)
+#
+# NOTE: The ${PREFIX} is not the same as ${T}.  The ${T} specifies
+#	a top level directory under which calc installs things.
+#	While usually ${T} is empty, it can be specific path
+#	as if calc where "chrooted" during an install.
+#	The ${PREFIX} value, during install, is a path between
+#	the top level ${T} install directory and the object
+#	such as an include file.
+#
+# NOTE: See also, ${T}, below.
+#
+# There are some paths that do NOT call under ${PREFIX}, such as
+# ${CALCPATH}, that include paths not under ${PREFIX}, but those
+# too are exceptions to this general rule.
+#
+# When in doubt, try:
+#
+#	PREFIX= /usr/local
+#
+PREFIX= /usr/local
+#PREFIX= /usr
+#PREFIX= /usr/global
+
+
+# CCBAN is given to ${CC} in order to control if banned.h is in effect.
+#
+# The banned.h attempts to ban the use of certain dangerous functions
+# that, if improperly used, could compromise the computational integrity
+# if calculations.
+#
+# In the case of calc, we are motivated in part by the desire for calc
+# to correctly calculate: even during extremely long calculations.
+#
+# If UNBAN is NOT defined, then calling certain functions
+# will result in a call to a non-existent function (link error).
+#
+# While we do NOT encourage defining UNBAN, there may be
+# a system / compiler environment where re-defining a
+# function may lead to a fatal compiler complication.
+# If that happens, consider compiling as:
+#
+#	make clobber all chk CCBAN=-DUNBAN
+#
+# as see if this is a work-a-round.
+#
+# If YOU discover a need for the -DUNBAN work-a-round, PLEASE tell us!
+# Please send us a bug report.  See the file:
+#
+#	BUGS
+#
+# or the URL:
+#
+#	http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
+#
+# for how to send us such a bug report.
+#
+CCBAN= -UUNBAN
+#CCBAN= -DUNBAN
+
+
 #if 0	/* start of skip for non-Gnu makefiles */
 ##############################################################################
 #-=-=-=-=-=-=-=-=- Identify the target machine, if possible -=-=-=-=-=-=-=-=-#
@@ -36,7 +153,7 @@
 #
 #	make ...__optional_arguments_... target=value
 
-# Try uname -s if the target was not alreadhy set on the make command line
+# Try uname -s if the target was not already set on the make command line
 #
 ifeq ($(target),)
 target=$(shell uname -s 2>/dev/null)
@@ -96,14 +213,38 @@ CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o \
 
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
-#
+
 # Makefile debug
 #
-# Q=@	do not echo internal makefile actions (quiet mode)
+# Q=@	do not echo internal Makefile actions (quiet mode)
-# Q=	echo internal makefile actions (debug / verbose mode)
+# Q=	echo internal Makefile actions (debug / verbose mode)
+#
+# H=@:	do not report hsrc file formation progress
+# H=@	do echo hsrc file formation progress
+#
+# S= >/dev/null 2>&1	slience ${CC} output during hsrc file formation
+# S=			full ${CC} output during hsrc file formation
+#
+# E= 2>/dev/null	slience command stderr during hsrc file formation
+# E=			full command stderr during hsrc file formation
+#
+# V=@:	do not echo debug statements (quiet mode)
+# V=@	do echo debug statements (debug / verbose mode)
 #
 #Q=
 Q=@
+#
+S= >/dev/null 2>&1
+#S=
+#
+E= 2>/dev/null
+#E=
+#
+#H=@:
+H=@
+#
+V=@:
+#V=@
 
 ####
 # Normally, the upper level makefile will set these values.  We provide
@@ -121,11 +262,11 @@ Q=@
 #	INCDIR= /usr/include
 #
 
-#INCDIR= /usr/local/include
+#INCDIR= ${PREFIX}/include
 #INCDIR= /dev/env/DJDIR/include
 INCDIR= /usr/include
 
-# where to install calc realted things
+# where to install calc related things
 #
 # ${BINDIR}		where to install calc binary files
 # ${LIBDIR}		where calc link library (*.a) files are installed
@@ -147,15 +288,15 @@ INCDIR= /usr/include
 #	LIBDIR= /usr/lib
 #	CALC_SHAREDIR= /usr/share/calc
 #
-#BINDIR= /usr/local/bin
+#BINDIR= ${PREFIX}/bin
 #BINDIR= /dev/env/DJDIR/bin
 BINDIR= /usr/bin
 
-#LIBDIR= /usr/local/lib
+#LIBDIR= ${PREFIX}/lib
 #LIBDIR= /dev/env/DJDIR/lib
 LIBDIR= /usr/lib
 
-#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= ${PREFIX}/lib/calc
 #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
 CALC_SHAREDIR= /usr/share/calc
 
@@ -348,7 +489,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.12.6.1
+VERSION= 2.14.0.0
 
 # Names of shared libraries with versions
 #
@@ -357,26 +498,25 @@ LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}
 
 # standard tools
 #
-SHELL= /bin/sh
-SED= sed
-MAKEDEPEND= makedepend
-GREP= egrep
-CHMOD= chmod
-FMT= fmt
-SORT= sort
-CMP= cmp
 AR= ar
-RM= rm
-TOUCH= touch
-MKDIR= mkdir
-RMDIR= rmdir
-MV= mv
-CP= cp
-CO= co
-TRUE= true
-MAKE= make
-LN= ln
 AWK= awk
+CHMOD= chmod
+CMP= cmp
+CO= co
+CP= cp
+FMT= fmt
+GREP= egrep
+LN= ln
+MAKE= make
+MAKEDEPEND= makedepend
+MKDIR= mkdir
+MV= mv
+RM= rm
+RMDIR= rmdir
+SED= sed
+SORT= sort
+TOUCH= touch
+TRUE= true
 
 # EXTRA_CFLAGS are flags given to ${CC} when compiling C files
 # EXTRA_LDFLAGS are flags given to ${CC} when linking progs
@@ -391,7 +531,7 @@ AWK= awk
 # NOTE: These should be left blank in this Makefile to make it
 #       easier to add stuff on the command line.  If you want to
 #	to change the way calc is compiled by this Makefile, change
-#	the appropirate host target section below or a flag above.
+#	the appropriate host target section below or a flag above.
 #
 EXTRA_CFLAGS=
 EXTRA_LDFLAGS=
@@ -420,9 +560,9 @@ COMMON_LDFLAGS= ${EXTRA_LDFLAGS}
 # NOTE: This does not work for: make-XYZ-only and BLD_TYPE != make-XYZ-only
 #
 ifeq ($(BLD_TYPE),calc-static-only)
-ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC}
+ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_STATIC}
 else
-ICFLAGS= ${COMMON_CFLAGS} ${CC_SHARE}
+ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_SHARE}
 endif
 CFLAGS= ${ICFLAGS} ${CCOPT}
 
@@ -435,7 +575,16 @@ ILDFLAGS= ${COMMON_LDFLAGS}
 LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
 
 #endif	/* end of skip for non-Gnu makefiles */
+
+##################################################
+# NOTE: End of section from custom/Makefile.head #
+##################################################
 # start of host target cut - Do not remove this line
+
+###########################################################
+# NOTE: Start of section from the middle of Makefile.ship #
+###########################################################
+
 ##############################################################################
 #-=-=-=-=-=- host target section - targets that override defaults -=-=-=-=-=-#
 ##############################################################################
@@ -466,12 +615,20 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
 # CCOPT are flags given to ${CC} for optimization
 # CCWARN are flags given to ${CC} for warning message control
 #
-# WNO_IMPLICT, WNO_ERROR_LONG_LONG and WNO_LONG_LONG are given to ${CC}
+# The following are given to ${CC}:
-#	when compiling special .o files that may need special compile options
+#
+#	WNO_IMPLICT
+#	WNO_ERROR_LONG_LONG
+#	WNO_LONG_LONG
+#
+# when compiling special .o files that may need special compile options:
+#
 #	NOTE: These flags simply turn off certain compiler warnings,
 #	      which is useful only when CCWERR is set to -Werror.
+#
 #	NOTE: If your compiler does not have these -Wno files, just
 #	      set these variables to nothing as in:
+#
 #		WNO_IMPLICT=
 #		WNO_ERROR_LONG_LONG=
 #		WNO_LONG_LONG=
@@ -482,6 +639,9 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
 #	      to abort on warnings, then leave CCWERR blank.
 # CCMISC are misc flags given to ${CC}
 #
+# CCBAN is given to ${CC} in order to control if banned.h is in effect.
+#	NOTE: See where CCBAN is defined above for details.
+#
 # LCC is how the C compiler is invoked on locally executed intermediate programs
 # CC is how the C compiler is invoked (with an optional Purify)
 #
@@ -493,7 +653,7 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
 #									 #
 #		calc-contrib at asthe dot com				 #
 #									 #
-#	EMail address an "ifeq ($(target),YOUR_TARGET_NAME)" ... "endif" #
+#	Email address an "ifeq ($(target),YOUR_TARGET_NAME)" ... "endif" #
 #	set of lines so that we can consider them for the next release.  #
 ##########################################################################
 
@@ -507,7 +667,7 @@ ifeq ($(target),Linux)
 BLD_TYPE= calc-dynamic-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
     "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
@@ -534,10 +694,8 @@ LIBCUSTCALC_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -552,16 +710,16 @@ CC= ${PURIFY} ${LCC} ${CCWERR}
 #
 endif
 
-##############################
+###############################
-# Apple OS X / Darwin target #
+# Apple macOS / Darwin target #
-##############################
+###############################
 
 ifeq ($(target),Darwin)
 #
 BLD_TYPE= calc-dynamic-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= ${DARWIN_ARCH}
 #SET_INSTALL_NAME= no
 SET_INSTALL_NAME= yes
@@ -602,10 +760,8 @@ LIBCUSTCALC_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -628,16 +784,6 @@ LDCONFIG:=
 # DARWIN_ARCH= -arch ppc		# PPC binary
 # DARWIN_ARCH= -arch x86_64		# native 64-bit binary
 DARWIN_ARCH=				# native binary
-#
-# Starting with El Capitan OS X 10.11, root by default could not
-# mkdir under system locations, so we now use the /usr/local tree.
-#
-OPTDIR:= /usr/local
-BINDIR:= /${OPTDIR}/bin
-LIBDIR:= /${OPTDIR}/lib
-CALC_SHAREDIR:= /${OPTDIR}/share
-CALC_INCDIR:= /${OPTDIR}/include
-SCRIPTDIR:= ${BINDIR}/cscript
 endif
 
 ##################
@@ -655,7 +801,7 @@ ifeq ($(target),FreeBSD)
 BLD_TYPE= calc-dynamic-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
     "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
@@ -682,10 +828,8 @@ LIBCUSTCALC_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -717,7 +861,7 @@ ifeq ($(target),OpenBSD)
 BLD_TYPE= calc-dynamic-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
     "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
@@ -744,10 +888,8 @@ LIBCUSTCALC_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -773,7 +915,7 @@ ifeq ($(target),SunOS)
 BLD_TYPE= calc-dynamic-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
     "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
@@ -800,10 +942,8 @@ LD_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -827,7 +967,7 @@ ifeq ($(target),Cygwin)
 BLD_TYPE= calc-static-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
     "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
@@ -854,10 +994,8 @@ LD_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -885,7 +1023,7 @@ ifeq ($(target),simple)
 BLD_TYPE= calc-static-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
     "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
@@ -914,7 +1052,7 @@ CC= ${PURIFY} ${LCC} ${CCWERR}
 # ILDFLAGS for ${CC} in linking intermediate programs used to help compile calc
 # LDFLAGS for ${CC} in linking calc programs other than intermediate programs
 #
-ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC}
+ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_STATIC}
 CFLAGS= ${ICFLAGS} ${CCOPT}
 #
 ILDFLAGS= ${COMMON_LDFLAGS} ${LD_STATIC}
@@ -939,12 +1077,12 @@ CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR};${T}${CUSTOMCALDIR}
 else
 CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR}
 endif
-CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
+CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup
 #
 BLD_TYPE= calc-static-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
     "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
@@ -984,7 +1122,7 @@ ifeq ($(target),)
 BLD_TYPE= calc-static-only
 #
 CC_SHARE= -fPIC
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
 LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
     "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
@@ -1011,10 +1149,8 @@ LD_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -1041,9 +1177,9 @@ endif
 # NOTE: This does not work for: make-XYZ-only and BLD_TYPE != make-XYZ-only
 #
 ifeq ($(BLD_TYPE),calc-static-only)
-ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC}
+ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_STATIC}
 else
-ICFLAGS= ${COMMON_CFLAGS} ${CC_SHARE}
+ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_SHARE}
 endif
 CFLAGS= ${ICFLAGS} ${CCOPT}
 
@@ -1059,7 +1195,27 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
 #######################################################################
 #-=-=-=-=-=- end of target section - only make rules below -=-=-=-=-=-#
 #######################################################################
+
+#########################################################
+# NOTE: End of section from the middle of Makefile.ship #
+#########################################################
+
 # end of host target cut - Do not remove this line
+#
+# Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
+#
+# SRC: Makefile via make -f Makefile.ship custom/Makefile
+#
+#	The "# SRC: ... - ..." comment line above indicates
+#	the origin of this file.
+#
+# IMPORTANT: Please see the section on Makefiles near the
+#	     bottom of the HOWTO.INSTALL file.
+
+####################################################
+# NOTE: Start of section from custom/Makefile.tail #
+####################################################
+
 ##############################################################################
 #-=-=-=-=-=-=-=-=- Be careful if you change something below -=-=-=-=-=-=-=-=-#
 ##############################################################################
@@ -1094,7 +1250,7 @@ CUSTCALC_OBJ= ${REQUIRED_OBJ} ${CUSTOM_OBJ}
 #
 C_SRC= ${REQUIRED_SRC} ${CUSTOM_SRC}
 
-# These .h files are used to build the dependecy list
+# These .h files are used to build the dependency list
 #
 H_SRC= ${CUSTOM_H_SRC}
 
@@ -1111,7 +1267,7 @@ DISTLIST= ${CUSTCALC_SRC} ${CUSTOM_CALC_FILES} ${CUSTOM_HELP} \
 #
 CALCLIBLIST= ${CUSTCALC_SRC} ${INSTALL_H_SRC} ${MAKE_FILE} HOW_TO_ADD
 
-# This is the custom dynbamic shared library that is build
+# This is the custom dynamic shared library that is build
 #
 CALC_DYNAMIC_LIBCUSTCALC= libcustcalc${LIB_EXT_VERSION}
 
@@ -1165,7 +1321,7 @@ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE}
 
 ###
 #
-# building calc-static and static lib*.a libraires
+# building calc-static and static lib*.a libraries
 #
 ###
 
@@ -1184,7 +1340,7 @@ libcustcalc.a: ${CUSTCALC_OBJ} ${MAKE_FILE}
 # sub-directory called calc/lib.
 #
 # NOTE: Due to bogus shells found on one common system we must have
-#	an non-emoty else clause for every if condition.  *sigh*
+#	an non-empty else clause for every if condition.  *sigh*
 #
 ##
 
@@ -1210,7 +1366,10 @@ Makefile.simple: ${MAKE_FILE}
 	${V} echo '=-=-=-=-= custom/${MAKE_FILE} start of $@ rule =-=-=-=-='
 	${Q} ${RM} -f $@
 	${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
-	    ${MAKE_FILE} > $@
+	    ${MAKE_FILE} | \
+	    ${GREP} -v '#\.#' | \
+	    ${SED} -e 's;^# SRC:.*;# SRC: non-GNU Makefile via;' \
+		   -e 's;via$$;via ${MAKE} -f ${MAKE_FILE} custom/$@;' > $@
 	${Q} echo >> $@
 	${Q} echo 'Makefile.simple:' >> $@
 	${Q} echo '	$${Q} if [ ! -f Makefile.simple ]; then '"\\" >> $@
@@ -1223,7 +1382,7 @@ Makefile.simple: ${MAKE_FILE}
 # Home grown make dependency rules.  Your system make not support
 # or have the needed tools.  You can ignore this section.
 #
-# We will form a skelaton tree of *.c files containing only #include "foo.h"
+# We will form a skeleton tree of *.c files containing only #include "foo.h"
 # lines and .h files containing the same lines surrounded by multiple include
 # prevention lines.  This allows us to build a static depend list that will
 # satisfy all possible cpp symbol definition combinations.
@@ -1232,7 +1391,7 @@ Makefile.simple: ${MAKE_FILE}
 
 depend:
 	${Q} if [ -f ${MAKE_FILE}.bak ]; then \
-	    echo "${MAKE_FILE}.bak exists, remove or move it"; \
+	    echo "custom/${MAKE_FILE}.bak exists, remove or move it"; \
 	    exit 1; \
 	else \
 	    ${TRUE}; \
@@ -1248,9 +1407,7 @@ depend:
 	    fi; \
 	done
 	-${Q} for i in ${H_SRC} /dev/null; do \
-	    if [ "$$i" = "/dev/null" ]; then \
+	    if [ "$$i" = "/dev/null" ]; then continue; fi; \
-		continue; \
-	    fi; \
 	    tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
 	    echo "#if !defined($$tag)" > "skel/custom/$$i"; \
 	    echo "#define $$tag" >> "skel/custom/$$i"; \
@@ -1259,25 +1416,25 @@ depend:
 	    echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
 	done
 	${Q} (cd ..; ${MAKE} -f ${TOP_MAKE_FILE} hsrc)
-	${Q} for i in `cd ..; ${MAKE} -f ${TOP_MAKE_FILE} h_list 2>&1 | \
+	${MAKE} -f ../${TOP_MAKE_FILE} h_list 2>/dev/null | \
-	    ${SED} -e '/Entering directory/d' \
+	    while read i; do \
-		   -e '/Nothing to be done/d' \
+		if [ ! -f "../$$i" ]; then continue; fi; \
-		   -e '/Leaving directory/d'` /dev/null; do \
+		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
-	    if [ "$$i" = "/dev/null" ]; then \
+		echo "#if !defined($$tag)" > "skel/$$i"; \
-		continue; \
+		echo "#define $$tag" >> "skel/$$i"; \
-	    fi; \
+		${SED} -n '/^#[	 ]*include[	 ]*"/p' "../$$i" \
-	    tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
+		    >> "skel/$$i"; \
-	    echo "#if !defined($$tag)" > "skel/$$i"; \
+		echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
-	    echo "#define $$tag" >> "skel/$$i"; \
+	    done
-	    ${SED} -n '/^#[	 ]*include[	 ]*"/p' "../$$i" \
-		>> "skel/$$i"; \
-	    echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
-	done
 	${Q} ${RM} -f skel/custom/makedep.out
 	${Q} echo custom/skel formed
 	${Q} echo forming custom dependency list
 	${Q} :> skel/custom/makedep.out
-	${Q} cd skel/custom; ${MAKEDEPEND} -I.. -w 1 -f makedep.out ${C_SRC}
+	${Q} cd skel/custom; ${MAKEDEPEND} \
+	    -I../../.. -w 1 -f makedep.out -- \
+	    ${CFLAGS} -- \
+	    ${C_SRC} 2>/dev/null
+	${Q} ${SED} -e 's|: ../../|: |' -E -i '' -l skel/custom/makedep.out
 	-${Q} for i in ${C_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
@@ -1292,22 +1449,16 @@ depend:
 	${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' \
 		    ${MAKE_FILE}.bak > ${MAKE_FILE}
 	${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE}
+	${Q} echo removing skel
 	${Q} ${RM} -rf skel
 	-${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \
-	    echo 'custom ${MAKE_FILE} was already up to date'; \
+	    echo 'custom/${MAKE_FILE} was already up to date'; \
+	    echo 'restoring original custom/${MAKE_FILE}'; \
 	    ${MV} -f ${MAKE_FILE}.bak ${MAKE_FILE}; \
 	else \
-	    ${RM} -f ${MAKE_FILE}.tmp; \
+	    echo 'old custom/${MAKE_FILE} is now custom/${MAKE_FILE}.bak'; \
-	    ${MV} ${MAKE_FILE} ${MAKE_FILE}.tmp; \
+	    echo 'new custom/${MAKE_FILE} formed'; \
-	    if [ -d RCS -a ! -w "${MAKE_FILE}" ]; then \
+	    echo 'try: diff -u custom/${MAKE_FILE}.bak custom/${MAKE_FILE}'; \
-		${CO} -l ${MAKE_FILE}; \
-	    fi ;\
-	    ${MV} ${MAKE_FILE}.tmp ${MAKE_FILE}; \
-	    if [ -d RCS ]; then \
-	    echo '****************************************************'; \
-	    echo 'new custom ${MAKE_FILE} formed -- you to check it in'; \
-	    echo '****************************************************'; \
-	    fi; \
 	fi
 
 ##
@@ -1354,6 +1505,7 @@ clobber: clean
 	${RM} -f libcustcalc${LIB_EXT}
 	${RM} -f libcustcalc.a
 	${RM} -f libcustcalc*
+	${RM} -rf skel
 	${V} echo remove files that are obsolete
 #if 0	/* start of skip for non-Gnu makefiles */
 	${RM} -f Makefile.simple
@@ -1541,7 +1693,7 @@ uninstall:
 	    if [ -f "${T}${CUSTOMCALDIR}/libcustcalc.a" ]; then \
 		echo "cannot uninstall ${T}${CUSTOMCALDIR}/libcustcalc.a"; \
 	    else \
-		echo "uninstalled ${T}${CUSTOMCALDIR}/libcustcalc.a"; \
+		echo "un-installed ${T}${CUSTOMCALDIR}/libcustcalc.a"; \
 	    fi; \
 	fi
 	-${Q} for i in ${CUSTOM_HELP} /dev/null; do \
@@ -1553,7 +1705,7 @@ uninstall:
 		if [ -f "${T}${CUSTOMHELPDIR}/$$i" ]; then \
 		   echo "cannot uninstall ${T}${CUSTOMHELPDIR}/$$i"; \
 		else \
-		   echo "uninstalled ${T}${CUSTOMHELPDIR}/$$i"; \
+		   echo "un-installed ${T}${CUSTOMHELPDIR}/$$i"; \
 		fi; \
 	    fi; \
 	done
@@ -1566,7 +1718,7 @@ uninstall:
 		if [ -f "${T}${CUSTOMCALDIR}/$$i" ]; then \
 		   echo "cannot uninstall ${T}${CUSTOMCALDIR}/$$i"; \
 		else \
-		   echo "uninstalled ${T}${CUSTOMCALDIR}/$$i"; \
+		   echo "un-installed ${T}${CUSTOMCALDIR}/$$i"; \
 		fi; \
 	    fi; \
 	done
@@ -1579,7 +1731,7 @@ uninstall:
 		if [ -f "${T}${CUSTOMINCDIR}/$$i" ]; then \
 		   echo "cannot uninstall ${T}${CUSTOMINCDIR}/$$i"; \
 		else \
-		   echo "uninstalled ${T}${CUSTOMINCDIR}/$$i"; \
+		   echo "un-installed ${T}${CUSTOMINCDIR}/$$i"; \
 		fi; \
 	    fi; \
 	done
@@ -1600,6 +1752,7 @@ uninstall:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 c_argv.o: ../alloc.h
+c_argv.o: ../banned.h
 c_argv.o: ../block.h
 c_argv.o: ../byteswap.h
 c_argv.o: ../calc.h
@@ -1610,6 +1763,7 @@ c_argv.o: ../custom.h
 c_argv.o: ../decl.h
 c_argv.o: ../endian_calc.h
 c_argv.o: ../hash.h
+c_argv.o: ../have_ban_pragma.h
 c_argv.o: ../have_const.h
 c_argv.o: ../have_memmv.h
 c_argv.o: ../have_newstr.h
@@ -1625,6 +1779,7 @@ c_argv.o: ../value.h
 c_argv.o: ../zmath.h
 c_argv.o: c_argv.c
 c_devnull.o: ../alloc.h
+c_devnull.o: ../banned.h
 c_devnull.o: ../block.h
 c_devnull.o: ../byteswap.h
 c_devnull.o: ../calcerr.h
@@ -1634,6 +1789,7 @@ c_devnull.o: ../custom.h
 c_devnull.o: ../decl.h
 c_devnull.o: ../endian_calc.h
 c_devnull.o: ../hash.h
+c_devnull.o: ../have_ban_pragma.h
 c_devnull.o: ../have_const.h
 c_devnull.o: ../have_memmv.h
 c_devnull.o: ../have_newstr.h
@@ -1650,6 +1806,7 @@ c_devnull.o: ../value.h
 c_devnull.o: ../zmath.h
 c_devnull.o: c_devnull.c
 c_help.o: ../alloc.h
+c_help.o: ../banned.h
 c_help.o: ../block.h
 c_help.o: ../byteswap.h
 c_help.o: ../calcerr.h
@@ -1659,6 +1816,7 @@ c_help.o: ../custom.h
 c_help.o: ../decl.h
 c_help.o: ../endian_calc.h
 c_help.o: ../hash.h
+c_help.o: ../have_ban_pragma.h
 c_help.o: ../have_const.h
 c_help.o: ../have_memmv.h
 c_help.o: ../have_newstr.h
@@ -1675,6 +1833,7 @@ c_help.o: ../value.h
 c_help.o: ../zmath.h
 c_help.o: c_help.c
 c_pmodm127.o: ../alloc.h
+c_pmodm127.o: ../banned.h
 c_pmodm127.o: ../block.h
 c_pmodm127.o: ../byteswap.h
 c_pmodm127.o: ../calcerr.h
@@ -1684,6 +1843,7 @@ c_pmodm127.o: ../custom.h
 c_pmodm127.o: ../decl.h
 c_pmodm127.o: ../endian_calc.h
 c_pmodm127.o: ../hash.h
+c_pmodm127.o: ../have_ban_pragma.h
 c_pmodm127.o: ../have_const.h
 c_pmodm127.o: ../have_memmv.h
 c_pmodm127.o: ../have_newstr.h
@@ -1699,6 +1859,7 @@ c_pmodm127.o: ../value.h
 c_pmodm127.o: ../zmath.h
 c_pmodm127.o: c_pmodm127.c
 c_pzasusb8.o: ../alloc.h
+c_pzasusb8.o: ../banned.h
 c_pzasusb8.o: ../block.h
 c_pzasusb8.o: ../byteswap.h
 c_pzasusb8.o: ../calcerr.h
@@ -1708,6 +1869,7 @@ c_pzasusb8.o: ../custom.h
 c_pzasusb8.o: ../decl.h
 c_pzasusb8.o: ../endian_calc.h
 c_pzasusb8.o: ../hash.h
+c_pzasusb8.o: ../have_ban_pragma.h
 c_pzasusb8.o: ../have_const.h
 c_pzasusb8.o: ../have_memmv.h
 c_pzasusb8.o: ../have_newstr.h
@@ -1723,6 +1885,7 @@ c_pzasusb8.o: ../value.h
 c_pzasusb8.o: ../zmath.h
 c_pzasusb8.o: c_pzasusb8.c
 c_register.o: ../alloc.h
+c_register.o: ../banned.h
 c_register.o: ../block.h
 c_register.o: ../byteswap.h
 c_register.o: ../calc.h
@@ -1733,6 +1896,7 @@ c_register.o: ../custom.h
 c_register.o: ../decl.h
 c_register.o: ../endian_calc.h
 c_register.o: ../hash.h
+c_register.o: ../have_ban_pragma.h
 c_register.o: ../have_const.h
 c_register.o: ../have_memmv.h
 c_register.o: ../have_newstr.h
@@ -1748,6 +1912,7 @@ c_register.o: ../value.h
 c_register.o: ../zmath.h
 c_register.o: c_register.c
 c_sysinfo.o: ../alloc.h
+c_sysinfo.o: ../banned.h
 c_sysinfo.o: ../block.h
 c_sysinfo.o: ../byteswap.h
 c_sysinfo.o: ../calc.h
@@ -1760,6 +1925,7 @@ c_sysinfo.o: ../decl.h
 c_sysinfo.o: ../endian_calc.h
 c_sysinfo.o: ../fposval.h
 c_sysinfo.o: ../hash.h
+c_sysinfo.o: ../have_ban_pragma.h
 c_sysinfo.o: ../have_const.h
 c_sysinfo.o: ../have_memmv.h
 c_sysinfo.o: ../have_newstr.h
@@ -1780,6 +1946,7 @@ c_sysinfo.o: ../zrand.h
 c_sysinfo.o: ../zrandom.h
 c_sysinfo.o: c_sysinfo.c
 custtbl.o: ../alloc.h
+custtbl.o: ../banned.h
 custtbl.o: ../block.h
 custtbl.o: ../byteswap.h
 custtbl.o: ../calcerr.h
@@ -1789,6 +1956,7 @@ custtbl.o: ../custom.h
 custtbl.o: ../decl.h
 custtbl.o: ../endian_calc.h
 custtbl.o: ../hash.h
+custtbl.o: ../have_ban_pragma.h
 custtbl.o: ../have_const.h
 custtbl.o: ../have_memmv.h
 custtbl.o: ../have_newstr.h
@@ -1802,3 +1970,7 @@ custtbl.o: ../str.h
 custtbl.o: ../value.h
 custtbl.o: ../zmath.h
 custtbl.o: custtbl.c
+
+##################################################
+# NOTE: End of section from custom/Makefile.tail #
+##################################################

custom/Makefile.head

@@ -2,7 +2,15 @@
 #
 # custom - makefile for calc custom routines
 #
-# Copyright (C) 1999-2006,2014,2017  Landon Curt Noll
+# Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
+#
+# SRC: custom/Makefile.head
+#
+#	The "# SRC: ... - ..." comment line above indicates
+#	the origin of this file.
+#
+# IMPORTANT: Please see the section on Makefiles near the
+#	     bottom of the HOWTO.INSTALL file.
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -27,6 +35,115 @@
 # calculator by David I. Bell with help/mods from others
 # Makefile by Landon Curt Noll
 
+####################################################
+# NOTE: Start of section from custom/Makefile.head #
+####################################################
+
+#.###############################################################.#
+#.#								#.#
+#.# WARNING: This Makefile is generated from a combination of	#.#
+#.#	   custom/Makefile.head, Makefile.ship, and		#.#
+#.#	   custom/Makefile.tail.  We recommend that you NOT	#.#
+#.#	   edit this file, but instead edit the proper source	#.#
+#.#	   file and then make custom/Makefile:			#.#
+#.#								#.#
+#.#		make custom/Makefile				#.#
+#.#								#.#
+#.#	   See the '# NOTE .. section from ..' lines for	#.#
+#.#	   where the source file for the lines are from.	#.#
+#.#								#.#
+#.###############################################################.#
+
+
+# The shell used by this Makefile
+#
+# On some systems, /bin/sh is a rather reduced shell with
+# deprecated behavior.
+#
+# If your system has a up to date, bash shell, then
+# you may wish to use:
+#
+#	SHELL= /bin/bash
+#
+# On some systems such as macOS, the bash shell is very
+# far behind to the point where is cannot be depended on.
+# On such systems, the zsh may be a much better alternative
+# shell for this Makefile to use:
+#
+#	SHELL= /bin/zsh
+#
+SHELL= /bin/sh
+#SHELL= /bin/bash
+#SHELL= /bin/zsh
+
+
+# PREFIX - Top level location for calc
+#
+# The PREFIX is often prepended to paths within calc and calc Makefiles.
+#
+# Starting with calc v2.13.0.1, nearly all Makefile places that used
+# /usr/local now use ${PREFIX}.  An exception is the olduninstall rule
+# and, of course, this section. :-)
+#
+# NOTE: The ${PREFIX} is not the same as ${T}.  The ${T} specifies
+#	a top level directory under which calc installs things.
+#	While usually ${T} is empty, it can be specific path
+#	as if calc where "chrooted" during an install.
+#	The ${PREFIX} value, during install, is a path between
+#	the top level ${T} install directory and the object
+#	such as an include file.
+#
+# NOTE: See also, ${T}, below.
+#
+# There are some paths that do NOT call under ${PREFIX}, such as
+# ${CALCPATH}, that include paths not under ${PREFIX}, but those
+# too are exceptions to this general rule.
+#
+# When in doubt, try:
+#
+#	PREFIX= /usr/local
+#
+PREFIX= /usr/local
+#PREFIX= /usr
+#PREFIX= /usr/global
+
+
+# CCBAN is given to ${CC} in order to control if banned.h is in effect.
+#
+# The banned.h attempts to ban the use of certain dangerous functions
+# that, if improperly used, could compromise the computational integrity
+# if calculations.
+#
+# In the case of calc, we are motivated in part by the desire for calc
+# to correctly calculate: even during extremely long calculations.
+#
+# If UNBAN is NOT defined, then calling certain functions
+# will result in a call to a non-existent function (link error).
+#
+# While we do NOT encourage defining UNBAN, there may be
+# a system / compiler environment where re-defining a
+# function may lead to a fatal compiler complication.
+# If that happens, consider compiling as:
+#
+#	make clobber all chk CCBAN=-DUNBAN
+#
+# as see if this is a work-a-round.
+#
+# If YOU discover a need for the -DUNBAN work-a-round, PLEASE tell us!
+# Please send us a bug report.  See the file:
+#
+#	BUGS
+#
+# or the URL:
+#
+#	http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
+#
+# for how to send us such a bug report.
+#
+CCBAN= -UUNBAN
+#CCBAN= -DUNBAN
+
+
 #if 0	/* start of skip for non-Gnu makefiles */
 ##############################################################################
 #-=-=-=-=-=-=-=-=- Identify the target machine, if possible -=-=-=-=-=-=-=-=-#
@@ -36,7 +153,7 @@
 #
 #	make ...__optional_arguments_... target=value
 
-# Try uname -s if the target was not alreadhy set on the make command line
+# Try uname -s if the target was not already set on the make command line
 #
 ifeq ($(target),)
 target=$(shell uname -s 2>/dev/null)
@@ -96,14 +213,38 @@ CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o \
 
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
-#
+
 # Makefile debug
 #
-# Q=@	do not echo internal makefile actions (quiet mode)
+# Q=@	do not echo internal Makefile actions (quiet mode)
-# Q=	echo internal makefile actions (debug / verbose mode)
+# Q=	echo internal Makefile actions (debug / verbose mode)
+#
+# H=@:	do not report hsrc file formation progress
+# H=@	do echo hsrc file formation progress
+#
+# S= >/dev/null 2>&1	slience ${CC} output during hsrc file formation
+# S=			full ${CC} output during hsrc file formation
+#
+# E= 2>/dev/null	slience command stderr during hsrc file formation
+# E=			full command stderr during hsrc file formation
+#
+# V=@:	do not echo debug statements (quiet mode)
+# V=@	do echo debug statements (debug / verbose mode)
 #
 #Q=
 Q=@
+#
+S= >/dev/null 2>&1
+#S=
+#
+E= 2>/dev/null
+#E=
+#
+#H=@:
+H=@
+#
+V=@:
+#V=@
 
 ####
 # Normally, the upper level makefile will set these values.  We provide
@@ -121,11 +262,11 @@ Q=@
 #	INCDIR= /usr/include
 #
 
-#INCDIR= /usr/local/include
+#INCDIR= ${PREFIX}/include
 #INCDIR= /dev/env/DJDIR/include
 INCDIR= /usr/include
 
-# where to install calc realted things
+# where to install calc related things
 #
 # ${BINDIR}		where to install calc binary files
 # ${LIBDIR}		where calc link library (*.a) files are installed
@@ -147,15 +288,15 @@ INCDIR= /usr/include
 #	LIBDIR= /usr/lib
 #	CALC_SHAREDIR= /usr/share/calc
 #
-#BINDIR= /usr/local/bin
+#BINDIR= ${PREFIX}/bin
 #BINDIR= /dev/env/DJDIR/bin
 BINDIR= /usr/bin
 
-#LIBDIR= /usr/local/lib
+#LIBDIR= ${PREFIX}/lib
 #LIBDIR= /dev/env/DJDIR/lib
 LIBDIR= /usr/lib
 
-#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= ${PREFIX}/lib/calc
 #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
 CALC_SHAREDIR= /usr/share/calc
 
@@ -348,7 +489,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.12.6.1
+VERSION= 2.14.0.0
 
 # Names of shared libraries with versions
 #
@@ -357,26 +498,25 @@ LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}
 
 # standard tools
 #
-SHELL= /bin/sh
-SED= sed
-MAKEDEPEND= makedepend
-GREP= egrep
-CHMOD= chmod
-FMT= fmt
-SORT= sort
-CMP= cmp
 AR= ar
-RM= rm
-TOUCH= touch
-MKDIR= mkdir
-RMDIR= rmdir
-MV= mv
-CP= cp
-CO= co
-TRUE= true
-MAKE= make
-LN= ln
 AWK= awk
+CHMOD= chmod
+CMP= cmp
+CO= co
+CP= cp
+FMT= fmt
+GREP= egrep
+LN= ln
+MAKE= make
+MAKEDEPEND= makedepend
+MKDIR= mkdir
+MV= mv
+RM= rm
+RMDIR= rmdir
+SED= sed
+SORT= sort
+TOUCH= touch
+TRUE= true
 
 # EXTRA_CFLAGS are flags given to ${CC} when compiling C files
 # EXTRA_LDFLAGS are flags given to ${CC} when linking progs
@@ -391,7 +531,7 @@ AWK= awk
 # NOTE: These should be left blank in this Makefile to make it
 #       easier to add stuff on the command line.  If you want to
 #	to change the way calc is compiled by this Makefile, change
-#	the appropirate host target section below or a flag above.
+#	the appropriate host target section below or a flag above.
 #
 EXTRA_CFLAGS=
 EXTRA_LDFLAGS=
@@ -420,9 +560,9 @@ COMMON_LDFLAGS= ${EXTRA_LDFLAGS}
 # NOTE: This does not work for: make-XYZ-only and BLD_TYPE != make-XYZ-only
 #
 ifeq ($(BLD_TYPE),calc-static-only)
-ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC}
+ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_STATIC}
 else
-ICFLAGS= ${COMMON_CFLAGS} ${CC_SHARE}
+ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_SHARE}
 endif
 CFLAGS= ${ICFLAGS} ${CCOPT}
 
@@ -435,3 +575,7 @@ ILDFLAGS= ${COMMON_LDFLAGS}
 LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
 
 #endif	/* end of skip for non-Gnu makefiles */
+
+##################################################
+# NOTE: End of section from custom/Makefile.head #
+##################################################

custom/Makefile.tail

@@ -1,3 +1,18 @@
+#
+# Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
+#
+# SRC: custom/Makefile.tail
+#
+#	The "# SRC: ... - ..." comment line above indicates
+#	the origin of this file.
+#
+# IMPORTANT: Please see the section on Makefiles near the
+#	     bottom of the HOWTO.INSTALL file.
+
+####################################################
+# NOTE: Start of section from custom/Makefile.tail #
+####################################################
+
 ##############################################################################
 #-=-=-=-=-=-=-=-=- Be careful if you change something below -=-=-=-=-=-=-=-=-#
 ##############################################################################
@@ -32,7 +47,7 @@ CUSTCALC_OBJ= ${REQUIRED_OBJ} ${CUSTOM_OBJ}
 #
 C_SRC= ${REQUIRED_SRC} ${CUSTOM_SRC}
 
-# These .h files are used to build the dependecy list
+# These .h files are used to build the dependency list
 #
 H_SRC= ${CUSTOM_H_SRC}
 
@@ -49,7 +64,7 @@ DISTLIST= ${CUSTCALC_SRC} ${CUSTOM_CALC_FILES} ${CUSTOM_HELP} \
 #
 CALCLIBLIST= ${CUSTCALC_SRC} ${INSTALL_H_SRC} ${MAKE_FILE} HOW_TO_ADD
 
-# This is the custom dynbamic shared library that is build
+# This is the custom dynamic shared library that is build
 #
 CALC_DYNAMIC_LIBCUSTCALC= libcustcalc${LIB_EXT_VERSION}
 
@@ -103,7 +118,7 @@ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE}
 
 ###
 #
-# building calc-static and static lib*.a libraires
+# building calc-static and static lib*.a libraries
 #
 ###
 
@@ -122,7 +137,7 @@ libcustcalc.a: ${CUSTCALC_OBJ} ${MAKE_FILE}
 # sub-directory called calc/lib.
 #
 # NOTE: Due to bogus shells found on one common system we must have
-#	an non-emoty else clause for every if condition.  *sigh*
+#	an non-empty else clause for every if condition.  *sigh*
 #
 ##
 
@@ -148,7 +163,10 @@ Makefile.simple: ${MAKE_FILE}
 	${V} echo '=-=-=-=-= custom/${MAKE_FILE} start of $@ rule =-=-=-=-='
 	${Q} ${RM} -f $@
 	${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
-	    ${MAKE_FILE} > $@
+	    ${MAKE_FILE} | \
+	    ${GREP} -v '#\.#' | \
+	    ${SED} -e 's;^# SRC:.*;# SRC: non-GNU Makefile via;' \
+		   -e 's;via$$;via ${MAKE} -f ${MAKE_FILE} custom/$@;' > $@
 	${Q} echo >> $@
 	${Q} echo 'Makefile.simple:' >> $@
 	${Q} echo '	$${Q} if [ ! -f Makefile.simple ]; then '"\\" >> $@
@@ -161,7 +179,7 @@ Makefile.simple: ${MAKE_FILE}
 # Home grown make dependency rules.  Your system make not support
 # or have the needed tools.  You can ignore this section.
 #
-# We will form a skelaton tree of *.c files containing only #include "foo.h"
+# We will form a skeleton tree of *.c files containing only #include "foo.h"
 # lines and .h files containing the same lines surrounded by multiple include
 # prevention lines.  This allows us to build a static depend list that will
 # satisfy all possible cpp symbol definition combinations.
@@ -170,7 +188,7 @@ Makefile.simple: ${MAKE_FILE}
 
 depend:
 	${Q} if [ -f ${MAKE_FILE}.bak ]; then \
-	    echo "${MAKE_FILE}.bak exists, remove or move it"; \
+	    echo "custom/${MAKE_FILE}.bak exists, remove or move it"; \
 	    exit 1; \
 	else \
 	    ${TRUE}; \
@@ -186,9 +204,7 @@ depend:
 	    fi; \
 	done
 	-${Q} for i in ${H_SRC} /dev/null; do \
-	    if [ "$$i" = "/dev/null" ]; then \
+	    if [ "$$i" = "/dev/null" ]; then continue; fi; \
-		continue; \
-	    fi; \
 	    tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
 	    echo "#if !defined($$tag)" > "skel/custom/$$i"; \
 	    echo "#define $$tag" >> "skel/custom/$$i"; \
@@ -197,25 +213,25 @@ depend:
 	    echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
 	done
 	${Q} (cd ..; ${MAKE} -f ${TOP_MAKE_FILE} hsrc)
-	${Q} for i in `cd ..; ${MAKE} -f ${TOP_MAKE_FILE} h_list 2>&1 | \
+	${MAKE} -f ../${TOP_MAKE_FILE} h_list 2>/dev/null | \
-	    ${SED} -e '/Entering directory/d' \
+	    while read i; do \
-		   -e '/Nothing to be done/d' \
+		if [ ! -f "../$$i" ]; then continue; fi; \
-		   -e '/Leaving directory/d'` /dev/null; do \
+		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
-	    if [ "$$i" = "/dev/null" ]; then \
+		echo "#if !defined($$tag)" > "skel/$$i"; \
-		continue; \
+		echo "#define $$tag" >> "skel/$$i"; \
-	    fi; \
+		${SED} -n '/^#[	 ]*include[	 ]*"/p' "../$$i" \
-	    tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
+		    >> "skel/$$i"; \
-	    echo "#if !defined($$tag)" > "skel/$$i"; \
+		echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
-	    echo "#define $$tag" >> "skel/$$i"; \
+	    done
-	    ${SED} -n '/^#[	 ]*include[	 ]*"/p' "../$$i" \
-		>> "skel/$$i"; \
-	    echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
-	done
 	${Q} ${RM} -f skel/custom/makedep.out
 	${Q} echo custom/skel formed
 	${Q} echo forming custom dependency list
 	${Q} :> skel/custom/makedep.out
-	${Q} cd skel/custom; ${MAKEDEPEND} -I.. -w 1 -f makedep.out ${C_SRC}
+	${Q} cd skel/custom; ${MAKEDEPEND} \
+	    -I../../.. -w 1 -f makedep.out -- \
+	    ${CFLAGS} -- \
+	    ${C_SRC} 2>/dev/null
+	${Q} ${SED} -e 's|: ../../|: |' -E -i '' -l skel/custom/makedep.out
 	-${Q} for i in ${C_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
@@ -230,22 +246,16 @@ depend:
 	${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' \
 		    ${MAKE_FILE}.bak > ${MAKE_FILE}
 	${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE}
+	${Q} echo removing skel
 	${Q} ${RM} -rf skel
 	-${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \
-	    echo 'custom ${MAKE_FILE} was already up to date'; \
+	    echo 'custom/${MAKE_FILE} was already up to date'; \
+	    echo 'restoring original custom/${MAKE_FILE}'; \
 	    ${MV} -f ${MAKE_FILE}.bak ${MAKE_FILE}; \
 	else \
-	    ${RM} -f ${MAKE_FILE}.tmp; \
+	    echo 'old custom/${MAKE_FILE} is now custom/${MAKE_FILE}.bak'; \
-	    ${MV} ${MAKE_FILE} ${MAKE_FILE}.tmp; \
+	    echo 'new custom/${MAKE_FILE} formed'; \
-	    if [ -d RCS -a ! -w "${MAKE_FILE}" ]; then \
+	    echo 'try: diff -u custom/${MAKE_FILE}.bak custom/${MAKE_FILE}'; \
-		${CO} -l ${MAKE_FILE}; \
-	    fi ;\
-	    ${MV} ${MAKE_FILE}.tmp ${MAKE_FILE}; \
-	    if [ -d RCS ]; then \
-	    echo '****************************************************'; \
-	    echo 'new custom ${MAKE_FILE} formed -- you to check it in'; \
-	    echo '****************************************************'; \
-	    fi; \
 	fi
 
 ##
@@ -292,6 +302,7 @@ clobber: clean
 	${RM} -f libcustcalc${LIB_EXT}
 	${RM} -f libcustcalc.a
 	${RM} -f libcustcalc*
+	${RM} -rf skel
 	${V} echo remove files that are obsolete
 #if 0	/* start of skip for non-Gnu makefiles */
 	${RM} -f Makefile.simple
@@ -479,7 +490,7 @@ uninstall:
 	    if [ -f "${T}${CUSTOMCALDIR}/libcustcalc.a" ]; then \
 		echo "cannot uninstall ${T}${CUSTOMCALDIR}/libcustcalc.a"; \
 	    else \
-		echo "uninstalled ${T}${CUSTOMCALDIR}/libcustcalc.a"; \
+		echo "un-installed ${T}${CUSTOMCALDIR}/libcustcalc.a"; \
 	    fi; \
 	fi
 	-${Q} for i in ${CUSTOM_HELP} /dev/null; do \
@@ -491,7 +502,7 @@ uninstall:
 		if [ -f "${T}${CUSTOMHELPDIR}/$$i" ]; then \
 		   echo "cannot uninstall ${T}${CUSTOMHELPDIR}/$$i"; \
 		else \
-		   echo "uninstalled ${T}${CUSTOMHELPDIR}/$$i"; \
+		   echo "un-installed ${T}${CUSTOMHELPDIR}/$$i"; \
 		fi; \
 	    fi; \
 	done
@@ -504,7 +515,7 @@ uninstall:
 		if [ -f "${T}${CUSTOMCALDIR}/$$i" ]; then \
 		   echo "cannot uninstall ${T}${CUSTOMCALDIR}/$$i"; \
 		else \
-		   echo "uninstalled ${T}${CUSTOMCALDIR}/$$i"; \
+		   echo "un-installed ${T}${CUSTOMCALDIR}/$$i"; \
 		fi; \
 	    fi; \
 	done
@@ -517,7 +528,7 @@ uninstall:
 		if [ -f "${T}${CUSTOMINCDIR}/$$i" ]; then \
 		   echo "cannot uninstall ${T}${CUSTOMINCDIR}/$$i"; \
 		else \
-		   echo "uninstalled ${T}${CUSTOMINCDIR}/$$i"; \
+		   echo "un-installed ${T}${CUSTOMINCDIR}/$$i"; \
 		fi; \
 	    fi; \
 	done
@@ -538,6 +549,7 @@ uninstall:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 c_argv.o: ../alloc.h
+c_argv.o: ../banned.h
 c_argv.o: ../block.h
 c_argv.o: ../byteswap.h
 c_argv.o: ../calc.h
@@ -548,6 +560,7 @@ c_argv.o: ../custom.h
 c_argv.o: ../decl.h
 c_argv.o: ../endian_calc.h
 c_argv.o: ../hash.h
+c_argv.o: ../have_ban_pragma.h
 c_argv.o: ../have_const.h
 c_argv.o: ../have_memmv.h
 c_argv.o: ../have_newstr.h
@@ -563,6 +576,7 @@ c_argv.o: ../value.h
 c_argv.o: ../zmath.h
 c_argv.o: c_argv.c
 c_devnull.o: ../alloc.h
+c_devnull.o: ../banned.h
 c_devnull.o: ../block.h
 c_devnull.o: ../byteswap.h
 c_devnull.o: ../calcerr.h
@@ -572,6 +586,7 @@ c_devnull.o: ../custom.h
 c_devnull.o: ../decl.h
 c_devnull.o: ../endian_calc.h
 c_devnull.o: ../hash.h
+c_devnull.o: ../have_ban_pragma.h
 c_devnull.o: ../have_const.h
 c_devnull.o: ../have_memmv.h
 c_devnull.o: ../have_newstr.h
@@ -588,6 +603,7 @@ c_devnull.o: ../value.h
 c_devnull.o: ../zmath.h
 c_devnull.o: c_devnull.c
 c_help.o: ../alloc.h
+c_help.o: ../banned.h
 c_help.o: ../block.h
 c_help.o: ../byteswap.h
 c_help.o: ../calcerr.h
@@ -597,6 +613,7 @@ c_help.o: ../custom.h
 c_help.o: ../decl.h
 c_help.o: ../endian_calc.h
 c_help.o: ../hash.h
+c_help.o: ../have_ban_pragma.h
 c_help.o: ../have_const.h
 c_help.o: ../have_memmv.h
 c_help.o: ../have_newstr.h
@@ -613,6 +630,7 @@ c_help.o: ../value.h
 c_help.o: ../zmath.h
 c_help.o: c_help.c
 c_pmodm127.o: ../alloc.h
+c_pmodm127.o: ../banned.h
 c_pmodm127.o: ../block.h
 c_pmodm127.o: ../byteswap.h
 c_pmodm127.o: ../calcerr.h
@@ -622,6 +640,7 @@ c_pmodm127.o: ../custom.h
 c_pmodm127.o: ../decl.h
 c_pmodm127.o: ../endian_calc.h
 c_pmodm127.o: ../hash.h
+c_pmodm127.o: ../have_ban_pragma.h
 c_pmodm127.o: ../have_const.h
 c_pmodm127.o: ../have_memmv.h
 c_pmodm127.o: ../have_newstr.h
@@ -637,6 +656,7 @@ c_pmodm127.o: ../value.h
 c_pmodm127.o: ../zmath.h
 c_pmodm127.o: c_pmodm127.c
 c_pzasusb8.o: ../alloc.h
+c_pzasusb8.o: ../banned.h
 c_pzasusb8.o: ../block.h
 c_pzasusb8.o: ../byteswap.h
 c_pzasusb8.o: ../calcerr.h
@@ -646,6 +666,7 @@ c_pzasusb8.o: ../custom.h
 c_pzasusb8.o: ../decl.h
 c_pzasusb8.o: ../endian_calc.h
 c_pzasusb8.o: ../hash.h
+c_pzasusb8.o: ../have_ban_pragma.h
 c_pzasusb8.o: ../have_const.h
 c_pzasusb8.o: ../have_memmv.h
 c_pzasusb8.o: ../have_newstr.h
@@ -661,6 +682,7 @@ c_pzasusb8.o: ../value.h
 c_pzasusb8.o: ../zmath.h
 c_pzasusb8.o: c_pzasusb8.c
 c_register.o: ../alloc.h
+c_register.o: ../banned.h
 c_register.o: ../block.h
 c_register.o: ../byteswap.h
 c_register.o: ../calc.h
@@ -671,6 +693,7 @@ c_register.o: ../custom.h
 c_register.o: ../decl.h
 c_register.o: ../endian_calc.h
 c_register.o: ../hash.h
+c_register.o: ../have_ban_pragma.h
 c_register.o: ../have_const.h
 c_register.o: ../have_memmv.h
 c_register.o: ../have_newstr.h
@@ -686,6 +709,7 @@ c_register.o: ../value.h
 c_register.o: ../zmath.h
 c_register.o: c_register.c
 c_sysinfo.o: ../alloc.h
+c_sysinfo.o: ../banned.h
 c_sysinfo.o: ../block.h
 c_sysinfo.o: ../byteswap.h
 c_sysinfo.o: ../calc.h
@@ -698,6 +722,7 @@ c_sysinfo.o: ../decl.h
 c_sysinfo.o: ../endian_calc.h
 c_sysinfo.o: ../fposval.h
 c_sysinfo.o: ../hash.h
+c_sysinfo.o: ../have_ban_pragma.h
 c_sysinfo.o: ../have_const.h
 c_sysinfo.o: ../have_memmv.h
 c_sysinfo.o: ../have_newstr.h
@@ -718,6 +743,7 @@ c_sysinfo.o: ../zrand.h
 c_sysinfo.o: ../zrandom.h
 c_sysinfo.o: c_sysinfo.c
 custtbl.o: ../alloc.h
+custtbl.o: ../banned.h
 custtbl.o: ../block.h
 custtbl.o: ../byteswap.h
 custtbl.o: ../calcerr.h
@@ -727,6 +753,7 @@ custtbl.o: ../custom.h
 custtbl.o: ../decl.h
 custtbl.o: ../endian_calc.h
 custtbl.o: ../hash.h
+custtbl.o: ../have_ban_pragma.h
 custtbl.o: ../have_const.h
 custtbl.o: ../have_memmv.h
 custtbl.o: ../have_newstr.h
@@ -740,3 +767,7 @@ custtbl.o: ../str.h
 custtbl.o: ../value.h
 custtbl.o: ../zmath.h
 custtbl.o: custtbl.c
+
+##################################################
+# NOTE: End of section from custom/Makefile.tail #
+##################################################

custom/c_argv.c

@@ -1,7 +1,7 @@
 /*
  * c_argv - a custom function display info about its args
  *
- * Copyright (C) 1999-2006  Landon Curt Noll
+ * Copyright (C) 1999-2006,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -38,6 +38,10 @@
 
 #include "have_unused.h"
 
+
+#include "banned.h"	/* include after system header <> includes */
+
+
 /*
  * c_argv - a custom function display info about its args
  *
@@ -49,7 +53,7 @@
  */
 /*ARGSUSED*/
 VALUE
-c_argv(char UNUSED *name, int count, VALUE **vals)
+c_argv(char *UNUSED(name), int count, VALUE **vals)
 {
 	VALUE result;		/* what we will return */
 	ZVALUE zfilelen;	/* length of a file as a ZVALUE */

custom/c_devnull.c

@@ -1,7 +1,7 @@
 /*
  * c_devnull - a custom function that does nothing
  *
- * Copyright (C) 1999-2004  Landon Curt Noll
+ * Copyright (C) 1999-2004,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -39,6 +39,9 @@
 #include "have_unused.h"
 
 
+#include "banned.h"	/* include after system header <> includes */
+
+
 /*
  * c_devnull - a custom function that does nothing
  *
@@ -47,7 +50,7 @@
  */
 /*ARGSUSED*/
 VALUE
-c_devnull(char UNUSED *name, int UNUSED count, VALUE UNUSED **vals)
+c_devnull(char *UNUSED(name), int UNUSED(count), VALUE **UNUSED(vals))
 {
 	VALUE result;		/* what we will return */
 

custom/c_help.c

@@ -1,7 +1,7 @@
 /*
  * c_help - custom help function
  *
- * Copyright (C) 1999-2004  Landon Curt Noll
+ * Copyright (C) 1999-2004,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -39,6 +39,9 @@
 #include "have_unused.h"
 
 
+#include "banned.h"	/* include after system header <> includes */
+
+
 /*
  * c_help - custom help function
  *
@@ -58,7 +61,7 @@
  */
 /*ARGSUSED*/
 VALUE
-c_help(char UNUSED *name, int UNUSED count, VALUE **vals)
+c_help(char *UNUSED(name), int UNUSED(count), VALUE **vals)
 {
 	VALUE result;		/* what we will return */
 

custom/c_pmodm127.c

@@ -1,7 +1,7 @@
 /*
  * c_pmodm127 - calculate q mod 2^(2^127-1)
  *
- * Copyright (C) 2004-2007  Landon Curt Noll
+ * Copyright (C) 2004-2007,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -35,6 +35,10 @@
 
 #include "have_unused.h"
 
+
+#include "banned.h"	/* include after system header <> includes */
+
+
 /* 2^255 */
 STATIC HALF h255[] = {
 #if BASEB == 32
@@ -71,7 +75,7 @@ STATIC ZVALUE lastmodinv[1];
  */
 /*ARGSUSED*/
 VALUE
-c_pmodm127(char UNUSED *name, int UNUSED count, VALUE **vals)
+c_pmodm127(char *UNUSED(name), int UNUSED(count), VALUE **vals)
 {
 	VALUE result;		/* what we will return */
 	ZVALUE q;		/* test factor */
@@ -124,7 +128,7 @@ c_pmodm127(char UNUSED *name, int UNUSED count, VALUE **vals)
 	result.v_type = V_NUM;
 
 	/*
-	 * compute 2^(2^127-1) mod q by modular exponentation
+	 * compute 2^(2^127-1) mod q by modular exponentiation
 	 *
 	 * We implement the following calc code in C:
 	 *

custom/c_pzasusb8.c

@@ -1,7 +1,7 @@
 /*
- * c_pzasusb8 - print numereator as a string of USB8s
+ * c_pzasusb8 - print numerator as a string of USB8s
  *
- * Copyright (C) 1999-2004  Ernest Bowen
+ * Copyright (C) 1999-2004,2021  Ernest Bowen
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -35,8 +35,12 @@
 
 #include "have_unused.h"
 
+
+#include "banned.h"	/* include after system header <> includes */
+
+
 /*
- * c_pzasusb8 - print numereator as a string of USB8s
+ * c_pzasusb8 - print numerator as a string of USB8s
  *
  * given:
  *    count = 1;
@@ -47,7 +51,7 @@
  */
 /*ARGSUSED*/
 VALUE
-c_pzasusb8(char UNUSED *name, int UNUSED count, VALUE **vals)
+c_pzasusb8(char *UNUSED(name), int UNUSED(count), VALUE **vals)
 {
 	VALUE result;		/* what we will return */
 	ZVALUE z;		/* numerator of the value */

custom/c_register.c

@@ -1,7 +1,7 @@
 /*
  * c_register - set or print a custom register value
  *
- * Copyright (C) 2007  Landon Curt Noll
+ * Copyright (C) 2007,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -39,6 +39,9 @@
 #include "have_unused.h"
 
 
+#include "banned.h"	/* include after system header <> includes */
+
+
 /*
  * registers
  */
@@ -76,7 +79,7 @@ init_custreg(void)
  */
 /*ARGSUSED*/
 VALUE
-c_register(char UNUSED *name, int count, VALUE **vals)
+c_register(char *UNUSED(name), int count, VALUE **vals)
 {
 	VALUE result;		/* what we will return */
 	long reg;		/* register number */

custom/c_sysinfo.c

@@ -1,7 +1,7 @@
 /*
  * c_sysinfo - names and values of selected #defines
  *
- * Copyright (C) 1999-2007  Landon Curt Noll
+ * Copyright (C) 1999-2007,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -57,6 +57,9 @@
 #include "have_unused.h"
 
 
+#include "banned.h"	/* include after system header <> includes */
+
+
 /*
  * sys_info - names and values of selected #defines
  */
@@ -173,21 +176,19 @@ STATIC struct infoname sys_info[] = {
      (FULL)MAXSCANCOUNT},
     {"MAXSTACK", "max depth of evaluation stack", NULL,
      (FULL)MAXSTACK},
-    {"MAXSTRING", "max size of string constant", NULL,
-     (FULL)MAXSTRING},
     {"MAXUFULL", "largest FULL value", NULL,
      (FULL)MAXUFULL},
     {"MAXULONG", "largest unsigned long val", NULL,
      (FULL)MAXULONG},
-    {"MAX_MAP_PRIME", "larest prime in pr_map", NULL,
+    {"MAX_MAP_PRIME", "largest prime in pr_map", NULL,
      (FULL)MAX_MAP_PRIME},
-    {"MAX_MAP_VAL", "larest bit in pr_map", NULL,
+    {"MAX_MAP_VAL", "largest bit in pr_map", NULL,
      (FULL)MAX_MAP_VAL},
     {"MAX_PFACT_VAL", "max x, for which pfact(x) is a long", NULL,
      (FULL)MAX_PFACT_VAL},
-    {"MAX_SM_PRIME", "larest 32 bit prime", NULL,
+    {"MAX_SM_PRIME", "largest 32 bit prime", NULL,
      (FULL)MAX_SM_PRIME},
-    {"MAX_SM_VAL", "larest 32 bit value", NULL,
+    {"MAX_SM_VAL", "largest 32 bit value", NULL,
      (FULL)MAX_SM_VAL},
     {"MUL_ALG2", "default size for alternative multiply", NULL,
      (FULL)MUL_ALG2},
@@ -268,7 +269,7 @@ S_FUNC void dump_mening_value(void);	/* custom("sysinfo", 2) */
  */
 /*ARGSUSED*/
 VALUE
-c_sysinfo(char UNUSED *name, int count, VALUE **vals)
+c_sysinfo(char *UNUSED(name), int count, VALUE **vals)
 {
 	VALUE result;		/* what we will return */
 	struct infoname *p;	/* current infoname */

custom/custtbl.c

@@ -1,7 +1,7 @@
 /*
  * custtbl - custom interface table
  *
- * Copyright (C) 1999-2007  Landon Curt Noll
+ * Copyright (C) 1999-2007,2021  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -30,6 +30,10 @@
 #include "value.h"
 #include "custom.h"
 
+
+#include "banned.h"	/* include after system header <> includes */
+
+
 /*
  * NOTE: See the file CUSTOM for instructions on how to add
  *	 custom functions.
@@ -40,7 +44,7 @@
 
 
 /*
- * add your forward custom function declaractions here
+ * add your forward custom function declarations here
  *
  * Declare custom functions as follows:
  *

custom/devnull

@@ -10,7 +10,7 @@ TYPES
     return	null
 
 DESCRIPTION
-    This custom function does nothing.	It is intented for testing
+    This custom function does nothing.	It is intended for testing
     of the general custom interface.
 
 EXAMPLE
@@ -26,7 +26,7 @@ LIBRARY
 SEE ALSO
     custom
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2021  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

custom/pmodm127

@@ -25,7 +25,7 @@ DESCRIPTION
     SPECIAL NOTE:
 
 	Can you find a value, q, for which this custom function returns 1?
-	If you do, send the value of q to chongo using the EMail address
+	If you do, send the value of q to chongo using the Email address
 	found at:
 
 	    http://www.isthe.com/chongo/address.html
@@ -51,7 +51,7 @@ LIBRARY
 SEE ALSO
     custom
 
-## Copyright (C) 2004  Landon Curt Noll
+## Copyright (C) 2004,2021  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

custom/pzasusb8

@@ -21,7 +21,7 @@ DESCRIPTION
 
     for details.
 
-    This custom function is intented for testing of the general
+    This custom function is intended for testing of the general
     custom interface.
 
 EXAMPLE
@@ -49,7 +49,7 @@ LIBRARY
 SEE ALSO
     custom
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2021  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

custom/pzasusb8.cal

@@ -1,7 +1,7 @@
 /*
- * pzasusb8 - print numereator as a string of USB8s
+ * pzasusb8 - print numerator as a string of USB8s
  *
- * Copyright (C) 1999,2004  Ernest Bowen and Landon Curt Noll
+ * Copyright (C) 1999,2004,2021  Ernest Bowen and Landon Curt Noll
  *
  * Primary author:  Ernest Bowen
  *

custom/register

@@ -20,14 +20,14 @@ DESCRIPTION
 
     The number of custom registers is defined at compile time.
     There will be at least 32 registers although there could be more
-    added in the future.  It may be deterimed by:
+    added in the future.  It may be determined by:
 
 		custom("sysinfo", "REGNUM_MAX")
 
     The custom registers are initialized to 0 by the internal
     function libcalc_call_me_first() during calc startup.
 
-    This custom interface is intented to make it easier to interface
+    This custom interface is intended to make it easier to interface
     with special purpose hardware.
 
 EXAMPLE
@@ -46,7 +46,7 @@ EXAMPLE
 LIMITS
     calc must be built with ALLOW_CUSTOM= -DCUSTOM
     calc must be executed with a -C arg.
-    The regnum numbe bee an integer >= 0 and < REGNUM_MAX where
+    The regnum number bee an integer >= 0 and < REGNUM_MAX where
         REGNUM_MAX is a compile time constant that is >= 32.
 
 LIBRARY
@@ -55,7 +55,7 @@ LIBRARY
 SEE ALSO
     custom
 
-## Copyright (C) 2007  Landon Curt Noll
+## Copyright (C) 2007,2021  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

custom/sysinfo

@@ -13,7 +13,7 @@ DESCRIPTION
 
     This custom function will return the value certain selected #define
     values.  The infoname arg must be a string that matches the given
-    #define name.  For conveience, the case infoname does not matter,
+    #define name.  For convenience, the case infoname does not matter,
     so "baseb" and "BASEB" refer to the same #define value.
 
     The return value is either an integer or a string depending on
@@ -53,7 +53,7 @@ LIBRARY
 SEE ALSO
     custom
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2021  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

decl.h

@@ -1,7 +1,7 @@
 /*
  * decl - variable and function declaration macros
  *
- * Copyright (C) 2007,2014  Landon Curt Noll
+ * Copyright (C) 2007,2014,2021  Landon Curt Noll
  *
  * Primary author:  Landon Curt Noll
  *