--- psiconv/trunk/program/psiconv/gen_rtf.c	2000/10/21 00:49:13	53
+++ psiconv/trunk/program/psiconv/gen_rtf.c	2001/01/10 16:39:30	90
@@ -22,8 +22,8 @@
 #include "compat.h"
 #include <stdio.h>
 #include <string.h>
-#include "data.h"
-#include "list.h"
+#include "psiconv/data.h"
+#include "psiconv/list.h"
 #include "gen.h"
 #include "psiconv.h"
 
@@ -295,11 +295,11 @@
   for (i = 0; i < psiconv_list_length(fonts); i++) {
     font = psiconv_list_get(fonts,i);
     fprintf(of,"{\\f%d",i);
-    if ((*font)->screenfont == 1)
+    if ((*font)->screenfont == psiconv_font_sansserif)
       fprintf(of,"\\fswiss");
-    else if ((*font)->screenfont == 2)
+    else if ((*font)->screenfont == psiconv_font_nonprop)
       fprintf(of,"\\fmodern");
-    else if ((*font)->screenfont == 3) 
+    else if ((*font)->screenfont == psiconv_font_serif) 
       fprintf(of,"\\froman");
     else 
       fprintf(of,"\\fnil");
@@ -327,11 +327,11 @@
 static psiconv_character_layout 
        gen_base_char(psiconv_list colors, psiconv_list fonts)
 {
-  struct psiconv_color white = { 0,0,0 };
-  struct psiconv_color black = { 0xff,0xff,0xff };
-  struct psiconv_font font = { NULL,-1 }; /* Pseudo - not added! */
+  struct psiconv_color_s white = { 0,0,0 };
+  struct psiconv_color_s black = { 0xff,0xff,0xff };
+  struct psiconv_font_s font = { NULL,-1 }; /* Pseudo - not added! */
   
-  struct psiconv_character_layout base_char_struct =
+  struct psiconv_character_layout_s base_char_struct =
   {
     &black,                /* color               */
     &white,                /* back_color          */
@@ -340,7 +340,7 @@
     psiconv_bool_false,    /* bold                */
     psiconv_normalscript,  /* super_sub           */
     psiconv_bool_false,    /* underline           */
-    psiconv_bool_false,    /* strike_out          */
+    psiconv_bool_false,    /* strikethrough          */
     &font,                 /* font                */
   };
 
@@ -374,8 +374,8 @@
     fprintf(of,"\\i%s",new->italic?"":"0");
   if (old->underline != new->underline)
     fprintf(of,"\\ul%s",new->underline?"":"0");
-  if (old->strike_out != new->strike_out)
-    fprintf(of,"\\strike%s",new->strike_out?"":"0");
+  if (old->strikethrough != new->strikethrough)
+    fprintf(of,"\\strike%s",new->strikethrough?"":"0");
   if ((old->color->red != new->color->red) ||
       (old->color->green != new->color->green) ||
       (old->color->blue != new->color->blue))
@@ -413,16 +413,16 @@
       fprintf(of,"\\ql");
 */
   }
-  if (para->interline != 0.0)
-    fprintf(of,"\\sl%d",(para->interline_exact?-1:1) * 
-                        length_to_twips(para->interline));
-  if (para->top_space != 0.0)
-    fprintf(of,"\\sb%d",length_to_twips(para->top_space));
-  if (para->bottom_space != 0.0)
-    fprintf(of,"\\sa%d",length_to_twips(para->bottom_space));
-  if (para->on_one_page)
+  if (para->linespacing != 0.0)
+    fprintf(of,"\\sl%d",(para->linespacing_exact?-1:1) * 
+                        length_to_twips(para->linespacing));
+  if (para->space_above != 0.0)
+    fprintf(of,"\\sb%d",length_to_twips(para->space_above));
+  if (para->space_below != 0.0)
+    fprintf(of,"\\sa%d",length_to_twips(para->space_below));
+  if (para->keep_together)
     fprintf(of,"\\keep");
-  if (para->together_with)
+  if (para->keep_with_next)
     fprintf(of,"\\keepn");
   if (!para->on_next_page)
     fprintf(of,"pagebb");
@@ -540,7 +540,7 @@
   return fclose(of);
 }
 
-static struct psiconv_fileformat ff =
+static struct psiconv_fileformat_s ff =
 {
   "RTF",
   "Rich Text Format (not functional yet!)",