--- psiconv/trunk/lib/psiconv/data.h	2004/02/04 12:19:09	196
+++ psiconv/trunk/lib/psiconv/data.h	2005/11/15 15:52:34	270
@@ -1,6 +1,6 @@
 /*
     data.h - Part of psiconv, a PSION 5 file formats converter
-    Copyright (c) 1999-2004  Frodo Looijaard <frodol@dds.nl>       
+    Copyright (c) 1999-2005  Frodo Looijaard <frodo@frodo.looijaard.name>       
 
     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
@@ -183,10 +183,23 @@
 } *psiconv_border;
 
 /* Complete bullet information.
-   If indent if off, the bullet is at the first line indentation level,
-   and the line text begins right after it. If it is on, the bullet is at 
-   the minimum of the first line and left indentation, and the text starts
-   at the maximum of both. */
+   The interaction of left and first line indentation and bullets is quite 
+   complicated.
+
+   BULLET       FIRST  BULLET      FIRST LINE             NEXT LINES
+
+   None         = 0    -           Left+First             Left
+                > 0    -           Left+First             Left
+                < 0    -           Left+First             Left
+
+   Indent Off   = 0    Left        Left(+Bullet)          Left
+                > 0    Left        Left+First             Left
+		< 0    Left+First  Left+First(+Bullet)    Left
+
+   Indent On    = 0    Left        Left(+Bullet)          Left
+                > 0    Left        Left+First             Left+First
+		< 0    Left+First  Left                   Left
+*/
 typedef struct psiconv_bullet_s
 {
   psiconv_bool_t on;           /* Whether the bullet is shown */
@@ -1052,6 +1065,12 @@
 
 /* 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);
+
+/* Return the number corresponding to the stylename. Returns 0 on success,
+   an error code on failure. */
+extern int psiconv_find_style(const psiconv_word_styles_section ss,
+                              const psiconv_ucs2 *name,int *nr);
+
 /* Get a numbered formula. Returns NULL if the style is unknown. */
 extern psiconv_formula psiconv_get_formula (psiconv_formula_list ss, int nr);
 
@@ -1071,6 +1090,7 @@
 extern void psiconv_free_paragraph_layout(psiconv_paragraph_layout layout);
 extern void psiconv_free_character_layout(psiconv_character_layout layout);
 extern void psiconv_free_word_style(psiconv_word_style style);
+extern void psiconv_free_word_style_list(psiconv_word_style_list style_list);
 extern void psiconv_free_word_styles_section
                                       (psiconv_word_styles_section styles);
 extern void psiconv_free_formula(psiconv_formula formula);