--- psiconv/trunk/lib/psiconv/data.c	2000/12/25 14:34:17	78
+++ psiconv/trunk/lib/psiconv/data.c	2001/07/24 20:32:51	129
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "data.h"
+#include "list.h"
 
 static psiconv_color clone_color(psiconv_color color);
 static psiconv_font clone_font(psiconv_font font);
@@ -33,6 +34,31 @@
 static void psiconv_free_paragraph_aux(void * paragraph);
 static void psiconv_free_paint_data_section_aux(void * section);
 static void psiconv_free_clipart_section_aux(void * section);
+static void psiconv_free_formula_aux(void *data);
+static void psiconv_free_sheet_worksheet_aux (void *data);
+static void psiconv_free_sheet_variable_aux(void * variable);
+
+static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
+static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
+static psiconv_texted_section psiconv_empty_texted_section(void);
+static psiconv_page_header psiconv_empty_page_header(void);
+static psiconv_page_layout_section psiconv_empty_page_layout_section(void);
+static psiconv_word_status_section psiconv_empty_word_status_section(void);
+static psiconv_word_f psiconv_empty_word_f(void);
+static psiconv_sheet_status_section psiconv_empty_sheet_status_section(void);
+static psiconv_formula_list psiconv_empty_formula_list(void);
+static psiconv_sheet_workbook_section 
+                                  psiconv_empty_sheet_workbook_section(void);
+static psiconv_sheet_f psiconv_empty_sheet_f(void);
+static psiconv_texted_f psiconv_empty_texted_f(void);
+static psiconv_paint_data_section psiconv_empty_paint_data_section(void);
+static psiconv_pictures psiconv_empty_pictures(void);
+static psiconv_mbm_f psiconv_empty_mbm_f(void);
+static psiconv_sketch_section psiconv_empty_sketch_section(void);
+static psiconv_sketch_f psiconv_empty_sketch_f(void);
+static psiconv_clipart_f psiconv_empty_clipart_f(void);
+static psiconv_cliparts psiconv_empty_cliparts(void);
+
 
 /* Note: these defaults seem to be hard-coded somewhere outside the
    files themself. */
@@ -129,6 +155,7 @@
     psiconv_bool_false,    /* keep_with_next      */
     psiconv_bool_false,    /* on_next_page        */
     psiconv_bool_false,    /* no_widow_protection */
+    psiconv_bool_false,    /* wrap_to_fit_cell    */
     0.0,                   /* left_margin         */
     &bullet,               /* bullet              */
     &no_border,            /* left_border         */
@@ -293,6 +320,34 @@
     return psiconv_list_get(ss->styles,0xff - nr);
 }
 
+psiconv_formula psiconv_get_formula (psiconv_formula_list ss, int nr)
+{
+  return psiconv_list_get(ss,psiconv_list_length(ss)-nr-1);
+}
+
+/* TODO: What if a cell is both in a default row and a default column?!? */
+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)
+{
+  int i;
+  psiconv_sheet_line line;
+  for (i = 0;i < psiconv_list_length(row_defaults);i++) {
+    line = psiconv_list_get(row_defaults,i);
+    if (line->position == row)
+      return line->layout;
+  }
+  for (i = 0;i < psiconv_list_length(col_defaults);i++) {
+    line = psiconv_list_get(col_defaults,i);
+    if (line->position == col)
+      return line->layout;
+  }
+  return cell_default;
+}
+
+
 void psiconv_free_color (psiconv_color color)
 {
   if (color)
@@ -518,6 +573,187 @@
   }
 }
 
+void psiconv_free_sheet_status_section(psiconv_sheet_status_section section)
+{
+  if (section) 
+    free(section);
+}
+
+void psiconv_free_sheet_numberformat(psiconv_sheet_numberformat numberformat)
+{
+  if (numberformat)
+    free(numberformat);
+}
+
+void psiconv_free_sheet_cell_layout(psiconv_sheet_cell_layout layout)
+{
+  psiconv_free_paragraph_layout(layout->paragraph);
+  psiconv_free_character_layout(layout->character);
+  psiconv_free_sheet_numberformat(layout->numberformat);
+}
+
+void psiconv_free_sheet_cell_aux(void *cell)
+{
+  psiconv_sheet_cell data = cell;
+
+  psiconv_free_sheet_cell_layout(data->layout);
+
+  if ((data->type == psiconv_cell_string) && (data->data.dat_string))
+    free(data->data.dat_string);
+}
+
+void psiconv_free_sheet_cell(psiconv_sheet_cell cell)
+{
+  if (cell) {
+    psiconv_free_sheet_cell_aux(cell);
+    free(cell);
+  }
+}
+
+void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list)
+{
+  if (list) 
+    psiconv_list_free_el(list,psiconv_free_sheet_cell_aux);
+}
+
+void psiconv_free_sheet_line_aux(void *line)
+{
+  psiconv_sheet_line data = line;
+
+  psiconv_free_sheet_cell_layout(data->layout);
+}
+
+void psiconv_free_sheet_line(psiconv_sheet_line line)
+{
+  if (line) {
+    psiconv_free_sheet_line_aux(line);
+    free(line);
+  }
+}
+
+void psiconv_free_sheet_line_list(psiconv_sheet_line_list list)
+{
+  if (list) 
+    psiconv_list_free_el(list,psiconv_free_sheet_line_aux);
+}
+
+void psiconv_free_sheet_worksheet_aux (void *data)
+{
+  psiconv_sheet_worksheet section = data;
+  psiconv_free_sheet_cell_layout(section->default_layout);
+  psiconv_free_sheet_cell_list(section->cells);
+  psiconv_free_sheet_line_list(section->row_default_layouts);
+  psiconv_free_sheet_line_list(section->col_default_layouts);
+}
+
+void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
+{
+  if (sheet) {
+    psiconv_free_sheet_worksheet_aux(sheet);
+    free(sheet);
+  }
+}
+
+void psiconv_free_sheet_worksheet_list(psiconv_sheet_worksheet_list list)
+{
+  if (list) 
+    psiconv_list_free_el(list,psiconv_free_sheet_worksheet_aux);
+}
+
+void psiconv_free_formula_aux(void *data)
+{
+  psiconv_formula formula;
+  formula = data;
+  if (formula->type == psiconv_formula_dat_string) 
+    free(formula->data.dat_string);
+  else if ((formula->type != psiconv_formula_dat_int) &&
+           (formula->type != psiconv_formula_dat_var) &&
+           (formula->type != psiconv_formula_dat_float) &&
+           (formula->type != psiconv_formula_dat_cellref) &&
+           (formula->type != psiconv_formula_dat_cellblock) &&
+           (formula->type != psiconv_formula_dat_vcellblock) &&
+           (formula->type != psiconv_formula_mark_opsep) &&
+           (formula->type != psiconv_formula_mark_opend) &&
+           (formula->type != psiconv_formula_mark_eof)  &&
+           (formula->type != psiconv_formula_unknown)) 
+    psiconv_free_formula_list(formula->data.fun_operands);
+}
+
+void psiconv_free_formula(psiconv_formula formula)
+{
+  if (formula) {
+    psiconv_free_formula_aux(formula);
+    free(formula);
+  }
+}
+
+void psiconv_free_formula_list(psiconv_formula_list list)
+{
+  if (list) 
+    psiconv_list_free_el(list,psiconv_free_formula_aux);
+}
+
+void psiconv_free_sheet_name_section(psiconv_sheet_name_section section)
+{
+  if (section) {
+    if(section->name)
+      free(section->name);
+    free(section);
+  }
+}
+
+void psiconv_free_sheet_info_section(psiconv_sheet_info_section section)
+{
+  if (section) {
+    free(section);
+  }
+}
+
+void psiconv_free_sheet_variable_aux(void * variable)
+{
+  psiconv_sheet_variable var = variable;
+  if (var->name)
+    free(var->name);
+  if (var->type == psiconv_var_string)
+    free(var->data.dat_string);
+}
+
+void psiconv_free_sheet_variable(psiconv_sheet_variable var)
+{
+  if (var) {
+    psiconv_free_sheet_variable_aux(var);
+    free(var);
+  }
+}
+
+void psiconv_free_sheet_variable_list(psiconv_sheet_variable_list list)
+{
+  if (list) 
+    psiconv_list_free_el(list,psiconv_free_sheet_variable_aux);
+}
+
+void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
+{
+  if (section) {
+    psiconv_free_formula_list(section->formulas);
+    psiconv_free_sheet_worksheet_list(section->worksheets);
+    psiconv_free_sheet_name_section(section->name);
+    psiconv_free_sheet_info_section(section->info);
+    psiconv_free_sheet_variable_list(section->variables);
+    free(section);
+  }
+}
+
+void psiconv_free_sheet_f(psiconv_sheet_f file)
+{
+  if (file) { 
+    psiconv_free_page_layout_section(file->page_sec);
+    psiconv_free_sheet_status_section(file->status_sec);
+    psiconv_free_sheet_workbook_section(file->workbook_sec);
+    free(file);
+  }
+}
+
 void psiconv_free_texted_f(psiconv_texted_f file)
 {
   if (file) {
@@ -622,6 +858,8 @@
       psiconv_free_sketch_f((psiconv_sketch_f) file->file);
     else if (file->type == psiconv_clipart_file)
       psiconv_free_clipart_f((psiconv_clipart_f) file->file);
+    else if (file->type == psiconv_sheet_file)
+      psiconv_free_sheet_f((psiconv_sheet_f) file->file);
     free(file);
   }
 }
@@ -760,3 +998,367 @@
   else
     return 1;
 }
+
+
+
+psiconv_word_styles_section psiconv_empty_word_styles_section(void)
+{
+  psiconv_word_styles_section result;
+  if (!(result = malloc(sizeof(*result))))
+    goto ERROR1;
+  if (!(result->styles = psiconv_list_new(sizeof(struct psiconv_word_style_s))))
+    goto ERROR2;
+  if (!(result->normal = malloc(sizeof(struct psiconv_word_style_s))))
+    goto ERROR3;
+  if (!(result->normal->character = psiconv_basic_character_layout()))
+    goto ERROR4;
+  if (!(result->normal->paragraph = psiconv_basic_paragraph_layout()))
+    goto ERROR5;
+  result->normal->hotkey = 'N';
+  result->normal->name = NULL;
+  result->normal->built_in = psiconv_bool_true;
+  result->normal->outline_level = 0;
+  return result;
+ERROR5:
+  psiconv_free_character_layout(result->normal->character);
+ERROR4:
+  free(result->normal);
+ERROR3:
+  psiconv_list_free(result->styles);
+ERROR2:
+  free(result);
+ERROR1:
+  return NULL;
+}
+
+psiconv_text_and_layout psiconv_empty_text_and_layout(void)
+{
+  return psiconv_list_new(sizeof(struct psiconv_paragraph_s));
+}
+
+psiconv_texted_section psiconv_empty_texted_section(void)
+{
+  psiconv_texted_section result;
+  if (!(result = malloc(sizeof(*result))))
+    goto ERROR1;
+  if (!(result->paragraphs = psiconv_empty_text_and_layout()))
+    goto ERROR2;
+  return result;
+ERROR2:
+  free(result);
+ERROR1:
+  return NULL;
+}
+
+psiconv_page_header psiconv_empty_page_header(void)
+{
+  psiconv_page_header result;
+  if (!(result = malloc(sizeof(*result))))
+    goto ERROR1;
+  result->on_first_page = psiconv_bool_true;
+  if (!(result->base_paragraph_layout = psiconv_basic_paragraph_layout()))
+    goto ERROR2;
+  if (!(result->base_character_layout = psiconv_basic_character_layout()))
+    goto ERROR3;
+  if (!(result->text = psiconv_empty_texted_section()))
+    goto ERROR4;
+  return result;
+ERROR4:
+  psiconv_free_character_layout(result->base_character_layout);
+ERROR3:
+  psiconv_free_paragraph_layout(result->base_paragraph_layout);
+ERROR2:
+  free(result);
+ERROR1:
+  return NULL;
+}
+
+psiconv_page_layout_section psiconv_empty_page_layout_section(void)
+{
+  psiconv_page_layout_section result;
+  if (!(result = malloc(sizeof(*result))))
+    goto ERROR1;
+  result->first_page_nr = 1;
+  result->header_dist = result->footer_dist = 1.27;
+  result->left_margin = result->right_margin = 3.175;
+  result->top_margin = result->bottom_margin = 2.54;
+  result->page_width = 21.0;
+  result->page_height = 29.7;
+  result->landscape = psiconv_bool_false;
+  if (!(result->header = psiconv_empty_page_header()))
+    goto ERROR2;
+  if (!(result->footer = psiconv_empty_page_header()))
+    goto ERROR3;
+  return result;
+ERROR3:
+  psiconv_free_page_header(result->header);
+ERROR2:
+  free(result);
+ERROR1:
+  return NULL;
+}
+
+psiconv_word_status_section psiconv_empty_word_status_section(void)
+{
+  psiconv_word_status_section result;
+  if (!(result = malloc(sizeof(*result))))
+    return NULL;
+  result->show_tabs = result->show_spaces = result->show_paragraph_ends =
+        result->show_hard_minus = result->show_hard_space = 
+        result->fit_lines_to_screen = psiconv_bool_false;
+  result->show_full_pictures = result->show_full_graphs =
+        result->show_top_toolbar = result->show_side_toolbar = 
+        psiconv_bool_true;
+  result->cursor_position = 0;
+  result->display_size = 1000;
+  return result;
+}
+
+psiconv_word_f psiconv_empty_word_f(void)
+{
+  psiconv_word_f result;
+  if (!(result = malloc(sizeof(*result))))
+    goto ERROR1;
+  if (!(result->page_sec = psiconv_empty_page_layout_section()))
+    goto ERROR2;
+  if (!(result->paragraphs = psiconv_empty_text_and_layout()))
+    goto ERROR3;
+  if (!(result->status_sec = psiconv_empty_word_status_section()))
+    goto ERROR4;
+  if (!(result->styles_sec = psiconv_empty_word_styles_section()))
+    goto ERROR5;
+  return result;
+ERROR5:
+  psiconv_free_word_status_section(result->status_sec);
+ERROR4:
+  psiconv_free_text_and_layout(result->paragraphs);
+ERROR3:
+  psiconv_free_page_layout_section(result->page_sec);
+ERROR2:
+  free(result);
+ERROR1:
+  return NULL;
+}
+
+psiconv_sheet_status_section psiconv_empty_sheet_status_section(void)
+{
+  psiconv_sheet_status_section result;
+  if (!(result = malloc(sizeof(*result))))
+    return NULL;
+  result->show_horizontal_scrollbar = result->show_vertical_scrollbar = 
+        psiconv_triple_auto;
+  result->show_graph = psiconv_bool_false;
+  result->show_top_sheet_toolbar = result->show_side_sheet_toolbar = 
+        result->show_top_graph_toolbar = result->show_side_graph_toolbar = 
+        psiconv_bool_true;
+  result->cursor_row = result->cursor_column = 0;
+  result->sheet_display_size = result->graph_display_size = 1000;
+  return result;
+}
+
+psiconv_formula_list psiconv_empty_formula_list(void)
+{
+  return psiconv_list_new(sizeof(struct psiconv_formula_s));
+}
+
+psiconv_sheet_workbook_section psiconv_empty_sheet_workbook_section(void)
+{
+  psiconv_sheet_workbook_section result;
+  if (!(result = malloc(sizeof(*result))))
+    goto ERROR1;
+  if (!(result->formulas = psiconv_empty_formula_list()))
+    goto ERROR2;
+  return result;
+ERROR2:
+  free(result);
+ERROR1:
+  return NULL;
+}
+
+
+psiconv_sheet_f psiconv_empty_sheet_f(void)
+{
+  psiconv_sheet_f result;
+  if (!(result = malloc(sizeof(*result))))
+    goto ERROR1;
+  if (!(result->page_sec = psiconv_empty_page_layout_section()))
+    goto ERROR2;
+  if (!(result->status_sec = psiconv_empty_sheet_status_section()))
+    goto ERROR3;
+  if (!(result->workbook_sec = psiconv_empty_sheet_workbook_section()))
+    goto ERROR4;
+  return result;
+ERROR4:
+  psiconv_free_sheet_status_section(result->status_sec);
+ERROR3:
+  psiconv_free_page_layout_section(result->page_sec);
+ERROR2:
+  free(result);
+ERROR1:
+  return NULL;
+}
+
+psiconv_texted_f psiconv_empty_texted_f(void)
+{
+  psiconv_texted_f result;
+  if (!(result = malloc(sizeof(*result))))
+    goto ERROR1;
+  if (!(result->page_sec = psiconv_empty_page_layout_section()))
+    goto ERROR2;
+  if (!(result->texted_sec = psiconv_empty_texted_section()))
+    goto ERROR3;
+  return result;
+ERROR3:
+  psiconv_free_page_layout_section(result->page_sec);
+ERROR2:
+  free(result);
+ERROR1:
+  return NULL;
+}
+
+psiconv_paint_data_section psiconv_empty_paint_data_section(void)
+{
+  psiconv_paint_data_section result;
+  if (!(result = malloc(sizeof(*result))))
+    goto ERROR1;
+  /* Is this correct? */
+  result->xsize = result->ysize = result->pic_xsize = result->pic_ysize = 0;
+  /* Probably forbidden... */
+  if (!(result->red = malloc(0)))
+    goto ERROR2;
+  if (!(result->green = malloc(0)))
+    goto ERROR3;
+  if (!(result->blue = malloc(0)))
+    goto ERROR4;
+  return result;
+ERROR4:
+  free(result->green);
+ERROR3:
+  free(result->red);
+ERROR2:
+  free(result);
+ERROR1:
+  return NULL;
+}
+
+
+psiconv_pictures psiconv_empty_pictures(void)
+{
+  psiconv_pictures result;
+  psiconv_paint_data_section pds;
+  if (!(result = psiconv_list_new(sizeof(struct psiconv_paint_data_section_s))))
+    goto ERROR1;
+  if (!(pds = psiconv_empty_paint_data_section()))
+    goto ERROR2;
+  if (psiconv_list_add(result,pds))
+    goto ERROR3;
+  free(pds);
+  return result;
+ERROR3:
+  psiconv_free_paint_data_section(pds);
+ERROR2:
+  psiconv_list_free(result);
+ERROR1:
+  return NULL;
+}
+
+psiconv_mbm_f psiconv_empty_mbm_f(void)
+{
+  psiconv_mbm_f result;
+  if (!(result = malloc(sizeof(*result))))
+    goto ERROR1;
+  if (!(result->sections = psiconv_empty_pictures()))
+    goto ERROR2;
+  return result;
+ERROR2:
+  free(result);
+ERROR1:
+  return NULL;
+}
+
+psiconv_sketch_section psiconv_empty_sketch_section(void)
+{
+  psiconv_sketch_section result;
+  if (!(result = malloc(sizeof(*result))))
+    goto ERROR1;
+  result->form_xsize = 320;
+  result->form_ysize = 200;
+  result->picture_x_offset = result->picture_y_offset = result->picture_xsize =
+          result->picture_ysize = 0;
+  result->magnification_x = result->magnification_y = 1.0;
+  result->cut_left = result->cut_right = result->cut_top = 
+          result->cut_bottom = 0.0;
+  if (!(result->picture = psiconv_empty_paint_data_section()))
+    goto ERROR2;
+  return result;
+ERROR2:
+  free(result);
+ERROR1:
+  return NULL;
+}
+
+psiconv_sketch_f psiconv_empty_sketch_f(void)
+{
+  psiconv_sketch_f result;
+  if (!(result = malloc(sizeof(*result))))
+    goto ERROR1;
+  if (!(result->sketch_sec = psiconv_empty_sketch_section()))
+    goto ERROR2;
+  return result;
+ERROR2:
+  free(result);
+ERROR1:
+  return NULL;
+}
+
+psiconv_cliparts psiconv_empty_cliparts(void)
+{
+  /* Is this correct? */
+  return psiconv_list_new(sizeof(struct psiconv_clipart_section_s));
+}
+
+psiconv_clipart_f psiconv_empty_clipart_f(void)
+{
+  psiconv_clipart_f result;
+  if (!(result = malloc(sizeof(*result))))
+    goto ERROR1;
+  if (!(result->sections = psiconv_empty_cliparts()))
+    goto ERROR2;
+  return result;
+ERROR2:
+  free(result);
+ERROR1:
+  return NULL;
+}
+
+psiconv_file psiconv_empty_file(psiconv_file_type_t type)
+{
+  psiconv_file result;
+  if (!(result = malloc(sizeof(*result))))
+    return NULL;
+  result->type = type;
+  if (type == psiconv_word_file) {
+    if (!(result->file =  psiconv_empty_word_f()))
+      goto ERROR;
+  } else if (type == psiconv_sheet_file) {
+    if (!(result->file =  psiconv_empty_sheet_f()))
+      goto ERROR;
+  } else if (type == psiconv_texted_file) {
+    if (!(result->file =  psiconv_empty_texted_f()))
+      goto ERROR;
+  } else if (type == psiconv_mbm_file) {
+    if (!(result->file =  psiconv_empty_mbm_f()))
+      goto ERROR;
+  } else if (type == psiconv_sketch_file) {
+    if (!(result->file =  psiconv_empty_sketch_f()))
+      goto ERROR;
+  } else if (type == psiconv_clipart_file) {
+    if (!(result->file =  psiconv_empty_clipart_f()))
+      goto ERROR;
+  } else 
+    goto ERROR;
+  return result;
+ERROR:
+  free(result);
+  return NULL;
+}