--- psiconv/trunk/lib/psiconv/generate_word.c	2002/01/29 18:38:38	142
+++ psiconv/trunk/lib/psiconv/generate_word.c	2003/11/25 17:57:05	168
@@ -30,40 +30,42 @@
 #endif
 
 
-int psiconv_write_word_status_section(psiconv_buffer buf,
-                                         psiconv_word_status_section value)
+int psiconv_write_word_status_section(const psiconv_config config,
+                                      psiconv_buffer buf,
+                                      psiconv_word_status_section value)
 {
   int res;
 
   if (!value) {
-    psiconv_warn(0,psiconv_buffer_length(buf),"Null word status section");
+    psiconv_warn(config,0,psiconv_buffer_length(buf),"Null word status section");
     return -PSICONV_E_GENERATE;
   }
 
-  if ((res = psiconv_write_u8(buf,0x02)))
+  if ((res = psiconv_write_u8(config,buf,0x02)))
     return res;
-  if ((res = psiconv_write_u8(buf,(value->show_tabs?0x01:0x00) |
+  if ((res = psiconv_write_u8(config,buf,(value->show_tabs?0x01:0x00) |
                               (value->show_spaces?0x02:0x00) |
                               (value->show_paragraph_ends?0x04:0x00) |
                               (value->show_line_breaks?0x08:0x00) |
                               (value->show_hard_minus?0x20:0x00) |
                               (value->show_hard_space?0x40:0x00))))
     return res;
-  if ((res = psiconv_write_u8(buf,(value->show_full_pictures?0x01:0x00) | 
+  if ((res = psiconv_write_u8(config,buf,(value->show_full_pictures?0x01:0x00) | 
                               (value->show_full_graphs?0x02:0x00))))
     return res;
-  if ((res = psiconv_write_bool(buf,value->show_top_toolbar)))
+  if ((res = psiconv_write_bool(config,buf,value->show_top_toolbar)))
     return res;
-  if ((res = psiconv_write_bool(buf,value->show_side_toolbar)))
+  if ((res = psiconv_write_bool(config,buf,value->show_side_toolbar)))
     return res;
-  if ((res = psiconv_write_u8(buf,(value->fit_lines_to_screen?0x08:0x00))))
+  if ((res = psiconv_write_u8(config,buf,(value->fit_lines_to_screen?0x08:0x00))))
     return res;
-  if ((res = psiconv_write_u32(buf,value->cursor_position)))
+  if ((res = psiconv_write_u32(config,buf,value->cursor_position)))
     return res;
-  return psiconv_write_u32(buf,value->display_size);
+  return psiconv_write_u32(config,buf,value->display_size);
 }
 
-int psiconv_write_word_styles_section(psiconv_buffer buf,
+int psiconv_write_word_styles_section(const psiconv_config config,
+                                      psiconv_buffer buf,
                                       psiconv_word_styles_section value)
 {
   int res,i;
@@ -74,7 +76,7 @@
 
 
   if (!value || !value->normal || !value->styles) {
-    psiconv_warn(0,psiconv_buffer_length(buf),"Null word styles section");
+    psiconv_warn(config,0,psiconv_buffer_length(buf),"Null word styles section");
     res = -PSICONV_E_GENERATE;
     goto ERROR1;
   }
@@ -90,63 +92,63 @@
   }
 
 
-  if ((res = psiconv_write_paragraph_layout_list(buf,value->normal->paragraph,
+  if ((res = psiconv_write_paragraph_layout_list(config,buf,value->normal->paragraph,
                                                  basepara)))
     goto ERROR3;
   /* Always generate the font for Normal */
   font = basechar->font;
   basechar->font = NULL;
-  res = psiconv_write_character_layout_list(buf,value->normal->character,
+  res = psiconv_write_character_layout_list(config,buf,value->normal->character,
                                                  basechar);
   basechar->font = font;
   if (res)
     goto ERROR3;
-  if ((res = psiconv_write_u32(buf,value->normal->hotkey)))
+  if ((res = psiconv_write_u32(config,buf,value->normal->hotkey)))
     goto ERROR3;
-  if ((res = psiconv_write_u8(buf,psiconv_list_length(value->styles))))
+  if ((res = psiconv_write_u8(config,buf,psiconv_list_length(value->styles))))
     goto ERROR3;
 
 
 
   for (i = 0; i < psiconv_list_length(value->styles); i++) {
     if (!(style = psiconv_list_get(value->styles,i))) {
-      psiconv_warn(0,psiconv_buffer_length(buf),"Massive memory corruption");
+      psiconv_warn(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
       res = -PSICONV_E_OTHER;
       goto ERROR3;
     }
-    if ((res = psiconv_write_u32(buf,style->hotkey)))
+    if ((res = psiconv_write_u32(config,buf,style->hotkey)))
       goto ERROR3;
   }
-  if ((res = psiconv_write_u8(buf,psiconv_list_length(value->styles))))
+  if ((res = psiconv_write_u8(config,buf,psiconv_list_length(value->styles))))
     goto ERROR3;
   for (i = 0; i < psiconv_list_length(value->styles); i++) {
     if (!(style = psiconv_list_get(value->styles,i))) {
-      psiconv_warn(0,psiconv_buffer_length(buf),"Massive memory corruption");
+      psiconv_warn(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
       res = -PSICONV_E_OTHER;
       goto ERROR3;
     }
     if (!style->name) {
-      psiconv_warn(0,psiconv_buffer_length(buf),"Null style name");
+      psiconv_warn(config,0,psiconv_buffer_length(buf),"Null style name");
       res = -PSICONV_E_GENERATE;
       goto ERROR3;
     }
-    if ((res = psiconv_write_string(buf,style->name)))
+    if ((res = psiconv_write_string(config,buf,style->name)))
       goto ERROR3;
-    if ((res = psiconv_write_u32(buf,style->built_in?PSICONV_ID_STYLE_BUILT_IN:
+    if ((res = psiconv_write_u32(config,buf,style->built_in?PSICONV_ID_STYLE_BUILT_IN:
                                                  PSICONV_ID_STYLE_REMOVABLE)))
       goto ERROR3;
-    if ((res = psiconv_write_u32(buf,style->outline_level)))
+    if ((res = psiconv_write_u32(config,buf,style->outline_level)))
       goto ERROR3;
-    if ((res = psiconv_write_character_layout_list(buf,style->character,
+    if ((res = psiconv_write_character_layout_list(config,buf,style->character,
                                                    value->normal->character)))
       goto ERROR3;
-    if ((res = psiconv_write_paragraph_layout_list(buf,style->paragraph,
+    if ((res = psiconv_write_paragraph_layout_list(config,buf,style->paragraph,
                                                    value->normal->paragraph)))
       goto ERROR3;
   }
 
   for (i = 0; i < psiconv_list_length(value->styles); i++)
-    if ((res = psiconv_write_u8(buf,0xff)))
+    if ((res = psiconv_write_u8(config,buf,0xff)))
       goto ERROR3;
   res = -PSICONV_E_OK;