--- psiconv/trunk/lib/psiconv/parse_routines.h	2000/12/15 00:21:51	64
+++ psiconv/trunk/lib/psiconv/parse_routines.h	2001/01/22 20:36:50	97
@@ -20,29 +20,16 @@
 #ifndef PSICONV_PARSE_ROUTINES_H
 #define PSICONV_PARSE_ROUTINES_H
 
-#include <psiconv/parse.h>
+#include <psiconv/general.h>
+#include <psiconv/data.h>
+#include <psiconv/buffer.h>
+#include <psiconv/common.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 
-/* ***************
-   * misc.c *
-   *************** */
-
-/* This function returns a copy of a string, that contains no ASCII codes
-   that are not printable. You should free this string yourself when you are
-   done with it. Returns NULL if there is not enough memory left. */
-extern char *psiconv_make_printable(const char *s);
-
-/* **************
-   * checkuid.c *
-   ************** */
-
-extern psiconv_u32 psiconv_checkuid(psiconv_u32 uid1,
-                                    psiconv_u32 uid2,psiconv_u32 uid3);
-
 /* ******************
    * parse_simple.c *
    ****************** */
@@ -146,16 +133,16 @@
                                       psiconv_text_and_layout *result);
 
 extern int psiconv_parse_styled_layout_section(const psiconv_buffer buf,
-                                        int lev,psiconv_u32 off,
-                                        int *length,
-                                        psiconv_text_and_layout result,
-                                        psiconv_word_styles_section styles);
+                                      int lev,psiconv_u32 off,
+                                      int *length,
+                                      psiconv_text_and_layout result,
+                                      const psiconv_word_styles_section styles);
 extern int psiconv_parse_styleless_layout_section(const psiconv_buffer buf,
-                                           int lev,psiconv_u32 off,
-                                           int *length,
-                                           psiconv_text_and_layout result,
-                                           psiconv_character_layout base_char,
-                                           psiconv_paragraph_layout base_para);
+                                      int lev,psiconv_u32 off,
+                                      int *length,
+                                      psiconv_text_and_layout result,
+                                      const psiconv_character_layout base_char,
+                                      const psiconv_paragraph_layout base_para);
 
 
 /* ******************
@@ -183,6 +170,28 @@
 
 
 /* *****************
+   * parse_sheet.c *
+   ***************** */
+
+extern int psiconv_parse_sheet_status_section(const psiconv_buffer buf, int lev,
+                                        psiconv_u32 off, int *length, 
+                                        psiconv_sheet_status_section *result);
+
+extern int psiconv_parse_sheet_formula_list(const psiconv_buffer buf, int lev,
+                                        psiconv_u32 off, int *length,
+                                        psiconv_sheet_formula_list *result);
+
+extern int psiconv_parse_sheet_formula(const psiconv_buffer buf, int lev,
+                                        psiconv_u32 off, int *length,
+                                        psiconv_sheet_formula *result);
+
+extern int psiconv_parse_sheet_workbook_section(const psiconv_buffer buf, 
+                                        int lev,
+                                        psiconv_u32 off, int *length, 
+                                        psiconv_sheet_workbook_section *result);
+
+
+/* *****************
    * parse_image.c *
    ***************** */
 
@@ -223,6 +232,9 @@
 
 extern int psiconv_parse_clipart_file(const psiconv_buffer buf,int lev, 
                                    psiconv_u32 off, psiconv_clipart_f *result);
+extern int psiconv_parse_sheet_file(const psiconv_buffer buf,int lev, 
+                                    psiconv_u32 off, psiconv_sheet_f *result);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */