--- psiconv/trunk/lib/psiconv/data.h	2000/12/10 15:44:40	56
+++ psiconv/trunk/lib/psiconv/data.h	2000/12/25 00:26:53	76
@@ -1,6 +1,6 @@
 /*
     data.h - Part of psiconv, a PSION 5 file formats converter
-    Copyright (c) 1999  Frodo Looijaard <frodol@dds.nl>       
+    Copyright (c) 1999, 2000  Frodo Looijaard <frodol@dds.nl>       
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,8 +24,8 @@
 #ifndef PSICONV_DATA_H
 #define PSICONV_DATA_H
 
-#include "general.h"
-#include "list.h"
+#include <psiconv/general.h>
+#include <psiconv/list.h>
 
 /* All types which end on _t are plain types; all other types are pointers
    to structs */
@@ -87,9 +87,9 @@
   psiconv_border_solid,
   psiconv_border_double,
   psiconv_border_dotted,
-  psiconv_border_striped,
-  psiconv_border_dotstripe,
-  psiconv_border_dotdotstripe
+  psiconv_border_dashed,
+  psiconv_border_dotdashed,
+  psiconv_border_dotdotdashed
 } psiconv_border_kind_t;
 
 /* Colors.
@@ -156,7 +156,7 @@
   psiconv_bool_t bold;
   psiconv_super_sub_t super_sub;
   psiconv_bool_t underline;
-  psiconv_bool_t strike_out;
+  psiconv_bool_t strikethrough;
   psiconv_font font; 
 } *psiconv_character_layout;
 
@@ -168,12 +168,12 @@
   psiconv_length_t indent_first;
   psiconv_justify_hor_t justify_hor;
   psiconv_justify_ver_t justify_ver;
-  psiconv_size_t interline;
-  psiconv_bool_t interline_exact;
-  psiconv_size_t top_space;
-  psiconv_size_t bottom_space;
-  psiconv_bool_t on_one_page;
-  psiconv_bool_t together_with; /* What the heck is this? */
+  psiconv_size_t linespacing;
+  psiconv_bool_t linespacing_exact;
+  psiconv_size_t space_above;
+  psiconv_size_t space_below;
+  psiconv_bool_t keep_together;
+  psiconv_bool_t keep_with_next;
   psiconv_bool_t on_next_page;
   psiconv_bool_t no_widow_protection;
   psiconv_length_t border_distance;
@@ -273,6 +273,7 @@
   psiconv_length_t page_height;
   psiconv_page_header header;
   psiconv_page_header footer;
+  psiconv_bool_t landscape;
 } * psiconv_page_layout_section;
 
 typedef struct psiconv_word_status_section_s
@@ -417,7 +418,8 @@
 #define PSICONV_ID_SKETCH_SECTION 0x1000007D
 
 /* Other ids */
-#define PSICONV_ID_PAGE_DIMENSIONS 0x100000fd
+#define PSICONV_ID_PAGE_DIMENSIONS1 0x100000fd
+#define PSICONV_ID_PAGE_DIMENSIONS2 0x1000010e
 #define PSICONV_ID_TEXTED_BODY 0x1000005c
 #define PSICONV_ID_TEXTED_REPLACEMENT 0x10000063
 #define PSICONV_ID_TEXTED_UNKNOWN 0x10000065
@@ -428,21 +430,23 @@
 #define PSICONV_ID_CLIPART_ITEM 0x10000040
 
 
-/* Return a clean layout_status. You can modify it at will */
+/* Return a clean layout_status. You can modify it at will. Returns NULL
+   if there is not enough memory. */
 extern psiconv_character_layout psiconv_basic_character_layout(void);
 
-/* Return a clean layout_status. You can modify it at will */
+/* Return a clean layout_status. You can modify it at will. Returns NULL
+   if there is not enough memory. */
 extern psiconv_paragraph_layout psiconv_basic_paragraph_layout(void);
 
 /* Clone a layout_status: the new copy is completely independent of the
-   original one */
+   original one. Returns NULL if there is not enough memory. */
 extern psiconv_paragraph_layout psiconv_clone_paragraph_layout
                                        (psiconv_paragraph_layout ls);
 
 extern psiconv_character_layout psiconv_clone_character_layout
                                 (psiconv_character_layout ls);
 
-/* Get a numbered style */
+/* Get a numbered style. Returns NULL if the style is unknown. */
 extern psiconv_word_style psiconv_get_style (psiconv_word_styles_section ss, int nr);
 
 extern void psiconv_free_color(psiconv_color color);