--- psiconv/trunk/lib/psiconv/generate_routines.h 2003/11/23 21:47:24 167 +++ psiconv/trunk/lib/psiconv/generate_routines.h 2003/11/25 17:57:05 168 @@ -25,6 +25,7 @@ #include #include #include +#include #ifdef __cplusplus extern "C" { @@ -36,32 +37,49 @@ * generate_simple.c * ********************* */ -extern int psiconv_write_u8(psiconv_buffer buf,const psiconv_u8 value); -extern int psiconv_write_u16(psiconv_buffer buf,const psiconv_u16 value); -extern int psiconv_write_u32(psiconv_buffer buf,const psiconv_u32 value); -extern int psiconv_write_S(psiconv_buffer buf, const psiconv_u32 value); -extern int psiconv_write_X(psiconv_buffer buf, const psiconv_u32 value); -extern int psiconv_write_length(psiconv_buffer buf, +extern int psiconv_write_u8(psiconv_config config, + psiconv_buffer buf,const psiconv_u8 value); +extern int psiconv_write_u16(psiconv_config config, + psiconv_buffer buf,const psiconv_u16 value); +extern int psiconv_write_u32(psiconv_config config, + psiconv_buffer buf,const psiconv_u32 value); +extern int psiconv_write_S(psiconv_config config, + psiconv_buffer buf, const psiconv_u32 value); +extern int psiconv_write_X(psiconv_config config, + psiconv_buffer buf, const psiconv_u32 value); +extern int psiconv_write_length(psiconv_config config, + psiconv_buffer buf, const psiconv_length_t value); -extern int psiconv_write_size(psiconv_buffer buf, const psiconv_size_t value); -extern int psiconv_write_bool(psiconv_buffer buf, const psiconv_bool_t value); -extern int psiconv_write_string(psiconv_buffer buf, +extern int psiconv_write_size(psiconv_config config, + psiconv_buffer buf, const psiconv_size_t value); +extern int psiconv_write_bool(psiconv_config config, + psiconv_buffer buf, const psiconv_bool_t value); +extern int psiconv_write_string(psiconv_config config, + psiconv_buffer buf, const psiconv_string_t value); -extern int psiconv_write_offset(psiconv_buffer buf, psiconv_u32 id); +extern int psiconv_write_offset(psiconv_config config, + psiconv_buffer buf, psiconv_u32 id); /* ********************* * generate_layout.c * ********************* */ -extern int psiconv_write_color(psiconv_buffer buf, const psiconv_color value); -extern int psiconv_write_font(psiconv_buffer buf, const psiconv_font value); -extern int psiconv_write_border(psiconv_buffer buf, const psiconv_border value); -extern int psiconv_write_bullet(psiconv_buffer buf, const psiconv_bullet value); -extern int psiconv_write_tab(psiconv_buffer buf,psiconv_tab value); -extern int psiconv_write_paragraph_layout_list(psiconv_buffer buf, +extern int psiconv_write_color(psiconv_config config, + psiconv_buffer buf, const psiconv_color value); +extern int psiconv_write_font(psiconv_config config, + psiconv_buffer buf, const psiconv_font value); +extern int psiconv_write_border(psiconv_config config, + psiconv_buffer buf, const psiconv_border value); +extern int psiconv_write_bullet(psiconv_config config, + psiconv_buffer buf, const psiconv_bullet value); +extern int psiconv_write_tab(psiconv_config config, + psiconv_buffer buf,psiconv_tab value); +extern int psiconv_write_paragraph_layout_list(psiconv_config config, + psiconv_buffer buf, psiconv_paragraph_layout value, psiconv_paragraph_layout base); -extern int psiconv_write_character_layout_list(psiconv_buffer buf, +extern int psiconv_write_character_layout_list(psiconv_config config, + psiconv_buffer buf, psiconv_character_layout value, psiconv_character_layout base); @@ -69,36 +87,47 @@ * generate_page.c * ******************* */ -extern int psiconv_write_page_header(psiconv_buffer buf, +extern int psiconv_write_page_header(psiconv_config config, + psiconv_buffer buf, const psiconv_page_header value, psiconv_buffer *extra_buf); -extern int psiconv_write_page_layout_section(psiconv_buffer buf, +extern int psiconv_write_page_layout_section(psiconv_config config, + psiconv_buffer buf, const psiconv_page_layout_section value); /* ********************* * generate_common.c * ********************* */ -extern int psiconv_write_header_section(psiconv_buffer buf,psiconv_u32 uid1, +extern int psiconv_write_header_section(psiconv_config config, + psiconv_buffer buf,psiconv_u32 uid1, psiconv_u32 uid2, psiconv_u32 uid3); -extern int psiconv_write_section_table_section(psiconv_buffer buf, +extern int psiconv_write_section_table_section(psiconv_config config, + psiconv_buffer buf, const psiconv_section_table_section value); -extern int psiconv_write_application_id_section(psiconv_buffer buf, +extern int psiconv_write_application_id_section(psiconv_config config, + psiconv_buffer buf, psiconv_u32 id, const psiconv_string_t text); -extern int psiconv_write_text_section(psiconv_buffer buf, +extern int psiconv_write_text_section(psiconv_config config, + psiconv_buffer buf, const psiconv_text_and_layout value); -extern int psiconv_write_styled_layout_section(psiconv_buffer buf, +extern int psiconv_write_styled_layout_section(psiconv_config config, + psiconv_buffer buf, psiconv_text_and_layout result, psiconv_word_styles_section styles); -extern int psiconv_write_styleless_layout_section(psiconv_buffer buf, +extern int psiconv_write_styleless_layout_section(psiconv_config config, + psiconv_buffer buf, const psiconv_text_and_layout value, const psiconv_character_layout base_char, const psiconv_paragraph_layout base_para); -extern int psiconv_write_embedded_object_section(psiconv_buffer buf, +extern int psiconv_write_embedded_object_section(psiconv_config config, + psiconv_buffer buf, const psiconv_embedded_object_section value); -extern int psiconv_write_object_display_section(psiconv_buffer buf, +extern int psiconv_write_object_display_section(psiconv_config config, + psiconv_buffer buf, const psiconv_object_display_section value); -extern int psiconv_write_object_icon_section(psiconv_buffer buf, +extern int psiconv_write_object_icon_section(psiconv_config config, + psiconv_buffer buf, const psiconv_object_icon_section value); @@ -108,7 +137,8 @@ * generate_texted.c * ********************* */ -extern int psiconv_write_texted_section(psiconv_buffer buf, +extern int psiconv_write_texted_section(psiconv_config config, + psiconv_buffer buf, const psiconv_texted_section value, const psiconv_character_layout base_char, const psiconv_paragraph_layout base_para, @@ -118,9 +148,11 @@ * generate_word.c * ******************* */ -extern int psiconv_write_word_status_section(psiconv_buffer buf, +extern int psiconv_write_word_status_section(psiconv_config config, + psiconv_buffer buf, psiconv_word_status_section value); -extern int psiconv_write_word_styles_section(psiconv_buffer buf, +extern int psiconv_write_word_styles_section(psiconv_config config, + psiconv_buffer buf, psiconv_word_styles_section value); @@ -128,8 +160,10 @@ * generate_driver.c * ********************* */ -extern int psiconv_write_word_file(psiconv_buffer buf,psiconv_word_f value); -extern int psiconv_write_texted_file(psiconv_buffer buf, +extern int psiconv_write_word_file(psiconv_config config, + psiconv_buffer buf,psiconv_word_f value); +extern int psiconv_write_texted_file(psiconv_config config, + psiconv_buffer buf, psiconv_texted_f value);