diff --git a/xlhtml/Makefile.am b/xlhtml/Makefile.am
index 1933372..62208b5 100644
--- a/xlhtml/Makefile.am
+++ b/xlhtml/Makefile.am
@@ -12,7 +12,7 @@ LDADD = ../cole/libcole.a
xlhtml_SOURCES = support.c xlhtml.c html.c ascii.c xml.c
xldump_SOURCES = xldump.c
xlcdump_SOURCES = xlcdump.c
-AM_CFLAGS = -Wshadow -Wcast-align -Wpointer-arith
+AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith
doc:
@echo Generating documentation...
diff --git a/xlhtml/Makefile.in b/xlhtml/Makefile.in
index 0fd02e5..bd84f07 100644
--- a/xlhtml/Makefile.in
+++ b/xlhtml/Makefile.in
@@ -86,7 +86,7 @@ LDADD = ../cole/libcole.a
xlhtml_SOURCES = support.c xlhtml.c html.c ascii.c xml.c
xldump_SOURCES = xldump.c
xlcdump_SOURCES = xlcdump.c
-AM_CFLAGS = -Wshadow -Wcast-align -Wpointer-arith
+AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
diff --git a/xlhtml/ascii.c b/xlhtml/ascii.c
index dae262f..8288fdf 100644
--- a/xlhtml/ascii.c
+++ b/xlhtml/ascii.c
@@ -1,7 +1,8 @@
#include "xlhtml.h"
-extern void SetupExtraction(void);
+
+
@@ -51,6 +52,13 @@ work_sheet **ws_array;
font_attr **font_array;
xf_attr **xf_array;
+extern int IsCellNumeric(cell *);
+extern int IsCellSafe(cell *);
+extern int IsCellFormula(cell *);
+extern void output_formatted_data(uni_string *, U16, int, int);
+extern void SetupExtraction(void);
+
+
void OutputPartialTableAscii(void)
{
int i, j, k;
diff --git a/xlhtml/version.h b/xlhtml/version.h
index ebf2fc8..32089cf 100644
--- a/xlhtml/version.h
+++ b/xlhtml/version.h
@@ -1,2 +1,2 @@
-#define VERSION "0.4.9.3"
+#define VERSION "0.5"
diff --git a/xlhtml/xlhtml.c b/xlhtml/xlhtml.c
index d7ee56e..9c0b973 100644
--- a/xlhtml/xlhtml.c
+++ b/xlhtml/xlhtml.c
@@ -138,6 +138,8 @@ void OutputPartialTableAscii(void);
/* These functions are in html.c */
extern void output_start_html_attr(html_attr *h, unsigned int, int);
extern void output_end_html_attr(html_attr *h);
+extern void output_footer(void);
+extern void output_header(void);
COLE_LOCATE_ACTION_FUNC scan_file;
void main_line_processor(U16, U16, U32, U16, U8);
@@ -630,6 +632,7 @@ void scan_file(COLEDIRENT *cde, void *_info)
ws_array[i]->ws_title.str ? (char *)ws_array[i]->ws_title.str : "(Unknown Page)",
ws_array[i]->biggest_row, ws_array[i]->biggest_col);
}
+
output_footer();
}
else
@@ -687,6 +690,7 @@ void SetupExtraction(void)
else
{
printf("Error - Col not in range during extraction.\n");
+
output_footer();
}
return;
diff --git a/xlhtml/xml.c b/xlhtml/xml.c
index 86e8366..6f0c29f 100644
--- a/xlhtml/xml.c
+++ b/xlhtml/xml.c
@@ -1,8 +1,6 @@
#include "xlhtml.h"
-extern void do_cr(void);
-extern int center_tables;
extern int first_sheet;
extern int last_sheet;
extern uni_string default_font;
@@ -11,15 +9,11 @@ extern int next_ws_title;
extern void SetupExtraction(void);
extern void update_default_font(unsigned int);
extern void OutputString(uni_string * );
-extern int default_fontsize;
-extern char *default_alignment;
-extern int aggressive;
extern char *lastUpdated;
extern int file_version;
extern int NoFormat;
extern int notAccurate;
extern int formula_warnings;
-extern int NoHeaders;
extern int NotImplemented;
extern int Unsupported;
extern int MaxWorksheetsExceeded;
@@ -31,9 +25,6 @@ extern int MaxPalExceeded;
extern int MaxXFExceeded;
extern int MaxFormatsExceeded;
extern char colorTab[MAX_COLORS];
-extern char *default_text_color;
-extern char *default_background_color;
-extern char *default_image;
extern char filename[256];
extern int UnicodeStrings;
extern int CodePage;
@@ -41,7 +32,6 @@ extern char *title;
extern void update_default_alignment(unsigned int, int);
extern void output_cell( cell *, int);
extern uni_string author;
-extern int null_string(U8 *);
work_sheet **ws_array;