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