Update to 0.99.1.

8 files changed, 382 insertions, 12 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 58911feb560d..56473b48f7d4 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnumeric
-PORTVERSION=	0.99.0
+PORTVERSION=	0.99.1
 CATEGORIES?=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnumeric
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 7eab72e8affc..9bcfcc1cd1b8 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.99.0.tar.bz2) = 4c8488cbb0fe2d2c658c991fc4b2308c
+MD5 (gnumeric-0.99.1.tar.bz2) = 98e683cad6a5c84fd41bfef24da13d6a
diff --git a/math/gnumeric/files/patch-src::stf-parse.c b/math/gnumeric/files/patch-src::stf-parse.c
new file mode 100644
index 000000000000..b0610997e852
--- /dev/null
+++ b/math/gnumeric/files/patch-src::stf-parse.c
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- src/stf-parse.c	2001/12/27 19:36:17	1.1
++++ src/stf-parse.c	2001/12/27 19:44:24
+@@ -29,8 +29,6 @@
+ #include "clipboard.h"
+ 
+ #include <ctype.h>
+-#include <wctype.h>
+-#include <stdlib.h>
+ 
+ #define WARN_TOO_MANY_ROWS _("Too many rows in data to parse: %d")
+ #define WARN_TOO_MANY_COLS _("Too many columns in data to parse: %d")
+@@ -865,20 +863,9 @@
+ 	wchar_t wstr;
+ 	int len;
+ 
+-	for (s = data; *s != '\0';) {
+-		len = mblen(s, MB_CUR_MAX);
+-		if (len == -1)
++	for (s = data; *s != '\0'; s++) {
++		if (!isprint (*s) && !isspace (*s))
+ 			return (char *)s;
+-		if (len > 1) {
+-			if (mbstowcs (&wstr, s, 1) == 1 &&
+-			    !iswprint (wstr) && !iswspace (wstr))
+-				return (char *)s;
+-			s += len;
+-		} else {
+-			if (!isprint (*s) && !isspace (*s))
+-				return (char *)s;
+-			s++;
+-		}
+ 	}
+ 
+ 	return NULL;
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index a2ef9d9c1f11..363ec0fc41fa 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -141,14 +141,20 @@ share/gnome/help/gnumeric/C/autofill.sgml
 share/gnome/help/gnumeric/C/autosave.html
 share/gnome/help/gnumeric/C/autosave.sgml
 share/gnome/help/gnumeric/C/cell-elements.html
+share/gnome/help/gnumeric/C/cell-grid.html
 share/gnome/help/gnumeric/C/cell-referencing.html
 share/gnome/help/gnumeric/C/cell_refer.sgml
+share/gnome/help/gnumeric/C/context-menu.html
 share/gnome/help/gnumeric/C/copying-moving.html
 share/gnome/help/gnumeric/C/copying-moving.sgml
 share/gnome/help/gnumeric/C/correlation-tool.html
 share/gnome/help/gnumeric/C/covariance-tool.html
 share/gnome/help/gnumeric/C/data-and-time-formatting.html
+share/gnome/help/gnumeric/C/data-entry.html
+share/gnome/help/gnumeric/C/data-menu.html
 share/gnome/help/gnumeric/C/descriptive-statistics-tool.html
+share/gnome/help/gnumeric/C/dndselection.sgml
+share/gnome/help/gnumeric/C/edit-menu.html
 share/gnome/help/gnumeric/C/editing-selections.html
 share/gnome/help/gnumeric/C/editing.html
 share/gnome/help/gnumeric/C/editing.sgml
@@ -160,6 +166,8 @@ share/gnome/help/gnumeric/C/figures/align-center.png
 share/gnome/help/gnumeric/C/figures/align-left.png
 share/gnome/help/gnumeric/C/figures/align-right.png
 share/gnome/help/gnumeric/C/figures/analysis-tools.png
+share/gnome/help/gnumeric/C/figures/analysistools-ANOVA1-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-ANOVA1-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-ANOVA2w-ex1.png
 share/gnome/help/gnumeric/C/figures/analysistools-ANOVA2w-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-ANOVA2wo-ex1.png
@@ -174,10 +182,47 @@ share/gnome/help/gnumeric/C/figures/analysistools-covariance.png
 share/gnome/help/gnumeric/C/figures/analysistools-descstats-ex1.png
 share/gnome/help/gnumeric/C/figures/analysistools-descstats-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-descstats.png
+share/gnome/help/gnumeric/C/figures/analysistools-ftest-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-ftest-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-ftest.png
+share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-histogram.png
+share/gnome/help/gnumeric/C/figures/analysistools-moving-average-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-moving-average-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-moving-average.png
 share/gnome/help/gnumeric/C/figures/analysistools-outputoptions.png
+share/gnome/help/gnumeric/C/figures/analysistools-random-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-random-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-random.png
 share/gnome/help/gnumeric/C/figures/analysistools-ranges.png
+share/gnome/help/gnumeric/C/figures/analysistools-rank-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-rank-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-rank.png
+share/gnome/help/gnumeric/C/figures/analysistools-regression-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-regression-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-regression-ex3.png
+share/gnome/help/gnumeric/C/figures/analysistools-regression.png
+share/gnome/help/gnumeric/C/figures/analysistools-sampling-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-sampling-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-sampling.png
+share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-smoothing.png
 share/gnome/help/gnumeric/C/figures/analysistools-tools.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-equal-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-equal-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-equal.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-paired-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-paired-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-paired.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-unequal-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-unequal-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-unequal.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest.png
+share/gnome/help/gnumeric/C/figures/analysistools-ztest-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-ztest-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-ztest.png
 share/gnome/help/gnumeric/C/figures/arrow.png
 share/gnome/help/gnumeric/C/figures/auto-correct.png
 share/gnome/help/gnumeric/C/figures/auto-save.png
@@ -196,6 +241,60 @@ share/gnome/help/gnumeric/C/figures/autofill-9.png
 share/gnome/help/gnumeric/C/figures/autosave.png
 share/gnome/help/gnumeric/C/figures/bold.png
 share/gnome/help/gnumeric/C/figures/border.png
+share/gnome/help/gnumeric/C/figures/button-align-center.png
+share/gnome/help/gnumeric/C/figures/button-align-left.png
+share/gnome/help/gnumeric/C/figures/button-align-right.png
+share/gnome/help/gnumeric/C/figures/button-arrow.png
+share/gnome/help/gnumeric/C/figures/button-bold.png
+share/gnome/help/gnumeric/C/figures/button-borders.png
+share/gnome/help/gnumeric/C/figures/button-center-across-selection.png
+share/gnome/help/gnumeric/C/figures/button-checkbox.png
+share/gnome/help/gnumeric/C/figures/button-combo.png
+share/gnome/help/gnumeric/C/figures/button-copy.png
+share/gnome/help/gnumeric/C/figures/button-cut.png
+share/gnome/help/gnumeric/C/figures/button-decrease-indent.png
+share/gnome/help/gnumeric/C/figures/button-decrease-precision.png
+share/gnome/help/gnumeric/C/figures/button-equals.png
+share/gnome/help/gnumeric/C/figures/button-fill.png
+share/gnome/help/gnumeric/C/figures/button-font-size.png
+share/gnome/help/gnumeric/C/figures/button-font-type.png
+share/gnome/help/gnumeric/C/figures/button-frame.png
+share/gnome/help/gnumeric/C/figures/button-function.png
+share/gnome/help/gnumeric/C/figures/button-fx.png
+share/gnome/help/gnumeric/C/figures/button-graph.png
+share/gnome/help/gnumeric/C/figures/button-increase-indent.png
+share/gnome/help/gnumeric/C/figures/button-increase-precision.png
+share/gnome/help/gnumeric/C/figures/button-insert-component.png
+share/gnome/help/gnumeric/C/figures/button-insert-object.png
+share/gnome/help/gnumeric/C/figures/button-italic.png
+share/gnome/help/gnumeric/C/figures/button-label.png
+share/gnome/help/gnumeric/C/figures/button-line.png
+share/gnome/help/gnumeric/C/figures/button-list.png
+share/gnome/help/gnumeric/C/figures/button-merge.png
+share/gnome/help/gnumeric/C/figures/button-money.png
+share/gnome/help/gnumeric/C/figures/button-new.png
+share/gnome/help/gnumeric/C/figures/button-open.png
+share/gnome/help/gnumeric/C/figures/button-oval.png
+share/gnome/help/gnumeric/C/figures/button-paste.png
+share/gnome/help/gnumeric/C/figures/button-percent.png
+share/gnome/help/gnumeric/C/figures/button-preview.png
+share/gnome/help/gnumeric/C/figures/button-print.png
+share/gnome/help/gnumeric/C/figures/button-rectangle.png
+share/gnome/help/gnumeric/C/figures/button-redo-and-history.png
+share/gnome/help/gnumeric/C/figures/button-save.png
+share/gnome/help/gnumeric/C/figures/button-sort-az.png
+share/gnome/help/gnumeric/C/figures/button-sort-za.png
+share/gnome/help/gnumeric/C/figures/button-split.png
+share/gnome/help/gnumeric/C/figures/button-sum.png
+share/gnome/help/gnumeric/C/figures/button-text-colour.png
+share/gnome/help/gnumeric/C/figures/button-thousands.png
+share/gnome/help/gnumeric/C/figures/button-underline.png
+share/gnome/help/gnumeric/C/figures/button-undo-and-history.png
+share/gnome/help/gnumeric/C/figures/button-zoom.png
+share/gnome/help/gnumeric/C/figures/buttonGroup-bonobo.png
+share/gnome/help/gnumeric/C/figures/buttonGroup-filesystem.png
+share/gnome/help/gnumeric/C/figures/buttonGroup-printing.png
+share/gnome/help/gnumeric/C/figures/cell-grid.png
 share/gnome/help/gnumeric/C/figures/cells-1.png
 share/gnome/help/gnumeric/C/figures/cells-2.png
 share/gnome/help/gnumeric/C/figures/define-name.png
@@ -205,14 +304,40 @@ share/gnome/help/gnumeric/C/figures/drawing-toolbar.png
 share/gnome/help/gnumeric/C/figures/editing-1.png
 share/gnome/help/gnumeric/C/figures/editing-cell-selection-1.png
 share/gnome/help/gnumeric/C/figures/file-dialog.png
+share/gnome/help/gnumeric/C/figures/files-formats-list.png
 share/gnome/help/gnumeric/C/figures/filter.png
 share/gnome/help/gnumeric/C/figures/function-wizard.png
 share/gnome/help/gnumeric/C/figures/function.png
+share/gnome/help/gnumeric/C/figures/gnumeric-labelled.png
+share/gnome/help/gnumeric/C/figures/gnumeric-rearranged.png
 share/gnome/help/gnumeric/C/figures/goal-seek.png
 share/gnome/help/gnumeric/C/figures/graphing.png
+share/gnome/help/gnumeric/C/figures/info-area.png
 share/gnome/help/gnumeric/C/figures/insert-object.png
 share/gnome/help/gnumeric/C/figures/italic.png
+share/gnome/help/gnumeric/C/figures/label-five.png
+share/gnome/help/gnumeric/C/figures/label-four.png
+share/gnome/help/gnumeric/C/figures/label-one.png
+share/gnome/help/gnumeric/C/figures/label-seven.png
+share/gnome/help/gnumeric/C/figures/label-six.png
+share/gnome/help/gnumeric/C/figures/label-three.png
+share/gnome/help/gnumeric/C/figures/label-transparent.png
+share/gnome/help/gnumeric/C/figures/label-two.png
 share/gnome/help/gnumeric/C/figures/line.png
+share/gnome/help/gnumeric/C/figures/menu-context-col-row-header.png
+share/gnome/help/gnumeric/C/figures/menu-context-grid.png
+share/gnome/help/gnumeric/C/figures/menu-context-object.png
+share/gnome/help/gnumeric/C/figures/menu-context-tabs.png
+share/gnome/help/gnumeric/C/figures/menu-context-toolbars.png
+share/gnome/help/gnumeric/C/figures/menu-data-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-edit-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-file-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-format-torn-off.png
+share/gnome/help/gnumeric/C/figures/menu-help-torn-off.png
+share/gnome/help/gnumeric/C/figures/menu-insert-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-tools-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-view-labelled.png
+share/gnome/help/gnumeric/C/figures/menubar.png
 share/gnome/help/gnumeric/C/figures/modify-comment.png
 share/gnome/help/gnumeric/C/figures/money.png
 share/gnome/help/gnumeric/C/figures/number-format-buttonbar.png
@@ -225,6 +350,7 @@ share/gnome/help/gnumeric/C/figures/oval.png
 share/gnome/help/gnumeric/C/figures/percentage.png
 share/gnome/help/gnumeric/C/figures/plug-ins.png
 share/gnome/help/gnumeric/C/figures/plugins.png
+share/gnome/help/gnumeric/C/figures/preface-screenshot.png
 share/gnome/help/gnumeric/C/figures/print-large.png
 share/gnome/help/gnumeric/C/figures/print-preview-back.png
 share/gnome/help/gnumeric/C/figures/print-preview-first.png
@@ -240,13 +366,16 @@ share/gnome/help/gnumeric/C/figures/print-preview.png
 share/gnome/help/gnumeric/C/figures/print-worksheet.png
 share/gnome/help/gnumeric/C/figures/print.png
 share/gnome/help/gnumeric/C/figures/printing-preview.png
+share/gnome/help/gnumeric/C/figures/printing-setup-header-config.png
 share/gnome/help/gnumeric/C/figures/printing-setup-header.png
 share/gnome/help/gnumeric/C/figures/printing-setup-margins.png
 share/gnome/help/gnumeric/C/figures/printing-setup-page-1.png
 share/gnome/help/gnumeric/C/figures/printing-setup-page.png
+share/gnome/help/gnumeric/C/figures/printing-setup-sheet.png
 share/gnome/help/gnumeric/C/figures/rect.png
 share/gnome/help/gnumeric/C/figures/redo.png
 share/gnome/help/gnumeric/C/figures/remove-decimals.png
+share/gnome/help/gnumeric/C/figures/sample_gnumeric.png
 share/gnome/help/gnumeric/C/figures/selection-1.png
 share/gnome/help/gnumeric/C/figures/selection-10.png
 share/gnome/help/gnumeric/C/figures/selection-2.png
@@ -273,8 +402,13 @@ share/gnome/help/gnumeric/C/figures/stock-open.png
 share/gnome/help/gnumeric/C/figures/stock-paste.png
 share/gnome/help/gnumeric/C/figures/stock-save.png
 share/gnome/help/gnumeric/C/figures/summary.png
+share/gnome/help/gnumeric/C/figures/tear-off-menu.png
 share/gnome/help/gnumeric/C/figures/thousands.png
+share/gnome/help/gnumeric/C/figures/toolbar-format.png
+share/gnome/help/gnumeric/C/figures/toolbar-object.png
+share/gnome/help/gnumeric/C/figures/toolbar-standard.png
 share/gnome/help/gnumeric/C/figures/toolbar.png
+share/gnome/help/gnumeric/C/figures/toolbars.png
 share/gnome/help/gnumeric/C/figures/underline.png
 share/gnome/help/gnumeric/C/figures/undo.png
 share/gnome/help/gnumeric/C/figures/worksheet-all-1.png
@@ -290,10 +424,13 @@ share/gnome/help/gnumeric/C/figures/zoom-dialog.png
 share/gnome/help/gnumeric/C/figures/zoom-toolbar.png
 share/gnome/help/gnumeric/C/figures/zoom.png
 share/gnome/help/gnumeric/C/file-format.html
+share/gnome/help/gnumeric/C/file-menu.html
 share/gnome/help/gnumeric/C/files.html
 share/gnome/help/gnumeric/C/files.sgml
 share/gnome/help/gnumeric/C/filter.sgml
 share/gnome/help/gnumeric/C/filters.html
+share/gnome/help/gnumeric/C/fmt-toolbar.html
+share/gnome/help/gnumeric/C/format-menu.html
 share/gnome/help/gnumeric/C/formatting.html
 share/gnome/help/gnumeric/C/formulas.html
 share/gnome/help/gnumeric/C/formulas.sgml
@@ -644,16 +781,22 @@ share/gnome/help/gnumeric/C/gnumeric-yieldmat.html
 share/gnome/help/gnumeric/C/gnumeric-ztest.html
 share/gnome/help/gnumeric/C/gnumeric.sgml
 share/gnome/help/gnumeric/C/goal-seek.html
+share/gnome/help/gnumeric/C/gui-elements.html
+share/gnome/help/gnumeric/C/help-menu.html
 share/gnome/help/gnumeric/C/histogram-tool.html
 share/gnome/help/gnumeric/C/index.html
-share/gnome/help/gnumeric/C/introduction.html
+share/gnome/help/gnumeric/C/info-area.html
+share/gnome/help/gnumeric/C/insert-menu.html
 share/gnome/help/gnumeric/C/introduction.sgml
 share/gnome/help/gnumeric/C/license.html
 share/gnome/help/gnumeric/C/license.sgml
-share/gnome/help/gnumeric/C/menu-bar.html
+share/gnome/help/gnumeric/C/menus.html
 share/gnome/help/gnumeric/C/moving-average-tool.html
 share/gnome/help/gnumeric/C/number-format.sgml
 share/gnome/help/gnumeric/C/number-formatting-overview.html
+share/gnome/help/gnumeric/C/obj-toolbar.html
+share/gnome/help/gnumeric/C/other-elements.html
+share/gnome/help/gnumeric/C/preface.html
 share/gnome/help/gnumeric/C/print-preview.html
 share/gnome/help/gnumeric/C/print-setup.html
 share/gnome/help/gnumeric/C/printing.html
@@ -661,16 +804,20 @@ share/gnome/help/gnumeric/C/printing.sgml
 share/gnome/help/gnumeric/C/random-number-generation-tool.html
 share/gnome/help/gnumeric/C/rank-and-percentile-tool.html
 share/gnome/help/gnumeric/C/regression-tool.html
-share/gnome/help/gnumeric/C/rest.html
 share/gnome/help/gnumeric/C/sampling-tool.html
 share/gnome/help/gnumeric/C/selecting-cells-entering-formulas.html
 share/gnome/help/gnumeric/C/selections.sgml
 share/gnome/help/gnumeric/C/solver.html
 share/gnome/help/gnumeric/C/solver.sgml
+share/gnome/help/gnumeric/C/std-toolbar.html
 share/gnome/help/gnumeric/C/t-test.html
-share/gnome/help/gnumeric/C/toolbar-buttons.html
+share/gnome/help/gnumeric/C/text-entry.sgml
+share/gnome/help/gnumeric/C/toolbars.html
+share/gnome/help/gnumeric/C/tools-menu.html
 share/gnome/help/gnumeric/C/topic.dat
 share/gnome/help/gnumeric/C/tutorials.html
+share/gnome/help/gnumeric/C/view-menu.html
+share/gnome/help/gnumeric/C/worksheet.sgml
 share/gnome/mc/templates/gnumeric.desktop
 share/gnome/mime-info/gnumeric.keys
 share/gnome/mime-info/gnumeric.mime
@@ -755,6 +902,7 @@ share/locale/no/LC_MESSAGES/gnumeric.mo
 share/locale/pl/LC_MESSAGES/gnumeric.mo
 share/locale/pt/LC_MESSAGES/gnumeric.mo
 share/locale/pt_BR/LC_MESSAGES/gnumeric.mo
+share/locale/ro/LC_MESSAGES/gnumeric.mo
 share/locale/ru/LC_MESSAGES/gnumeric.mo
 share/locale/sk/LC_MESSAGES/gnumeric.mo
 share/locale/sv/LC_MESSAGES/gnumeric.mo
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 58911feb560d..56473b48f7d4 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnumeric
-PORTVERSION=	0.99.0
+PORTVERSION=	0.99.1
 CATEGORIES?=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnumeric
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index 7eab72e8affc..9bcfcc1cd1b8 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.99.0.tar.bz2) = 4c8488cbb0fe2d2c658c991fc4b2308c
+MD5 (gnumeric-0.99.1.tar.bz2) = 98e683cad6a5c84fd41bfef24da13d6a
diff --git a/math/gnumeric2/files/patch-src::stf-parse.c b/math/gnumeric2/files/patch-src::stf-parse.c
new file mode 100644
index 000000000000..b0610997e852
--- /dev/null
+++ b/math/gnumeric2/files/patch-src::stf-parse.c
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- src/stf-parse.c	2001/12/27 19:36:17	1.1
++++ src/stf-parse.c	2001/12/27 19:44:24
+@@ -29,8 +29,6 @@
+ #include "clipboard.h"
+ 
+ #include <ctype.h>
+-#include <wctype.h>
+-#include <stdlib.h>
+ 
+ #define WARN_TOO_MANY_ROWS _("Too many rows in data to parse: %d")
+ #define WARN_TOO_MANY_COLS _("Too many columns in data to parse: %d")
+@@ -865,20 +863,9 @@
+ 	wchar_t wstr;
+ 	int len;
+ 
+-	for (s = data; *s != '\0';) {
+-		len = mblen(s, MB_CUR_MAX);
+-		if (len == -1)
++	for (s = data; *s != '\0'; s++) {
++		if (!isprint (*s) && !isspace (*s))
+ 			return (char *)s;
+-		if (len > 1) {
+-			if (mbstowcs (&wstr, s, 1) == 1 &&
+-			    !iswprint (wstr) && !iswspace (wstr))
+-				return (char *)s;
+-			s += len;
+-		} else {
+-			if (!isprint (*s) && !isspace (*s))
+-				return (char *)s;
+-			s++;
+-		}
+ 	}
+ 
+ 	return NULL;
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index a2ef9d9c1f11..363ec0fc41fa 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -141,14 +141,20 @@ share/gnome/help/gnumeric/C/autofill.sgml
 share/gnome/help/gnumeric/C/autosave.html
 share/gnome/help/gnumeric/C/autosave.sgml
 share/gnome/help/gnumeric/C/cell-elements.html
+share/gnome/help/gnumeric/C/cell-grid.html
 share/gnome/help/gnumeric/C/cell-referencing.html
 share/gnome/help/gnumeric/C/cell_refer.sgml
+share/gnome/help/gnumeric/C/context-menu.html
 share/gnome/help/gnumeric/C/copying-moving.html
 share/gnome/help/gnumeric/C/copying-moving.sgml
 share/gnome/help/gnumeric/C/correlation-tool.html
 share/gnome/help/gnumeric/C/covariance-tool.html
 share/gnome/help/gnumeric/C/data-and-time-formatting.html
+share/gnome/help/gnumeric/C/data-entry.html
+share/gnome/help/gnumeric/C/data-menu.html
 share/gnome/help/gnumeric/C/descriptive-statistics-tool.html
+share/gnome/help/gnumeric/C/dndselection.sgml
+share/gnome/help/gnumeric/C/edit-menu.html
 share/gnome/help/gnumeric/C/editing-selections.html
 share/gnome/help/gnumeric/C/editing.html
 share/gnome/help/gnumeric/C/editing.sgml
@@ -160,6 +166,8 @@ share/gnome/help/gnumeric/C/figures/align-center.png
 share/gnome/help/gnumeric/C/figures/align-left.png
 share/gnome/help/gnumeric/C/figures/align-right.png
 share/gnome/help/gnumeric/C/figures/analysis-tools.png
+share/gnome/help/gnumeric/C/figures/analysistools-ANOVA1-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-ANOVA1-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-ANOVA2w-ex1.png
 share/gnome/help/gnumeric/C/figures/analysistools-ANOVA2w-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-ANOVA2wo-ex1.png
@@ -174,10 +182,47 @@ share/gnome/help/gnumeric/C/figures/analysistools-covariance.png
 share/gnome/help/gnumeric/C/figures/analysistools-descstats-ex1.png
 share/gnome/help/gnumeric/C/figures/analysistools-descstats-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-descstats.png
+share/gnome/help/gnumeric/C/figures/analysistools-ftest-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-ftest-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-ftest.png
+share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-histogram.png
+share/gnome/help/gnumeric/C/figures/analysistools-moving-average-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-moving-average-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-moving-average.png
 share/gnome/help/gnumeric/C/figures/analysistools-outputoptions.png
+share/gnome/help/gnumeric/C/figures/analysistools-random-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-random-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-random.png
 share/gnome/help/gnumeric/C/figures/analysistools-ranges.png
+share/gnome/help/gnumeric/C/figures/analysistools-rank-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-rank-ex2.png
 share/gnome/help/gnumeric/C/figures/analysistools-rank.png
+share/gnome/help/gnumeric/C/figures/analysistools-regression-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-regression-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-regression-ex3.png
+share/gnome/help/gnumeric/C/figures/analysistools-regression.png
+share/gnome/help/gnumeric/C/figures/analysistools-sampling-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-sampling-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-sampling.png
+share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-smoothing.png
 share/gnome/help/gnumeric/C/figures/analysistools-tools.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-equal-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-equal-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-equal.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-paired-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-paired-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-paired.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-unequal-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-unequal-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest-unequal.png
+share/gnome/help/gnumeric/C/figures/analysistools-ttest.png
+share/gnome/help/gnumeric/C/figures/analysistools-ztest-ex1.png
+share/gnome/help/gnumeric/C/figures/analysistools-ztest-ex2.png
+share/gnome/help/gnumeric/C/figures/analysistools-ztest.png
 share/gnome/help/gnumeric/C/figures/arrow.png
 share/gnome/help/gnumeric/C/figures/auto-correct.png
 share/gnome/help/gnumeric/C/figures/auto-save.png
@@ -196,6 +241,60 @@ share/gnome/help/gnumeric/C/figures/autofill-9.png
 share/gnome/help/gnumeric/C/figures/autosave.png
 share/gnome/help/gnumeric/C/figures/bold.png
 share/gnome/help/gnumeric/C/figures/border.png
+share/gnome/help/gnumeric/C/figures/button-align-center.png
+share/gnome/help/gnumeric/C/figures/button-align-left.png
+share/gnome/help/gnumeric/C/figures/button-align-right.png
+share/gnome/help/gnumeric/C/figures/button-arrow.png
+share/gnome/help/gnumeric/C/figures/button-bold.png
+share/gnome/help/gnumeric/C/figures/button-borders.png
+share/gnome/help/gnumeric/C/figures/button-center-across-selection.png
+share/gnome/help/gnumeric/C/figures/button-checkbox.png
+share/gnome/help/gnumeric/C/figures/button-combo.png
+share/gnome/help/gnumeric/C/figures/button-copy.png
+share/gnome/help/gnumeric/C/figures/button-cut.png
+share/gnome/help/gnumeric/C/figures/button-decrease-indent.png
+share/gnome/help/gnumeric/C/figures/button-decrease-precision.png
+share/gnome/help/gnumeric/C/figures/button-equals.png
+share/gnome/help/gnumeric/C/figures/button-fill.png
+share/gnome/help/gnumeric/C/figures/button-font-size.png
+share/gnome/help/gnumeric/C/figures/button-font-type.png
+share/gnome/help/gnumeric/C/figures/button-frame.png
+share/gnome/help/gnumeric/C/figures/button-function.png
+share/gnome/help/gnumeric/C/figures/button-fx.png
+share/gnome/help/gnumeric/C/figures/button-graph.png
+share/gnome/help/gnumeric/C/figures/button-increase-indent.png
+share/gnome/help/gnumeric/C/figures/button-increase-precision.png
+share/gnome/help/gnumeric/C/figures/button-insert-component.png
+share/gnome/help/gnumeric/C/figures/button-insert-object.png
+share/gnome/help/gnumeric/C/figures/button-italic.png
+share/gnome/help/gnumeric/C/figures/button-label.png
+share/gnome/help/gnumeric/C/figures/button-line.png
+share/gnome/help/gnumeric/C/figures/button-list.png
+share/gnome/help/gnumeric/C/figures/button-merge.png
+share/gnome/help/gnumeric/C/figures/button-money.png
+share/gnome/help/gnumeric/C/figures/button-new.png
+share/gnome/help/gnumeric/C/figures/button-open.png
+share/gnome/help/gnumeric/C/figures/button-oval.png
+share/gnome/help/gnumeric/C/figures/button-paste.png
+share/gnome/help/gnumeric/C/figures/button-percent.png
+share/gnome/help/gnumeric/C/figures/button-preview.png
+share/gnome/help/gnumeric/C/figures/button-print.png
+share/gnome/help/gnumeric/C/figures/button-rectangle.png
+share/gnome/help/gnumeric/C/figures/button-redo-and-history.png
+share/gnome/help/gnumeric/C/figures/button-save.png
+share/gnome/help/gnumeric/C/figures/button-sort-az.png
+share/gnome/help/gnumeric/C/figures/button-sort-za.png
+share/gnome/help/gnumeric/C/figures/button-split.png
+share/gnome/help/gnumeric/C/figures/button-sum.png
+share/gnome/help/gnumeric/C/figures/button-text-colour.png
+share/gnome/help/gnumeric/C/figures/button-thousands.png
+share/gnome/help/gnumeric/C/figures/button-underline.png
+share/gnome/help/gnumeric/C/figures/button-undo-and-history.png
+share/gnome/help/gnumeric/C/figures/button-zoom.png
+share/gnome/help/gnumeric/C/figures/buttonGroup-bonobo.png
+share/gnome/help/gnumeric/C/figures/buttonGroup-filesystem.png
+share/gnome/help/gnumeric/C/figures/buttonGroup-printing.png
+share/gnome/help/gnumeric/C/figures/cell-grid.png
 share/gnome/help/gnumeric/C/figures/cells-1.png
 share/gnome/help/gnumeric/C/figures/cells-2.png
 share/gnome/help/gnumeric/C/figures/define-name.png
@@ -205,14 +304,40 @@ share/gnome/help/gnumeric/C/figures/drawing-toolbar.png
 share/gnome/help/gnumeric/C/figures/editing-1.png
 share/gnome/help/gnumeric/C/figures/editing-cell-selection-1.png
 share/gnome/help/gnumeric/C/figures/file-dialog.png
+share/gnome/help/gnumeric/C/figures/files-formats-list.png
 share/gnome/help/gnumeric/C/figures/filter.png
 share/gnome/help/gnumeric/C/figures/function-wizard.png
 share/gnome/help/gnumeric/C/figures/function.png
+share/gnome/help/gnumeric/C/figures/gnumeric-labelled.png
+share/gnome/help/gnumeric/C/figures/gnumeric-rearranged.png
 share/gnome/help/gnumeric/C/figures/goal-seek.png
 share/gnome/help/gnumeric/C/figures/graphing.png
+share/gnome/help/gnumeric/C/figures/info-area.png
 share/gnome/help/gnumeric/C/figures/insert-object.png
 share/gnome/help/gnumeric/C/figures/italic.png
+share/gnome/help/gnumeric/C/figures/label-five.png
+share/gnome/help/gnumeric/C/figures/label-four.png
+share/gnome/help/gnumeric/C/figures/label-one.png
+share/gnome/help/gnumeric/C/figures/label-seven.png
+share/gnome/help/gnumeric/C/figures/label-six.png
+share/gnome/help/gnumeric/C/figures/label-three.png
+share/gnome/help/gnumeric/C/figures/label-transparent.png
+share/gnome/help/gnumeric/C/figures/label-two.png
 share/gnome/help/gnumeric/C/figures/line.png
+share/gnome/help/gnumeric/C/figures/menu-context-col-row-header.png
+share/gnome/help/gnumeric/C/figures/menu-context-grid.png
+share/gnome/help/gnumeric/C/figures/menu-context-object.png
+share/gnome/help/gnumeric/C/figures/menu-context-tabs.png
+share/gnome/help/gnumeric/C/figures/menu-context-toolbars.png
+share/gnome/help/gnumeric/C/figures/menu-data-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-edit-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-file-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-format-torn-off.png
+share/gnome/help/gnumeric/C/figures/menu-help-torn-off.png
+share/gnome/help/gnumeric/C/figures/menu-insert-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-tools-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-view-labelled.png
+share/gnome/help/gnumeric/C/figures/menubar.png
 share/gnome/help/gnumeric/C/figures/modify-comment.png
 share/gnome/help/gnumeric/C/figures/money.png
 share/gnome/help/gnumeric/C/figures/number-format-buttonbar.png
@@ -225,6 +350,7 @@ share/gnome/help/gnumeric/C/figures/oval.png
 share/gnome/help/gnumeric/C/figures/percentage.png
 share/gnome/help/gnumeric/C/figures/plug-ins.png
 share/gnome/help/gnumeric/C/figures/plugins.png
+share/gnome/help/gnumeric/C/figures/preface-screenshot.png
 share/gnome/help/gnumeric/C/figures/print-large.png
 share/gnome/help/gnumeric/C/figures/print-preview-back.png
 share/gnome/help/gnumeric/C/figures/print-preview-first.png
@@ -240,13 +366,16 @@ share/gnome/help/gnumeric/C/figures/print-preview.png
 share/gnome/help/gnumeric/C/figures/print-worksheet.png
 share/gnome/help/gnumeric/C/figures/print.png
 share/gnome/help/gnumeric/C/figures/printing-preview.png
+share/gnome/help/gnumeric/C/figures/printing-setup-header-config.png
 share/gnome/help/gnumeric/C/figures/printing-setup-header.png
 share/gnome/help/gnumeric/C/figures/printing-setup-margins.png
 share/gnome/help/gnumeric/C/figures/printing-setup-page-1.png
 share/gnome/help/gnumeric/C/figures/printing-setup-page.png
+share/gnome/help/gnumeric/C/figures/printing-setup-sheet.png
 share/gnome/help/gnumeric/C/figures/rect.png
 share/gnome/help/gnumeric/C/figures/redo.png
 share/gnome/help/gnumeric/C/figures/remove-decimals.png
+share/gnome/help/gnumeric/C/figures/sample_gnumeric.png
 share/gnome/help/gnumeric/C/figures/selection-1.png
 share/gnome/help/gnumeric/C/figures/selection-10.png
 share/gnome/help/gnumeric/C/figures/selection-2.png
@@ -273,8 +402,13 @@ share/gnome/help/gnumeric/C/figures/stock-open.png
 share/gnome/help/gnumeric/C/figures/stock-paste.png
 share/gnome/help/gnumeric/C/figures/stock-save.png
 share/gnome/help/gnumeric/C/figures/summary.png
+share/gnome/help/gnumeric/C/figures/tear-off-menu.png
 share/gnome/help/gnumeric/C/figures/thousands.png
+share/gnome/help/gnumeric/C/figures/toolbar-format.png
+share/gnome/help/gnumeric/C/figures/toolbar-object.png
+share/gnome/help/gnumeric/C/figures/toolbar-standard.png
 share/gnome/help/gnumeric/C/figures/toolbar.png
+share/gnome/help/gnumeric/C/figures/toolbars.png
 share/gnome/help/gnumeric/C/figures/underline.png
 share/gnome/help/gnumeric/C/figures/undo.png
 share/gnome/help/gnumeric/C/figures/worksheet-all-1.png
@@ -290,10 +424,13 @@ share/gnome/help/gnumeric/C/figures/zoom-dialog.png
 share/gnome/help/gnumeric/C/figures/zoom-toolbar.png
 share/gnome/help/gnumeric/C/figures/zoom.png
 share/gnome/help/gnumeric/C/file-format.html
+share/gnome/help/gnumeric/C/file-menu.html
 share/gnome/help/gnumeric/C/files.html
 share/gnome/help/gnumeric/C/files.sgml
 share/gnome/help/gnumeric/C/filter.sgml
 share/gnome/help/gnumeric/C/filters.html
+share/gnome/help/gnumeric/C/fmt-toolbar.html
+share/gnome/help/gnumeric/C/format-menu.html
 share/gnome/help/gnumeric/C/formatting.html
 share/gnome/help/gnumeric/C/formulas.html
 share/gnome/help/gnumeric/C/formulas.sgml
@@ -644,16 +781,22 @@ share/gnome/help/gnumeric/C/gnumeric-yieldmat.html
 share/gnome/help/gnumeric/C/gnumeric-ztest.html
 share/gnome/help/gnumeric/C/gnumeric.sgml
 share/gnome/help/gnumeric/C/goal-seek.html
+share/gnome/help/gnumeric/C/gui-elements.html
+share/gnome/help/gnumeric/C/help-menu.html
 share/gnome/help/gnumeric/C/histogram-tool.html
 share/gnome/help/gnumeric/C/index.html
-share/gnome/help/gnumeric/C/introduction.html
+share/gnome/help/gnumeric/C/info-area.html
+share/gnome/help/gnumeric/C/insert-menu.html
 share/gnome/help/gnumeric/C/introduction.sgml
 share/gnome/help/gnumeric/C/license.html
 share/gnome/help/gnumeric/C/license.sgml
-share/gnome/help/gnumeric/C/menu-bar.html
+share/gnome/help/gnumeric/C/menus.html
 share/gnome/help/gnumeric/C/moving-average-tool.html
 share/gnome/help/gnumeric/C/number-format.sgml
 share/gnome/help/gnumeric/C/number-formatting-overview.html
+share/gnome/help/gnumeric/C/obj-toolbar.html
+share/gnome/help/gnumeric/C/other-elements.html
+share/gnome/help/gnumeric/C/preface.html
 share/gnome/help/gnumeric/C/print-preview.html
 share/gnome/help/gnumeric/C/print-setup.html
 share/gnome/help/gnumeric/C/printing.html
@@ -661,16 +804,20 @@ share/gnome/help/gnumeric/C/printing.sgml
 share/gnome/help/gnumeric/C/random-number-generation-tool.html
 share/gnome/help/gnumeric/C/rank-and-percentile-tool.html
 share/gnome/help/gnumeric/C/regression-tool.html
-share/gnome/help/gnumeric/C/rest.html
 share/gnome/help/gnumeric/C/sampling-tool.html
 share/gnome/help/gnumeric/C/selecting-cells-entering-formulas.html
 share/gnome/help/gnumeric/C/selections.sgml
 share/gnome/help/gnumeric/C/solver.html
 share/gnome/help/gnumeric/C/solver.sgml
+share/gnome/help/gnumeric/C/std-toolbar.html
 share/gnome/help/gnumeric/C/t-test.html
-share/gnome/help/gnumeric/C/toolbar-buttons.html
+share/gnome/help/gnumeric/C/text-entry.sgml
+share/gnome/help/gnumeric/C/toolbars.html
+share/gnome/help/gnumeric/C/tools-menu.html
 share/gnome/help/gnumeric/C/topic.dat
 share/gnome/help/gnumeric/C/tutorials.html
+share/gnome/help/gnumeric/C/view-menu.html
+share/gnome/help/gnumeric/C/worksheet.sgml
 share/gnome/mc/templates/gnumeric.desktop
 share/gnome/mime-info/gnumeric.keys
 share/gnome/mime-info/gnumeric.mime
@@ -755,6 +902,7 @@ share/locale/no/LC_MESSAGES/gnumeric.mo
 share/locale/pl/LC_MESSAGES/gnumeric.mo
 share/locale/pt/LC_MESSAGES/gnumeric.mo
 share/locale/pt_BR/LC_MESSAGES/gnumeric.mo
+share/locale/ro/LC_MESSAGES/gnumeric.mo
 share/locale/ru/LC_MESSAGES/gnumeric.mo
 share/locale/sk/LC_MESSAGES/gnumeric.mo
 share/locale/sv/LC_MESSAGES/gnumeric.mo