--- psiconv/trunk/lib/psiconv/parse_routines.h	2001/01/29 21:57:05	98
+++ psiconv/trunk/lib/psiconv/parse_routines.h	2003/11/23 21:47:24	167
@@ -40,6 +40,8 @@
                                     psiconv_u32 off, int *status);
 extern psiconv_u32 psiconv_read_u32(const psiconv_buffer buf,int lev,
                                     psiconv_u32 off, int *status);
+extern psiconv_s32 psiconv_read_sint(const psiconv_buffer buf,int lev,
+                                    psiconv_u32 off, int *length, int *status);
 
 extern psiconv_S_t psiconv_read_S(const psiconv_buffer buf, int lev, 
                                   psiconv_u32 off, int *length, int *status);
@@ -54,11 +56,18 @@
 extern psiconv_string_t psiconv_read_string(const psiconv_buffer buf,int lev,
                                             psiconv_u32 off,int *length, 
                                             int *status);
+extern psiconv_string_t psiconv_read_short_string(const psiconv_buffer buf,
+                                            int lev,psiconv_u32 off,
+                                            int *length,int *status);
 
 extern int psiconv_parse_bool(const psiconv_buffer buf, int lev, 
                               psiconv_u32 off, int *length, 
                               psiconv_bool_t *result);
 
+extern psiconv_float_t psiconv_read_float(const psiconv_buffer buf, int lev,
+                                   psiconv_u32 off, int *length, int *status);
+
+
 
 /* ******************
    * parse_layout.c *
@@ -143,6 +152,20 @@
                                       psiconv_text_and_layout result,
                                       const psiconv_character_layout base_char,
                                       const psiconv_paragraph_layout base_para);
+extern int psiconv_parse_embedded_object_section
+                                 (const psiconv_buffer buf, int lev,
+                                 psiconv_u32 off, int *length,
+				 psiconv_embedded_object_section *result);
+extern int psiconv_parse_object_display_section(const psiconv_buffer buf,
+                                        int lev,
+                                        psiconv_u32 off, int *length,
+                                        psiconv_object_display_section *result);
+extern int psiconv_parse_object_icon_section(const psiconv_buffer buf,int lev,
+                                      psiconv_u32 off, int *length,
+                                      psiconv_object_icon_section *result);
+
+
+ 
 
 
 /* ******************
@@ -177,7 +200,7 @@
                                         psiconv_u32 off, int *length, 
                                         psiconv_sheet_status_section *result);
 
-extern int psiconv_parse_sheet_formula_table(const psiconv_buffer buf, int lev,
+extern int psiconv_parse_sheet_formula_list(const psiconv_buffer buf, int lev,
                                         psiconv_u32 off, int *length,
                                         psiconv_formula_list *result);
 
@@ -189,6 +212,66 @@
                                         int lev,
                                         psiconv_u32 off, int *length, 
                                         psiconv_sheet_workbook_section *result);
+extern int psiconv_parse_sheet_cell(const psiconv_buffer buf, int lev,
+                             psiconv_u32 off, int *length,
+                             psiconv_sheet_cell *result,
+                             const psiconv_sheet_cell_layout default_layout,
+                             const psiconv_sheet_line_list row_default_layouts,
+                             const psiconv_sheet_line_list col_default_layouts);
+
+extern int psiconv_parse_sheet_cell_list(const psiconv_buffer buf, int lev,
+                             psiconv_u32 off, int *length,
+                             psiconv_sheet_cell_list *result,
+                             const psiconv_sheet_cell_layout default_layout,
+                             const psiconv_sheet_line_list row_default_layouts,
+                             const psiconv_sheet_line_list col_default_layouts);
+extern int psiconv_parse_sheet_worksheet_list( const psiconv_buffer buf,
+                                        int lev,
+                                        psiconv_u32 off, int *length,
+                                        psiconv_sheet_worksheet_list *result);
+extern int psiconv_parse_sheet_worksheet(const psiconv_buffer buf, int lev,
+                                         psiconv_u32 off, int *length,
+                                         psiconv_sheet_worksheet *result);
+extern int psiconv_parse_sheet_numberformat(const psiconv_buffer buf, int lev,
+                                     psiconv_u32 off, int *length,
+                                     psiconv_sheet_numberformat result);
+extern int psiconv_parse_sheet_cell_layout(const psiconv_buffer buf, int lev,
+                                    psiconv_u32 off, int *length,
+                                    psiconv_sheet_cell_layout result);
+extern int psiconv_parse_sheet_line(const psiconv_buffer buf, int lev,
+                                psiconv_u32 off, int *length,
+                                psiconv_sheet_line *result,
+                                const psiconv_sheet_cell_layout default_layout);
+extern int psiconv_parse_sheet_line_list(const psiconv_buffer buf, int lev,
+                                psiconv_u32 off, int *length,
+                                psiconv_sheet_line_list *result,
+                                const psiconv_sheet_cell_layout default_layout);
+extern int psiconv_parse_sheet_name_section(const psiconv_buffer buf, int lev,
+                                     psiconv_u32 off, int *length,
+                                     psiconv_sheet_name_section *result);
+extern int psiconv_parse_sheet_info_section(const psiconv_buffer buf, int lev,
+                                     psiconv_u32 off, int *length,
+                                     psiconv_sheet_info_section *result);
+extern int psiconv_parse_sheet_variable(const psiconv_buffer buf, int lev, 
+                                      psiconv_u32 off, int *length, 
+                                      psiconv_sheet_variable *result);
+extern int psiconv_parse_sheet_variable_list(const psiconv_buffer buf, int lev,
+                                      psiconv_u32 off, int *length,
+                                      psiconv_sheet_variable_list *result);
+extern int psiconv_parse_sheet_grid_section(const psiconv_buffer buf, int lev,
+                                     psiconv_u32 off, int *length,
+                                     psiconv_sheet_grid_section *result);
+extern int psiconv_parse_sheet_grid_size_list(const psiconv_buffer buf, int lev,
+                                  psiconv_u32 off, int *length,
+                                  psiconv_sheet_grid_size_list *result);
+extern int psiconv_parse_sheet_grid_size(const psiconv_buffer buf, int lev,
+                                    psiconv_u32 off, int *length,
+                                    psiconv_sheet_grid_size *result);
+extern int psiconv_parse_sheet_grid_break_list(const psiconv_buffer buf, 
+                                  int lev, psiconv_u32 off, int *length,
+                                  psiconv_sheet_grid_break_list *result);
+
+
 
 
 /* *****************
@@ -204,7 +287,7 @@
                                         psiconv_u32 off, int *length,
                                         psiconv_jumptable_section *result);
 extern int psiconv_parse_sketch_section(const psiconv_buffer buf, int lev,
-                                 psiconv_u32 off, int *length, int is_object,
+                                 psiconv_u32 off, int *length, 
                                  psiconv_sketch_section *result);
 extern int psiconv_parse_clipart_section(const psiconv_buffer buf, int lev,
                                  psiconv_u32 off, int *length,