--- psiconv/trunk/lib/psiconv/parse_layout.c	2000/12/15 00:21:51	64
+++ psiconv/trunk/lib/psiconv/parse_layout.c	2000/12/22 22:31:50	71
@@ -18,11 +18,13 @@
 */
 
 #include "config.h"
+#include "compat.h"
+
 #include <stdlib.h>
 #include <math.h>
 
-#include "data.h"
 #include "parse_routines.h"
+#include "error.h"
 
 int psiconv_parse_color(const psiconv_buffer buf, int lev, psiconv_u32 off, 
                         int *length, psiconv_color *result)
@@ -147,11 +149,11 @@
   else if (temp == 0x03)
     (*result)->kind = psiconv_border_dotted;
   else if (temp == 0x04)
-    (*result)->kind = psiconv_border_striped;
+    (*result)->kind = psiconv_border_dashed;
   else if (temp == 0x05)
-    (*result)->kind = psiconv_border_dotstripe;
+    (*result)->kind = psiconv_border_dotdashed;
   else if (temp == 0x06)
-    (*result)->kind = psiconv_border_dotdotstripe;
+    (*result)->kind = psiconv_border_dotdotdashed;
   else {
     psiconv_warn(lev+2,off,"Unknown border kind (defaults to `none')");
     (*result)->kind = psiconv_border_none;
@@ -272,7 +274,7 @@
 
   if (length)
     *length = len;
-  return res;
+  return 0;
 
 ERROR3:
   psiconv_free_color((*result)->color);
@@ -447,29 +449,29 @@
         psiconv_debug(lev+3,off+len,"Justify: %02x",temp);
         len ++;
       case 0x07:
-        psiconv_progress(lev+3,off+len,"Going to read interline distance");
-        result->interline = psiconv_read_size(buf,lev+3,off+len,&leng,&res);
+        psiconv_progress(lev+3,off+len,"Going to read linespacing distance");
+        result->linespacing = psiconv_read_size(buf,lev+3,off+len,&leng,&res);
         if (res)
           goto ERROR1;
         len += leng;
         break;
       case 0x08:
-        psiconv_progress(lev+3,off+len,"Going to read interline exact");
+        psiconv_progress(lev+3,off+len,"Going to read linespacing exact");
         if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng,
-                                  &result->interline_exact)))
+                                  &result->linespacing_exact)))
           goto ERROR1;
         len += leng;
         break;
       case 0x09:
         psiconv_progress(lev+3,off+len,"Going to read top space");
-        result->top_space = psiconv_read_size(buf,lev+3,off+len,&leng,&res);
+        result->space_above = psiconv_read_size(buf,lev+3,off+len,&leng,&res);
         if (res)
           goto ERROR1;
         len += leng;
         break;
       case 0x0a:
         psiconv_progress(lev+3,off+len,"Going to read bottom space");
-        result->bottom_space = psiconv_read_size(buf,lev+3,off+len,&leng,&res);
+        result->space_below = psiconv_read_size(buf,lev+3,off+len,&leng,&res);
         if (res)
           goto ERROR1;
         len += leng;
@@ -477,14 +479,14 @@
       case 0x0b:
         psiconv_progress(lev+3,off+len,"Going to read on one page");
         if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng,
-                                      &result->on_one_page)))
+                                      &result->keep_together)))
           goto ERROR1;
         len += leng;
         break;
       case 0x0c:
         psiconv_progress(lev+3,off+len,"Going to read together with");
         if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng,
-                                      &result->together_with)))
+                                      &result->keep_with_next)))
           goto ERROR1;
         len += leng;
         break;
@@ -544,7 +546,7 @@
         break;
       case 0x15:
         psiconv_progress(lev+3,off+len,"Going to read bullet");
-        if ((res = psiconv_parse_bullet(buf,lev+3,off+len,&leng,&temp_bullet)));
+        if ((res = psiconv_parse_bullet(buf,lev+3,off+len,&leng,&temp_bullet)))
           goto ERROR1;
         psiconv_free_bullet(result->bullet);
         result->bullet = temp_bullet;
@@ -699,9 +701,9 @@
         len += leng;
         break;
       case 0x21:
-        psiconv_progress(lev+3,off+len,"Going to read strike_out");
+        psiconv_progress(lev+3,off+len,"Going to read strikethrough");
         if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng,
-                                      &result->strike_out)))
+                                      &result->strikethrough)))
           goto ERROR1;
         len += leng;
         break;