diff --git a/amath.1 b/amath.1 index 265e9c31..5496b675 100644 --- a/amath.1 +++ b/amath.1 @@ -20,7 +20,7 @@ .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.TH amath 1 "Version 1.8.3" "July 21 2017" +.TH amath 1 "Version 1.8.4" "August 05 2018" .SH NAME amath \- Simple command line calculator .SH SYNOPSIS @@ -128,6 +128,7 @@ archcc Inverse hacoversed cosine function .fi .SH STATEMENTS .nf +about Show about text clear Clear console window def Define function delete Delete variable or function @@ -144,6 +145,7 @@ load Load variable and functions from file save Save variable and functions to file variables Show list of variables version Show version string +license Show copyright and license texts memory Show internal memory usage exit Exit program .fi diff --git a/amath.doxygen b/amath.doxygen index 8a3591a3..7e8362c9 100644 --- a/amath.doxygen +++ b/amath.doxygen @@ -1,7 +1,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "amath" -PROJECT_NUMBER = "1.8.3" +PROJECT_NUMBER = "1.8.4" PROJECT_BRIEF = "Simple command line calculator" PROJECT_LOGO = OUTPUT_DIRECTORY = ../amath-doc diff --git a/builddeb b/builddeb index 30e6a2ca..b35521b6 100755 --- a/builddeb +++ b/builddeb @@ -30,7 +30,7 @@ set -e -version="1.8.3" +version="1.8.4" build_package () { @@ -87,7 +87,7 @@ echo "Depends: libc6" echo "Section: math" echo "Priority: optional" echo "Homepage: https://amath.innolan.net" -echo "Built-Using: gcc-5.4" +echo "Built-Using: gcc-7.3" echo "Description: Simple command line calculator" echo " Features a case sensitive command line interface, internal IEEE 754" echo " calculations with 15 significant digits, calculations with real and" diff --git a/builddebdev b/builddebdev index 59c01abe..c8ab61b9 100755 --- a/builddebdev +++ b/builddebdev @@ -32,7 +32,7 @@ set -e -version="1.8.3" +version="1.8.4" build_package () { diff --git a/builddist b/builddist index 8676e1de..5587b26f 100755 --- a/builddist +++ b/builddist @@ -67,7 +67,3 @@ date -Ru >dist/build_date mv dist amath #lha-ac a amath.lha amath - -# GCC 6.x -#./configure --enable-test --cross-compile="/opt/m68k-amigaos6/bin/m68k-amigaos" CFLAGS="-m68000 -noixemul" LDFLAGS="-Xlinker --allow-multiple-definition" -#make static diff --git a/buildsrc b/buildsrc index 1dac978f..5fe93eb5 100755 --- a/buildsrc +++ b/buildsrc @@ -8,8 +8,8 @@ # DO NOT USE THIS SCRIPT UNLESS YOU KNOW WHAT YOU ARE DOING ! -version='1.8.3' -stamp="201707210000" +version='1.8.4' +stamp="201808050000" srcdir="amath-rc" distdir="amath-${version}" cd .. diff --git a/buildwin b/buildwin index d931b37d..4d341b15 100755 --- a/buildwin +++ b/buildwin @@ -8,7 +8,7 @@ set -e -version="1.8.3" +version="1.8.4" echo "Building amath ${version} for Windows ..." diff --git a/catalog/english/amath-text.ct b/catalog/english/amath-text.ct index 923b6bad..7e0d0082 100644 --- a/catalog/english/amath-text.ct +++ b/catalog/english/amath-text.ct @@ -1,4 +1,4 @@ -## version $VER: amath-text.catalog 1.70 (28.02.2017) English +## version $VER: amath-text.catalog 1.84 (05.08.2018) English ## language english ## codeset 0 ; ############################################################################# @@ -33,6 +33,8 @@ INTROMSG #NORMALTEXT##BOLD##STARTMSG##NEWLINE##NORMALTEXT##COLOR02#Type help to show info.#NEWLINE# STATEMENTLINE ---------------------------------------------------------#NEWLINE# +STATEMENTABOUT +about Show about text#NEWLINE# STATEMENTCLEAR clear Clear console window.#NEWLINE# STATEMENTDEF @@ -65,6 +67,8 @@ STATEMENTVARS variables Show list of variables.#NEWLINE# STATEMENTVERSION version Show version string.#NEWLINE# +STATEMENTLICENSE +license Show copyright and license texts#NEWLINE# STATEMENTMEMORY memory Show internal memory usage.#NEWLINE# STATEMENTEXIT diff --git a/configure b/configure index 71370de8..95726503 100755 --- a/configure +++ b/configure @@ -27,7 +27,7 @@ set -e -version="1.8.3" +version="1.8.4" clang=false debugsym=false diff --git a/src/clib/amathc.3 b/src/clib/amathc.3 index 2bbddcd0..3564f31e 100644 --- a/src/clib/amathc.3 +++ b/src/clib/amathc.3 @@ -20,7 +20,7 @@ .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.TH "amathc.h" 3 "Version 1.8.3" "July 21 2017" +.TH "amathc.h" 3 "Version 1.8.4" "August 05 2018" .SH NAME amathc.h \- C functions for manipulating strings and memory .SH SYNOPSIS diff --git a/src/clib/amathc.dox b/src/clib/amathc.dox index c00cb619..7ab86326 100644 --- a/src/clib/amathc.dox +++ b/src/clib/amathc.dox @@ -1,7 +1,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "amathc" -PROJECT_NUMBER = "1.8.3" +PROJECT_NUMBER = "1.8.4" PROJECT_BRIEF = "C functions for manipulating strings and memory" PROJECT_LOGO = OUTPUT_DIRECTORY = diff --git a/src/clib/amathc.pc b/src/clib/amathc.pc index 0e3664ef..ad7ef13b 100644 --- a/src/clib/amathc.pc +++ b/src/clib/amathc.pc @@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib Name: amath C library Description: C functions for manipulating strings and memory -Version: 1.8.3 +Version: 1.8.4 Cflags: -I${includedir} Libs: -L${libdir} -lamathc diff --git a/src/cplex/amathi.3 b/src/cplex/amathi.3 index 78b92e7e..d813da2e 100644 --- a/src/cplex/amathi.3 +++ b/src/cplex/amathi.3 @@ -20,7 +20,7 @@ .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.TH "mathi.h" 3 "Version 1.8.3" "July 21 2017" +.TH "mathi.h" 3 "Version 1.8.4" "August 05 2018" .SH NAME mathi.h \- Complex numbers math library .SH SYNOPSIS diff --git a/src/cplex/amathi.dox b/src/cplex/amathi.dox index 230a864b..e169afb1 100644 --- a/src/cplex/amathi.dox +++ b/src/cplex/amathi.dox @@ -1,7 +1,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "amathi" -PROJECT_NUMBER = "1.8.3" +PROJECT_NUMBER = "1.8.4" PROJECT_BRIEF = "Complex numbers math library" PROJECT_LOGO = OUTPUT_DIRECTORY = diff --git a/src/cplex/amathi.pc b/src/cplex/amathi.pc index b799cf09..6829d468 100644 --- a/src/cplex/amathi.pc +++ b/src/cplex/amathi.pc @@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib Name: amath complex library Description: Complex numbers math library -Version: 1.8.3 +Version: 1.8.4 Cflags: -I${includedir} Libs: -L${libdir} -lamathi diff --git a/src/lib/amatha.pc b/src/lib/amatha.pc index a91b12fa..c1ea2108 100644 --- a/src/lib/amatha.pc +++ b/src/lib/amatha.pc @@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib Name: amath application library Description: C++ library for handling numbers -Version: 1.8.3 +Version: 1.8.4 Cflags: -I${includedir} Libs: -L${libdir} -lamathapp -lamathr -lamathi -lamathc diff --git a/src/loc/text.h b/src/loc/text.h index 16287b6d..dc903600 100644 --- a/src/loc/text.h +++ b/src/loc/text.h @@ -46,114 +46,118 @@ #define INTROMSG (Program->Language->GetText(0)) #define STATEMENTLINE (Program->Language->GetText(1)) -#define STATEMENTCLEAR (Program->Language->GetText(2)) -#define STATEMENTDEF (Program->Language->GetText(3)) -#define STATEMENTDELETE (Program->Language->GetText(4)) -#define STATEMENTDIGITS (Program->Language->GetText(5)) -#define STATEMENTEVAL (Program->Language->GetText(6)) -#define STATEMENTEXECUTE (Program->Language->GetText(7)) -#define STATEMENTFUNCS (Program->Language->GetText(8)) -#define STATEMENTINPUT (Program->Language->GetText(9)) -#define STATEMENTHELP (Program->Language->GetText(10)) -#define STATEMENTOUTPUT (Program->Language->GetText(11)) -#define STATEMENTLIST (Program->Language->GetText(12)) -#define STATEMENTSHOW (Program->Language->GetText(13)) -#define STATEMENTLOAD (Program->Language->GetText(14)) -#define STATEMENTSAVE (Program->Language->GetText(15)) -#define STATEMENTVARS (Program->Language->GetText(16)) -#define STATEMENTVERSION (Program->Language->GetText(17)) -#define STATEMENTMEMORY (Program->Language->GetText(18)) -#define STATEMENTEXIT (Program->Language->GetText(19)) -#define STATEMENTFOOTER (Program->Language->GetText(20)) -#define TXTLISTDIRHEADER (Program->Language->GetText(21)) -#define TXTLISTDIRTFILE (Program->Language->GetText(22)) -#define TXTLISTDIRTDIR (Program->Language->GetText(23)) -#define TXTLISTDIRTUNKNOWN (Program->Language->GetText(24)) -#define TXTMEMBLOCKS (Program->Language->GetText(25)) -#define TXTMEMSIZE (Program->Language->GetText(26)) -#define TXTMEMMAXSIZE (Program->Language->GetText(27)) -#define HELPNOHELP (Program->Language->GetText(28)) -#define HELPSYNTAX (Program->Language->GetText(29)) -#define HELPUERROR (Program->Language->GetText(30)) -#define HELPVARNDEF (Program->Language->GetText(31)) -#define HELPFUNNDEF (Program->Language->GetText(32)) -#define HELPFUNRDEF (Program->Language->GetText(33)) -#define HELPPNUMERA (Program->Language->GetText(34)) -#define HELPPDIGITS (Program->Language->GetText(35)) -#define HELPINPUSHOW (Program->Language->GetText(36)) -#define HELPOUTPSHOW (Program->Language->GetText(37)) -#define HELPINPUSETT (Program->Language->GetText(38)) -#define HELPOUTPSETT (Program->Language->GetText(39)) -#define HELPDIGISETT (Program->Language->GetText(40)) -#define HELPDIGISHOW (Program->Language->GetText(41)) -#define HELPVARSNDEF (Program->Language->GetText(42)) -#define HELPFUNCNDEF (Program->Language->GetText(43)) -#define HELPLOADSUCC (Program->Language->GetText(44)) -#define HELPSAVESUCC (Program->Language->GetText(45)) -#define HELPSAVEFAIL (Program->Language->GetText(46)) -#define HELPSAVENOTH (Program->Language->GetText(47)) -#define HELPPREFLOAD (Program->Language->GetText(48)) -#define HELPPREFNOLO (Program->Language->GetText(49)) -#define HELPPREFSAVE (Program->Language->GetText(50)) -#define HELPPREFNOSA (Program->Language->GetText(51)) -#define MSGNODIR (Program->Language->GetText(52)) -#define MSGNOFILE (Program->Language->GetText(53)) +#define STATEMENTABOUT (Program->Language->GetText(2)) +#define STATEMENTCLEAR (Program->Language->GetText(3)) +#define STATEMENTDEF (Program->Language->GetText(4)) +#define STATEMENTDELETE (Program->Language->GetText(5)) +#define STATEMENTDIGITS (Program->Language->GetText(6)) +#define STATEMENTEVAL (Program->Language->GetText(7)) +#define STATEMENTEXECUTE (Program->Language->GetText(8)) +#define STATEMENTFUNCS (Program->Language->GetText(9)) +#define STATEMENTINPUT (Program->Language->GetText(10)) +#define STATEMENTHELP (Program->Language->GetText(11)) +#define STATEMENTOUTPUT (Program->Language->GetText(12)) +#define STATEMENTLIST (Program->Language->GetText(13)) +#define STATEMENTSHOW (Program->Language->GetText(14)) +#define STATEMENTLOAD (Program->Language->GetText(15)) +#define STATEMENTSAVE (Program->Language->GetText(16)) +#define STATEMENTVARS (Program->Language->GetText(17)) +#define STATEMENTVERSION (Program->Language->GetText(18)) +#define STATEMENTLICENSE (Program->Language->GetText(19)) +#define STATEMENTMEMORY (Program->Language->GetText(20)) +#define STATEMENTEXIT (Program->Language->GetText(21)) +#define STATEMENTFOOTER (Program->Language->GetText(22)) +#define TXTLISTDIRHEADER (Program->Language->GetText(23)) +#define TXTLISTDIRTFILE (Program->Language->GetText(24)) +#define TXTLISTDIRTDIR (Program->Language->GetText(25)) +#define TXTLISTDIRTUNKNOWN (Program->Language->GetText(26)) +#define TXTMEMBLOCKS (Program->Language->GetText(27)) +#define TXTMEMSIZE (Program->Language->GetText(28)) +#define TXTMEMMAXSIZE (Program->Language->GetText(29)) +#define HELPNOHELP (Program->Language->GetText(30)) +#define HELPSYNTAX (Program->Language->GetText(31)) +#define HELPUERROR (Program->Language->GetText(32)) +#define HELPVARNDEF (Program->Language->GetText(33)) +#define HELPFUNNDEF (Program->Language->GetText(34)) +#define HELPFUNRDEF (Program->Language->GetText(35)) +#define HELPPNUMERA (Program->Language->GetText(36)) +#define HELPPDIGITS (Program->Language->GetText(37)) +#define HELPINPUSHOW (Program->Language->GetText(38)) +#define HELPOUTPSHOW (Program->Language->GetText(39)) +#define HELPINPUSETT (Program->Language->GetText(40)) +#define HELPOUTPSETT (Program->Language->GetText(41)) +#define HELPDIGISETT (Program->Language->GetText(42)) +#define HELPDIGISHOW (Program->Language->GetText(43)) +#define HELPVARSNDEF (Program->Language->GetText(44)) +#define HELPFUNCNDEF (Program->Language->GetText(45)) +#define HELPLOADSUCC (Program->Language->GetText(46)) +#define HELPSAVESUCC (Program->Language->GetText(47)) +#define HELPSAVEFAIL (Program->Language->GetText(48)) +#define HELPSAVENOTH (Program->Language->GetText(49)) +#define HELPPREFLOAD (Program->Language->GetText(50)) +#define HELPPREFNOLO (Program->Language->GetText(51)) +#define HELPPREFSAVE (Program->Language->GetText(52)) +#define HELPPREFNOSA (Program->Language->GetText(53)) +#define MSGNODIR (Program->Language->GetText(54)) +#define MSGNOFILE (Program->Language->GetText(55)) static const textdef textdefs[] = { { 0, "#NORMALTEXT##BOLD##STARTMSG##NEWLINE##NORMALTEXT##COLOR02#Type help to show info.#NEWLINE#" }, /* INTROMSG */ { 1, "------------------------------------------------------------#NEWLINE#" }, /* STATEMENTLINE */ - { 2, "clear Clear console window#NEWLINE#" }, /* STATEMENTCLEAR */ - { 3, "def Define function#NEWLINE#" }, /* STATEMENTDEF */ - { 4, "delete Delete variable or function#NEWLINE#" }, /* STATEMENTDELETE */ - { 5, "digits Set number of significant digits#NEWLINE#" }, /* STATEMENTDIGITS */ - { 6, "eval Evaluate arithmetic expression#NEWLINE#" }, /* STATEMENTEVAL */ - { 7, "execute Execute statements in a file#NEWLINE#" }, /* STATEMENTEXECUTE */ - { 8, "functions Show list of user defined functions#NEWLINE#" }, /* STATEMENTFUNCS */ - { 9, "input Change numeral input system#NEWLINE#" }, /* STATEMENTINPUT */ - { 10, "help Show basic help text#NEWLINE#" }, /* STATEMENTHELP */ - { 11, "output Change numeral output system#NEWLINE#" }, /* STATEMENTOUTPUT */ - { 12, "list Show content of a directory#NEWLINE#" }, /* STATEMENTLIST */ - { 13, "show Show content of a file#NEWLINE#" }, /* STATEMENTSHOW */ - { 14, "load Load variable and functions from file#NEWLINE#" }, /* STATEMENTLOAD */ - { 15, "save Save variable and functions to file#NEWLINE#" }, /* STATEMENTSAVE */ - { 16, "variables Show list of variables#NEWLINE#" }, /* STATEMENTVARS */ - { 17, "version Show version string#NEWLINE#" }, /* STATEMENTVERSION */ - { 18, "memory Show internal memory usage#NEWLINE#" }, /* STATEMENTMEMORY */ - { 19, "exit Exit program#NEWLINE#" }, /* STATEMENTEXIT */ - { 20, "The def and eval statements are optional. Functions and#NEWLINE#variables statements can be shorten to funcs and vars.#NEWLINE#" }, /* STATEMENTFOOTER */ - { 21, "Type Name#NEWLINE#--------------------------------------------------#NEWLINE#" }, /* TXTLISTDIRHEADER */ - { 22, "[file]" }, /* TXTLISTDIRTFILE */ - { 23, "[dir]" }, /* TXTLISTDIRTDIR */ - { 24, "[unknown]" }, /* TXTLISTDIRTUNKNOWN */ - { 25, "Allocated blocks:#SPACE#" }, /* TXTMEMBLOCKS */ - { 26, "Memory usage: #SPACE#" }, /* TXTMEMSIZE */ - { 27, "Maximum usage: #SPACE#" }, /* TXTMEMMAXSIZE */ - { 28, "No help is available for this topic.#NEWLINE#" }, /* HELPNOHELP */ - { 29, "Syntax error:#SPACE#" }, /* HELPSYNTAX */ - { 30, "Unexpected error:#SPACE#" }, /* HELPUERROR */ - { 31, "Variable is not defined:#SPACE#" }, /* HELPVARNDEF */ - { 32, "Function is not defined:#SPACE#" }, /* HELPFUNNDEF */ - { 33, "Function cannot be redefined:#SPACE#" }, /* HELPFUNRDEF */ - { 34, "Base value must be between 2 and 32:#SPACE#" }, /* HELPPNUMERA */ - { 35, "Number of digist must be between 0 and 15:#SPACE#" }, /* HELPPDIGITS */ - { 36, "Numeral input system is#SPACE#" }, /* HELPINPUSHOW */ - { 37, "Numeral output system is#SPACE#" }, /* HELPOUTPSHOW */ - { 38, "Input changed to#SPACE#" }, /* HELPINPUSETT */ - { 39, "Output changed to#SPACE#" }, /* HELPOUTPSETT */ - { 40, "Number of digits changed to#SPACE#" }, /* HELPDIGISETT */ - { 41, "Number of digits shown are#SPACE#" }, /* HELPDIGISHOW */ - { 42, "No variables are defined.#NEWLINE#" }, /* HELPVARSNDEF */ - { 43, "No functions are defined.#NEWLINE#" }, /* HELPFUNCNDEF */ - { 44, "Variable and functions loaded from file.#NEWLINE#" }, /* HELPLOADSUCC */ - { 45, "Variable and functions saved to file.#NEWLINE#" }, /* HELPSAVESUCC */ - { 46, "Cannot save to file.#NEWLINE#" }, /* HELPSAVEFAIL */ - { 47, "Nothing to save.#NEWLINE#" }, /* HELPSAVENOTH */ - { 48, "Preferences loaded.#NEWLINE#" }, /* HELPPREFLOAD */ - { 49, "Preferences could not be loaded.#NEWLINE#" }, /* HELPPREFNOLO */ - { 50, "Preferences saved to disk.#NEWLINE#" }, /* HELPPREFSAVE */ - { 51, "Preferences could not be saved.#NEWLINE#" }, /* HELPPREFNOSA */ - { 52, "Could not open directory:#SPACE#" }, /* MSGNODIR */ - { 53, "Cannot open file.#NEWLINE#" }, /* MSGNOFILE */ + { 2, "about Show about text#NEWLINE#" }, /* STATEMENTABOUT */ + { 3, "clear Clear console window#NEWLINE#" }, /* STATEMENTCLEAR */ + { 4, "def Define function#NEWLINE#" }, /* STATEMENTDEF */ + { 5, "delete Delete variable or function#NEWLINE#" }, /* STATEMENTDELETE */ + { 6, "digits Set number of significant digits#NEWLINE#" }, /* STATEMENTDIGITS */ + { 7, "eval Evaluate arithmetic expression#NEWLINE#" }, /* STATEMENTEVAL */ + { 8, "execute Execute statements in a file#NEWLINE#" }, /* STATEMENTEXECUTE */ + { 9, "functions Show list of user defined functions#NEWLINE#" }, /* STATEMENTFUNCS */ + { 10, "input Change numeral input system#NEWLINE#" }, /* STATEMENTINPUT */ + { 11, "help Show basic help text#NEWLINE#" }, /* STATEMENTHELP */ + { 12, "output Change numeral output system#NEWLINE#" }, /* STATEMENTOUTPUT */ + { 13, "list Show content of a directory#NEWLINE#" }, /* STATEMENTLIST */ + { 14, "show Show content of a file#NEWLINE#" }, /* STATEMENTSHOW */ + { 15, "load Load variable and functions from file#NEWLINE#" }, /* STATEMENTLOAD */ + { 16, "save Save variable and functions to file#NEWLINE#" }, /* STATEMENTSAVE */ + { 17, "variables Show list of variables#NEWLINE#" }, /* STATEMENTVARS */ + { 18, "version Show version string#NEWLINE#" }, /* STATEMENTVERSION */ + { 19, "license Show copyright and license texts#NEWLINE#" }, /* STATEMENTLICENSE */ + { 20, "memory Show internal memory usage#NEWLINE#" }, /* STATEMENTMEMORY */ + { 21, "exit Exit program#NEWLINE#" }, /* STATEMENTEXIT */ + { 22, "The def and eval statements are optional. Functions and#NEWLINE#variables statements can be shorten to funcs and vars.#NEWLINE#" }, /* STATEMENTFOOTER */ + { 23, "Type Name#NEWLINE#--------------------------------------------------#NEWLINE#" }, /* TXTLISTDIRHEADER */ + { 24, "[file]" }, /* TXTLISTDIRTFILE */ + { 25, "[dir]" }, /* TXTLISTDIRTDIR */ + { 26, "[unknown]" }, /* TXTLISTDIRTUNKNOWN */ + { 27, "Allocated blocks:#SPACE#" }, /* TXTMEMBLOCKS */ + { 28, "Memory usage: #SPACE#" }, /* TXTMEMSIZE */ + { 29, "Maximum usage: #SPACE#" }, /* TXTMEMMAXSIZE */ + { 30, "No help is available for this topic.#NEWLINE#" }, /* HELPNOHELP */ + { 31, "Syntax error:#SPACE#" }, /* HELPSYNTAX */ + { 32, "Unexpected error:#SPACE#" }, /* HELPUERROR */ + { 33, "Variable is not defined:#SPACE#" }, /* HELPVARNDEF */ + { 34, "Function is not defined:#SPACE#" }, /* HELPFUNNDEF */ + { 35, "Function cannot be redefined:#SPACE#" }, /* HELPFUNRDEF */ + { 36, "Base value must be between 2 and 32:#SPACE#" }, /* HELPPNUMERA */ + { 37, "Number of digist must be between 0 and 15:#SPACE#" }, /* HELPPDIGITS */ + { 38, "Numeral input system is#SPACE#" }, /* HELPINPUSHOW */ + { 39, "Numeral output system is#SPACE#" }, /* HELPOUTPSHOW */ + { 40, "Input changed to#SPACE#" }, /* HELPINPUSETT */ + { 41, "Output changed to#SPACE#" }, /* HELPOUTPSETT */ + { 42, "Number of digits changed to#SPACE#" }, /* HELPDIGISETT */ + { 43, "Number of digits shown are#SPACE#" }, /* HELPDIGISHOW */ + { 44, "No variables are defined.#NEWLINE#" }, /* HELPVARSNDEF */ + { 45, "No functions are defined.#NEWLINE#" }, /* HELPFUNCNDEF */ + { 46, "Variable and functions loaded from file.#NEWLINE#" }, /* HELPLOADSUCC */ + { 47, "Variable and functions saved to file.#NEWLINE#" }, /* HELPSAVESUCC */ + { 48, "Cannot save to file.#NEWLINE#" }, /* HELPSAVEFAIL */ + { 49, "Nothing to save.#NEWLINE#" }, /* HELPSAVENOTH */ + { 50, "Preferences loaded.#NEWLINE#" }, /* HELPPREFLOAD */ + { 51, "Preferences could not be loaded.#NEWLINE#" }, /* HELPPREFNOLO */ + { 52, "Preferences saved to disk.#NEWLINE#" }, /* HELPPREFSAVE */ + { 53, "Preferences could not be saved.#NEWLINE#" }, /* HELPPREFNOSA */ + { 54, "Could not open directory:#SPACE#" }, /* MSGNODIR */ + { 55, "Cannot open file.#NEWLINE#" }, /* MSGNOFILE */ { -1, EMPTYSTRING } }; diff --git a/src/main.h b/src/main.h index 1c410b82..8609aeee 100644 --- a/src/main.h +++ b/src/main.h @@ -79,17 +79,13 @@ https://github.com/rainlance/amath \subsection download Download - Windows: https://amath.innolan.net/amath-1.8.0.zip
-
- FreeBSD: https://www.freshports.org/math/amath/
-
- NetBSD: http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/math/amath/README.html
-
- Haiku: https://github.com/haikuports
-
- Included in the Icaros Desktop environment: http://vmwaros.blogspot.com/
-
- Other packages: https://ranger.innolan.net/rainlance/amath/releases + FreeBSD: freshports.org
+ Haiku OS: depot.haiku-os.org
+ Mac OS X and Linux: pkgsrc.joyent.com<
+ NetBSD: netbsd.org and + pkgsrc.se
+ Windows: amath.innolan.net
+ Other packages: ftp.innolan.net \subsection history History A full \ref release_page is available for amath. @@ -98,6 +94,8 @@ \subsection command_stat Statements \verbatim + + about Show about text clear Clear console window def Define function delete Delete variable or function @@ -114,6 +112,7 @@ save Save variable and functions to file variables Show list of variables version Show version string + license Show copyright and license texts memory Show internal memory usage exit Exit program \endverbatim diff --git a/src/main/statement/help.cpp b/src/main/statement/help.cpp index 02362ddb..c03516ea 100644 --- a/src/main/statement/help.cpp +++ b/src/main/statement/help.cpp @@ -90,12 +90,10 @@ char* HelpStatement::StatementHelp() const output->ClearBuffer(); APPENDHELP(STATEMENTLINE) + APPENDHELP(STATEMENTABOUT) #if defined(AMIGA) || defined(TERMIOS) || defined(WINDOWS) APPENDHELP(STATEMENTCLEAR) #endif - APPENDHELP(STATEMENTDEF) - APPENDHELP(STATEMENTDELETE) - APPENDHELP(STATEMENTDIGITS) APPENDHELP(STATEMENTDEF) APPENDHELP(STATEMENTDELETE) APPENDHELP(STATEMENTDIGITS) @@ -113,6 +111,7 @@ char* HelpStatement::StatementHelp() const APPENDHELP(STATEMENTSAVE) APPENDHELP(STATEMENTVARS) APPENDHELP(STATEMENTVERSION) + APPENDHELP(STATEMENTLICENSE) APPENDHELP(STATEMENTMEMORY) APPENDHELP(STATEMENTEXIT) APPENDHELP(STATEMENTLINE) diff --git a/src/real/amathr.3 b/src/real/amathr.3 index 56c06c7d..e43b9c43 100644 --- a/src/real/amathr.3 +++ b/src/real/amathr.3 @@ -20,7 +20,7 @@ .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.TH "mathr.h" 3 "Version 1.8.3" "July 21 2017" +.TH "mathr.h" 3 "Version 1.8.4" "August 05 2018" .SH NAME mathr.h \- Real numbers math library .SH SYNOPSIS diff --git a/src/real/amathr.dox b/src/real/amathr.dox index 073b634e..9bed491d 100644 --- a/src/real/amathr.dox +++ b/src/real/amathr.dox @@ -1,7 +1,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "amathr" -PROJECT_NUMBER = "1.8.3" +PROJECT_NUMBER = "1.8.4" PROJECT_BRIEF = "Real numbers math library" PROJECT_LOGO = OUTPUT_DIRECTORY = diff --git a/src/real/amathr.pc b/src/real/amathr.pc index d00e6464..62898c68 100644 --- a/src/real/amathr.pc +++ b/src/real/amathr.pc @@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib Name: amath real library Description: Real numbers math library -Version: 1.8.3 +Version: 1.8.4 Cflags: -I${includedir} Libs: -L${libdir} -lamathr diff --git a/text/text.cd b/text/text.cd index b3f5c656..005543ac 100644 --- a/text/text.cd +++ b/text/text.cd @@ -36,6 +36,8 @@ INTROMSG (/8/) #NORMALTEXT##BOLD##STARTMSG##NEWLINE##NORMALTEXT##COLOR02#Type help to show info.#NEWLINE# STATEMENTLINE (/10/) ------------------------------------------------------------#NEWLINE# +STATEMENTABOUT (/10/) +about Show about text#NEWLINE# STATEMENTCLEAR (/10/) clear Clear console window#NEWLINE# STATEMENTDEF (/10/) @@ -68,6 +70,8 @@ STATEMENTVARS (/10/) variables Show list of variables#NEWLINE# STATEMENTVERSION (/10/) version Show version string#NEWLINE# +STATEMENTLICENSE (/10/) +license Show copyright and license texts#NEWLINE# STATEMENTMEMORY (/10/) memory Show internal memory usage#NEWLINE# STATEMENTEXIT (/10/)