--- psiconv/trunk/lib/psiconv/data.h	2001/07/10 22:38:49	125
+++ psiconv/trunk/lib/psiconv/data.h	2001/07/24 20:32:51	129
@@ -504,8 +504,8 @@
     psiconv_u32 dat_int;
     double dat_float;
     char *dat_string;
-	psiconv_bool_t dat_bool;
-	psiconv_sheet_errorcode_t dat_error;
+    psiconv_bool_t dat_bool;
+    psiconv_sheet_errorcode_t dat_error;
   } data;
   psiconv_sheet_cell_layout layout;
   psiconv_bool_t calculated;
@@ -513,7 +513,6 @@
 } *psiconv_sheet_cell;
 
 typedef psiconv_list psiconv_sheet_cell_list;
-                                        /* Of struct psiconv_sheet_cell_s */
 
 typedef struct psiconv_sheet_status_section_s
 {
@@ -680,23 +679,74 @@
     psiconv_sheet_cell_reference_t dat_cellref;
     psiconv_sheet_cell_block_t dat_cellblock;
     psiconv_formula_list fun_operands;
+    psiconv_u32 dat_variable;
   } data;
 } *psiconv_formula;
 
+typedef struct psiconv_sheet_line_s
+{
+  psiconv_u32 position;
+  psiconv_sheet_cell_layout layout;
+} *psiconv_sheet_line;
+
+typedef psiconv_list psiconv_sheet_line_list; 
+                     /* Of struct psiconv_sheet_line_s */
+
 typedef struct psiconv_sheet_worksheet_s
 {
   psiconv_sheet_cell_layout default_layout;
   psiconv_sheet_cell_list cells;
   psiconv_bool_t show_zeros;
+  psiconv_sheet_line_list row_default_layouts;
+  psiconv_sheet_line_list col_default_layouts;
 } *psiconv_sheet_worksheet;
 
 typedef psiconv_list psiconv_sheet_worksheet_list; 
-        /* of struct psiconv_sheet_worksheet */
+        /* of struct psiconv_sheet_worksheet_s */
+
+typedef enum psiconv_variable_type
+{
+  psiconv_var_int,
+  psiconv_var_float,
+  psiconv_var_string,
+  psiconv_var_cellref,
+  psiconv_var_cellblock
+} psiconv_variable_type_t;
+
+typedef struct psiconv_sheet_variable_s
+{
+  psiconv_u32 number;
+  char *name;
+  psiconv_variable_type_t type;
+  union {
+    psiconv_s32 dat_int;
+    double dat_float;
+    char *dat_string;
+    psiconv_sheet_cell_reference_t dat_cellref;
+    psiconv_sheet_cell_block_t dat_cellblock;
+  } data;
+} *psiconv_sheet_variable;
+  
+typedef psiconv_list psiconv_sheet_variable_list; 
+        /* of struct psiconv_sheet_variable_s */
+
+typedef struct psiconv_sheet_name_section_s
+{
+  char *name;
+} *psiconv_sheet_name_section;
+
+typedef struct psiconv_sheet_info_section_s
+{
+  psiconv_bool_t auto_recalc;
+} *psiconv_sheet_info_section;
 
 typedef struct psiconv_sheet_workbook_section_s
 {
   psiconv_formula_list formulas;
   psiconv_sheet_worksheet_list worksheets;
+  psiconv_sheet_variable_list variables;
+  psiconv_sheet_info_section info;
+  psiconv_sheet_name_section name;
 } *psiconv_sheet_workbook_section;
 
 typedef struct psiconv_sheet_f_s
@@ -769,8 +819,16 @@
 
 /* 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);
+/* Get a numbered formula. Returns NULL if the style is unknown. */
 extern psiconv_formula psiconv_get_formula (psiconv_formula_list ss, int nr);
 
+/* Return the default layout */
+extern psiconv_sheet_cell_layout psiconv_get_default_layout
+                                       (psiconv_sheet_line_list row_defaults,
+                                        psiconv_sheet_line_list col_defaults,
+                                        psiconv_sheet_cell_layout cell_default,
+                                        int row,int col);
+
 extern void psiconv_free_color(psiconv_color color);
 extern void psiconv_free_border(psiconv_border border);
 extern void psiconv_free_bullet(psiconv_bullet bullet);
@@ -796,6 +854,12 @@
 extern void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list);
 extern void psiconv_free_sheet_numberformat
                                     (psiconv_sheet_numberformat numberformat);
+extern void psiconv_free_sheet_line_list(psiconv_sheet_line_list list);
+extern void psiconv_free_sheet_line(psiconv_sheet_line line);
+extern void psiconv_free_sheet_name_section(psiconv_sheet_name_section section);
+extern void psiconv_free_sheet_variable(psiconv_sheet_variable list);
+extern void psiconv_free_sheet_variable_list(psiconv_sheet_variable_list list);
+extern void psiconv_free_sheet_info_section(psiconv_sheet_info_section section);
 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