--- psiconv/trunk/lib/psiconv/generate_routines.h	2000/12/24 17:26:24	75
+++ psiconv/trunk/lib/psiconv/generate_routines.h	2000/12/25 22:25:33	79
@@ -21,9 +21,10 @@
 #define PSICONV_GENERATE_ROUTINES_H
 
 #include <psiconv/general.h>
-#include <psiconv/common.h>
 #include <psiconv/data.h>
 #include <psiconv/generate.h>
+#include <psiconv/buffer.h>
+#include <psiconv/common.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -40,6 +41,7 @@
 extern int psiconv_write_u32(psiconv_buffer buf,const psiconv_u32 value);
 extern int psiconv_write_S(psiconv_buffer buf, const psiconv_u32 value);
 extern int psiconv_write_X(psiconv_buffer buf, const psiconv_u32 value);
+extern int psiconv_write_offset(psiconv_buffer buf, const psiconv_u32 value);
 extern int psiconv_write_length(psiconv_buffer buf, 
                                 const psiconv_length_t value);
 extern int psiconv_write_size(psiconv_buffer buf, const psiconv_size_t value);
@@ -48,11 +50,12 @@
                                 const psiconv_string_t value);
 
 /* *********************
-   * generate_simple.c *
+   * generate_layout.c *
    ********************* */
 
 extern int psiconv_write_color(psiconv_buffer buf, const psiconv_color value);
 extern int psiconv_write_font(psiconv_buffer buf, const psiconv_font value);
+extern int psiconv_write_border(psiconv_buffer buf, const psiconv_border value);
 extern int psiconv_write_bullet(psiconv_buffer buf, const psiconv_bullet value);
 extern int psiconv_write_tab(psiconv_buffer buf,psiconv_tab value);
 extern int psiconv_write_paragraph_layout_list(psiconv_buffer buf,
@@ -62,6 +65,14 @@
                                         psiconv_character_layout value,
                                         psiconv_character_layout base);
 
+/* *******************
+   * generate_page.c *
+   ******************* */
+
+extern int psiconv_write_page_header(psiconv_buffer buf,
+                                     const psiconv_page_header value);
+extern int psiconv_write_page_layout_section(psiconv_buffer buf,
+                                     const psiconv_page_layout_section value);
 
 /* *********************
    * generate_common.c *
@@ -75,17 +86,15 @@
                                   psiconv_u32 id, const psiconv_string_t text);
 extern int psiconv_write_text_section(psiconv_buffer buf,
                                       const psiconv_text_and_layout value);
+extern int psiconv_write_styled_layout_section(psiconv_buffer buf,
+                                    psiconv_text_and_layout result,
+                                    psiconv_word_styles_section styles);
+extern int psiconv_write_styleless_layout_section(psiconv_buffer buf,
+                                     const psiconv_text_and_layout value,
+                                     const psiconv_character_layout base_char,
+                                     const psiconv_paragraph_layout base_para);
 
 
-/* *******************
-   * generate_page.c *
-   ******************* */
-
-extern int psiconv_write_page_header(psiconv_buffer buf,
-                                     const psiconv_page_header value);
-extern int psiconv_write_page_layout_section(psiconv_buffer buf,
-                                     const psiconv_page_layout_section value);
-
 
 /* *********************
    * generate_texted.c *
@@ -96,6 +105,15 @@
                                         psiconv_character_layout base_char,
                                         psiconv_paragraph_layout base_para);
 
+/* *******************
+   * generate_word.c *
+   ******************* */
+
+extern int psiconv_generate_word_status_section(psiconv_buffer buf,
+                                         psiconv_word_status_section value);
+extern int psiconv_write_word_styles_section(psiconv_buffer buf,
+                                      psiconv_word_styles_section value);
+
 
 /* *********************
    * generate_driver.c *