Commit 90991486 authored by Jody Goldberg's avatar Jody Goldberg

Release 0.67

parent 8bd889aa
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* Makefile.am : Install .desktop file not .in
* src/formats.c : Add comments re: order assumptions.
* src/workbook-control-gui.c (workbook_standard_toolbar_orient) :
......@@ -8,6 +14,16 @@
* src/workbook-control-gui.c (sort_by_rows) : fix old bug with sort
tool buttons.
* src/stf-export.c (stf_export_sheet) : ignore spans and merges.
* src/ranges.c (range_clip_to_finite) : add comment re: expense.
* src/print.c (print_sheet) : Include spans and merges when printing.
(compute_sheet_pages) : ditto.
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : spans are not
relevant here.
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* configure.in : bump libxml1 req to 1.8.14 to fix i18n xml import
......
......@@ -14,12 +14,12 @@ appicon_DATA = gnome-gnumeric.png \
gnome-application-x-xls.png
Applicationsdir = $(datadir)/gnome/apps/Applications
Applications_in_files = gnumeric.desktop.in.in
Applications_DATA = $(Applications_in_files:.desktop.in.in=.desktop.in)
Applications_in_files = gnumeric.desktop.in
Applications_DATA = gnumeric.desktop
@XML_I18N_MERGE_DESKTOP_RULE@
gnewdir = $(datadir)/mc/templates
gnew_in_files = gnumeric.desktop.in
gnew_DATA = $(gnew_in_files:.desktop.in.in=.desktop.in)
gnew_DATA = gnumeric.desktop
@XML_I18N_MERGE_DESKTOP_RULE@
Mimedir = $(datadir)/mime-info
......@@ -32,7 +32,7 @@ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
oaf_in_files = GNOME_Gnumeric.oaf.in
EXTRA_DIST = \
gnumeric.desktop.in.in gnumeric.spec.in gnumericConf.sh.in \
gnumeric.desktop.in gnumeric.spec.in gnumericConf.sh.in \
gnumeric.keys.in gnumeric.mime $(appicon_DATA) \
README HACKING NEWS BUGS MAINTAINERS AUTHORS $(change_logs) \
xml-i18n-extract.in \
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* Makefile.am : Install .desktop file not .in
* src/formats.c : Add comments re: order assumptions.
* src/workbook-control-gui.c (workbook_standard_toolbar_orient) :
......@@ -8,6 +14,16 @@
* src/workbook-control-gui.c (sort_by_rows) : fix old bug with sort
tool buttons.
* src/stf-export.c (stf_export_sheet) : ignore spans and merges.
* src/ranges.c (range_clip_to_finite) : add comment re: expense.
* src/print.c (print_sheet) : Include spans and merges when printing.
(compute_sheet_pages) : ditto.
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : spans are not
relevant here.
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* configure.in : bump libxml1 req to 1.8.14 to fix i18n xml import
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* Makefile.am : Install .desktop file not .in
* src/formats.c : Add comments re: order assumptions.
* src/workbook-control-gui.c (workbook_standard_toolbar_orient) :
......@@ -8,6 +14,16 @@
* src/workbook-control-gui.c (sort_by_rows) : fix old bug with sort
tool buttons.
* src/stf-export.c (stf_export_sheet) : ignore spans and merges.
* src/ranges.c (range_clip_to_finite) : add comment re: expense.
* src/print.c (print_sheet) : Include spans and merges when printing.
(compute_sheet_pages) : ditto.
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : spans are not
relevant here.
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* configure.in : bump libxml1 req to 1.8.14 to fix i18n xml import
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* Makefile.am : Install .desktop file not .in
* src/formats.c : Add comments re: order assumptions.
* src/workbook-control-gui.c (workbook_standard_toolbar_orient) :
......@@ -8,6 +14,16 @@
* src/workbook-control-gui.c (sort_by_rows) : fix old bug with sort
tool buttons.
* src/stf-export.c (stf_export_sheet) : ignore spans and merges.
* src/ranges.c (range_clip_to_finite) : add comment re: expense.
* src/print.c (print_sheet) : Include spans and merges when printing.
(compute_sheet_pages) : ditto.
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : spans are not
relevant here.
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* configure.in : bump libxml1 req to 1.8.14 to fix i18n xml import
......
......@@ -628,7 +628,6 @@ templates/Makefile
templates/english/Makefile
templates/autoformat/Makefile
macros/Makefile
gnumeric.desktop.in
stamp.h
])
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-05-20 Jody Goldberg <jgoldberg@home.com>
* Release 0.65
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
[Desktop Entry]
_Name=Gnumeric
_Comment=The GNOME Spreadsheet
Exec=@gnumeric_executable@
Icon=gnome-gnumeric.png
Terminal=0
Type=Application
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2000-12-17 Jody Goldberg <jgoldberg@home.com>
* Release 0.61
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* dif.c (dif_file_save) : we don't handle spans or merges.
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
......@@ -369,7 +369,7 @@ dif_file_save (GnumFileSaver const *fs, IOContext *io_context,
fputs ("DATA\n0,0\n" "\"\"\n", f);
/* Process all cells */
r = sheet_get_extent (sheet);
r = sheet_get_extent (sheet, FALSE);
for (row = r.start.row; row <= r.end.row; row++) {
fputs ("-1,0\n" "BOT\n", f);
for (col = r.start.col; col <= r.end.col; col++) {
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* ms-excel-util.c (lookup_font_base_char_width_new) : add more safety.
* ms-excel-write.c (formats_put_magic) : const.
(new_sheet) : ignore spans and merges for extent calcs.
* ms-excel-read.c (ms_excel_read_init) : new function to init the
locale specific date format.
......
......@@ -324,6 +324,7 @@ lookup_font_base_char_width_new (char const * const name, double size_pts,
}
g_return_val_if_fail (xl_font_width_hash != NULL, 10.);
g_return_val_if_fail (name != NULL, 10.);
res = g_hash_table_lookup (xl_font_width_hash, name);
......
......@@ -3511,7 +3511,8 @@ new_sheet (ExcelWorkbook *wb, Sheet *value)
g_return_val_if_fail (value, NULL);
g_return_val_if_fail (wb, NULL);
extent = sheet_get_extent (value);
/* Ignore spans and merges past the bound */
extent = sheet_get_extent (value, FALSE);
sheet_style_get_extent (value, &extent);
sheet->gnum_sheet = value;
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* roff.c (write_wb_roff) : we don't handle spans or merges.
* latex.c (latex2e_file_save) : ditto.
(latex_file_save) : ditto.
* html.c (html32_file_save) : ditto.
(html40_file_save) : ditto.
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
......@@ -253,7 +253,7 @@ html32_file_save (GnumFileSaver const *fs, IOContext *io_context,
sheets = workbook_sheets (wb);
for (ptr = sheets ; ptr != NULL ; ptr = ptr->next) {
Sheet *sheet = ptr->data;
Range r = sheet_get_extent (sheet);
Range r = sheet_get_extent (sheet, FALSE);
fprintf (fp, "<TABLE border=1>\n");
fprintf (fp, "<CAPTION>%s</CAPTION>\n", sheet->name_unquoted);
......@@ -322,7 +322,7 @@ html40_file_save (GnumFileSaver const *fs, IOContext *io_context,
sheets = workbook_sheets (wb);
for (ptr = sheets ; ptr != NULL ; ptr = ptr->next) {
Sheet *sheet = ptr->data;
Range r = sheet_get_extent (sheet);
Range r = sheet_get_extent (sheet, FALSE);
fprintf (fp, "<TABLE border=1>\n");
fprintf (fp, "<CAPTION>%s</CAPTION>\n", sheet->name_unquoted);
......
......@@ -253,7 +253,7 @@ html32_file_save (GnumFileSaver const *fs, IOContext *io_context,
sheets = workbook_sheets (wb);
for (ptr = sheets ; ptr != NULL ; ptr = ptr->next) {
Sheet *sheet = ptr->data;
Range r = sheet_get_extent (sheet);
Range r = sheet_get_extent (sheet, FALSE);
fprintf (fp, "<TABLE border=1>\n");
fprintf (fp, "<CAPTION>%s</CAPTION>\n", sheet->name_unquoted);
......@@ -322,7 +322,7 @@ html40_file_save (GnumFileSaver const *fs, IOContext *io_context,
sheets = workbook_sheets (wb);
for (ptr = sheets ; ptr != NULL ; ptr = ptr->next) {
Sheet *sheet = ptr->data;
Range r = sheet_get_extent (sheet);
Range r = sheet_get_extent (sheet, FALSE);
fprintf (fp, "<TABLE border=1>\n");
fprintf (fp, "<CAPTION>%s</CAPTION>\n", sheet->name_unquoted);
......
......@@ -110,7 +110,7 @@ latex_file_save (GnumFileSaver const *fs, IOContext *io_context,
sheets = workbook_sheets (wb);
for (ptr = sheets ; ptr != NULL ; ptr = ptr->next) {
Sheet *sheet = ptr->data;
Range r = sheet_get_extent (sheet);
Range range = sheet_get_extent (sheet, FALSE);
latex_fputs (sheet->name_unquoted, fp);
fprintf (fp, "\n\n");
......@@ -120,8 +120,8 @@ latex_file_save (GnumFileSaver const *fs, IOContext *io_context,
}
fprintf (fp, "}\\hline\n");
for (row = r.start.row; row <= r.end.row; row++) {
for (col = r.start.col; col <= r.end.col; col++) {
for (row = range.start.row; row <= range.end.row; row++) {
for (col = range.start.col; col <= range.end.col; col++) {
cell = sheet_cell_get (sheet, col, row);
if (!cell) {
if (col)
......@@ -133,7 +133,6 @@ latex_file_save (GnumFileSaver const *fs, IOContext *io_context,
if (!mstyle)
break;
if (col != 0)
fprintf (fp, "\t&");
else
......@@ -210,7 +209,7 @@ latex2e_file_save (GnumFileSaver const *fs, IOContext *io_context,
sheets = workbook_sheets (wb);
for (ptr = sheets ; ptr != NULL ; ptr = ptr->next) {
Sheet *sheet = ptr->data;
Range range = sheet_get_extent (sheet);
Range range = sheet_get_extent (sheet, FALSE);
latex_fputs (sheet->name_unquoted, fp);
fprintf (fp, "\n\n");
......@@ -230,17 +229,20 @@ latex2e_file_save (GnumFileSaver const *fs, IOContext *io_context,
fprintf (fp, "\t\n");
} else {
MStyle *mstyle = cell_get_mstyle (cell);
if (!mstyle)
break;
if (col != 0)
fprintf (fp, "\t&");
else
fprintf (fp, "\t ");
if (mstyle_get_align_h (mstyle) & HALIGN_RIGHT)
if (mstyle_get_align_h (mstyle) == HALIGN_RIGHT)
fprintf (fp, "\\hfill ");
if (mstyle_get_align_h (mstyle) & HALIGN_CENTER)
else if (mstyle_get_align_h (mstyle) == HALIGN_CENTER ||
/* FIXME : center across selection is wrong */
mstyle_get_align_h (mstyle) == HALIGN_CENTER_ACROSS_SELECTION)
fprintf (fp, "\\centering "); /* doesn't work */
if (mstyle_get_align_v (mstyle) & VALIGN_TOP)
if (mstyle_get_align_v (mstyle) == VALIGN_TOP)
;
r = mstyle_get_color (mstyle, MSTYLE_COLOR_FORE)->color.red >> 8;
g = mstyle_get_color (mstyle, MSTYLE_COLOR_FORE)->color.green >> 8;
......
......@@ -90,7 +90,7 @@ write_wb_roff (IOContext *io_context, WorkbookView *wb_view, FILE *fp)
sheets = workbook_sheets (wb);
for (ptr = sheets ; ptr != NULL ; ptr = ptr->next) {
Sheet *sheet = ptr->data;
Range r = sheet_get_extent (sheet);
Range r = sheet_get_extent (sheet, FALSE);
fprintf (fp, "%s\n\n", sheet->name_unquoted);
fprintf (fp, ".TS H\n");
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* py-gnumeric.c (py_sheet_get_extent_method) : changes to
sheet_get_extent.
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
......@@ -1462,7 +1462,7 @@ py_sheet_get_extent_method (py_Sheet_object *self, PyObject *args)
return NULL;
}
range = sheet_get_extent (self->sheet);
range = sheet_get_extent (self->sheet, FALSE);
return py_new_Range_object (&range);
}
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* POTFILES.in (gnumeric.desktop) : translate the .in file.
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
......@@ -159,4 +159,4 @@ src/xml-io.c
src/xml-io-autoft.c
src/GNOME_Gnumeric.xml
# files added by xml-i18n-prepare
gnumeric.desktop.in.in
gnumeric.desktop.in
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -1110,7 +1110,7 @@ static CORBA_long
Sheet_max_cols_used (PortableServer_Servant servant, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Range extent = sheet_get_extent (sheet);
Range extent = sheet_get_extent (sheet, FALSE);
return extent.end.col;
}
......@@ -1119,7 +1119,7 @@ static CORBA_long
Sheet_max_rows_used (PortableServer_Servant servant, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Range extent = sheet_get_extent (sheet);
Range extent = sheet_get_extent (sheet, FALSE);
return extent.end.row;
}
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
......@@ -438,7 +438,7 @@ name_print_area (FunctionEvalInfo *ei, Value **args)
if (!ei || !ei->pos->sheet)
return value_new_error (ei->pos, _("Error: no sheet"));
else {
Range r = sheet_get_extent (ei->pos->sheet);
Range r = sheet_get_extent (ei->pos->sheet, FALSE);
sheet_style_get_extent (ei->pos->sheet, &r);
return value_new_cellrange_r (ei->pos->sheet, &r);
}
......
2001-06-28 Jody Goldberg <jgoldberg@home>
* Release 0.67
2001-06-27 Jody Goldberg <jgoldberg@home.com>
* Release 0.66
......
......@@ -250,7 +250,7 @@ gnumeric_sheet_key_mode_sheet (GnumericSheet *gsheet, GdkEventKey *event)
if (new_row > 0)
gnumeric_sheet_set_top_row (gsheet, new_row);
} else {
Range r = sheet_get_extent (sheet);
Range r = sheet_get_extent (sheet, FALSE);
/* do the ctrl-end jump to the extent in 2 steps */
(*movefn)(gsheet->scg, r.end.col - sheet->edit_pos.col, FALSE, TRUE);
......
......@@ -250,7 +250,7 @@ gnumeric_sheet_key_mode_sheet (GnumericSheet *gsheet, GdkEventKey *event)
if (new_row > 0)
gnumeric_sheet_set_top_row (gsheet, new_row);
} else {
Range r = sheet_get_extent (sheet);
Range r = sheet_get_extent (sheet, FALSE);
/* do the ctrl-end jump to the extent in 2 steps */
(*movefn)(gsheet->scg, r.end.col - sheet->edit_pos.col, FALSE, TRUE);
......
......@@ -947,7 +947,7 @@ compute_sheet_pages (PageCountInfo *pc, Sheet const *sheet)
print_job_info_init_sheet (pj, sheet);
if (pj->range != PRINT_SHEET_SELECTION) {
r = sheet_get_extent (sheet);
r = sheet_get_extent (sheet, TRUE);
if (pj->pi->print_even_if_only_styles)
sheet_style_get_extent (sheet, &r);
} else
......@@ -1003,7 +1003,7 @@ print_sheet (gpointer value, gpointer user_data)
}
print_job_info_init_sheet (pj, sheet);
extent = sheet_get_extent (sheet);
extent = sheet_get_extent (sheet, TRUE);
if (pj->pi->print_even_if_only_styles)
sheet_style_get_extent (sheet, &extent);
......
......@@ -1034,12 +1034,24 @@ range_is_infinite (Range const *r)
return range_is_full (r, TRUE) || range_is_full (r, TRUE);
}
/**
* range_clip_to_finite :
* @range :
* @sheet :
*
* Clip the range to the area of the sheet with content.
* WARNING THIS IS EXPENSIVE!
*/
void