--- psiconv/trunk/lib/psiconv/data.h 2000/12/10 15:44:40 56 +++ psiconv/trunk/lib/psiconv/data.h 2000/12/13 16:30:21 63 @@ -1,6 +1,6 @@ /* data.h - Part of psiconv, a PSION 5 file formats converter - Copyright (c) 1999 Frodo Looijaard + Copyright (c) 1999, 2000 Frodo Looijaard 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 +#include /* All types which end on _t are plain types; all other types are pointers to structs */ @@ -428,21 +428,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);