--- psiconv/trunk/lib/psiconv/generate_layout.c	2000/12/25 00:29:23	77
+++ psiconv/trunk/lib/psiconv/generate_layout.c	2000/12/25 14:34:17	78
@@ -134,9 +134,9 @@
                                         psiconv_paragraph_layout value,
                                         psiconv_paragraph_layout base)
 {
-  int res,i,tabs_different;
+  int res,i;
   psiconv_buffer extra_buf;
-  psiconv_tab value_tab,base_tab;
+  psiconv_tab tab;
   
   if (!value) {
     psiconv_warn(0,psiconv_list_length(buf),"Null paragraph layout list");
@@ -145,10 +145,7 @@
   if (!(extra_buf = psiconv_new_buffer()))
     return -PSICONV_E_NOMEM;
   
-  if (!base || !base->back_color || !value->back_color ||
-      (value->back_color->red != base->back_color->red) ||
-      (value->back_color->green != base->back_color->green) ||
-      (value->back_color->blue != base->back_color->blue)) {
+  if (!base || psiconv_compare_color(base->back_color,value->back_color)) {
     if ((res = psiconv_write_u8(extra_buf,0x01)))
       goto ERROR;
     if ((res = psiconv_write_color(extra_buf,value->back_color)))
@@ -268,72 +265,39 @@
       goto ERROR;
   }
 
-  if (!base || !value->top_border || !base->top_border ||
-      !value->top_border->color || !base->top_border->color ||
-      (value->top_border->kind != base->top_border->kind) ||
-      (value->top_border->thickness != base->top_border->thickness) ||
-      (value->top_border->color->red != base->top_border->color->red) ||
-      (value->top_border->color->green != base->top_border->color->green) ||
-      (value->top_border->color->blue != base->top_border->color->blue)) {
+  if (!base || psiconv_compare_border(value->top_border,base->top_border)) {
     if ((res = psiconv_write_u8(extra_buf,0x11)))
       goto ERROR;
     if ((res = psiconv_write_border(extra_buf,value->top_border))) 
       goto ERROR;
   }
 
-  if (!base || !value->top_border || !base->top_border ||
-      !value->top_border->color || !base->top_border->color ||
-      (value->top_border->kind != base->top_border->kind) ||
-      (value->top_border->thickness != base->top_border->thickness) ||
-      (value->top_border->color->red != base->top_border->color->red) ||
-      (value->top_border->color->green != base->top_border->color->green) ||
-      (value->top_border->color->blue != base->top_border->color->blue)) {
+  if (!base || psiconv_compare_border(value->bottom_border,
+                                       base->bottom_border)) {
     if ((res = psiconv_write_u8(extra_buf,0x12)))
       goto ERROR;
-    if ((res = psiconv_write_border(extra_buf,value->top_border)))
+    if ((res = psiconv_write_border(extra_buf,value->bottom_border)))
       goto ERROR;
   }
 
-  if (!base || !value->left_border || !base->left_border ||
-      !value->left_border->color || !base->left_border->color ||
-      (value->left_border->kind != base->left_border->kind) ||
-      (value->left_border->thickness != base->left_border->thickness) ||
-      (value->left_border->color->red != base->left_border->color->red) ||
-      (value->left_border->color->green != base->left_border->color->green) ||
-      (value->left_border->color->blue != base->left_border->color->blue)) {
+  if (!base || psiconv_compare_border(value->left_border,
+                                       base->left_border)) {
     if ((res = psiconv_write_u8(extra_buf,0x13)))
       goto ERROR;
     if ((res = psiconv_write_border(extra_buf,value->left_border)))
       goto ERROR;
   }
 
-  if (!base || !value->right_border || !base->right_border ||
-      !value->right_border->color || !base->right_border->color ||
-      (value->right_border->kind != base->right_border->kind) ||
-      (value->right_border->thickness != base->right_border->thickness) ||
-      (value->right_border->color->red != base->right_border->color->red) ||
-      (value->right_border->color->green != 
-                                         base->right_border->color->green) ||
-      (value->right_border->color->blue != base->right_border->color->blue)) {
+  if (!base || psiconv_compare_border(value->right_border,
+                                       base->right_border)) {
     if ((res = psiconv_write_u8(extra_buf,0x14))) 
       goto ERROR;
     if ((res = psiconv_write_border(extra_buf,value->right_border)))
       goto ERROR;
   }
 
-  if (!base || !value->bullet || !base->bullet || 
-      !value->bullet->color || !base->bullet->color ||
-      !value->bullet->font || !base->bullet->font ||
-      !value->bullet->font->name || !base->bullet->font->name ||
-      (value->bullet->on != base->bullet->on) ||
-      (value->bullet->font_size != base->bullet->font_size) ||
-      (value->bullet->character != base->bullet->character) ||
-      (value->bullet->indent != base->bullet->indent) ||
-      (value->bullet->color->red != base->bullet->color->red) ||
-      (value->bullet->color->green != base->bullet->color->green) ||
-      (value->bullet->color->blue != base->bullet->color->blue) ||
-      (value->bullet->font->screenfont != base->bullet->font->screenfont) ||
-      strcmp(value->bullet->font->name,base->bullet->font->name)) {
+  if (!base || psiconv_compare_bullet(value->bullet,
+                                       base->bullet)) {
     if ((res = psiconv_write_u8(extra_buf,0x15))) 
       goto ERROR;
     if ((res = psiconv_write_bullet(extra_buf,value->bullet)))
@@ -345,46 +309,24 @@
     res = -PSICONV_E_GENERATE;
     goto ERROR;
   } 
+
   /* It is not entirely clear how tabs are inherited. For now, I assume
      if there is any difference at all, we will have to generate both
      the normal tab-interval, and all specific tabs */
-  tabs_different = 0;
-  if (!base || !base->tabs || !base->tabs->extras ||
-      (value->tabs->normal != base->tabs->normal) ||
-      (psiconv_list_length(value->tabs->extras) != 
-              psiconv_list_length(base->tabs->extras))) 
-    tabs_different = 1;
-  else {
-    for (i = 0; i < psiconv_list_length(value->tabs->extras); i++) {
-      value_tab = psiconv_list_get(value->tabs->extras,i);
-      base_tab = psiconv_list_get(base->tabs->extras,i);
-      if (!value_tab || !base_tab) {
-        psiconv_warn(0,psiconv_list_length(buf),"Massive memory corruption");
-        res = -PSICONV_E_NOMEM;
-        goto ERROR;
-      }
-      if ((value_tab->kind != base_tab->kind) || 
-          (value_tab->location != base_tab->location)) {
-        tabs_different = 1;
-        break;
-      }
-    }
-  }
-
-  if (tabs_different) {
+  if (!base || psiconv_compare_all_tabs(value->tabs,base->tabs)) {
     if ((res = psiconv_write_u8(extra_buf,0x16))) 
       goto ERROR;
     if ((res = psiconv_write_length(extra_buf,value->tabs->normal)))
       goto ERROR;
     for (i = 0; i < psiconv_list_length(value->tabs->extras); i++) {
-      if (!(value_tab = psiconv_list_get(value->tabs->extras,i))) {
+      if (!(tab = psiconv_list_get(value->tabs->extras,i))) {
         psiconv_warn(0,psiconv_list_length(buf),"Massive memory corruption");
         res = -PSICONV_E_NOMEM;
         goto ERROR;
       }
       if ((res = psiconv_write_u8(extra_buf,0x17)))
         goto ERROR;
-      if ((res = psiconv_write_tab(extra_buf,value_tab)))
+      if ((res = psiconv_write_tab(extra_buf,tab)))
         goto ERROR;
     }
   }
@@ -412,20 +354,14 @@
   if (!(extra_buf = psiconv_new_buffer()))
     return -PSICONV_E_NOMEM;
 
-  if (!base || !base->color || !value->color ||
-      (value->color->red != base->color->red) ||
-      (value->color->green != base->color->green) ||
-      (value->color->blue != base->color->blue)) {
+  if (!base || psiconv_compare_color(base->color,value->color)) {
     if ((res = psiconv_write_u8(extra_buf,0x19)))
       goto ERROR;
     if ((res = psiconv_write_color(extra_buf,value->color)))
       goto ERROR;
   }
 
-  if (!base || !base->back_color || !value->back_color ||
-      (value->back_color->red != base->back_color->red) ||
-      (value->back_color->green != base->back_color->green) ||
-      (value->back_color->blue != base->back_color->blue)) {
+  if (!base || psiconv_compare_color(base->back_color,value->back_color)) {
     if ((res = psiconv_write_u8(extra_buf,0x1a)))
       goto ERROR;
     if ((res = psiconv_write_color(extra_buf,value->back_color)))
@@ -482,9 +418,7 @@
       goto ERROR;
   }
 
-  if (!base || !value->font || !base->font ||
-      (value->font->screenfont != base->font->screenfont) ||
-      strcmp(value->font->name,base->font->name)) {
+  if (!base || psiconv_compare_font(base->font,value->font)) {
     if ((res = psiconv_write_u8(extra_buf,0x22)))
       goto ERROR;
     if ((res = psiconv_write_font(extra_buf,value->font)))