--- psiconv/trunk/lib/psiconv/parse_routines.h	2001/01/22 20:36:50	97
+++ psiconv/trunk/lib/psiconv/parse_routines.h	2001/03/04 22:10:45	110
@@ -54,11 +54,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 *
@@ -177,13 +184,13 @@
                                         psiconv_u32 off, int *length, 
                                         psiconv_sheet_status_section *result);
 
-extern int psiconv_parse_sheet_formula_list(const psiconv_buffer buf, int lev,
+extern int psiconv_parse_sheet_formula_table(const psiconv_buffer buf, int lev,
                                         psiconv_u32 off, int *length,
-                                        psiconv_sheet_formula_list *result);
+                                        psiconv_formula_list *result);
 
-extern int psiconv_parse_sheet_formula(const psiconv_buffer buf, int lev,
+extern int psiconv_parse_formula(const psiconv_buffer buf, int lev,
                                         psiconv_u32 off, int *length,
-                                        psiconv_sheet_formula *result);
+                                        psiconv_formula *result);
 
 extern int psiconv_parse_sheet_workbook_section(const psiconv_buffer buf, 
                                         int lev,