diff --git a/app/localize/help.h b/app/localize/help.h index 14fe2ce9..ea2d5644 100644 --- a/app/localize/help.h +++ b/app/localize/help.h @@ -33,7 +33,7 @@ /** * @file help.h * @brief Localized help text definitions. - * + * */ #include "clib.h" @@ -44,46 +44,44 @@ struct helptextdef { int id; Symbol symbol; - const char *key; const char *text; }; static const helptextdef helptexts[] = { - { 0, symzero, "symzero", "Enter command or expression to evaluate.#NEWLINE##SYNTAXHIGHLIGHT#Example: 2+3-cos(3)#NORMALTEXT##NEWLINE# #NEWLINE#More help is available for designated topics.#NEWLINE#-------------------------------------------------#NEWLINE#functions Base functions.#NEWLINE#trigon Trigonometric functions.#NEWLINE#hyper Hyperbolic functions.#NEWLINE#complex Syntax for complex numbers.#NEWLINE#statements Available statements.#NEWLINE#operators Supported operators.#NEWLINE#-------------------------------------------------#NEWLINE##SYNTAXHIGHLIGHT#Example: help trigon#NEWLINE#" }, - { 1, symoperator, "symoperator", "-------------------------------------------------#NEWLINE# + Mathematical addition.#NEWLINE# - Mathematical subtraction.#NEWLINE# * Mathematical multiplication.#NEWLINE# / Mathematical division.#NEWLINE# ^ Mathematical exponentiation.#NEWLINE# = Assignment of variable values.#NEWLINE# | Absolute value of number. #NEWLINE#-------------------------------------------------#NEWLINE#" }, - { 2, symfunction, "symfunction", "-------------------------------------------------#NEWLINE#abs Absolute value of number.#NEWLINE#sgn Mathematical signum function.#NEWLINE#round Round to nearest integer number.#NEWLINE#trunc Discard fraction part of number.#NEWLINE#floor Mathematical floor function.#NEWLINE#ceil Mathematical ceiling function.#NEWLINE#sqrt Square root function (exp 1/2).#NEWLINE#cbrt Cube root function (exp 1/3).#NEWLINE#lb Binary logarithm function (base 2).#NEWLINE#ln Natural logarithm function (base e).#NEWLINE#lg Common logarithm function (base 10).#NEWLINE#-------------------------------------------------#NEWLINE##SYNTAXHIGHLIGHT#Example: round(1.55)#NORMALTEXT##NEWLINE#" }, - { 3, symtrigon, "symtrigon", "-------------------------------------------------#NEWLINE#sin Trigonometric sine function.#NEWLINE#cos Trigonometric cosine function.#NEWLINE#tan Trigonometric tangent function.#NEWLINE#cot Trigonometric cotangent function.#NEWLINE#sec Trigonometric secant function.#NEWLINE#csc Trigonometric cosecant function.#NEWLINE#asin Inverse trigonometric sine function.#NEWLINE#acos Inverse trigonometric cosine function.#NEWLINE#atan Inverse trigonometric tangent function.#NEWLINE#acot Inverse trigonometric cotangent function.#NEWLINE#asec Inverse trigonometric secant function.#NEWLINE#acsc Inverse trigonometric cosecant function.#NEWLINE#-------------------------------------------------#NEWLINE#Inverse functions can be prefixed with ar or arc #NEWLINE#instead of a.#NEWLINE#" }, - { 4, symhyper, "symhyper", "-------------------------------------------------#NEWLINE#sinh Hyperbolic sine function.#NEWLINE#cosh Hyperbolic cosine function.#NEWLINE#tanh Hyperbolic tangent function.#NEWLINE#coth Hyperbolic cotangent function.#NEWLINE#sech Hyperbolic secant function.#NEWLINE#csch Hyperbolic cosecant function. #NEWLINE#asinh Inverse hyperbolic sine function.#NEWLINE#acosh Inverse hyperbolic cosine function.#NEWLINE#atanh Inverse hyperbolic tangent function.#NEWLINE#acoth Inverse hyperbolic cotangent function.#NEWLINE#asech Inverse hyperbolic secant function.#NEWLINE#acsch Inverse hyperbolic cosecant function.#NEWLINE#-------------------------------------------------#NEWLINE#Inverse functions can be prefixed with ar or arc #NEWLINE#instead of a.#NEWLINE#" }, - { 5, symstatement, "symstatement", "---------------------------------------------------------#NEWLINE#clear Clear console window.#NEWLINE#def Define function.#NEWLINE#delete Delete variable or function.#NEWLINE#digits Set number of significant digits.#NEWLINE#eval Evaluate arithmetic expression.#NEWLINE#execute Execute statements in a file.#NEWLINE#functions Show list of user defined functions.#NEWLINE#input Change numeral input system (experimental).#NEWLINE#help Show basic help text.#NEWLINE#output Change numeral output system (experimental).#NEWLINE#list Show content of a directory.#NEWLINE#show Show content of a file.#NEWLINE#load Load variable and functions from file.#NEWLINE#save Save variable and functions to file.#NEWLINE#variables Show list of variables.#NEWLINE#version Show version string.#NEWLINE#memory Show internal memory usage.#NEWLINE#exit Exit program.#NEWLINE#---------------------------------------------------------#NEWLINE#The def and eval statements are optional. Functions and#NEWLINE#variables statements can be shorten to funcs and vars.#NEWLINE#" }, - { 6, symcomplex, "symcomplex", "Expressions with complex numbers are written using an i to denote#NEWLINE#the imaginary value. Complex numbers can seamlessly be mixed with#NEWLINE#real numbers.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: 2+3i#NEWLINE#Example: 2+3.2i*cos(-1i)+5/7#NEWLINE#" }, - { 7, symclear, "symclear", "The clear statement erases all text in the console window.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: clear#NEWLINE#" }, - { 8, symdef, "symdef", "The def statement is used to define functions. When defining a function#NEWLINE#it is possible to omit the def keyword. Defined functions can be shown#NEWLINE#using the functions statement.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: def f(x)=2*x+3#NEWLINE#Optional syntax: f(x)=2*x+3#NEWLINE#" }, - { 9, symdelete, "symdelete", "The delete statement can delete variable and functions. To delete a#NEWLINE#single variable or functions use the name of the function or variable.#NEWLINE#To delete all functions or variables specify either the variable or#NEWLINE#function keyword.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: delete f(x)#NEWLINE#Syntax: delete variables#NEWLINE#" }, - { 10, symdigits, "symdigits", "The digits statement defines the displayed number of significant digits.#NEWLINE#To show current configuration use the digits statement without specifying#NEWLINE#the number.#NEWLINE# #SYNTAXHIGHLIGHT#Syntax: digits 7#NEWLINE#" }, - { 11, symeval, "symeval", "The eval statement evaluates an expression. When evaluating an expression#NEWLINE#it is possible to omit the eval keyword.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: eval 2.4*x+3.2#NEWLINE#Optional syntax: 2.4*x+3.2#NEWLINE#" }, - { 12, symexecute, "symexecute", "The execute statement reads the content of a file and execute all statements.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: execute \"savedfile\"#NEWLINE#" }, - { 13, syminput, "syminput", "The input statement either changes or shows the how numeral input is interpreted.#NEWLINE#Possible input systems are: binary, octal, decimal and hexadecimal. Default is#NEWLINE#decimal. To use positional systems with other bases specify the base number.#NEWLINE#Numeral output system can be modified using the output statement.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: input hexadecimal#NEWLINE#Syntax: input 4#NEWLINE#" }, - { 14, symhelp, "symhelp", "The help statement can be used to display help about topics and statements.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: help variables#NEWLINE#" }, - { 15, symoutput, "symoutput", "The output statement either changes or shows the how numeral output is shown.#NEWLINE#Possible output systems are: binary, octal, decimal and hexadecimal. Default#NEWLINE#is decimal. To use positional systems with other bases specify the base number.#NEWLINE#Numeral input system can be modified using the input statement.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: output octal#NEWLINE#" }, - { 16, symlist, "symlist", "No description is available for the list statement.#NEWLINE#" }, - { 17, symshow, "symshow", "The show statement displays the content of a file.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: show \"filetosee\"#NEWLINE#" }, - { 18, symload, "symload", "The load statement retrieves a set of defined variables and functions from#NEWLINE#a file. Variables and functions can be saved using the save statement.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: load \"savedwork\"#NEWLINE#" }, - { 19, symsave, "symsave", "The save statement saves defined variables and functions to a file in a#NEWLINE#plain text format. Saved variables and functions can be retrieved using#NEWLINE#the load statement.#NEWLINE# #SYNTAXHIGHLIGHT#Syntax: save \"worktokeep\"#NEWLINE#" }, - { 20, symversion, "symversion", "Show which version of amath is running.#NEWLINE#" }, - { 21, symmem, "symmem", "Show internal memory usage together with maximum usage.#NEWLINE#" }, - { 22, symprefs, "symprefs", "There is no help for prefs statement now.#NEWLINE#" }, - { 23, symvariable, "symvariable", "The variable statement shows a list of variables in memory.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: variables#NEWLINE##NORMALTEXT#optional syntax: vars#NEWLINE#" }, - { 24, symexit, "symexit", "The exit statement shuts down amath.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: exit#NEWLINE#" }, - { 25, syme, "syme", "Euler's number is base of the exponential function which equals its own#NEWLINE#derivative. It is approximately equal to 2.71828.#NEWLINE##SYNTAXHIGHLIGHT#Example: ln(e)#NEWLINE#" }, - { 26, sympi, "sympi", "Pi is the ratio of the circumference of a circle to its diameter. Being an#NEWLINE#irrational number, pi cannot be expressed exactly as a common fraction.#NEWLINE#The value of pi is commonly approximated as #SYNTAXHIGHLIGHT#3.14159#NORMALTEXT#.#NEWLINE#" }, - { 27, symi, "symi", "The imaginary unit is denoted and commonly referred to as i.#NEWLINE#The imaginary unit is a number, which when multiplied#NEWLINE#by itself gives -1.#NEWLINE#" }, - { 28, symins, "symins", "No help is available for the ins variable#NEWLINE#" }, - { 29, symbin, "symbin", "No help is available for the binary keyword#NEWLINE" }, - { 30, symoct, "symoct", "No help is available for the octal keyword#NEWLINE" }, - { 31, symdec, "symdec", "No help is available for the decimal keyword#NEWLINE" }, - { 32, symhex, "symhex", "No help is available for the hexadecimal keyword#NEWLINE" }, - { -1, symzero, EMPTYSTRING, EMPTYSTRING } + { 0, symzero, "Enter command or expression to evaluate.#NEWLINE##SYNTAXHIGHLIGHT#Example: 2+3-cos(3)#NORMALTEXT##NEWLINE# #NEWLINE#More help is available for designated topics.#NEWLINE#-------------------------------------------------#NEWLINE#functions Base functions.#NEWLINE#trigon Trigonometric functions.#NEWLINE#hyper Hyperbolic functions.#NEWLINE#complex Syntax for complex numbers.#NEWLINE#statements Available statements.#NEWLINE#operators Supported operators.#NEWLINE#-------------------------------------------------#NEWLINE##SYNTAXHIGHLIGHT#Example: help trigon#NEWLINE#" }, + { 1, symoperator, "-------------------------------------------------#NEWLINE# + Mathematical addition.#NEWLINE# - Mathematical subtraction.#NEWLINE# * Mathematical multiplication.#NEWLINE# / Mathematical division.#NEWLINE# ^ Mathematical exponentiation.#NEWLINE# = Assignment of variable values.#NEWLINE# | Absolute value of number. #NEWLINE#-------------------------------------------------#NEWLINE#" }, + { 2, symfunction, "-------------------------------------------------#NEWLINE#abs Absolute value of number.#NEWLINE#sgn Mathematical signum function.#NEWLINE#round Round to nearest integer number.#NEWLINE#trunc Discard fraction part of number.#NEWLINE#floor Mathematical floor function.#NEWLINE#ceil Mathematical ceiling function.#NEWLINE#sqrt Square root function (exp 1/2).#NEWLINE#cbrt Cube root function (exp 1/3).#NEWLINE#lb Binary logarithm function (base 2).#NEWLINE#ln Natural logarithm function (base e).#NEWLINE#lg Common logarithm function (base 10).#NEWLINE#-------------------------------------------------#NEWLINE##SYNTAXHIGHLIGHT#Example: round(1.55)#NORMALTEXT##NEWLINE#" }, + { 3, symtrigon, "-------------------------------------------------#NEWLINE#sin Trigonometric sine function.#NEWLINE#cos Trigonometric cosine function.#NEWLINE#tan Trigonometric tangent function.#NEWLINE#cot Trigonometric cotangent function.#NEWLINE#sec Trigonometric secant function.#NEWLINE#csc Trigonometric cosecant function.#NEWLINE#asin Inverse trigonometric sine function.#NEWLINE#acos Inverse trigonometric cosine function.#NEWLINE#atan Inverse trigonometric tangent function.#NEWLINE#acot Inverse trigonometric cotangent function.#NEWLINE#asec Inverse trigonometric secant function.#NEWLINE#acsc Inverse trigonometric cosecant function.#NEWLINE#-------------------------------------------------#NEWLINE#Inverse functions can be prefixed with ar or arc #NEWLINE#instead of a.#NEWLINE#" }, + { 4, symhyper, "-------------------------------------------------#NEWLINE#sinh Hyperbolic sine function.#NEWLINE#cosh Hyperbolic cosine function.#NEWLINE#tanh Hyperbolic tangent function.#NEWLINE#coth Hyperbolic cotangent function.#NEWLINE#sech Hyperbolic secant function.#NEWLINE#csch Hyperbolic cosecant function. #NEWLINE#asinh Inverse hyperbolic sine function.#NEWLINE#acosh Inverse hyperbolic cosine function.#NEWLINE#atanh Inverse hyperbolic tangent function.#NEWLINE#acoth Inverse hyperbolic cotangent function.#NEWLINE#asech Inverse hyperbolic secant function.#NEWLINE#acsch Inverse hyperbolic cosecant function.#NEWLINE#-------------------------------------------------#NEWLINE#Inverse functions can be prefixed with ar or arc #NEWLINE#instead of a.#NEWLINE#" }, + { 5, symstatement, "---------------------------------------------------------#NEWLINE#clear Clear console window.#NEWLINE#def Define function.#NEWLINE#delete Delete variable or function.#NEWLINE#digits Set number of significant digits.#NEWLINE#eval Evaluate arithmetic expression.#NEWLINE#execute Execute statements in a file.#NEWLINE#functions Show list of user defined functions.#NEWLINE#input Change numeral input system (experimental).#NEWLINE#help Show basic help text.#NEWLINE#output Change numeral output system (experimental).#NEWLINE#list Show content of a directory.#NEWLINE#show Show content of a file.#NEWLINE#load Load variable and functions from file.#NEWLINE#save Save variable and functions to file.#NEWLINE#variables Show list of variables.#NEWLINE#version Show version string.#NEWLINE#memory Show internal memory usage.#NEWLINE#exit Exit program.#NEWLINE#---------------------------------------------------------#NEWLINE#The def and eval statements are optional. Functions and#NEWLINE#variables statements can be shorten to funcs and vars.#NEWLINE#" }, + { 6, symcomplex, "Expressions with complex numbers are written using an i to denote#NEWLINE#the imaginary value. Complex numbers can seamlessly be mixed with#NEWLINE#real numbers.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: 2+3i#NEWLINE#Example: 2+3.2i*cos(-1i)+5/7#NEWLINE#" }, + { 7, symclear, "The clear statement erases all text in the console window.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: clear#NEWLINE#" }, + { 8, symdef, "The def statement is used to define functions. When defining a function#NEWLINE#it is possible to omit the def keyword. Defined functions can be shown#NEWLINE#using the functions statement.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: def f(x)=2*x+3#NEWLINE#Optional syntax: f(x)=2*x+3#NEWLINE#" }, + { 9, symdelete, "The delete statement can delete variable and functions. To delete a#NEWLINE#single variable or functions use the name of the function or variable.#NEWLINE#To delete all functions or variables specify either the variable or#NEWLINE#function keyword.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: delete f(x)#NEWLINE#Syntax: delete variables#NEWLINE#" }, + { 10, symdigits, "The digits statement defines the displayed number of significant digits.#NEWLINE#To show current configuration use the digits statement without specifying#NEWLINE#the number.#NEWLINE# #SYNTAXHIGHLIGHT#Syntax: digits 7#NEWLINE#" }, + { 11, symeval, "The eval statement evaluates an expression. When evaluating an expression#NEWLINE#it is possible to omit the eval keyword.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: eval 2.4*x+3.2#NEWLINE#Optional syntax: 2.4*x+3.2#NEWLINE#" }, + { 12, symexecute, "The execute statement reads the content of a file and execute all statements.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: execute \"savedfile\"#NEWLINE#" }, + { 13, syminput, "The input statement either changes or shows the how numeral input is interpreted.#NEWLINE#Possible input systems are: binary, octal, decimal and hexadecimal. Default is#NEWLINE#decimal. To use positional systems with other bases specify the base number.#NEWLINE#Numeral output system can be modified using the output statement.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: input hexadecimal#NEWLINE#Syntax: input 4#NEWLINE#" }, + { 14, symhelp, "The help statement can be used to display help about topics and statements.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: help variables#NEWLINE#" }, + { 15, symoutput, "The output statement either changes or shows the how numeral output is shown.#NEWLINE#Possible output systems are: binary, octal, decimal and hexadecimal. Default#NEWLINE#is decimal. To use positional systems with other bases specify the base number.#NEWLINE#Numeral input system can be modified using the input statement.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: output octal#NEWLINE#" }, + { 16, symlist, "No description is available for the list statement.#NEWLINE#" }, + { 17, symshow, "The show statement displays the content of a file.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: show \"filetosee\"#NEWLINE#" }, + { 18, symload, "The load statement retrieves a set of defined variables and functions from#NEWLINE#a file. Variables and functions can be saved using the save statement.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: load \"savedwork\"#NEWLINE#" }, + { 19, symsave, "The save statement saves defined variables and functions to a file in a#NEWLINE#plain text format. Saved variables and functions can be retrieved using#NEWLINE#the load statement.#NEWLINE# #SYNTAXHIGHLIGHT#Syntax: save \"worktokeep\"#NEWLINE#" }, + { 20, symversion, "Show which version of amath is running.#NEWLINE#" }, + { 21, symmem, "Show internal memory usage together with maximum usage.#NEWLINE#" }, + { 22, symprefs, "There is no help for prefs statement now.#NEWLINE#" }, + { 23, symvariable, "The variable statement shows a list of variables in memory.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: variables#NEWLINE##NORMALTEXT#optional syntax: vars#NEWLINE#" }, + { 24, symexit, "The exit statement shuts down amath.#NEWLINE##SYNTAXHIGHLIGHT#Syntax: exit#NEWLINE#" }, + { 25, syme, "Euler's number is base of the exponential function which equals its own#NEWLINE#derivative. It is approximately equal to 2.71828.#NEWLINE##SYNTAXHIGHLIGHT#Example: ln(e)#NEWLINE#" }, + { 26, sympi, "Pi is the ratio of the circumference of a circle to its diameter. Being an#NEWLINE#irrational number, pi cannot be expressed exactly as a common fraction.#NEWLINE#The value of pi is commonly approximated as #SYNTAXHIGHLIGHT#3.14159#NORMALTEXT#.#NEWLINE#" }, + { 27, symi, "The imaginary unit is denoted and commonly referred to as i.#NEWLINE#The imaginary unit is a number, which when multiplied#NEWLINE#by itself gives -1.#NEWLINE#" }, + { 28, symins, "No help is available for the ins variable#NEWLINE#" }, + { 29, symbin, "No help is available for the binary keyword#NEWLINE" }, + { 30, symoct, "No help is available for the octal keyword#NEWLINE" }, + { 31, symdec, "No help is available for the decimal keyword#NEWLINE" }, + { 32, symhex, "No help is available for the hexadecimal keyword#NEWLINE" }, + { -1, symzero, EMPTYSTRING } }; #endif - diff --git a/app/localize/ident.h b/app/localize/ident.h index 56273a66..5c5b4e6b 100644 --- a/app/localize/ident.h +++ b/app/localize/ident.h @@ -33,7 +33,7 @@ /** * @file ident.h * @brief Localized help text definitions. - * + * */ #include "clib.h" diff --git a/app/localize/text.h b/app/localize/text.h index 96b56656..e6aaff8f 100644 --- a/app/localize/text.h +++ b/app/localize/text.h @@ -33,7 +33,7 @@ /** * @file text.h * @brief Localized text definitions. - * + * */ #include "clib.h" @@ -75,46 +75,45 @@ struct textdef { int id; - const char *key; const char *text; }; static const textdef textdefs[] = { - { 0, "INTROMSG", "#NORMALTEXT##BOLD##STARTMSG##NEWLINE##NORMALTEXT##COLOR02##ITALICS#Type help to show info.#NEWLINE#" }, - { 1, "TXTLISTDIRHEADER", "Type Name#NEWLINE#-----------------------------------------------#NEWLINE#" }, - { 2, "TXTLISTDIRTFILE", "[file]" }, - { 3, "TXTLISTDIRTDIR", "[dir]" }, - { 4, "TXTLISTDIRTUNKNOWN", "[unknown]" }, - { 5, "TXTMEMBLOCKS", "Allocated blocks:#SPACE#" }, - { 6, "TXTMEMSIZE", "Memory usage: #SPACE#" }, - { 7, "TXTMEMMAXSIZE", "Maximum usage: #SPACE#" }, - { 8, "HELPNOHELP", "No help is available for this topic.#NEWLINE#" }, - { 9, "HELPSYNTAX", "Syntax error:#SPACE#" }, - { 10, "HELPUERROR", "Unexpected error:#SPACE#" }, - { 11, "HELPVARNDEF", "Variable is not defined:#SPACE#" }, - { 12, "HELPFUNNDEF", "Function is not defined:#SPACE#" }, - { 13, "HELPFUNRDEF", "Function cannot be redefined:#SPACE#" }, - { 14, "HELPPNUMERA", "Base value must be between 2 and 32:#SPACE#" }, - { 15, "HELPPDIGITS", "Number of digist must be between 0 and 15:#SPACE#" }, - { 16, "HELPINPUSHOW", "Numeral input system is#SPACE#" }, - { 17, "HELPOUTPSHOW", "Numeral output system is#SPACE#" }, - { 18, "HELPINPUSETT", "Input changed to#SPACE#" }, - { 19, "HELPOUTPSETT", "Output changed to#SPACE#" }, - { 20, "HELPDIGISETT", "Number of digits changed to#SPACE#" }, - { 21, "HELPDIGISHOW", "Number of digits shown are#SPACE#" }, - { 22, "HELPVARSNDEF", "No variables are defined.#NEWLINE#" }, - { 23, "HELPFUNCNDEF", "No functions are defined.#NEWLINE#" }, - { 24, "HELPLOADSUCC", "Variable and functions loaded from file.#NEWLINE#" }, - { 25, "HELPSAVESUCC", "Variable and functions saved to file.#NEWLINE#" }, - { 26, "HELPSAVEFAIL", "Cannot save to file.#NEWLINE#" }, - { 27, "HELPSAVENOTH", "Nothing to save.#NEWLINE#" }, - { 28, "HELPPREFLOAD", "Preferences loaded.#NEWLINE#" }, - { 29, "HELPPREFNOLO", "Preferences could not be loaded.#NEWLINE#" }, - { 30, "HELPPREFSAVE", "Preferences saved to disk.#NEWLINE#" }, - { 31, "HELPPREFNOSA", "Preferences could not be saved.#NEWLINE#" }, - { 32, "MSGNODIR", "Could not open directory:#SPACE#" }, - { 33, "MSGNOFILE", "Cannot open file.#NEWLINE#" }, - { -1, EMPTYSTRING, EMPTYSTRING } + { 0, "#NORMALTEXT##BOLD##STARTMSG##NEWLINE##NORMALTEXT##COLOR02##ITALICS#Type help to show info.#NEWLINE#" }, /* INTROMSG */ + { 1, "Type Name#NEWLINE#-----------------------------------------------#NEWLINE#" }, /* TXTLISTDIRHEADER */ + { 2, "[file]" }, /* TXTLISTDIRTFILE */ + { 3, "[dir]" }, /* TXTLISTDIRTDIR */ + { 4, "[unknown]" }, /* TXTLISTDIRTUNKNOWN */ + { 5, "Allocated blocks:#SPACE#" }, /* TXTMEMBLOCKS */ + { 6, "Memory usage: #SPACE#" }, /* TXTMEMSIZE */ + { 7, "Maximum usage: #SPACE#" }, /* TXTMEMMAXSIZE */ + { 8, "No help is available for this topic.#NEWLINE#" }, /* HELPNOHELP */ + { 9, "Syntax error:#SPACE#" }, /* HELPSYNTAX */ + { 10, "Unexpected error:#SPACE#" }, /* HELPUERROR */ + { 11, "Variable is not defined:#SPACE#" }, /* HELPVARNDEF */ + { 12, "Function is not defined:#SPACE#" }, /* HELPFUNNDEF */ + { 13, "Function cannot be redefined:#SPACE#" }, /* HELPFUNRDEF */ + { 14, "Base value must be between 2 and 32:#SPACE#" }, /* HELPPNUMERA */ + { 15, "Number of digist must be between 0 and 15:#SPACE#" }, /* HELPPDIGITS */ + { 16, "Numeral input system is#SPACE#" }, /* HELPINPUSHOW */ + { 17, "Numeral output system is#SPACE#" }, /* HELPOUTPSHOW */ + { 18, "Input changed to#SPACE#" }, /* HELPINPUSETT */ + { 19, "Output changed to#SPACE#" }, /* HELPOUTPSETT */ + { 20, "Number of digits changed to#SPACE#" }, /* HELPDIGISETT */ + { 21, "Number of digits shown are#SPACE#" }, /* HELPDIGISHOW */ + { 22, "No variables are defined.#NEWLINE#" }, /* HELPVARSNDEF */ + { 23, "No functions are defined.#NEWLINE#" }, /* HELPFUNCNDEF */ + { 24, "Variable and functions loaded from file.#NEWLINE#" }, /* HELPLOADSUCC */ + { 25, "Variable and functions saved to file.#NEWLINE#" }, /* HELPSAVESUCC */ + { 26, "Cannot save to file.#NEWLINE#" }, /* HELPSAVEFAIL */ + { 27, "Nothing to save.#NEWLINE#" }, /* HELPSAVENOTH */ + { 28, "Preferences loaded.#NEWLINE#" }, /* HELPPREFLOAD */ + { 29, "Preferences could not be loaded.#NEWLINE#" }, /* HELPPREFNOLO */ + { 30, "Preferences saved to disk.#NEWLINE#" }, /* HELPPREFSAVE */ + { 31, "Preferences could not be saved.#NEWLINE#" }, /* HELPPREFNOSA */ + { 32, "Could not open directory:#SPACE#" }, /* MSGNODIR */ + { 33, "Cannot open file.#NEWLINE#" }, /* MSGNOFILE */ + { -1, EMPTYSTRING } }; #endif diff --git a/app/system/language_amiga.cpp b/app/system/language_amiga.cpp index 2bf169fe..fcea8238 100644 --- a/app/system/language_amiga.cpp +++ b/app/system/language_amiga.cpp @@ -46,12 +46,15 @@ AmigaLanguage::AmigaLanguage() locale = OpenLocale(NULL); help = OpenCatalog(NULL, "amath-help.catalog", OC_BuiltInLanguage,"english", + OC_Language,"dansk", TAG_DONE); ident = OpenCatalog(NULL, "amath-ident.catalog", OC_BuiltInLanguage,"english", + OC_Language,"dansk", TAG_DONE); text = OpenCatalog(NULL, "amath-text.catalog", OC_BuiltInLanguage,"english", + OC_Language,"dansk", TAG_DONE); } @@ -79,7 +82,7 @@ char* AmigaLanguage::GetText(int id) return (char*)(HELPNOHELP); } - const char *text = GetCatalogStr(help, def->key, (char*)def->text); + const char *text = GetCatalogStr(help, def->id, (char*)def->text); char *untagged = UntagText(text); return untagged; } @@ -99,7 +102,7 @@ char* AmigaLanguage::GetHelpText(char* ident) return (char*)(HELPNOHELP); } - const char *text = GetCatalogStr(help, def->ident, (char*)def->text); + const char *text = GetCatalogStr(help, def->id, (char*)def->text); char *untagged = UntagText(text); return untagged; } @@ -119,7 +122,7 @@ char* AmigaLanguage::GetHelpText(Symbol symbol) return (char*)(HELPNOHELP); } - const char *text = GetCatalogStr(help, def->key, (char*)def->text); + const char *text = GetCatalogStr(help, def->id, (char*)def->text); char *untagged = UntagText(text); return untagged; } diff --git a/catalog/help.sd b/catalog/help.sd index 808e30ee..47bb6960 100644 --- a/catalog/help.sd +++ b/catalog/help.sd @@ -46,14 +46,12 @@ struct helptextdef { int id; Symbol symbol; - const char *key; const char *text; }; static const helptextdef helptexts[] = { - { %d, %i, "%i", %s }, - { -1, symzero, EMPTYSTRING, EMPTYSTRING } + { %d, %i, %s }, + { -1, symzero, EMPTYSTRING } }; #endif - diff --git a/catalog/text.sd b/catalog/text.sd index c9a2293f..24e99f65 100644 --- a/catalog/text.sd +++ b/catalog/text.sd @@ -44,13 +44,12 @@ struct textdef { int id; - const char *key; const char *text; }; static const textdef textdefs[] = { - { %d, "%i", %s }, - { -1, EMPTYSTRING, EMPTYSTRING } + { %d, %s }, /* %i */ + { -1, EMPTYSTRING } }; #endif