--- psiconv/trunk/lib/psiconv/generate_common.c	2000/12/25 22:25:33	79
+++ psiconv/trunk/lib/psiconv/generate_common.c	2000/12/27 02:12:23	80
@@ -64,7 +64,7 @@
     }
     if ((res = psiconv_write_u32(buf,entry->id)))
       return res;
-    if ((res = psiconv_write_u32(buf,entry->offset)))
+    if ((res = psiconv_write_offset(buf,entry->offset)))
       return res;
   }
   return -PSICONV_E_OK;
@@ -92,7 +92,7 @@
     return -PSICONV_E_GENERATE;
   }
 
-  if (!(extra_buf = psiconv_buffer_new(0))) 
+  if (!(extra_buf = psiconv_buffer_new())) 
     return -PSICONV_E_NOMEM;
   for (i = 0; i < psiconv_list_length(value); i++) {
     if (!(paragraph = psiconv_list_get(value,i))) {
@@ -145,17 +145,17 @@
     goto ERROR1;
   }
 
-  if (!(buf_types = psiconv_buffer_new(0))) {
+  if (!(buf_types = psiconv_buffer_new())) {
     res = -PSICONV_E_NOMEM;
     goto ERROR2;
   }
 
-  if (!(buf_elements = psiconv_buffer_new(0))) {
+  if (!(buf_elements = psiconv_buffer_new())) {
     res = -PSICONV_E_NOMEM;
     goto ERROR3;
   }
 
-  if (!(buf_inlines = psiconv_buffer_new(0))) {
+  if (!(buf_inlines = psiconv_buffer_new())) {
     res = -PSICONV_E_NOMEM;
     goto ERROR4;
   }
@@ -172,7 +172,7 @@
     if (psiconv_list_length(paragraph->in_lines)) {
       /* Inline layouts, so we generate a paragraph element and inline 
          elements */
-      if ((res = psiconv_write_u32(buf_elements,0x00)))
+      if ((res = psiconv_write_u8(buf_elements,0x00)))
         goto ERROR5;
       if (!(style = psiconv_get_style(styles,paragraph->base_style))) {
         psiconv_warn(0,psiconv_buffer_length(buf),"Unknown style");
@@ -202,7 +202,7 @@
           goto ERROR5;
         if ((res = psiconv_write_u32(buf_inlines,in_line->length)))
           goto ERROR5;
-        if ((res = psiconv_write_character_layout_list(buf_elements,
+        if ((res = psiconv_write_character_layout_list(buf_inlines,
                                                      in_line->layout,
                                                      style->character)))
           goto ERROR5;
@@ -258,9 +258,7 @@
   }
 
   /* Now append everything */
-  if ((res = psiconv_write_u8(buf,with_styles?0x00:0x01)))
-    goto ERROR5;
-  if ((res = psiconv_write_u8(buf,0x00)))
+  if ((res = psiconv_write_u16(buf,with_styles?0x0001:0x0000)))
     goto ERROR5;
   if ((res = psiconv_write_u8(buf,psiconv_list_length(paragraph_type_list))))
     goto ERROR5;