Commit 7666a707 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

partial patch. Should this be tied to the current locale ? 2001-06-25 Jody

2001-06-25  Jody Goldberg <jgoldberg@home.com>

	* fn-information.c (translate_table) : partial patch.  Should this be
	  tied to the current locale ?
2001-06-25  Jody Goldberg <jgoldberg@home.com>

	* src/xml-io.c (xml_not_used_old_array_spec) : fix a few warnings.
parent 0f7073cb
if BONOBO
gnumeric = gnumeric-bonobo
else
gnumeric = gnumeric
endif
gnumeric_helpdir = $(datadir)/gnome/help/gnumeric/C
......
......@@ -2296,7 +2296,7 @@ ATANH(0.5) equals 0.549306.
@FUNCTION=ERFC
@SYNTAX=ERFC(x)
@DESCRIPTION=The ERFC function returns the complimentary error function, defined as 1 - erf(x). erfc(x) is calculated more accurately than erf(x) for arguments larger than about 0.5.
@DESCRIPTION=The ERFC function returns the complementary error function, defined as 1 - erf(x). erfc(x) is calculated more accurately than 1 - erf(x) for arguments larger than about 0.5.
If @x is not numeric a #VALUE! error is returned.
@EXAMPLES=
ERFC(6) equals 2.15197367e-17.
......@@ -2494,8 +2494,8 @@ NORMINV(0.76,2,3) equals 4.118907689.
@SEEALSO=NORMDIST,NORMSDIST,NORMSINV,STANDARDIZE,ZTEST
@FUNCTION=PV
@SYNTAX=PV(rate,nper,pmt,fv,type)
@DESCRIPTION=PV calculates the present value of an investment. @rate is the periodic interest rate, @nper is the number of periods used for compounding. @pmt is the payment made each period, @fv is the future value and @type is when the payment is made. If @type = 1 then the payment is made at the begining of the period. If @type = 0 it is made at the end of each period.@EXAMPLES=
@SYNTAX=PV(rate,nper,pmt[,fv,type])
@DESCRIPTION=PV calculates the present value of an investment. @rate is the periodic interest rate, @nper is the number of periods used for compounding. @pmt is the payment made each period, @fv is the future value and @type is when the payment is made. If @type = 1 then the payment is made at the begining of the period. If @type = 0 (or omitted) it is made at the end of each period.@EXAMPLES=
@SEEALSO=FV
......@@ -2587,7 +2587,7 @@ PROPER("j. f. kennedy") equals "J. F. Kennedy".
@FUNCTION=DELTA
@SYNTAX=DELTA(x[,y])
@DESCRIPTION=DELTA function test for numerical equivilance of two arguments returning 1 in equality @y is optional, and defaults to 0.
@DESCRIPTION=The DELTA function tests for numerical equivalence of two arguments returning 1 in case of equality. @y is optional, and defaults to 0.
If either argument is non-numeric returns a #VALUE! error. This function is Excel compatible.
@EXAMPLES=
DELTA(42.99,43) equals 0.
......@@ -3349,7 +3349,7 @@ This function is Excel compatible.
@FUNCTION=IMLN
@SYNTAX=IMLN(inumber)
@DESCRIPTION=IMLN returns the natural logarithm of a complex number. (The result will have an imaginary part between -pi an +pi. The natural logarithm is not uniquely defined on complex numbers. You may need to add or subtract an even multiple of pi to the imaginary part.)
@DESCRIPTION=IMLN returns the natural logarithm of a complex number. (The result will have an imaginary part between -pi and +pi. The natural logarithm is not uniquely defined on complex numbers. You may need to add or subtract an even multiple of pi to the imaginary part.)
This function is Excel compatible.
@EXAMPLES=
IMLN("3-j") equals 1.15129-0.32175j.
......
......@@ -7065,7 +7065,7 @@
</refsynopsisdiv>
<refsect1>
<title>Description</title>
<para>The ERFC function returns the complimentary error function, defined as 1 - erf(x). erfc(x) is calculated more accurately than erf(x) for arguments larger than about 0.5.</para>
<para>The ERFC function returns the complementary error function, defined as 1 - erf(x). erfc(x) is calculated more accurately than 1 - erf(x) for arguments larger than about 0.5.</para>
<para>If @x is not numeric a #VALUE! error is returned.</para>
</refsect1> <refsect1>
<title>Examples</title>
......@@ -7642,11 +7642,11 @@
<refpurpose></refpurpose>
</refnamediv>
<refsynopsisdiv>
<synopsis>PV(rate,nper,pmt,fv,type)</synopsis>
<synopsis>PV(rate,nper,pmt[,fv,type])</synopsis>
</refsynopsisdiv>
<refsect1>
<title>Description</title>
<para>PV calculates the present value of an investment. @rate is the periodic interest rate, @nper is the number of periods used for compounding. @pmt is the payment made each period, @fv is the future value and @type is when the payment is made. If @type = 1 then the payment is made at the begining of the period. If @type = 0 it is made at the end of each period.@EXAMPLES=</para>
<para>PV calculates the present value of an investment. @rate is the periodic interest rate, @nper is the number of periods used for compounding. @pmt is the payment made each period, @fv is the future value and @type is when the payment is made. If @type = 1 then the payment is made at the begining of the period. If @type = 0 (or omitted) it is made at the end of each period.@EXAMPLES=</para>
<para></para>
</refsect1>
<refsect1><title>See also</title>
......@@ -7964,7 +7964,7 @@
</refsynopsisdiv>
<refsect1>
<title>Description</title>
<para>DELTA function test for numerical equivilance of two arguments returning 1 in equality @y is optional, and defaults to 0.</para>
<para>The DELTA function tests for numerical equivalence of two arguments returning 1 in case of equality. @y is optional, and defaults to 0.</para>
<para>If either argument is non-numeric returns a #VALUE! error. This function is Excel compatible.</para>
</refsect1> <refsect1>
<title>Examples</title>
......@@ -10173,7 +10173,7 @@
</refsynopsisdiv>
<refsect1>
<title>Description</title>
<para>IMLN returns the natural logarithm of a complex number. (The result will have an imaginary part between -pi an +pi. The natural logarithm is not uniquely defined on complex numbers. You may need to add or subtract an even multiple of pi to the imaginary part.)</para>
<para>IMLN returns the natural logarithm of a complex number. (The result will have an imaginary part between -pi and +pi. The natural logarithm is not uniquely defined on complex numbers. You may need to add or subtract an even multiple of pi to the imaginary part.)</para>
<para>This function is Excel compatible.</para>
</refsect1> <refsect1>
<title>Examples</title>
......
if BONOBO
gnumeric = gnumeric-bonobo
else
gnumeric = gnumeric
endif
gnumeric_helpdir = $(datadir)/gnome/help/gnumeric/ja
......
......@@ -99,10 +99,10 @@ static translate_t translate_table[] = {
{ "#,##0", ",0" },
{ "0.00", "F2" },
{ "#,##0.00", ",2" },
{ "$#,##0_);($#,##0)", "C0" },
{ "$#,##0_);[Red]($#,##0)", "C0-" },
{ "$#,##0.00_);($#,##0.00)", "C2" },
{ "$#,##0.00_);[Red]($#,##0.00)", "C2-" },
{ "\"$\"#,##0_);\\(\"$\"#,##0\\)", "C0" },
{ "\"$\"#,##0_);[Red]\\(\"$\"#,##0\\)", "C0-" },
{ "\"$\"#,##0.00_);\\(\"$\"#,##0.00\\)", "C2" },
{ "\"$\"#,##0.00_);[Red]\\(\"$\"#,##0.00\\)", "C2-" },
{ "0%", "P0" },
{ "0.00%", "P2" },
{ "0.00e+00", "S2" },
......
#
# Gnumeric's Makefile.
# Author: Miguel de Icaza (miguel@kernel.org)
#
# This Makefile has targets for three programs:
#
# gnumeric:
# the plain spreadsheet
#
# gnumeric-bonobo:
# spreadsheet with CORBA and Bonobo additions
#
#
SUBDIRS = dialogs functions widgets
if BONOBO
bin_PROGRAMS = gnumeric-bonobo
CLEANFILES += gnumeric
else
bin_PROGRAMS = gnumeric
CLEANFILES +=gnumeric-bonobo
endif
#noinst_PROGRAMS = number-match
INCLUDES = \
......@@ -135,6 +118,7 @@ GNUMERIC_BASE_SOURCES = \
item-grid.c \
item-grid.h \
main.h \
main.c \
mathfunc.c \
mathfunc.h \
module-plugin-defs.h \
......@@ -266,44 +250,41 @@ GNUMERIC_BONOBO_SOURCES = \
sheet-object-container.h \
sheet-object-item.c \
sheet-object-item.h
# workbook-control-bonobo.h \
# workbook-control-bonobo.c
if BONOBO
gnumeric_SOURCES = \
main.c \
normal-args.c \
$(GNUMERIC_BASE_SOURCES)
gnumeric_bonobo_SOURCES = \
main.c \
corba-args.c \
$(GNUMERIC_BASE_SOURCES) \
corba-args.c \
$(GNUMERIC_BONOBO_SOURCES)
gnumeric_LDFLAGS = -export-dynamic
gnumeric_libs = \
dialogs/libdialogs.a \
widgets/libwidgets.a \
functions/libfunctions.a
gnumeric_LDADD = \
gnumeric_LDADD = \
$(gnumeric_libs) \
-lbonobo-print \
../idl/libGnumericIDL.a \
$(EXTRA_GNOME_LIBS) \
$(GNOME_XML_LIB) \
$(GUILE_LIBS) \
$(PSPELL_LIBS) \
$(INTLLIBS)
# $(PSPELL_LIBS)
else
gnumeric_SOURCES = \
$(GNUMERIC_BASE_SOURCES) \
normal-args.c
gnumeric_bonobo_LDADD = \
gnumeric_LDADD = \
$(gnumeric_libs) \
-lbonobo-print \
../idl/libGnumericIDL.a \
$(EXTRA_GNOME_LIBS) \
$(GNOME_XML_LIB) \
$(GUILE_LIBS) \
$(PSPELL_LIBS) \
$(INTLLIBS)
endif
gnumeric_LDFLAGS = -export-dynamic
gnumeric_libs = \
dialogs/libdialogs.a \
widgets/libwidgets.a \
functions/libfunctions.a
dist-hook:
-mkdir $(distdir)/pixmaps
......
2001-06-25 Jody Goldberg <jgoldberg@home.com>
* fn-information.c (translate_table) : partial patch. Should this be
tied to the current locale ?
2001-06-22 Morten Welinder <terra@diku.dk>
* fn-financial.c (gnumeric_rate, gnumeric_irr): No longer respect
......
......@@ -99,10 +99,10 @@ static translate_t translate_table[] = {
{ "#,##0", ",0" },
{ "0.00", "F2" },
{ "#,##0.00", ",2" },
{ "$#,##0_);($#,##0)", "C0" },
{ "$#,##0_);[Red]($#,##0)", "C0-" },
{ "$#,##0.00_);($#,##0.00)", "C2" },
{ "$#,##0.00_);[Red]($#,##0.00)", "C2-" },
{ "\"$\"#,##0_);\\(\"$\"#,##0\\)", "C0" },
{ "\"$\"#,##0_);[Red]\\(\"$\"#,##0\\)", "C0-" },
{ "\"$\"#,##0.00_);\\(\"$\"#,##0.00\\)", "C2" },
{ "\"$\"#,##0.00_);[Red]\\(\"$\"#,##0.00\\)", "C2-" },
{ "0%", "P0" },
{ "0.00%", "P2" },
{ "0.00e+00", "S2" },
......
......@@ -1832,13 +1832,13 @@ xml_not_used_old_array_spec (Cell *cell, char *content)
rows = strtol (ptr = expr_end + 2, &end, 10);
if (end == ptr || *end != ',')
return TRUE;
cols = strtol (ptr = ++end, &end, 10);
cols = strtol (ptr = end + 1, &end, 10);
if (end == ptr || end[0] != ')' || end[1] != '[')
return TRUE;
row = strtol (ptr = (end += 2), &end, 10);
row = strtol (ptr = (end + 2), &end, 10);
if (end == ptr || end[0] != ']' || end[1] != '[')
return TRUE;
col = strtol (ptr = (end += 2), &end, 10);
col = strtol (ptr = (end + 2), &end, 10);
if (end == ptr || end[0] != ']' || end[1] != '\0')
return TRUE;
......
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