diff --git a/app/localize/help.h b/app/localize/help.h index ea2d5644..ec17491f 100644 --- a/app/localize/help.h +++ b/app/localize/help.h @@ -32,8 +32,8 @@ /** * @file help.h - * @brief Localized help text definitions. - * + * @brief Help texts for statement. + * */ #include "clib.h" diff --git a/app/localize/ialias.h b/app/localize/ialias.h index ad6e783c..24334ef1 100644 --- a/app/localize/ialias.h +++ b/app/localize/ialias.h @@ -62,6 +62,6 @@ static const identalias identaliases[] = { { "arccoth", "acoth" }, { "arcsech", "asech" }, { "arccsch", "acsch" } -} +}; #endif diff --git a/app/localize/ident.h b/app/localize/ident.h index 5c5b4e6b..c85afed0 100644 --- a/app/localize/ident.h +++ b/app/localize/ident.h @@ -27,13 +27,13 @@ * */ -#ifndef AMATH_LOCALIZE_IDENT_HELP_H -#define AMATH_LOCALIZE_IDENT_HELP_H +#ifndef AMATH_LOCALIZE_IDENT_H +#define AMATH_LOCALIZE_IDENT_H /** * @file ident.h - * @brief Localized help text definitions. - * + * @brief Help texts for built-in functions. + * */ #include "clib.h" @@ -52,63 +52,34 @@ static const identhelpdef identtexts[] = { { 4, "floor", "No help is available for this function.#NEWLINE#" }, { 5, "ceil", "No help is available for this function.#NEWLINE#" }, { 6, "sqr", "No help is available for this function.#NEWLINE#" }, - { 7, "sqrt", "No help is available for this function.#NEWLINE#" }, - { 8, "cbr", "No help is available for this function.#NEWLINE#" }, - { 9, "cbrt", "No help is available for this function.#NEWLINE#" }, - { 10, "lb", "No help is available for this function.#NEWLINE#" }, - { 11, "log2", "No help is available for this function.#NEWLINE#" }, - { 12, "ln", "No help is available for this function.#NEWLINE#" }, - { 13, "lg", "No help is available for this function.#NEWLINE#" }, - { 14, "log", "No help is available for this function.#NEWLINE#" }, - { 15, "log10", "No help is available for this function.#NEWLINE#" }, - { 16, "sin", "No help is available for this function.#NEWLINE#" }, - { 17, "cos", "No help is available for this function.#NEWLINE#" }, - { 18, "tan", "No help is available for this function.#NEWLINE#" }, - { 19, "cot", "No help is available for this function.#NEWLINE#" }, - { 20, "sec", "No help is available for this function.#NEWLINE#" }, - { 21, "csc", "No help is available for this function.#NEWLINE#" }, - { 22, "asin", "No help is available for this function.#NEWLINE#" }, - { 23, "acos", "No help is available for this function.#NEWLINE#" }, - { 24, "atan", "No help is available for this function.#NEWLINE#" }, - { 25, "acot", "No help is available for this function.#NEWLINE#" }, - { 26, "asec", "No help is available for this function.#NEWLINE#" }, - { 27, "acsc", "No help is available for this function.#NEWLINE#" }, - { 28, "arsin", "No help is available for this function.#NEWLINE#" }, - { 29, "arcos", "No help is available for this function.#NEWLINE#" }, - { 30, "artan", "No help is available for this function.#NEWLINE#" }, - { 31, "arcot", "No help is available for this function.#NEWLINE#" }, - { 32, "arsec", "No help is available for this function.#NEWLINE#" }, - { 33, "arcsc", "No help is available for this function.#NEWLINE#" }, - { 34, "arcsin", "No help is available for this function.#NEWLINE#" }, - { 35, "arccos", "No help is available for this function.#NEWLINE#" }, - { 36, "arctan", "No help is available for this function.#NEWLINE#" }, - { 37, "arccot", "No help is available for this function.#NEWLINE#" }, - { 38, "arcsec", "No help is available for this function.#NEWLINE#" }, - { 39, "arccsc", "No help is available for this function.#NEWLINE#" }, - { 40, "sinh", "No help is available for this function.#NEWLINE#" }, - { 41, "cosh", "No help is available for this function.#NEWLINE#" }, - { 42, "tanh", "No help is available for this function.#NEWLINE#" }, - { 43, "coth", "No help is available for this function.#NEWLINE#" }, - { 44, "sech", "No help is available for this function.#NEWLINE#" }, - { 45, "csch", "No help is available for this function.#NEWLINE#" }, - { 46, "asinh", "No help is available for this function.#NEWLINE#" }, - { 47, "acosh", "No help is available for this function.#NEWLINE#" }, - { 48, "atanh", "No help is available for this function.#NEWLINE#" }, - { 49, "acoth", "No help is available for this function.#NEWLINE#" }, - { 50, "asech", "No help is available for this function.#NEWLINE#" }, - { 51, "acsch", "No help is available for this function.#NEWLINE#" }, - { 52, "arsinh", "No help is available for this function.#NEWLINE#" }, - { 53, "arcosh", "No help is available for this function.#NEWLINE#" }, - { 54, "artanh", "No help is available for this function.#NEWLINE#" }, - { 55, "arcoth", "No help is available for this function.#NEWLINE#" }, - { 56, "arsech", "No help is available for this function.#NEWLINE#" }, - { 57, "arcsch", "No help is available for this function.#NEWLINE#" }, - { 58, "arcsinh", "No help is available for this function.#NEWLINE#" }, - { 59, "arccosh", "No help is available for this function.#NEWLINE#" }, - { 60, "arctanh", "No help is available for this function.#NEWLINE#" }, - { 61, "arccoth", "No help is available for this function.#NEWLINE#" }, - { 62, "arcsech", "No help is available for this function.#NEWLINE#" }, - { 63, "arccsch", "No help is available for this function.#NEWLINE#" }, + { 7, "cbr", "No help is available for this function.#NEWLINE#" }, + { 8, "lb", "No help is available for this function.#NEWLINE#" }, + { 9, "ln", "No help is available for this function.#NEWLINE#" }, + { 10, "lg", "No help is available for this function.#NEWLINE#" }, + { 11, "sin", "No help is available for this function.#NEWLINE#" }, + { 12, "cos", "No help is available for this function.#NEWLINE#" }, + { 13, "tan", "No help is available for this function.#NEWLINE#" }, + { 14, "cot", "No help is available for this function.#NEWLINE#" }, + { 15, "sec", "No help is available for this function.#NEWLINE#" }, + { 16, "csc", "No help is available for this function.#NEWLINE#" }, + { 17, "asin", "No help is available for this function.#NEWLINE#" }, + { 18, "acos", "No help is available for this function.#NEWLINE#" }, + { 19, "atan", "No help is available for this function.#NEWLINE#" }, + { 20, "acot", "No help is available for this function.#NEWLINE#" }, + { 21, "asec", "No help is available for this function.#NEWLINE#" }, + { 22, "acsc", "No help is available for this function.#NEWLINE#" }, + { 23, "sinh", "No help is available for this function.#NEWLINE#" }, + { 24, "cosh", "No help is available for this function.#NEWLINE#" }, + { 25, "tanh", "No help is available for this function.#NEWLINE#" }, + { 26, "coth", "No help is available for this function.#NEWLINE#" }, + { 27, "sech", "No help is available for this function.#NEWLINE#" }, + { 28, "csch", "No help is available for this function.#NEWLINE#" }, + { 29, "asinh", "No help is available for this function.#NEWLINE#" }, + { 30, "acosh", "No help is available for this function.#NEWLINE#" }, + { 31, "atanh", "No help is available for this function.#NEWLINE#" }, + { 32, "acoth", "No help is available for this function.#NEWLINE#" }, + { 33, "asech", "No help is available for this function.#NEWLINE#" }, + { 34, "acsch", "No help is available for this function.#NEWLINE#" }, { -1, EMPTYSTRING, EMPTYSTRING } }; diff --git a/app/localize/lang.h b/app/localize/lang.h new file mode 100644 index 00000000..83b27375 --- /dev/null +++ b/app/localize/lang.h @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2015 Carsten Larsen + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * 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. + * + */ + +#ifndef AMATH_TEXT_LANGUAGE_H +#define AMATH_TEXT_LANGUAGE_H + +/* +english +bosanski +catala +czech +dansk +deutsch +espanol +francais +italiano +magyar +nederlands +norsk +polski +portugues +portugues-Brasil +russian +slovensko +srpski +suomi +svenska +turkce +*/ + +#endif diff --git a/app/localize/text.h b/app/localize/text.h index e6aaff8f..f205d58e 100644 --- a/app/localize/text.h +++ b/app/localize/text.h @@ -32,8 +32,8 @@ /** * @file text.h - * @brief Localized text definitions. - * + * @brief Static texts in amath. + * */ #include "clib.h" diff --git a/app/system/language.cpp b/app/system/language.cpp index 488eef90..09786c5e 100644 --- a/app/system/language.cpp +++ b/app/system/language.cpp @@ -45,7 +45,7 @@ char* Language::FindAlias(const char* ident) { static const unsigned int count = sizeof(identaliases) / sizeof(identalias); for (unsigned int i = 0; i < count; i++) { - if (StrIsEqual(identaliases[i].ident == ident)) { + if (StrIsEqual(identaliases[i].ident, ident)) { return (char*)identaliases[i].alias; } } diff --git a/app/system/language_amiga.cpp b/app/system/language_amiga.cpp index c6704054..86938349 100644 --- a/app/system/language_amiga.cpp +++ b/app/system/language_amiga.cpp @@ -87,7 +87,7 @@ char* AmigaLanguage::GetText(int id) char* AmigaLanguage::GetHelpText(char* ident) { char *s = FindAlias(ident); - + identhelpdef *def = NOMEM; static const unsigned int count = sizeof(identtexts) / sizeof(identhelpdef); for (unsigned int i = 0; i < count; i++) { diff --git a/catalog/dansk/amath-help.ct b/catalog/dansk/amath-help.ct index fc49da26..2044aefd 100644 --- a/catalog/dansk/amath-help.ct +++ b/catalog/dansk/amath-help.ct @@ -33,7 +33,7 @@ symzero Indtast kommando eller udtryk.#NEWLINE##SYNTAXHIGHLIGHT#Eksempel: 2+3-cos(3)#NORMALTEXT##NEWLINE# #NEWLINE#Mere hjælp er tilgængelig i udvalgte områder.#NEWLINE#-------------------------------------------------#NEWLINE#funktions Grundlæggende funktioner.#NEWLINE#trigon Trigonometriske funktioner.#NEWLINE#hyper Hyperbolske funktioner.#NEWLINE#complex Komplekse tal.#NEWLINE#statements Understøttede kommondoer.#NEWLINE#operators Understøttede operatorer.#NEWLINE#-------------------------------------------------#NEWLINE##SYNTAXHIGHLIGHT#Eksemple: help trigon#NEWLINE# symoperator -------------------------------------------------#NEWLINE# + Matematik addition.#NEWLINE# - Matematik subtraktion.#NEWLINE# * Matematik multiplikation.#NEWLINE# / Matematik division.#NEWLINE# ^ Matematik potensopløftning.#NEWLINE# = Tildeling af variabel værdi.#NEWLINE# | Absolutte eller numerisk værdi.#NEWLINE#-------------------------------------------------#NEWLINE# -symfunktion +symfunction -------------------------------------------------#NEWLINE#abs Absolutte eller numerisk værdi.#NEWLINE#sgn Matematik signum funktion.#NEWLINE#round Afrund til nærmeste heltal.#NEWLINE#trunc Fjern decimaler.#NEWLINE#floor Afrund i positiv retning.#NEWLINE#ceil Afrund i negativ retning.#NEWLINE#sqrt Kvadratrodsfunktion (exponent 1/2).#NEWLINE#cbrt Kubikrods (exponent 1/3).#NEWLINE#lb Binær logaritme funktion (grundtal 2).#NEWLINE#ln Naturlig logaritme funktion (grundtal e).#NEWLINE#lg 10-talslogaritme funktion (grundtal 10).#NEWLINE#-------------------------------------------------#NEWLINE##SYNTAXHIGHLIGHT#Eksempel: round(1.55)#NORMALTEXT##NEWLINE# symtrigon -------------------------------------------------#NEWLINE#sin Trigonometrisk sinus funktion.#NEWLINE#cos Trigonometrisk cosinus funktion.#NEWLINE#tan Trigonometrisk tangent funktion.#NEWLINE#cot Trigonometrisk cotangent funktion.#NEWLINE#sec Trigonometrisk secant funktion.#NEWLINE#csc Trigonometrisk cosecant funktion.#NEWLINE#asin Invers trigonometrisk sinus funktion.#NEWLINE#acos Invers trigonometrisk cosinus funktion.#NEWLINE#atan Invers trigonometrisk tangent funktion.#NEWLINE#acot Invers trigonometrisk cotangent funktion.#NEWLINE#asec Invers trigonometrisk secant funktion.#NEWLINE#acsc Invers trigonometrisk cosecant funktion.#NEWLINE#-------------------------------------------------#NEWLINE#Inverse funktioner kan prefixes med ar eller arc #NEWLINE#i stedet for a.#NEWLINE# diff --git a/catalog/english/amath-ident.ct b/catalog/english/amath-ident.ct index 17623b12..7b2fb0a4 100644 --- a/catalog/english/amath-ident.ct +++ b/catalog/english/amath-ident.ct @@ -2,12 +2,12 @@ ## language english ## codeset 0 ; ############################################################################# -; This file is published under Creative Common License. See: -; http://creativecommons.org/licenses/by-sa/3.0/ -; Parts of the content came from wikipedia.org -; ############################################################################# -; ### flexcat catalog/ident.cd NEWCTFILE catalog/english/amath-ident.ct -; flexcat catalog/ident.cd catalog/english/amath-ident.ct CATALOG catalog/english/amath-ident.catalog +; ## Help texts for built-in functions in amath +; ## ------------------------------------------ +; ## +; ## This file is published under Creative Common License. See: +; ## http://creativecommons.org/licenses/by-sa/3.0/ +; ## Parts of the content came from wikipedia.org ; ############################################################################# abs The absolute value (or modulus) |x| of a real number x is the#NEWLINE#non-negative value of x without regard to its sign.#NEWLINE##SYNTAXHIGHLIGHT#Example: abs(-237.25)#NORMALTEXT##NEWLINE# @@ -23,24 +23,14 @@ ceil No help is available for this function.#NEWLINE# sqr No help is available for this function.#NEWLINE# -sqrt -No help is available for this function.#NEWLINE# cbr No help is available for this function.#NEWLINE# -cbrt -No help is available for this function.#NEWLINE# lb No help is available for this function.#NEWLINE# -log2 -No help is available for this function.#NEWLINE# ln No help is available for this function.#NEWLINE# lg No help is available for this function.#NEWLINE# -log -No help is available for this function.#NEWLINE# -log10 -No help is available for this function.#NEWLINE# sin Sine is the trigonometric function that for an acute angle is the#NEWLINE#ratio between the leg opposite the angle when it is considered#NEWLINE#part of a right triangle and the hypotenuse.#NEWLINE# cos @@ -65,30 +55,6 @@ asec No help is available for this function.#NEWLINE# acsc No help is available for this function.#NEWLINE# -arsin -No help is available for this function.#NEWLINE# -arcos -No help is available for this function.#NEWLINE# -artan -No help is available for this function.#NEWLINE# -arcot -No help is available for this function.#NEWLINE# -arsec -No help is available for this function.#NEWLINE# -arcsc -No help is available for this function.#NEWLINE# -arcsin -No help is available for this function.#NEWLINE# -arccos -No help is available for this function.#NEWLINE# -arctan -No help is available for this function.#NEWLINE# -arccot -No help is available for this function.#NEWLINE# -arcsec -No help is available for this function.#NEWLINE# -arccsc -No help is available for this function.#NEWLINE# sinh No help is available for this function.#NEWLINE# cosh @@ -113,27 +79,3 @@ asech No help is available for this function.#NEWLINE# acsch No help is available for this function.#NEWLINE# -arsinh -No help is available for this function.#NEWLINE# -arcosh -No help is available for this function.#NEWLINE# -artanh -No help is available for this function.#NEWLINE# -arcoth -No help is available for this function.#NEWLINE# -arsech -No help is available for this function.#NEWLINE# -arcsch -No help is available for this function.#NEWLINE# -arcsinh -No help is available for this function.#NEWLINE# -arccosh -No help is available for this function.#NEWLINE# -arctanh -No help is available for this function.#NEWLINE# -arccoth -No help is available for this function.#NEWLINE# -arcsech -No help is available for this function.#NEWLINE# -arccsch -No help is available for this function.#NEWLINE#