--- psiconv/trunk/lib/psiconv/data.h	2001/03/04 22:10:45	110
+++ psiconv/trunk/lib/psiconv/data.h	2001/07/10 22:38:49	125
@@ -447,7 +447,7 @@
   psiconv_sheet_error_notavail
 } psiconv_sheet_errorcode_t;
 
-typedef enum psiconv_numberformat
+typedef enum psiconv_sheet_numberformat_code
 {
   psiconv_numberformat_general,
   psiconv_numberformat_fixeddecimal,
@@ -457,19 +457,19 @@
   psiconv_numberformat_triads,
   psiconv_numberformat_boolean,
   psiconv_numberformat_text,
-  psiconv_numberformat_date_ddmm,
-  psiconv_numberformat_date_mmdd,
+  psiconv_numberformat_date_dmm,
+  psiconv_numberformat_date_mmd,
   psiconv_numberformat_date_ddmmyy,
   psiconv_numberformat_date_mmddyy,
   psiconv_numberformat_date_yymmdd,
-  psiconv_numberformat_date_ddmmm,
+  psiconv_numberformat_date_dmmm,
+  psiconv_numberformat_date_dmmmyy,
   psiconv_numberformat_date_ddmmmyy,
-  psiconv_numberformat_date_ddmmmyyyy,
   psiconv_numberformat_date_mmm,
   psiconv_numberformat_date_monthname,
   psiconv_numberformat_date_mmmyy,
   psiconv_numberformat_date_monthnameyy,
-  psiconv_numberformat_date_monthnameddyyyy,
+  psiconv_numberformat_date_monthnamedyyyy,
   psiconv_numberformat_datetime_ddmmyyyyhhii,
   psiconv_numberformat_datetime_ddmmyyyyHHii,
   psiconv_numberformat_datetime_mmddyyyyhhii,
@@ -480,13 +480,20 @@
   psiconv_numberformat_time_hhiiss,
   psiconv_numberformat_time_HHii,
   psiconv_numberformat_time_HHiiss
-} psiconv_numberformat_t;
+} psiconv_sheet_numberformat_code_t;
 
-typedef struct psiconv_numberformat_s
+typedef struct psiconv_sheet_numberformat_s
 {
-  psiconv_numberformat_t numberformat;
+  psiconv_sheet_numberformat_code_t code;
   psiconv_u8 decimal;
-} *psiconv_numberformat;
+} *psiconv_sheet_numberformat;
+
+typedef struct psiconv_sheet_cell_layout_s
+{
+  psiconv_character_layout character;
+  psiconv_paragraph_layout paragraph;
+  psiconv_sheet_numberformat numberformat;  
+} * psiconv_sheet_cell_layout;
 
 typedef struct psiconv_sheet_cell_s
 {
@@ -500,9 +507,7 @@
 	psiconv_bool_t dat_bool;
 	psiconv_sheet_errorcode_t dat_error;
   } data;
-  psiconv_character_layout character;
-  psiconv_paragraph_layout paragraph;
-  psiconv_numberformat numberformat;  
+  psiconv_sheet_cell_layout layout;
   psiconv_bool_t calculated;
   psiconv_u32 ref_formula;
 } *psiconv_sheet_cell;
@@ -678,18 +683,20 @@
   } data;
 } *psiconv_formula;
 
-typedef struct psiconv_sheet_worksheet_section_s
+typedef struct psiconv_sheet_worksheet_s
 {
-  psiconv_character_layout character;
-  psiconv_paragraph_layout paragraph;
-  psiconv_numberformat numberformat;  
+  psiconv_sheet_cell_layout default_layout;
   psiconv_sheet_cell_list cells;
-} *psiconv_sheet_worksheet_section;
+  psiconv_bool_t show_zeros;
+} *psiconv_sheet_worksheet;
+
+typedef psiconv_list psiconv_sheet_worksheet_list; 
+        /* of struct psiconv_sheet_worksheet */
 
 typedef struct psiconv_sheet_workbook_section_s
 {
   psiconv_formula_list formulas;
-  psiconv_sheet_worksheet_section worksheet;
+  psiconv_sheet_worksheet_list worksheets;
 } *psiconv_sheet_workbook_section;
 
 typedef struct psiconv_sheet_f_s
@@ -762,6 +769,7 @@
 
 /* Get a numbered style. Returns NULL if the style is unknown. */
 extern psiconv_word_style psiconv_get_style (psiconv_word_styles_section ss, int nr);
+extern psiconv_formula psiconv_get_formula (psiconv_formula_list ss, int nr);
 
 extern void psiconv_free_color(psiconv_color color);
 extern void psiconv_free_border(psiconv_border border);
@@ -778,10 +786,16 @@
 extern void psiconv_free_formula_list(psiconv_formula_list list);
 extern void psiconv_free_sheet_status_section
                                       (psiconv_sheet_status_section section);
+extern void psiconv_free_sheet_cell_layout(psiconv_sheet_cell_layout layout);
+extern void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet);
+extern void psiconv_free_sheet_worksheet_list
+                                         (psiconv_sheet_worksheet_list list);
+
 extern void psiconv_free_sheet_f(psiconv_sheet_f file);
 extern void psiconv_free_sheet_cell(psiconv_sheet_cell cell);
 extern void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list);
-extern void psiconv_free_numberformat(psiconv_numberformat numberformat);
+extern void psiconv_free_sheet_numberformat
+                                    (psiconv_sheet_numberformat numberformat);
 extern void psiconv_free_header_section(psiconv_header_section header);
 extern void psiconv_free_section_table_entry(psiconv_section_table_entry entry);
 extern void psiconv_free_section_table_section