--- psiconv/trunk/lib/psiconv/data.h 1999/12/03 00:59:12 41 +++ psiconv/trunk/lib/psiconv/data.h 2000/12/15 18:52:49 67 @@ -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,12 +24,17 @@ #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 */ +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + + typedef enum psiconv_file_type { psiconv_unknown_file, psiconv_word_file, @@ -82,35 +87,35 @@ 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. black: 0x00 0x00 0x00 white: 0xff 0xff 0xff */ -typedef struct psiconv_color +typedef struct psiconv_color_s { psiconv_u8 red; psiconv_u8 green; psiconv_u8 blue; } * psiconv_color; -typedef struct psiconv_font +typedef struct psiconv_font_s { char *name; psiconv_u8 screenfont; } *psiconv_font; -typedef struct psiconv_border +typedef struct psiconv_border_s { psiconv_border_kind_t kind; psiconv_size_t thickness; /* Set to 1/20 for non-solid lines */ psiconv_color color; } *psiconv_border; -typedef struct psiconv_bullet +typedef struct psiconv_bullet_s { psiconv_bool_t on; psiconv_size_t font_size; @@ -127,7 +132,7 @@ psiconv_tab_right } psiconv_tab_kind_t; -typedef struct psiconv_tab +typedef struct psiconv_tab_s { psiconv_length_t location; psiconv_tab_kind_t kind; @@ -136,13 +141,13 @@ typedef psiconv_list psiconv_tab_list; /* of struct psiconv_tab */ -typedef struct psiconv_all_tabs +typedef struct psiconv_all_tabs_s { psiconv_length_t normal; psiconv_tab_list extras; } *psiconv_all_tabs; -typedef struct psiconv_character_layout +typedef struct psiconv_character_layout_s { psiconv_color color; psiconv_color back_color; @@ -151,11 +156,11 @@ 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; -typedef struct psiconv_paragraph_layout +typedef struct psiconv_paragraph_layout_s { psiconv_color back_color; psiconv_length_t indent_left; @@ -163,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; @@ -180,7 +185,7 @@ psiconv_all_tabs tabs; } *psiconv_paragraph_layout; -typedef struct psiconv_header_section +typedef struct psiconv_header_section_s { psiconv_u32 uid1; psiconv_u32 uid2; @@ -189,7 +194,7 @@ psiconv_file_type_t file; } *psiconv_header_section; -typedef struct psiconv_section_table_entry +typedef struct psiconv_section_table_entry_s { psiconv_u32 id; psiconv_u32 offset; @@ -198,13 +203,13 @@ typedef psiconv_list psiconv_section_table_section; /* Of struct sectiontable_entry */ -typedef struct psiconv_application_id_section +typedef struct psiconv_application_id_section_s { psiconv_u32 id; psiconv_string_t name; } *psiconv_application_id_section; -typedef struct psiconv_in_line_layout +typedef struct psiconv_in_line_layout_s { psiconv_character_layout layout; int length; @@ -221,7 +226,7 @@ psiconv_replace_filename } psiconv_replacement_type_t; -typedef struct psiconv_replacement +typedef struct psiconv_replacement_s { int offset; int cur_len; @@ -230,7 +235,7 @@ typedef psiconv_list psiconv_replacements; /* of struct replacement */ -typedef struct psiconv_paragraph +typedef struct psiconv_paragraph_s { char *text; psiconv_character_layout base_character; @@ -242,12 +247,12 @@ typedef psiconv_list psiconv_text_and_layout; /* Of struct paragraphs */ -typedef struct psiconv_texted_section +typedef struct psiconv_texted_section_s { psiconv_text_and_layout paragraphs; } *psiconv_texted_section; -typedef struct psiconv_page_header +typedef struct psiconv_page_header_s { psiconv_bool_t on_first_page; psiconv_paragraph_layout base_paragraph_layout; @@ -255,7 +260,7 @@ psiconv_texted_section text; } *psiconv_page_header; -typedef struct psiconv_page_layout_section +typedef struct psiconv_page_layout_section_s { psiconv_u32 first_page_nr; psiconv_length_t header_dist; @@ -270,7 +275,7 @@ psiconv_page_header footer; } * psiconv_page_layout_section; -typedef struct psiconv_word_status_section +typedef struct psiconv_word_status_section_s { psiconv_bool_t show_tabs; psiconv_bool_t show_spaces; @@ -287,7 +292,7 @@ psiconv_u32 display_size; } *psiconv_word_status_section; -typedef struct psiconv_word_style +typedef struct psiconv_word_style_s { psiconv_character_layout character; psiconv_paragraph_layout paragraph; @@ -299,29 +304,32 @@ typedef psiconv_list psiconv_word_style_list; /* Of style */ -typedef struct psiconv_word_styles_section +typedef struct psiconv_word_styles_section_s { psiconv_word_style normal; psiconv_word_style_list styles; } *psiconv_word_styles_section; -typedef struct psiconv_word_f { +typedef struct psiconv_word_f_s +{ psiconv_page_layout_section page_sec; psiconv_text_and_layout paragraphs; psiconv_word_status_section status_sec; psiconv_word_styles_section styles_sec; } *psiconv_word_f; -typedef struct psiconv_texted_f { +typedef struct psiconv_texted_f_s +{ psiconv_page_layout_section page_sec; psiconv_texted_section texted_sec; } *psiconv_texted_f; -typedef psiconv_list psiconv_mbm_jumptable_section; /* of psiconv_u32 */ +typedef psiconv_list psiconv_jumptable_section; /* of psiconv_u32 */ /* Normalized values [0..1] for each component Origin is (x,y)=(0,0), to get pixel at (X,Y) use index [Y*xsize+X] */ -typedef struct psiconv_paint_data_section { +typedef struct psiconv_paint_data_section_s +{ psiconv_u32 xsize; psiconv_u32 ysize; psiconv_length_t pic_xsize; /* 0 if not specified */ @@ -334,7 +342,8 @@ typedef psiconv_list psiconv_pictures; /* of struct psiconv_paint_data_section */ -typedef struct psiconv_mbm_f { +typedef struct psiconv_mbm_f_s +{ psiconv_pictures sections; } *psiconv_mbm_f; @@ -344,7 +353,8 @@ picture itself has size picture_{x,y}size. Cuts are always <= 1.0; a cut of 0.0 cuts nothing away, a cut of 1.0 cuts everything away. */ -typedef struct psiconv_sketch_section { +typedef struct psiconv_sketch_section_s +{ psiconv_u16 form_xsize; psiconv_u16 form_ysize; psiconv_u16 picture_x_offset; @@ -360,22 +370,26 @@ psiconv_paint_data_section picture; } *psiconv_sketch_section; -typedef struct psiconv_sketch_f { +typedef struct psiconv_sketch_f_s +{ psiconv_sketch_section sketch_sec; } *psiconv_sketch_f; -typedef struct psiconv_clipart_section { +typedef struct psiconv_clipart_section_s +{ /* Perhaps later on some currently unknown stuff. */ psiconv_paint_data_section picture; } * psiconv_clipart_section; typedef psiconv_list psiconv_cliparts; /* of struct psiconv_clipart_section */ -typedef struct psiconv_clipart_f { +typedef struct psiconv_clipart_f_s +{ psiconv_cliparts sections; } *psiconv_clipart_f; -typedef struct psiconv_file { +typedef struct psiconv_file_s +{ psiconv_file_type_t type; void *file; } *psiconv_file; @@ -411,23 +425,26 @@ #define PSICONV_ID_TEXTED_TEXT 0x10000064 #define PSICONV_ID_STYLE_REMOVABLE 0x1000004F #define PSICONV_ID_STYLE_BUILT_IN 0x1000004C +#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); @@ -463,8 +480,8 @@ extern void psiconv_free_texted_f(psiconv_texted_f file); extern void psiconv_free_paint_data_section(psiconv_paint_data_section section); extern void psiconv_free_pictures(psiconv_pictures section); -extern void psiconv_free_mbm_jumptable_section - (psiconv_mbm_jumptable_section section); +extern void psiconv_free_jumptable_section + (psiconv_jumptable_section section); extern void psiconv_free_mbm_f(psiconv_mbm_f file); extern void psiconv_free_sketch_section(psiconv_sketch_section sec); extern void psiconv_free_sketch_f(psiconv_sketch_f file); @@ -475,5 +492,8 @@ extern void psiconv_free_file(psiconv_file file); +#ifdef __cplusplus +} +#endif /* __cplusplus */ #endif /* def PSICONV_DATA_H */