/[public]/psiconv/trunk/lib/psiconv/data.h
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/data.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 25 Revision 90
1/* 1/*
2 data.h - Part of psiconv, a PSION 5 file formats converter 2 data.h - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 1999 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 1999, 2000 Frodo Looijaard <frodol@dds.nl>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
22 parse routines, and read by the generation routines. */ 22 parse routines, and read by the generation routines. */
23 23
24#ifndef PSICONV_DATA_H 24#ifndef PSICONV_DATA_H
25#define PSICONV_DATA_H 25#define PSICONV_DATA_H
26 26
27#include "general.h" 27#include <psiconv/general.h>
28#include "list.h" 28#include <psiconv/list.h>
29 29
30/* All types which end on _t are plain types; all other types are pointers 30/* All types which end on _t are plain types; all other types are pointers
31 to structs */ 31 to structs */
32
33#ifdef __cplusplus
34extern "C" {
35#endif /* __cplusplus */
36
32 37
33typedef enum psiconv_file_type { 38typedef enum psiconv_file_type {
34 psiconv_unknown_file, 39 psiconv_unknown_file,
35 psiconv_word_file, 40 psiconv_word_file,
36 psiconv_texted_file, 41 psiconv_texted_file,
37 psiconv_mbm_file, 42 psiconv_mbm_file,
38 psiconv_sketch_file 43 psiconv_sketch_file,
44 psiconv_clipart_file
39} psiconv_file_type_t; 45} psiconv_file_type_t;
40 46
41/* Length indicators */ 47/* Length indicators */
42typedef psiconv_u32 psiconv_S_t; 48typedef psiconv_u32 psiconv_S_t;
43typedef psiconv_u32 psiconv_X_t; 49typedef psiconv_u32 psiconv_X_t;
79typedef enum psiconv_border_kind 85typedef enum psiconv_border_kind
80{ psiconv_border_none, 86{ psiconv_border_none,
81 psiconv_border_solid, 87 psiconv_border_solid,
82 psiconv_border_double, 88 psiconv_border_double,
83 psiconv_border_dotted, 89 psiconv_border_dotted,
84 psiconv_border_striped, 90 psiconv_border_dashed,
85 psiconv_border_dotstripe, 91 psiconv_border_dotdashed,
86 psiconv_border_dotdotstripe 92 psiconv_border_dotdotdashed
87} psiconv_border_kind_t; 93} psiconv_border_kind_t;
94
95typedef enum psiconv_screenfont
96{
97 psiconv_font_misc,
98 psiconv_font_sansserif,
99 psiconv_font_nonprop,
100 psiconv_font_serif
101} psiconv_screenfont_t;
88 102
89/* Colors. 103/* Colors.
90 black: 0x00 0x00 0x00 104 black: 0x00 0x00 0x00
91 white: 0xff 0xff 0xff */ 105 white: 0xff 0xff 0xff */
92typedef struct psiconv_color 106typedef struct psiconv_color_s
93{ 107{
94 psiconv_u8 red; 108 psiconv_u8 red;
95 psiconv_u8 green; 109 psiconv_u8 green;
96 psiconv_u8 blue; 110 psiconv_u8 blue;
97} * psiconv_color; 111} * psiconv_color;
98 112
99typedef struct psiconv_font 113typedef struct psiconv_font_s
100{ 114{
101 char *name; 115 char *name;
102 psiconv_u8 screenfont; 116 psiconv_screenfont_t screenfont;
103} *psiconv_font; 117} *psiconv_font;
104 118
105typedef struct psiconv_border 119typedef struct psiconv_border_s
106{ 120{
107 psiconv_border_kind_t kind; 121 psiconv_border_kind_t kind;
108 psiconv_size_t thickness; /* Set to 1/20 for non-solid lines */ 122 psiconv_size_t thickness; /* Set to 1/20 for non-solid lines */
109 psiconv_color color; 123 psiconv_color color;
110} *psiconv_border; 124} *psiconv_border;
111 125
112typedef struct psiconv_bullet 126typedef struct psiconv_bullet_s
113{ 127{
114 psiconv_bool_t on; 128 psiconv_bool_t on;
115 psiconv_size_t font_size; 129 psiconv_size_t font_size;
116 psiconv_u8 character; 130 psiconv_u8 character;
117 psiconv_bool_t indent; 131 psiconv_bool_t indent;
124 psiconv_tab_left, 138 psiconv_tab_left,
125 psiconv_tab_centre, 139 psiconv_tab_centre,
126 psiconv_tab_right 140 psiconv_tab_right
127} psiconv_tab_kind_t; 141} psiconv_tab_kind_t;
128 142
129typedef struct psiconv_tab 143typedef struct psiconv_tab_s
130{ 144{
131 psiconv_length_t location; 145 psiconv_length_t location;
132 psiconv_tab_kind_t kind; 146 psiconv_tab_kind_t kind;
133} *psiconv_tab; 147} *psiconv_tab;
134 148
135 149
136typedef psiconv_list psiconv_tab_list; /* of struct psiconv_tab */ 150typedef psiconv_list psiconv_tab_list; /* of struct psiconv_tab */
137 151
138typedef struct psiconv_all_tabs 152typedef struct psiconv_all_tabs_s
139{ 153{
140 psiconv_length_t normal; 154 psiconv_length_t normal;
141 psiconv_tab_list extras; 155 psiconv_tab_list extras;
142} *psiconv_all_tabs; 156} *psiconv_all_tabs;
143 157
144typedef struct psiconv_character_layout 158typedef struct psiconv_character_layout_s
145{ 159{
146 psiconv_color color; 160 psiconv_color color;
147 psiconv_color back_color; 161 psiconv_color back_color;
148 psiconv_size_t font_size; 162 psiconv_size_t font_size;
149 psiconv_bool_t italic; 163 psiconv_bool_t italic;
150 psiconv_bool_t bold; 164 psiconv_bool_t bold;
151 psiconv_super_sub_t super_sub; 165 psiconv_super_sub_t super_sub;
152 psiconv_bool_t underline; 166 psiconv_bool_t underline;
153 psiconv_bool_t strike_out; 167 psiconv_bool_t strikethrough;
154 psiconv_font font; 168 psiconv_font font;
155} *psiconv_character_layout; 169} *psiconv_character_layout;
156 170
157typedef struct psiconv_paragraph_layout 171typedef struct psiconv_paragraph_layout_s
158{ 172{
159 psiconv_color back_color; 173 psiconv_color back_color;
160 psiconv_length_t indent_left; 174 psiconv_length_t indent_left;
161 psiconv_length_t indent_right; 175 psiconv_length_t indent_right;
162 psiconv_length_t indent_first; 176 psiconv_length_t indent_first;
163 psiconv_justify_hor_t justify_hor; 177 psiconv_justify_hor_t justify_hor;
164 psiconv_justify_ver_t justify_ver; 178 psiconv_justify_ver_t justify_ver;
165 psiconv_size_t interline; 179 psiconv_size_t linespacing;
166 psiconv_bool_t interline_exact; 180 psiconv_bool_t linespacing_exact;
167 psiconv_size_t top_space; 181 psiconv_size_t space_above;
168 psiconv_size_t bottom_space; 182 psiconv_size_t space_below;
169 psiconv_bool_t on_one_page; 183 psiconv_bool_t keep_together;
170 psiconv_bool_t together_with; /* What the heck is this? */ 184 psiconv_bool_t keep_with_next;
171 psiconv_bool_t on_next_page; 185 psiconv_bool_t on_next_page;
172 psiconv_bool_t no_widow_protection; 186 psiconv_bool_t no_widow_protection;
173 psiconv_length_t border_distance; 187 psiconv_length_t border_distance;
174 psiconv_bullet bullet; 188 psiconv_bullet bullet;
175 psiconv_border left_border; 189 psiconv_border left_border;
177 psiconv_border top_border; 191 psiconv_border top_border;
178 psiconv_border bottom_border; 192 psiconv_border bottom_border;
179 psiconv_all_tabs tabs; 193 psiconv_all_tabs tabs;
180} *psiconv_paragraph_layout; 194} *psiconv_paragraph_layout;
181 195
182typedef struct psiconv_header_section 196typedef struct psiconv_header_section_s
183{ 197{
184 psiconv_u32 uid1; 198 psiconv_u32 uid1;
185 psiconv_u32 uid2; 199 psiconv_u32 uid2;
186 psiconv_u32 uid3; 200 psiconv_u32 uid3;
187 psiconv_u32 checksum; 201 psiconv_u32 checksum;
188 psiconv_file_type_t file; 202 psiconv_file_type_t file;
189} *psiconv_header_section; 203} *psiconv_header_section;
190 204
191typedef struct psiconv_section_table_entry 205typedef struct psiconv_section_table_entry_s
192{ 206{
193 psiconv_u32 id; 207 psiconv_u32 id;
194 psiconv_u32 offset; 208 psiconv_u32 offset;
195} *psiconv_section_table_entry; 209} *psiconv_section_table_entry;
196 210
197typedef psiconv_list psiconv_section_table_section; 211typedef psiconv_list psiconv_section_table_section;
198/* Of struct sectiontable_entry */ 212/* Of struct sectiontable_entry */
199 213
200typedef struct psiconv_application_id_section 214typedef struct psiconv_application_id_section_s
201{ 215{
202 psiconv_u32 id; 216 psiconv_u32 id;
203 psiconv_string_t name; 217 psiconv_string_t name;
204} *psiconv_application_id_section; 218} *psiconv_application_id_section;
205 219
206typedef struct psiconv_in_line_layout 220typedef struct psiconv_in_line_layout_s
207{ 221{
208 psiconv_character_layout layout; 222 psiconv_character_layout layout;
209 int length; 223 int length;
210} *psiconv_in_line_layout; 224} *psiconv_in_line_layout;
211 225
218 psiconv_replace_pagenr, 232 psiconv_replace_pagenr,
219 psiconv_replace_nr_of_pages, 233 psiconv_replace_nr_of_pages,
220 psiconv_replace_filename 234 psiconv_replace_filename
221} psiconv_replacement_type_t; 235} psiconv_replacement_type_t;
222 236
223typedef struct psiconv_replacement 237typedef struct psiconv_replacement_s
224{ 238{
225 int offset; 239 int offset;
226 int cur_len; 240 int cur_len;
227 psiconv_replacement_type_t type; 241 psiconv_replacement_type_t type;
228} *psiconv_replacement; 242} *psiconv_replacement;
229 243
230typedef psiconv_list psiconv_replacements; /* of struct replacement */ 244typedef psiconv_list psiconv_replacements; /* of struct replacement */
231 245
232typedef struct psiconv_paragraph 246typedef struct psiconv_paragraph_s
233{ 247{
234 char *text; 248 char *text;
235 psiconv_character_layout base_character; 249 psiconv_character_layout base_character;
236 psiconv_paragraph_layout base_paragraph; 250 psiconv_paragraph_layout base_paragraph;
237 psiconv_s16 base_style; 251 psiconv_s16 base_style;
239 psiconv_replacements replacements; 253 psiconv_replacements replacements;
240} *psiconv_paragraph; 254} *psiconv_paragraph;
241 255
242typedef psiconv_list psiconv_text_and_layout; /* Of struct paragraphs */ 256typedef psiconv_list psiconv_text_and_layout; /* Of struct paragraphs */
243 257
244typedef struct psiconv_texted_section 258typedef struct psiconv_texted_section_s
245{ 259{
246 psiconv_text_and_layout paragraphs; 260 psiconv_text_and_layout paragraphs;
247} *psiconv_texted_section; 261} *psiconv_texted_section;
248 262
249typedef struct psiconv_page_header 263typedef struct psiconv_page_header_s
250{ 264{
251 psiconv_bool_t on_first_page; 265 psiconv_bool_t on_first_page;
252 psiconv_paragraph_layout base_paragraph_layout; 266 psiconv_paragraph_layout base_paragraph_layout;
253 psiconv_character_layout base_character_layout; 267 psiconv_character_layout base_character_layout;
254 psiconv_texted_section text; 268 psiconv_texted_section text;
255} *psiconv_page_header; 269} *psiconv_page_header;
256 270
257typedef struct psiconv_page_layout_section 271typedef struct psiconv_page_layout_section_s
258{ 272{
259 psiconv_u32 first_page_nr; 273 psiconv_u32 first_page_nr;
260 psiconv_length_t header_dist; 274 psiconv_length_t header_dist;
261 psiconv_length_t footer_dist; 275 psiconv_length_t footer_dist;
262 psiconv_length_t left_margin; 276 psiconv_length_t left_margin;
265 psiconv_length_t bottom_margin; 279 psiconv_length_t bottom_margin;
266 psiconv_length_t page_width; 280 psiconv_length_t page_width;
267 psiconv_length_t page_height; 281 psiconv_length_t page_height;
268 psiconv_page_header header; 282 psiconv_page_header header;
269 psiconv_page_header footer; 283 psiconv_page_header footer;
284 psiconv_bool_t landscape;
270} * psiconv_page_layout_section; 285} * psiconv_page_layout_section;
271 286
272typedef struct psiconv_word_status_section 287typedef struct psiconv_word_status_section_s
273{ 288{
274 psiconv_bool_t show_tabs; 289 psiconv_bool_t show_tabs;
275 psiconv_bool_t show_spaces; 290 psiconv_bool_t show_spaces;
276 psiconv_bool_t show_paragraph_ends; 291 psiconv_bool_t show_paragraph_ends;
277 psiconv_bool_t show_line_breaks; 292 psiconv_bool_t show_line_breaks;
284 psiconv_bool_t fit_lines_to_screen; 299 psiconv_bool_t fit_lines_to_screen;
285 psiconv_u32 cursor_position; 300 psiconv_u32 cursor_position;
286 psiconv_u32 display_size; 301 psiconv_u32 display_size;
287} *psiconv_word_status_section; 302} *psiconv_word_status_section;
288 303
289typedef struct psiconv_word_style 304typedef struct psiconv_word_style_s
290{ 305{
291 psiconv_character_layout character; 306 psiconv_character_layout character;
292 psiconv_paragraph_layout paragraph; 307 psiconv_paragraph_layout paragraph;
293 psiconv_u8 hotkey; 308 psiconv_u8 hotkey;
294 psiconv_string_t name; 309 psiconv_string_t name;
295 psiconv_bool_t built_in; 310 psiconv_bool_t built_in;
311 psiconv_u32 outline_level;
296} *psiconv_word_style; 312} *psiconv_word_style;
297 313
298typedef psiconv_list psiconv_word_style_list; /* Of style */ 314typedef psiconv_list psiconv_word_style_list; /* Of style */
299 315
300typedef struct psiconv_word_styles_section 316typedef struct psiconv_word_styles_section_s
301{ 317{
302 psiconv_word_style normal; 318 psiconv_word_style normal;
303 psiconv_word_style_list styles; 319 psiconv_word_style_list styles;
304} *psiconv_word_styles_section; 320} *psiconv_word_styles_section;
305 321
306typedef struct psiconv_word_f { 322typedef struct psiconv_word_f_s
323{
307 psiconv_page_layout_section page_sec; 324 psiconv_page_layout_section page_sec;
308 psiconv_text_and_layout paragraphs; 325 psiconv_text_and_layout paragraphs;
309 psiconv_word_status_section status_sec; 326 psiconv_word_status_section status_sec;
310 psiconv_word_styles_section styles_sec; 327 psiconv_word_styles_section styles_sec;
311} *psiconv_word_f; 328} *psiconv_word_f;
312 329
313typedef struct psiconv_texted_f { 330typedef struct psiconv_texted_f_s
331{
314 psiconv_page_layout_section page_sec; 332 psiconv_page_layout_section page_sec;
315 psiconv_texted_section texted_sec; 333 psiconv_texted_section texted_sec;
316} *psiconv_texted_f; 334} *psiconv_texted_f;
317 335
318typedef psiconv_list psiconv_mbm_jumptable_section; /* of psiconv_u32 */ 336typedef psiconv_list psiconv_jumptable_section; /* of psiconv_u32 */
319 337
320/* Normalized values [0..1] for each component 338/* Normalized values [0..1] for each component
321 Origin is (x,y)=(0,0), to get pixel at (X,Y) use index [Y*xsize+X] */ 339 Origin is (x,y)=(0,0), to get pixel at (X,Y) use index [Y*xsize+X] */
322typedef struct psiconv_paint_data_section { 340typedef struct psiconv_paint_data_section_s
341{
323 psiconv_u32 xsize; 342 psiconv_u32 xsize;
324 psiconv_u32 ysize; 343 psiconv_u32 ysize;
325 psiconv_length_t pic_xsize; /* 0 if not specified */ 344 psiconv_length_t pic_xsize; /* 0 if not specified */
326 psiconv_length_t pic_ysize; /* 0 if not specified */ 345 psiconv_length_t pic_ysize; /* 0 if not specified */
327 float *red; 346 float *red;
330} *psiconv_paint_data_section; 349} *psiconv_paint_data_section;
331 350
332typedef psiconv_list psiconv_pictures; 351typedef psiconv_list psiconv_pictures;
333 /* of struct psiconv_paint_data_section */ 352 /* of struct psiconv_paint_data_section */
334 353
335typedef struct psiconv_mbm_f { 354typedef struct psiconv_mbm_f_s
355{
336 psiconv_pictures sections; 356 psiconv_pictures sections;
337} *psiconv_mbm_f; 357} *psiconv_mbm_f;
338 358
339/* This is a little intricated. A picture may be embedded in a larger form. 359/* This is a little intricated. A picture may be embedded in a larger form.
340 A form is empty, except for the picture. The form has size form_{x,y}size, 360 A form is empty, except for the picture. The form has size form_{x,y}size,
341 and the picture is at offset picture_{x,y}_offset within the form. The 361 and the picture is at offset picture_{x,y}_offset within the form. The
342 picture itself has size picture_{x,y}size. 362 picture itself has size picture_{x,y}size.
343 Cuts are always <= 1.0; a cut of 0.0 cuts nothing away, a cut of 1.0 363 Cuts are always <= 1.0; a cut of 0.0 cuts nothing away, a cut of 1.0
344 cuts everything away. */ 364 cuts everything away. */
345typedef struct psiconv_sketch_section { 365typedef struct psiconv_sketch_section_s
366{
346 psiconv_u16 form_xsize; 367 psiconv_u16 form_xsize;
347 psiconv_u16 form_ysize; 368 psiconv_u16 form_ysize;
348 psiconv_u16 picture_x_offset; 369 psiconv_u16 picture_x_offset;
349 psiconv_u16 picture_y_offset; 370 psiconv_u16 picture_y_offset;
350 psiconv_u16 picture_xsize; 371 psiconv_u16 picture_xsize;
356 float cut_top; /* computed relative to first six values */ 377 float cut_top; /* computed relative to first six values */
357 float cut_bottom; /* computed relative to first six values */ 378 float cut_bottom; /* computed relative to first six values */
358 psiconv_paint_data_section picture; 379 psiconv_paint_data_section picture;
359} *psiconv_sketch_section; 380} *psiconv_sketch_section;
360 381
361typedef struct psiconv_sketch_f { 382typedef struct psiconv_sketch_f_s
383{
362 psiconv_sketch_section sketch_sec; 384 psiconv_sketch_section sketch_sec;
363} *psiconv_sketch_f; 385} *psiconv_sketch_f;
364 386
387typedef struct psiconv_clipart_section_s
388{
389 /* Perhaps later on some currently unknown stuff. */
390 psiconv_paint_data_section picture;
391} * psiconv_clipart_section;
392
393typedef psiconv_list psiconv_cliparts; /* of struct psiconv_clipart_section */
394
395typedef struct psiconv_clipart_f_s
396{
397 psiconv_cliparts sections;
398} *psiconv_clipart_f;
399
365typedef struct psiconv_file { 400typedef struct psiconv_file_s
401{
366 psiconv_file_type_t type; 402 psiconv_file_type_t type;
367 void *file; 403 void *file;
368} *psiconv_file; 404} *psiconv_file;
369 405
370 406
371/* UID1 */ 407/* UID1 */
372#define PSICONV_ID_PSION5 0x10000037 408#define PSICONV_ID_PSION5 0x10000037
409#define PSICONV_ID_CLIPART 0x10000041
373/* UID2 */ 410/* UID2 */
374#define PSICONV_ID_DATA_FILE 0x1000006D 411#define PSICONV_ID_DATA_FILE 0x1000006D
375#define PSICONV_ID_MBM_FILE 0x10000042 412#define PSICONV_ID_MBM_FILE 0x10000042
376/* UID3 */ 413/* UID3 */
377#define PSICONV_ID_WORD 0x1000007F 414#define PSICONV_ID_WORD 0x1000007F
387#define PSICONV_ID_PAGE_LAYOUT_SECTION 0x10000105 424#define PSICONV_ID_PAGE_LAYOUT_SECTION 0x10000105
388#define PSICONV_ID_PASSWORD_SECTION 0x100000CD 425#define PSICONV_ID_PASSWORD_SECTION 0x100000CD
389#define PSICONV_ID_SKETCH_SECTION 0x1000007D 426#define PSICONV_ID_SKETCH_SECTION 0x1000007D
390 427
391/* Other ids */ 428/* Other ids */
392#define PSICONV_ID_PAGE_DIMENSIONS 0x100000fd 429#define PSICONV_ID_PAGE_DIMENSIONS1 0x100000fd
430#define PSICONV_ID_PAGE_DIMENSIONS2 0x1000010e
393#define PSICONV_ID_TEXTED_BODY 0x1000005c 431#define PSICONV_ID_TEXTED_BODY 0x1000005c
394#define PSICONV_ID_TEXTED_REPLACEMENT 0x10000063 432#define PSICONV_ID_TEXTED_REPLACEMENT 0x10000063
395#define PSICONV_ID_TEXTED_UNKNOWN 0x10000065 433#define PSICONV_ID_TEXTED_UNKNOWN 0x10000065
396#define PSICONV_ID_TEXTED_LAYOUT 0x10000066 434#define PSICONV_ID_TEXTED_LAYOUT 0x10000066
397#define PSICONV_ID_TEXTED_TEXT 0x10000064 435#define PSICONV_ID_TEXTED_TEXT 0x10000064
398#define PSICONV_ID_STYLE_REMOVABLE 0x1000004F 436#define PSICONV_ID_STYLE_REMOVABLE 0x1000004F
399#define PSICONV_ID_STYLE_BUILT_IN 0x1000004C 437#define PSICONV_ID_STYLE_BUILT_IN 0x1000004C
438#define PSICONV_ID_CLIPART_ITEM 0x10000040
400 439
401 440
402/* Return a clean layout_status. You can modify it at will */ 441/* Return a clean layout_status. You can modify it at will. Returns NULL
442 if there is not enough memory. */
403extern psiconv_character_layout psiconv_basic_character_layout(void); 443extern psiconv_character_layout psiconv_basic_character_layout(void);
404 444
405/* Return a clean layout_status. You can modify it at will */ 445/* Return a clean layout_status. You can modify it at will. Returns NULL
446 if there is not enough memory. */
406extern psiconv_paragraph_layout psiconv_basic_paragraph_layout(void); 447extern psiconv_paragraph_layout psiconv_basic_paragraph_layout(void);
407 448
408/* Clone a layout_status: the new copy is completely independent of the 449/* Clone a layout_status: the new copy is completely independent of the
409 original one */ 450 original one. Returns NULL if there is not enough memory. */
410extern psiconv_paragraph_layout psiconv_clone_paragraph_layout 451extern psiconv_paragraph_layout psiconv_clone_paragraph_layout
411 (psiconv_paragraph_layout ls); 452 (psiconv_paragraph_layout ls);
412 453
413extern psiconv_character_layout psiconv_clone_character_layout 454extern psiconv_character_layout psiconv_clone_character_layout
414 (psiconv_character_layout ls); 455 (psiconv_character_layout ls);
415 456
416/* Get a numbered style */ 457/* Get a numbered style. Returns NULL if the style is unknown. */
417extern psiconv_word_style psiconv_get_style (psiconv_word_styles_section ss, int nr); 458extern psiconv_word_style psiconv_get_style (psiconv_word_styles_section ss, int nr);
418 459
419extern void psiconv_free_color(psiconv_color color); 460extern void psiconv_free_color(psiconv_color color);
420extern void psiconv_free_border(psiconv_border border); 461extern void psiconv_free_border(psiconv_border border);
421extern void psiconv_free_bullet(psiconv_bullet bullet); 462extern void psiconv_free_bullet(psiconv_bullet bullet);
447 (psiconv_word_status_section section); 488 (psiconv_word_status_section section);
448extern void psiconv_free_word_f(psiconv_word_f file); 489extern void psiconv_free_word_f(psiconv_word_f file);
449extern void psiconv_free_texted_f(psiconv_texted_f file); 490extern void psiconv_free_texted_f(psiconv_texted_f file);
450extern void psiconv_free_paint_data_section(psiconv_paint_data_section section); 491extern void psiconv_free_paint_data_section(psiconv_paint_data_section section);
451extern void psiconv_free_pictures(psiconv_pictures section); 492extern void psiconv_free_pictures(psiconv_pictures section);
452extern void psiconv_free_mbm_jumptable_section 493extern void psiconv_free_jumptable_section
453 (psiconv_mbm_jumptable_section section); 494 (psiconv_jumptable_section section);
454extern void psiconv_free_mbm_f(psiconv_mbm_f file); 495extern void psiconv_free_mbm_f(psiconv_mbm_f file);
455extern void psiconv_free_sketch_section(psiconv_sketch_section sec); 496extern void psiconv_free_sketch_section(psiconv_sketch_section sec);
456extern void psiconv_free_sketch_f(psiconv_sketch_f file); 497extern void psiconv_free_sketch_f(psiconv_sketch_f file);
498extern void psiconv_free_clipart_section(psiconv_clipart_section section);
499extern void psiconv_free_cliparts(psiconv_cliparts section);
500extern void psiconv_free_clipart_f(psiconv_clipart_f file);
457 501
458extern void psiconv_free_file(psiconv_file file); 502extern void psiconv_free_file(psiconv_file file);
459 503
504extern int psiconv_compare_color(const psiconv_color value1,
505 const psiconv_color value2);
506extern int psiconv_compare_font(const psiconv_font value1,
507 const psiconv_font value2);
508extern int psiconv_compare_border(const psiconv_border value1,
509 const psiconv_border value2);
510extern int psiconv_compare_bullet(const psiconv_bullet value1,
511 const psiconv_bullet value2);
512extern int psiconv_compare_tab(const psiconv_tab value1,
513 const psiconv_tab value2);
514extern int psiconv_compare_all_tabs(const psiconv_all_tabs value1,
515 const psiconv_all_tabs value2);
516extern int psiconv_compare_paragraph_layout
517 (const psiconv_paragraph_layout value1,
518 const psiconv_paragraph_layout value2);
519
520extern int psiconv_compare_character_layout
521 (const psiconv_character_layout value1,
522 const psiconv_character_layout value2);
523
524/* Get a newly allocated file with sensible defaults, ready to generate. */
525extern psiconv_file psiconv_empty_file(psiconv_file_type_t type);
526
527
528#ifdef __cplusplus
529}
530#endif /* __cplusplus */
460 531
461#endif /* def PSICONV_DATA_H */ 532#endif /* def PSICONV_DATA_H */

Legend:
Removed from v.25  
changed lines
  Added in v.90

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26