Skip to content

GitLab

gnumeric
gnumeric
Commit ab90084f authored by Morten Welinder's avatar Morten Welinder
Browse files
Options

Fix 1308.

parent 8c170537
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 46 deletions
ChangeLog-1999-07-09
View file @ ab90084f
1999-05-28 Morten Welinder <terra@diku.dk>
* src/file.c (workbook_read): Temporarily switch to "C" locale
when loading and saving. I am not sure this is the right thing to
do, but until someone finds a better way, it will work fine.
(workbook_save_as): Ditto.
(workbook_save): Ditto.
* src/fn-math.c (gnumeric_power): Fix domain.
1999-05-27 Morten Welinder <terra@diku.dk>
* src/expr.c (value_get_as_string): Improve precision -- this
......
ChangeLog-2000-02-23
View file @ ab90084f
1999-05-28 Morten Welinder <terra@diku.dk>
* src/file.c (workbook_read): Temporarily switch to "C" locale
when loading and saving. I am not sure this is the right thing to
do, but until someone finds a better way, it will work fine.
(workbook_save_as): Ditto.
(workbook_save): Ditto.
* src/fn-math.c (gnumeric_power): Fix domain.
1999-05-27 Morten Welinder <terra@diku.dk>
* src/expr.c (value_get_as_string): Improve precision -- this
......
OChangeLog-1999-07-09
View file @ ab90084f
1999-05-28 Morten Welinder <terra@diku.dk>
* src/file.c (workbook_read): Temporarily switch to "C" locale
when loading and saving. I am not sure this is the right thing to
do, but until someone finds a better way, it will work fine.
(workbook_save_as): Ditto.
(workbook_save): Ditto.
* src/fn-math.c (gnumeric_power): Fix domain.
1999-05-27 Morten Welinder <terra@diku.dk>
* src/expr.c (value_get_as_string): Improve precision -- this
......
OChangeLog-2000-02-23
View file @ ab90084f
1999-05-28 Morten Welinder <terra@diku.dk>
* src/file.c (workbook_read): Temporarily switch to "C" locale
when loading and saving. I am not sure this is the right thing to
do, but until someone finds a better way, it will work fine.
(workbook_save_as): Ditto.
(workbook_save): Ditto.
* src/fn-math.c (gnumeric_power): Fix domain.
1999-05-27 Morten Welinder <terra@diku.dk>
* src/expr.c (value_get_as_string): Improve precision -- this
......
plugins/fn-math/functions.c
View file @ ab90084f
......@@ -861,7 +861,7 @@ static char *help_int = {
"@DESCRIPTION="
"The INT function round b1 now to the nearest int. "
"Where 'nearest' implies being closer to zero. "
"Equivalent to FLOOR(b1) for b1 >0, amd CEIL(b1) "
"Equivalent to FLOOR(b1) for b1 >= 0, amd CEIL(b1) "
"for b1 < 0. "
"\n"
"Performing this function on a string or empty cell simply does nothing."
......@@ -876,6 +876,8 @@ gnumeric_int (struct FunctionDefinition *i,
{
float_t t;
/* FIXME: What about strings and empty cells? */
t = value_get_as_float (argv [0]);
return value_new_float (t > 0.0 ? floor (t) : ceil (t));
......@@ -944,9 +946,9 @@ static char *help_power = {
"@SYNTAX=POWER(x,y)\n"
"@DESCRIPTION="
"Returns the value of x raised to the power y"
"Returns the value of x raised to the power y."
"\n"
"Performing this function on a string or empty cell returns an error. "
"Performing this function on a string or empty cell returns an error."
"\n"
"@SEEALSO=EXP")
};
......@@ -955,8 +957,17 @@ static Value *
gnumeric_power (struct FunctionDefinition *i,
Value *argv [], char **error_string)
{
return value_new_float (pow(value_get_as_float (argv [0]),
value_get_as_float (argv [1]))) ;
float_t x, y;
x = value_get_as_float (argv [0]);
y = value_get_as_float (argv [1]);
if ((x > 0) || (x == 0 && y > 0) || (x < 0 && y == floor (y)))
return value_new_float (pow (x, y));
/* FIXME: What is supposed to happen for x=y=0? */
*error_string = _("#VALUE!");
return NULL;
}
static char *help_log2 = {
......@@ -1101,7 +1112,7 @@ static char *help_sin = {
"@DESCRIPTION="
"The SIN function returns the sine of x, where x is given "
" in radians. "
" in radians."
"\n"
"Performing this function on a string or empty cell simply does nothing. "
"This function only takes one argument."
......@@ -1121,9 +1132,8 @@ static char *help_sinh = {
"@SYNTAX=SINH(x)\n"
"@DESCRIPTION="
"The SINH function returns the hyperbolic sine of x, "
"which is defined mathematically as (exp(x) - exp(-x)) / 2. "
" x is in radians. "
"The SINH function returns the hyperbolic sine of @x, "
"which is defined mathematically as (exp(x) - exp(-x)) / 2."
"\n"
"Performing this function on a string or empty cell simply does nothing. "
"This function only takes one argument."
......@@ -1143,7 +1153,7 @@ static char *help_sqrt = {
"@SYNTAX=SQRT(x)\n"
"@DESCRIPTION="
"The SQRT function returns the square root of x, "
"The SQRT function returns the square root of @x."
"\n"
"If x is negative returns #NUM!."
"This function only takes one argument."
......@@ -1460,8 +1470,8 @@ static char *help_tan = {
"@SYNTAX=TAN(x)\n"
"@DESCRIPTION="
"The TAN function returns the tangent of x, where x is "
"given in radians. "
"The TAN function returns the tangent of @x, where @x is "
"given in radians."
"\n"
"Performing this function on a string or empty cell simply does nothing. "
"This function only takes one argument."
......@@ -1521,9 +1531,9 @@ static char *help_trunc = {
N_("@FUNCTION=TRUNC\n"
"@SYNTAX=TRUNC(number[,digits])\n"
"@DESCRIPTION=The TRUNC function returns the value of number "
"truncated to the number of digits specified. If digits is omited "
"then digits defaults to zero."
"@DESCRIPTION=The TRUNC function returns the value of @number "
"truncated to the number of digits specified. If @digits is omited "
"then @digits defaults to zero."
"\n"
"\n"
......
src/file.c
View file @ ab90084f
......@@ -11,6 +11,7 @@
#include "dialogs.h"
#include "xml-io.h"
#include "file.h"
#include <locale.h>
static GList *gnumeric_file_savers = NULL;
static GList *gnumeric_file_openers = NULL;
......@@ -138,6 +139,9 @@ workbook_read (const char *filename)
g_return_val_if_fail (filename != NULL, NULL);
/* Files are expected to be in standard C format. */
setlocale (LC_ALL, "C");
for (l = gnumeric_file_openers; l; l = l->next){
const FileOpener *fo = l->data;
......@@ -145,10 +149,14 @@ workbook_read (const char *filename)
Workbook *w;
w = (*fo->open) (filename);
if (w)
if (w) {
setlocale (LC_ALL, "");
return w;
}
}
}
setlocale (LC_ALL, "");
return NULL;
}
......@@ -323,8 +331,13 @@ workbook_save_as (Workbook *wb)
workbook_set_filename (wb, name);
/* Files are expected to be in standard C format. */
setlocale (LC_ALL, "C");
current_saver->save (wb, wb->filename);
setlocale (LC_ALL, "");
g_free (name);
}
}
......@@ -342,7 +355,11 @@ workbook_save (Workbook *wb)
return;
}
/* Files are expected to be in standard C format. */
setlocale (LC_ALL, "C");
gnumericWriteXmlWorkbook (wb, wb->filename);
setlocale (LC_ALL, "");
}
char *
......
src/fn-math.c
View file @ ab90084f
......@@ -861,7 +861,7 @@ static char *help_int = {
"@DESCRIPTION="
"The INT function round b1 now to the nearest int. "
"Where 'nearest' implies being closer to zero. "
"Equivalent to FLOOR(b1) for b1 >0, amd CEIL(b1) "
"Equivalent to FLOOR(b1) for b1 >= 0, amd CEIL(b1) "
"for b1 < 0. "
"\n"
"Performing this function on a string or empty cell simply does nothing."
......@@ -876,6 +876,8 @@ gnumeric_int (struct FunctionDefinition *i,
{
float_t t;
/* FIXME: What about strings and empty cells? */
t = value_get_as_float (argv [0]);
return value_new_float (t > 0.0 ? floor (t) : ceil (t));
......@@ -944,9 +946,9 @@ static char *help_power = {
"@SYNTAX=POWER(x,y)\n"
"@DESCRIPTION="
"Returns the value of x raised to the power y"
"Returns the value of x raised to the power y."
"\n"
"Performing this function on a string or empty cell returns an error. "
"Performing this function on a string or empty cell returns an error."
"\n"
"@SEEALSO=EXP")
};
......@@ -955,8 +957,17 @@ static Value *
gnumeric_power (struct FunctionDefinition *i,
Value *argv [], char **error_string)
{
return value_new_float (pow(value_get_as_float (argv [0]),
value_get_as_float (argv [1]))) ;
float_t x, y;
x = value_get_as_float (argv [0]);
y = value_get_as_float (argv [1]);
if ((x > 0) || (x == 0 && y > 0) || (x < 0 && y == floor (y)))
return value_new_float (pow (x, y));
/* FIXME: What is supposed to happen for x=y=0? */
*error_string = _("#VALUE!");
return NULL;
}
static char *help_log2 = {
......@@ -1101,7 +1112,7 @@ static char *help_sin = {
"@DESCRIPTION="
"The SIN function returns the sine of x, where x is given "
" in radians. "
" in radians."
"\n"
"Performing this function on a string or empty cell simply does nothing. "
"This function only takes one argument."
......@@ -1121,9 +1132,8 @@ static char *help_sinh = {
"@SYNTAX=SINH(x)\n"
"@DESCRIPTION="
"The SINH function returns the hyperbolic sine of x, "
"which is defined mathematically as (exp(x) - exp(-x)) / 2. "
" x is in radians. "
"The SINH function returns the hyperbolic sine of @x, "
"which is defined mathematically as (exp(x) - exp(-x)) / 2."
"\n"
"Performing this function on a string or empty cell simply does nothing. "
"This function only takes one argument."
......@@ -1143,7 +1153,7 @@ static char *help_sqrt = {
"@SYNTAX=SQRT(x)\n"
"@DESCRIPTION="
"The SQRT function returns the square root of x, "
"The SQRT function returns the square root of @x."
"\n"
"If x is negative returns #NUM!."
"This function only takes one argument."
......@@ -1460,8 +1470,8 @@ static char *help_tan = {
"@SYNTAX=TAN(x)\n"
"@DESCRIPTION="
"The TAN function returns the tangent of x, where x is "
"given in radians. "
"The TAN function returns the tangent of @x, where @x is "
"given in radians."
"\n"
"Performing this function on a string or empty cell simply does nothing. "
"This function only takes one argument."
......@@ -1521,9 +1531,9 @@ static char *help_trunc = {
N_("@FUNCTION=TRUNC\n"
"@SYNTAX=TRUNC(number[,digits])\n"
"@DESCRIPTION=The TRUNC function returns the value of number "
"truncated to the number of digits specified. If digits is omited "
"then digits defaults to zero."
"@DESCRIPTION=The TRUNC function returns the value of @number "
"truncated to the number of digits specified. If @digits is omited "
"then @digits defaults to zero."
"\n"
"\n"
......
src/functions/fn-math.c
View file @ ab90084f
......@@ -861,7 +861,7 @@ static char *help_int = {
"@DESCRIPTION="
"The INT function round b1 now to the nearest int. "
"Where 'nearest' implies being closer to zero. "
"Equivalent to FLOOR(b1) for b1 >0, amd CEIL(b1) "
"Equivalent to FLOOR(b1) for b1 >= 0, amd CEIL(b1) "
"for b1 < 0. "
"\n"
"Performing this function on a string or empty cell simply does nothing."
......@@ -876,6 +876,8 @@ gnumeric_int (struct FunctionDefinition *i,
{
float_t t;
/* FIXME: What about strings and empty cells? */
t = value_get_as_float (argv [0]);
return value_new_float (t > 0.0 ? floor (t) : ceil (t));
......@@ -944,9 +946,9 @@ static char *help_power = {
"@SYNTAX=POWER(x,y)\n"
"@DESCRIPTION="
"Returns the value of x raised to the power y"
"Returns the value of x raised to the power y."
"\n"
"Performing this function on a string or empty cell returns an error. "
"Performing this function on a string or empty cell returns an error."
"\n"
"@SEEALSO=EXP")
};
......@@ -955,8 +957,17 @@ static Value *
gnumeric_power (struct FunctionDefinition *i,
Value *argv [], char **error_string)
{
return value_new_float (pow(value_get_as_float (argv [0]),
value_get_as_float (argv [1]))) ;
float_t x, y;
x = value_get_as_float (argv [0]);
y = value_get_as_float (argv [1]);
if ((x > 0) || (x == 0 && y > 0) || (x < 0 && y == floor (y)))
return value_new_float (pow (x, y));
/* FIXME: What is supposed to happen for x=y=0? */
*error_string = _("#VALUE!");
return NULL;
}
static char *help_log2 = {
......@@ -1101,7 +1112,7 @@ static char *help_sin = {
"@DESCRIPTION="
"The SIN function returns the sine of x, where x is given "
" in radians. "
" in radians."
"\n"
"Performing this function on a string or empty cell simply does nothing. "
"This function only takes one argument."
......@@ -1121,9 +1132,8 @@ static char *help_sinh = {
"@SYNTAX=SINH(x)\n"
"@DESCRIPTION="
"The SINH function returns the hyperbolic sine of x, "
"which is defined mathematically as (exp(x) - exp(-x)) / 2. "
" x is in radians. "
"The SINH function returns the hyperbolic sine of @x, "
"which is defined mathematically as (exp(x) - exp(-x)) / 2."
"\n"
"Performing this function on a string or empty cell simply does nothing. "
"This function only takes one argument."
......@@ -1143,7 +1153,7 @@ static char *help_sqrt = {
"@SYNTAX=SQRT(x)\n"
"@DESCRIPTION="
"The SQRT function returns the square root of x, "
"The SQRT function returns the square root of @x."
"\n"
"If x is negative returns #NUM!."
"This function only takes one argument."
......@@ -1460,8 +1470,8 @@ static char *help_tan = {
"@SYNTAX=TAN(x)\n"
"@DESCRIPTION="
"The TAN function returns the tangent of x, where x is "
"given in radians. "
"The TAN function returns the tangent of @x, where @x is "
"given in radians."
"\n"
"Performing this function on a string or empty cell simply does nothing. "
"This function only takes one argument."
......@@ -1521,9 +1531,9 @@ static char *help_trunc = {
N_("@FUNCTION=TRUNC\n"
"@SYNTAX=TRUNC(number[,digits])\n"
"@DESCRIPTION=The TRUNC function returns the value of number "
"truncated to the number of digits specified. If digits is omited "
"then digits defaults to zero."
"@DESCRIPTION=The TRUNC function returns the value of @number "
"truncated to the number of digits specified. If @digits is omited "
"then @digits defaults to zero."
"\n"
"\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment