/[public]/psiconv/trunk/lib/psiconv/generate_common.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/generate_common.c

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

Revision 167 Revision 196
1/* 1/*
2 generate_common.c - Part of psiconv, a PSION 5 file formats converter 2 generate_common.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 2000 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 2000-2004 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.
… …
27 27
28#ifdef DMALLOC 28#ifdef DMALLOC
29#include <dmalloc.h> 29#include <dmalloc.h>
30#endif 30#endif
31 31
32static int psiconv_write_layout_section(psiconv_buffer buf, 32static int psiconv_write_layout_section(const psiconv_config config,
33 psiconv_buffer buf, int lev,
33 const psiconv_text_and_layout value, 34 const psiconv_text_and_layout value,
34 const psiconv_word_styles_section styles, 35 const psiconv_word_styles_section styles,
35 int with_styles); 36 int with_styles);
36 37
37/* Maybe use a psiconv_header_section variable instead? */ 38/* Maybe use a psiconv_header_section variable instead? */
38int psiconv_write_header_section(psiconv_buffer buf,psiconv_u32 uid1, 39int psiconv_write_header_section(const psiconv_config config,
40 psiconv_buffer buf,int lev,psiconv_u32 uid1,
39 psiconv_u32 uid2, psiconv_u32 uid3) 41 psiconv_u32 uid2, psiconv_u32 uid3)
40{ 42{
41 int res; 43 int res;
44 psiconv_progress(config,lev,0,"Writing header section");
42 if ((res = psiconv_write_u32(buf,uid1))) 45 if ((res = psiconv_write_u32(config,buf,lev+1,uid1)))
43 return res; 46 return res;
44 if ((res = psiconv_write_u32(buf,uid2))) 47 if ((res = psiconv_write_u32(config,buf,lev+1,uid2)))
45 return res; 48 return res;
46 if ((res = psiconv_write_u32(buf,uid3))) 49 if ((res = psiconv_write_u32(config,buf,lev+1,uid3)))
47 return res; 50 return res;
48 return psiconv_write_u32(buf,psiconv_checkuid(uid1,uid2,uid3)); 51 return psiconv_write_u32(config,buf,lev+1,psiconv_checkuid(uid1,uid2,uid3));
49} 52}
50 53
51int psiconv_write_section_table_section(psiconv_buffer buf, 54int psiconv_write_section_table_section(const psiconv_config config,
55 psiconv_buffer buf,int lev,
52 const psiconv_section_table_section value) 56 const psiconv_section_table_section value)
53{ 57{
54 int res,i; 58 int res,i;
55 psiconv_section_table_entry entry; 59 psiconv_section_table_entry entry;
56 60
61 psiconv_progress(config,lev,0,"Writing section table section");
57 if (!value) { 62 if (!value) {
58 psiconv_warn(0,psiconv_buffer_length(buf),"Null section table section"); 63 psiconv_error(config,0,psiconv_buffer_length(buf),"Null section table section");
59 return -PSICONV_E_GENERATE; 64 return -PSICONV_E_GENERATE;
60 } 65 }
61 66
62 if ((res = psiconv_write_u8(buf,2 * psiconv_list_length(value)))) 67 if ((res = psiconv_write_u8(config,buf,lev+1,2 * psiconv_list_length(value))))
63 return res; 68 return res;
64 for (i = 0; i < psiconv_list_length(value); i++) { 69 for (i = 0; i < psiconv_list_length(value); i++) {
65 if (!(entry = psiconv_list_get(value,i))) { 70 if (!(entry = psiconv_list_get(value,i))) {
66 psiconv_warn(0,psiconv_buffer_length(buf),"Massive memory corruption"); 71 psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
67 return -PSICONV_E_NOMEM; 72 return -PSICONV_E_NOMEM;
68 } 73 }
69 if ((res = psiconv_write_u32(buf,entry->id))) 74 if ((res = psiconv_write_u32(config,buf,lev+1,entry->id)))
70 return res; 75 return res;
71 if ((res = psiconv_write_offset(buf,entry->offset))) 76 if ((res = psiconv_write_offset(config,buf,lev+1,entry->offset)))
72 return res; 77 return res;
73 } 78 }
74 return -PSICONV_E_OK; 79 return -PSICONV_E_OK;
75} 80}
76 81
77int psiconv_write_application_id_section(psiconv_buffer buf,psiconv_u32 id, 82int psiconv_write_application_id_section(const psiconv_config config,
83 psiconv_buffer buf,int lev,psiconv_u32 id,
78 const psiconv_string_t text) 84 const psiconv_string_t text)
79{ 85{
80 int res; 86 int res;
87 psiconv_progress(config,lev,0,"Writing application id section");
81 if ((res = psiconv_write_u32(buf,id))) 88 if ((res = psiconv_write_u32(config,buf,lev+1,id)))
82 return res; 89 return res;
83 return psiconv_write_string(buf,text); 90 return psiconv_write_string(config,buf,lev+1,text);
84} 91}
85 92
86int psiconv_write_text_section(psiconv_buffer buf, 93int psiconv_write_text_section(const psiconv_config config,
94 psiconv_buffer buf,int lev,
87 const psiconv_text_and_layout value) 95 const psiconv_text_and_layout value)
88{ 96{
89 int res; 97 int res;
90 psiconv_buffer extra_buf; 98 psiconv_buffer extra_buf;
91 int i,j; 99 int i,j;
92 psiconv_paragraph paragraph; 100 psiconv_paragraph paragraph;
93 101
102 psiconv_progress(config,lev,0,"Writing text section");
94 if (!value) { 103 if (!value) {
95 psiconv_warn(0,psiconv_buffer_length(buf),"Null text section"); 104 psiconv_error(config,0,psiconv_buffer_length(buf),"Null text section");
96 return -PSICONV_E_GENERATE; 105 return -PSICONV_E_GENERATE;
97 } 106 }
98 107
99 if (psiconv_list_length(value)) { 108 if (psiconv_list_length(value)) {
100 if (!(extra_buf = psiconv_buffer_new())) 109 if (!(extra_buf = psiconv_buffer_new()))
101 return -PSICONV_E_NOMEM; 110 return -PSICONV_E_NOMEM;
102 for (i = 0; i < psiconv_list_length(value); i++) { 111 for (i = 0; i < psiconv_list_length(value); i++) {
103 if (!(paragraph = psiconv_list_get(value,i))) { 112 if (!(paragraph = psiconv_list_get(value,i))) {
104 psiconv_warn(0,psiconv_buffer_length(buf),"Massive memory corruption"); 113 psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
105 res = -PSICONV_E_OTHER; 114 res = -PSICONV_E_NOMEM;
106 goto ERROR; 115 goto ERROR;
107 } 116 }
108 for (j = 0; j < strlen(paragraph->text); j++) 117 for (j = 0; j < psiconv_unicode_strlen(paragraph->text); j++)
109 if ((res = psiconv_write_u8(extra_buf,paragraph->text[j]))) 118 if ((res = psiconv_write_u8(config,extra_buf,lev+1,
119 psiconv_unicode_to_char(config,paragraph->text[j]))))
110 goto ERROR; 120 goto ERROR;
111 psiconv_write_u8(extra_buf,0x06); 121 psiconv_write_u8(config,extra_buf,lev+1,0x06);
112 } 122 }
113 if ((res = psiconv_write_X(buf,psiconv_buffer_length(extra_buf)))) 123 if ((res = psiconv_write_X(config,buf,lev+1,psiconv_buffer_length(extra_buf))))
114 goto ERROR; 124 goto ERROR;
115 res = psiconv_buffer_concat(buf,extra_buf); 125 res = psiconv_buffer_concat(buf,extra_buf);
116 } else 126 } else
117 /* Hack: empty text sections are just not allowed */ 127 /* Hack: empty text sections are just not allowed */
118 return psiconv_write_u16(buf,0x0602); 128 return psiconv_write_u16(config,buf,lev+1,0x0602);
119 129
120ERROR: 130ERROR:
121 psiconv_buffer_free(extra_buf); 131 psiconv_buffer_free(extra_buf);
122 return res; 132 return res;
123} 133}
124 134
125int psiconv_write_layout_section(psiconv_buffer buf, 135int psiconv_write_layout_section(const psiconv_config config,
136 psiconv_buffer buf,int lev,
126 const psiconv_text_and_layout value, 137 const psiconv_text_and_layout value,
127 const psiconv_word_styles_section styles, 138 const psiconv_word_styles_section styles,
128 int with_styles) 139 int with_styles)
129{ 140{
130 typedef struct psiconv_paragraph_type_list_s 141 typedef struct psiconv_paragraph_type_list_s
… …
143 psiconv_in_line_layout in_line = NULL; 154 psiconv_in_line_layout in_line = NULL;
144 psiconv_word_style style; 155 psiconv_word_style style;
145 psiconv_character_layout para_charlayout; 156 psiconv_character_layout para_charlayout;
146 int i,j,para_type,nr_of_inlines=0,res,ptl_length,pel_length,thislen,paralen; 157 int i,j,para_type,nr_of_inlines=0,res,ptl_length,pel_length,thislen,paralen;
147 158
159 psiconv_progress(config,lev,0,"Writing layout section");
148 if (!value) { 160 if (!value) {
149 psiconv_warn(0,psiconv_buffer_length(buf),"Null text section"); 161 psiconv_error(config,0,psiconv_buffer_length(buf),"Null text section");
150 return -PSICONV_E_GENERATE; 162 return -PSICONV_E_GENERATE;
151 } 163 }
152 164
153 if (!(paragraph_type_list = psiconv_list_new(sizeof(new_type)))) { 165 if (!(paragraph_type_list = psiconv_list_new(sizeof(new_type)))) {
154 res = -PSICONV_E_NOMEM; 166 res = -PSICONV_E_NOMEM;
… …
175 goto ERROR5; 187 goto ERROR5;
176 } 188 }
177 189
178 for (i = 0; i < psiconv_list_length(value); i++) { 190 for (i = 0; i < psiconv_list_length(value); i++) {
179 if (!(paragraph = psiconv_list_get(value,i))) { 191 if (!(paragraph = psiconv_list_get(value,i))) {
180 psiconv_warn(0,psiconv_buffer_length(buf),"Massive memory corruption"); 192 psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
181 res = -PSICONV_E_OTHER; 193 res = -PSICONV_E_NOMEM;
182 goto ERROR6; 194 goto ERROR6;
183 } 195 }
184 if ((res = psiconv_write_u32(buf_elements,strlen(paragraph->text)+1))) 196 if ((res = psiconv_write_u32(config,buf_elements,lev+1,
197 psiconv_unicode_strlen(paragraph->text)+1)))
185 goto ERROR6; 198 goto ERROR6;
186 199
187 /* We need it for the next if-statement */ 200 /* We need it for the next if-statement */
188 if (psiconv_list_length(paragraph->in_lines) == 1) 201 if (psiconv_list_length(paragraph->in_lines) == 1)
189 if (!(in_line = psiconv_list_get(paragraph->in_lines,1))) 202 if (!(in_line = psiconv_list_get(paragraph->in_lines,1)))
… …
192 if ((psiconv_list_length(paragraph->in_lines) > 1) || 205 if ((psiconv_list_length(paragraph->in_lines) > 1) ||
193 ((psiconv_list_length(paragraph->in_lines) == 1) && 206 ((psiconv_list_length(paragraph->in_lines) == 1) &&
194 (in_line->object != NULL))) { 207 (in_line->object != NULL))) {
195 /* Inline layouts, or an object, so we generate a paragraph element 208 /* Inline layouts, or an object, so we generate a paragraph element
196 and inline elements */ 209 and inline elements */
197 if ((res = psiconv_write_u8(buf_elements,0x00))) 210 if ((res = psiconv_write_u8(config,buf_elements,lev+1,0x00)))
198 goto ERROR6; 211 goto ERROR6;
199 if (!(style = psiconv_get_style(styles,paragraph->base_style))) { 212 if (!(style = psiconv_get_style(styles,paragraph->base_style))) {
200 psiconv_warn(0,psiconv_buffer_length(buf),"Unknown style"); 213 psiconv_error(config,0,psiconv_buffer_length(buf),"Unknown style");
201 res = -PSICONV_E_GENERATE; 214 res = -PSICONV_E_GENERATE;
202 goto ERROR6; 215 goto ERROR6;
203 } 216 }
204 if ((res = psiconv_write_paragraph_layout_list(buf_elements, 217 if ((res = psiconv_write_paragraph_layout_list(config,buf_elements,lev+1,
205 paragraph->base_paragraph, 218 paragraph->base_paragraph,
206 style->paragraph))) 219 style->paragraph)))
207 goto ERROR6; 220 goto ERROR6;
208 if (with_styles) 221 if (with_styles)
209 if ((res = psiconv_write_u8(buf_elements,paragraph->base_style))) 222 if ((res = psiconv_write_u8(config,buf_elements,lev+1,paragraph->base_style)))
210 goto ERROR6; 223 goto ERROR6;
211 if ((res = psiconv_write_u32(buf_elements, 224 if ((res = psiconv_write_u32(config,buf_elements,lev+1,
212 psiconv_list_length(paragraph->in_lines)))) 225 psiconv_list_length(paragraph->in_lines))))
213 goto ERROR6; 226 goto ERROR6;
214 227
215 /* Generate the inlines. NB: Against what are all settings relative?!? */ 228 /* Generate the inlines. NB: Against what are all settings relative?!? */
216 paralen = 0; 229 paralen = 0;
217 for (j = 0; j < psiconv_list_length(paragraph->in_lines); j++) { 230 for (j = 0; j < psiconv_list_length(paragraph->in_lines); j++) {
218 nr_of_inlines ++; 231 nr_of_inlines ++;
219 if (!(in_line = psiconv_list_get(paragraph->in_lines,j))) { 232 if (!(in_line = psiconv_list_get(paragraph->in_lines,j))) {
220 psiconv_warn(0,psiconv_buffer_length(buf), 233 psiconv_error(config,0,psiconv_buffer_length(buf),
221 "Massive memory corruption"); 234 "Massive memory corruption");
222 res = -PSICONV_E_OTHER; 235 res = -PSICONV_E_NOMEM;
223 goto ERROR6; 236 goto ERROR6;
224 } 237 }
225 if ((res = psiconv_write_u8(buf_inlines,in_line->object?0x01:0x00))) 238 if ((res = psiconv_write_u8(config,buf_inlines,lev+1,in_line->object?0x01:0x00)))
226 goto ERROR6; 239 goto ERROR6;
227 thislen = in_line->length; 240 thislen = in_line->length;
228 paralen += thislen; 241 paralen += thislen;
229 /* If this is the last in_line, we need to make sure that the 242 /* If this is the last in_line, we need to make sure that the
230 complete length of all inlines equals the text length */ 243 complete length of all inlines equals the text length */
231 if (j == psiconv_list_length(paragraph->in_lines)-1) { 244 if (j == psiconv_list_length(paragraph->in_lines)-1) {
232 if (paralen > strlen(paragraph->text)+1) { 245 if (paralen > psiconv_unicode_strlen(paragraph->text)+1) {
233 res = -PSICONV_E_GENERATE; 246 res = -PSICONV_E_GENERATE;
234 goto ERROR6; 247 goto ERROR6;
235 } 248 }
236 thislen += strlen(paragraph->text)+1-paralen; 249 thislen += psiconv_unicode_strlen(paragraph->text)+1-paralen;
237 } 250 }
238 if ((res = psiconv_write_u32(buf_inlines,thislen))) 251 if ((res = psiconv_write_u32(config,buf_inlines,lev+1,thislen)))
239 goto ERROR6; 252 goto ERROR6;
240 if ((res = psiconv_write_character_layout_list(buf_inlines, 253 if ((res = psiconv_write_character_layout_list(config,buf_inlines,lev+1,
241 in_line->layout, 254 in_line->layout,
242 style->character))) 255 style->character)))
243 goto ERROR6; 256 goto ERROR6;
244 if (in_line->object) { 257 if (in_line->object) {
245 if ((res = psiconv_write_u32(buf_inlines,PSICONV_ID_OBJECT))) 258 if ((res = psiconv_write_u32(config,buf_inlines,lev+1,PSICONV_ID_OBJECT)))
246 goto ERROR6; 259 goto ERROR6;
247 obj_id = psiconv_buffer_unique_id(); 260 obj_id = psiconv_buffer_unique_id();
248 if ((res = psiconv_buffer_add_reference(buf_inlines,obj_id))) 261 if ((res = psiconv_buffer_add_reference(buf_inlines,obj_id)))
249 goto ERROR6; 262 goto ERROR6;
250 if ((res = psiconv_buffer_add_target(buf_objects,obj_id))) 263 if ((res = psiconv_buffer_add_target(buf_objects,obj_id)))
251 goto ERROR6; 264 goto ERROR6;
252 if ((res = psiconv_write_embedded_object_section(buf_objects, 265 if ((res = psiconv_write_embedded_object_section(config,buf_objects,lev+1,
253 in_line->object))) 266 in_line->object)))
254 goto ERROR6; 267 goto ERROR6;
255 if ((res = psiconv_write_length(buf_inlines,in_line->object_width))) 268 if ((res = psiconv_write_length(config,buf_inlines,lev+1,in_line->object_width)))
256 goto ERROR6; 269 goto ERROR6;
257 if ((res = psiconv_write_length(buf_inlines,in_line->object_height))) 270 if ((res = psiconv_write_length(config,buf_inlines,lev+1,in_line->object_height)))
258 goto ERROR6; 271 goto ERROR6;
259 } 272 }
260 } 273 }
261 } else { 274 } else {
262 /* No inline layouts (or only 1), so we generate a paragraph type list */ 275 /* No inline layouts (or only 1), so we generate a paragraph type list */
… …
264 /* Set para_charlayout to the correct character-level layout */ 277 /* Set para_charlayout to the correct character-level layout */
265 if (psiconv_list_length(paragraph->in_lines) == 0) 278 if (psiconv_list_length(paragraph->in_lines) == 0)
266 para_charlayout = paragraph->base_character; 279 para_charlayout = paragraph->base_character;
267 else { 280 else {
268 if (!(in_line = psiconv_list_get(paragraph->in_lines,0))) { 281 if (!(in_line = psiconv_list_get(paragraph->in_lines,0))) {
269 psiconv_warn(0,psiconv_buffer_length(buf), 282 psiconv_error(config,0,psiconv_buffer_length(buf),
270 "Massive memory corruption"); 283 "Massive memory corruption");
271 res = -PSICONV_E_OTHER; 284 res = -PSICONV_E_NOMEM;
272 goto ERROR6; 285 goto ERROR6;
273 } 286 }
274 para_charlayout = in_line->layout; 287 para_charlayout = in_line->layout;
275 } 288 }
276 for (j = 0; j < psiconv_list_length(paragraph_type_list); j++) { 289 for (j = 0; j < psiconv_list_length(paragraph_type_list); j++) {
277 if (!(paragraph_type = psiconv_list_get(paragraph_type_list,j))) { 290 if (!(paragraph_type = psiconv_list_get(paragraph_type_list,j))) {
278 psiconv_warn(0,psiconv_buffer_length(buf), 291 psiconv_error(config,0,psiconv_buffer_length(buf),
279 "Massive memory corruption"); 292 "Massive memory corruption");
280 res = -PSICONV_E_OTHER; 293 res = -PSICONV_E_NOMEM;
281 goto ERROR6; 294 goto ERROR6;
282 } 295 }
283 if ((paragraph->base_style == paragraph_type->style) && 296 if ((paragraph->base_style == paragraph_type->style) &&
284 !psiconv_compare_character_layout(para_charlayout, 297 !psiconv_compare_character_layout(para_charlayout,
285 paragraph_type->character) && 298 paragraph_type->character) &&
… …
297 new_type.character = para_charlayout; 310 new_type.character = para_charlayout;
298 new_type.style = paragraph->base_style; 311 new_type.style = paragraph->base_style;
299 paragraph_type = &new_type; 312 paragraph_type = &new_type;
300 if ((res = psiconv_list_add(paragraph_type_list,paragraph_type))) 313 if ((res = psiconv_list_add(paragraph_type_list,paragraph_type)))
301 goto ERROR6; 314 goto ERROR6;
302 if ((res = psiconv_write_u32(buf_types,paragraph_type->nr))) 315 if ((res = psiconv_write_u32(config,buf_types,lev+1,paragraph_type->nr)))
303 goto ERROR6; 316 goto ERROR6;
304 if (!(style = psiconv_get_style(styles,paragraph_type->style))) { 317 if (!(style = psiconv_get_style(styles,paragraph_type->style))) {
305 psiconv_warn(0,psiconv_buffer_length(buf),"Unknown style"); 318 psiconv_error(config,0,psiconv_buffer_length(buf),"Unknown style");
306 res = -PSICONV_E_GENERATE; 319 res = -PSICONV_E_GENERATE;
307 goto ERROR6; 320 goto ERROR6;
308 } 321 }
309 if ((res = psiconv_write_paragraph_layout_list(buf_types, 322 if ((res = psiconv_write_paragraph_layout_list(config,buf_types,lev+1,
310 paragraph_type->paragraph,style->paragraph))) 323 paragraph_type->paragraph,style->paragraph)))
311 goto ERROR6; 324 goto ERROR6;
312 if (with_styles) 325 if (with_styles)
313 if ((res = psiconv_write_u8(buf_types,paragraph_type->style))) 326 if ((res = psiconv_write_u8(config,buf_types,lev+1,paragraph_type->style)))
314 goto ERROR6; 327 goto ERROR6;
315 if ((res = psiconv_write_character_layout_list(buf_types, 328 if ((res = psiconv_write_character_layout_list(config,buf_types,lev+1,
316 paragraph_type->character,style->character))) 329 paragraph_type->character,style->character)))
317 goto ERROR6; 330 goto ERROR6;
318 } 331 }
319 if ((res = psiconv_write_u8(buf_elements,para_type))) 332 if ((res = psiconv_write_u8(config,buf_elements,lev+1,para_type)))
320 goto ERROR6; 333 goto ERROR6;
321 } 334 }
322 } 335 }
323 336
324 /* HACK: special case: no paragraphs at all. We need to improvize. */ 337 /* HACK: special case: no paragraphs at all. We need to improvize. */
325 if (!psiconv_list_length(value)) { 338 if (!psiconv_list_length(value)) {
326 if ((res = psiconv_write_u32(buf_types,1))) 339 if ((res = psiconv_write_u32(config,buf_types,lev+1,1)))
327 goto ERROR6; 340 goto ERROR6;
328 if ((res = psiconv_write_u32(buf_types,0))) 341 if ((res = psiconv_write_u32(config,buf_types,lev+1,0)))
329 goto ERROR6; 342 goto ERROR6;
330 if (with_styles) 343 if (with_styles)
331 if ((res = psiconv_write_u8(buf_types,0))) 344 if ((res = psiconv_write_u8(config,buf_types,lev+1,0)))
332 goto ERROR6; 345 goto ERROR6;
333 if ((res = psiconv_write_u32(buf_types,0))) 346 if ((res = psiconv_write_u32(config,buf_types,lev+1,0)))
334 goto ERROR6; 347 goto ERROR6;
335 348
336 if ((res = psiconv_write_u32(buf_elements,1))) 349 if ((res = psiconv_write_u32(config,buf_elements,lev+1,1)))
337 goto ERROR6; 350 goto ERROR6;
338 if ((res = psiconv_write_u8(buf_elements,1))) 351 if ((res = psiconv_write_u8(config,buf_elements,lev+1,1)))
339 goto ERROR6; 352 goto ERROR6;
340 pel_length = 1; 353 pel_length = 1;
341 ptl_length = 1; 354 ptl_length = 1;
342 } else { 355 } else {
343 pel_length = psiconv_list_length(value); 356 pel_length = psiconv_list_length(value);
344 ptl_length = psiconv_list_length(paragraph_type_list); 357 ptl_length = psiconv_list_length(paragraph_type_list);
345 } 358 }
346 359
347 /* Now append everything */ 360 /* Now append everything */
348 if ((res = psiconv_write_u16(buf,with_styles?0x0001:0x0000))) 361 if ((res = psiconv_write_u16(config,buf,lev+1,with_styles?0x0001:0x0000)))
349 goto ERROR6; 362 goto ERROR6;
350 if ((res = psiconv_write_u8(buf, ptl_length))) 363 if ((res = psiconv_write_u8(config,buf,lev+1, ptl_length)))
351 goto ERROR6; 364 goto ERROR6;
352 if ((res = psiconv_buffer_concat(buf,buf_types))) 365 if ((res = psiconv_buffer_concat(buf,buf_types)))
353 goto ERROR6; 366 goto ERROR6;
354 if ((res = psiconv_write_u32(buf,pel_length))) 367 if ((res = psiconv_write_u32(config,buf,lev+1,pel_length)))
355 goto ERROR6; 368 goto ERROR6;
356 if ((res = psiconv_buffer_concat(buf,buf_elements))) 369 if ((res = psiconv_buffer_concat(buf,buf_elements)))
357 goto ERROR6; 370 goto ERROR6;
358 if ((res = psiconv_write_u32(buf,nr_of_inlines))) 371 if ((res = psiconv_write_u32(config,buf,lev+1,nr_of_inlines)))
359 goto ERROR6; 372 goto ERROR6;
360 if ((res = psiconv_buffer_concat(buf,buf_inlines))) 373 if ((res = psiconv_buffer_concat(buf,buf_inlines)))
361 goto ERROR6; 374 goto ERROR6;
362 if ((res = psiconv_buffer_concat(buf,buf_objects))) 375 if ((res = psiconv_buffer_concat(buf,buf_objects)))
363 goto ERROR6; 376 goto ERROR6;
… …
374 psiconv_list_free(paragraph_type_list); 387 psiconv_list_free(paragraph_type_list);
375ERROR1: 388ERROR1:
376 return res; 389 return res;
377} 390}
378 391
379int psiconv_write_styled_layout_section(psiconv_buffer buf, 392int psiconv_write_styled_layout_section(const psiconv_config config,
393 psiconv_buffer buf,int lev,
380 psiconv_text_and_layout result, 394 psiconv_text_and_layout result,
381 psiconv_word_styles_section styles) 395 psiconv_word_styles_section styles)
382{ 396{
397 psiconv_progress(config,lev,0,"Writing styled layout section");
383 return psiconv_write_layout_section(buf,result,styles,1); 398 return psiconv_write_layout_section(config,buf,lev+1,result,styles,1);
384} 399}
385 400
386int psiconv_write_styleless_layout_section(psiconv_buffer buf, 401int psiconv_write_styleless_layout_section(const psiconv_config config,
402 psiconv_buffer buf,int lev,
387 const psiconv_text_and_layout value, 403 const psiconv_text_and_layout value,
388 const psiconv_character_layout base_char, 404 const psiconv_character_layout base_char,
389 const psiconv_paragraph_layout base_para) 405 const psiconv_paragraph_layout base_para)
390{ 406{
391 int res = 0; 407 int res = 0;
392 psiconv_word_styles_section styles_section; 408 psiconv_word_styles_section styles_section;
393 409
410 psiconv_progress(config,lev,0,"Writing styleless layout section");
394 if (!(styles_section = malloc(sizeof(*styles_section)))) 411 if (!(styles_section = malloc(sizeof(*styles_section))))
395 goto ERROR1; 412 goto ERROR1;
396 if (!(styles_section->normal = malloc(sizeof(*styles_section->normal)))) 413 if (!(styles_section->normal = malloc(sizeof(*styles_section->normal))))
397 goto ERROR2; 414 goto ERROR2;
398 if (!(styles_section->normal->character = 415 if (!(styles_section->normal->character =
… …
400 goto ERROR3; 417 goto ERROR3;
401 if (!(styles_section->normal->paragraph = 418 if (!(styles_section->normal->paragraph =
402 psiconv_clone_paragraph_layout(base_para))) 419 psiconv_clone_paragraph_layout(base_para)))
403 goto ERROR4; 420 goto ERROR4;
404 styles_section->normal->hotkey = 0; 421 styles_section->normal->hotkey = 0;
405 if (!(styles_section->normal->name = strdup(""))) 422 if ((res = psiconv_unicode_from_chars(config,"",
423 &styles_section->normal->name)))
406 goto ERROR5; 424 goto ERROR5;
407 if (!(styles_section->styles = psiconv_list_new(sizeof( 425 if (!(styles_section->styles = psiconv_list_new(sizeof(
408 struct psiconv_word_style_s)))) 426 struct psiconv_word_style_s))))
409 goto ERROR6; 427 goto ERROR6;
410 428
411 res = psiconv_write_layout_section(buf,value,styles_section,0); 429 res = psiconv_write_layout_section(config,buf,lev+1,value,styles_section,0);
412 psiconv_free_word_styles_section(styles_section); 430 psiconv_free_word_styles_section(styles_section);
413 return res; 431 return res;
414 432
415ERROR6: 433ERROR6:
416 free(styles_section->normal->name); 434 free(styles_section->normal->name);
… …
428 else 446 else
429 return res; 447 return res;
430} 448}
431 449
432 450
433int psiconv_write_embedded_object_section(psiconv_buffer buf, 451int psiconv_write_embedded_object_section(const psiconv_config config,
452 psiconv_buffer buf,int lev,
434 const psiconv_embedded_object_section value) 453 const psiconv_embedded_object_section value)
435{ 454{
436 int res; 455 int res;
437 psiconv_u32 display_id,icon_id,table_id; 456 psiconv_u32 display_id,icon_id,table_id;
438 psiconv_buffer extra_buf; 457 psiconv_buffer extra_buf;
439 458
459 psiconv_progress(config,lev,0,"Writing embedded object section");
440 if (!value) { 460 if (!value) {
441 psiconv_warn(0,psiconv_buffer_length(buf),"Null Object"); 461 psiconv_error(config,0,psiconv_buffer_length(buf),"Null Object");
442 res = -PSICONV_E_GENERATE; 462 res = -PSICONV_E_GENERATE;
443 goto ERROR1; 463 goto ERROR1;
444 } 464 }
445 465
446 if (!(extra_buf = psiconv_buffer_new())) { 466 if (!(extra_buf = psiconv_buffer_new())) {
… …
449 } 469 }
450 470
451 display_id = psiconv_buffer_unique_id(); 471 display_id = psiconv_buffer_unique_id();
452 icon_id = psiconv_buffer_unique_id(); 472 icon_id = psiconv_buffer_unique_id();
453 table_id = psiconv_buffer_unique_id(); 473 table_id = psiconv_buffer_unique_id();
454 if ((res = psiconv_write_u8(buf,0x06))) 474 if ((res = psiconv_write_u8(config,buf,lev+1,0x06)))
455 goto ERROR2; 475 goto ERROR2;
456 if ((res = psiconv_write_u32(buf,PSICONV_ID_OBJECT_DISPLAY_SECTION))) 476 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_OBJECT_DISPLAY_SECTION)))
457 goto ERROR2; 477 goto ERROR2;
458 if ((res = psiconv_buffer_add_reference(buf,display_id))) 478 if ((res = psiconv_buffer_add_reference(buf,display_id)))
459 goto ERROR2; 479 goto ERROR2;
460 if ((res = psiconv_write_u32(buf,PSICONV_ID_OBJECT_ICON_SECTION))) 480 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_OBJECT_ICON_SECTION)))
461 goto ERROR2; 481 goto ERROR2;
462 if ((res = psiconv_buffer_add_reference(buf,icon_id))) 482 if ((res = psiconv_buffer_add_reference(buf,icon_id)))
463 goto ERROR2; 483 goto ERROR2;
464 if ((res = psiconv_write_u32(buf,PSICONV_ID_OBJECT_SECTION_TABLE_SECTION))) 484 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_OBJECT_SECTION_TABLE_SECTION)))
465 goto ERROR2; 485 goto ERROR2;
466 if ((res = psiconv_buffer_add_reference(buf,table_id))) 486 if ((res = psiconv_buffer_add_reference(buf,table_id)))
467 goto ERROR2; 487 goto ERROR2;
468 488
469 if ((res = psiconv_buffer_add_target(buf,display_id))) 489 if ((res = psiconv_buffer_add_target(buf,display_id)))
470 goto ERROR2; 490 goto ERROR2;
471 if ((res = psiconv_write_object_display_section(buf,value->display))) 491 if ((res = psiconv_write_object_display_section(config,buf,lev+1,value->display)))
472 goto ERROR2; 492 goto ERROR2;
473 if ((res = psiconv_buffer_add_target(buf,icon_id))) 493 if ((res = psiconv_buffer_add_target(buf,icon_id)))
474 goto ERROR2; 494 goto ERROR2;
475 if ((res = psiconv_write_object_icon_section(buf,value->icon))) 495 if ((res = psiconv_write_object_icon_section(config,buf,lev+1,value->icon)))
476 goto ERROR2; 496 goto ERROR2;
477 if ((res = psiconv_buffer_add_target(buf,table_id))) 497 if ((res = psiconv_buffer_add_target(buf,table_id)))
478 goto ERROR2; 498 goto ERROR2;
479 switch(value->object->type) { 499 switch(value->object->type) {
480 case psiconv_word_file: 500 case psiconv_word_file:
481 if ((res = psiconv_write_word_file(extra_buf, 501 if ((res = psiconv_write_word_file(config,extra_buf,lev+1,
482 (psiconv_word_f) value->object->file))) 502 (psiconv_word_f) value->object->file)))
483 goto ERROR2; 503 goto ERROR2;
484 break; 504 break;
485/*
486 case psiconv_sketch_file: 505 case psiconv_sketch_file:
487 if ((res = psiconv_write_sketch_file(extra_buf, 506 if ((res = psiconv_write_sketch_file(config,extra_buf,lev+1,
488 (psiconv_sketch_f) value->object->file))) 507 (psiconv_sketch_f) value->object->file)))
489 goto ERROR2; 508 goto ERROR2;
490 break; 509 break;
510/*
491 case psiconv_sheet_file: 511 case psiconv_sheet_file:
492 if ((res = psiconv_write_sheet_file(extra_buf, 512 if ((res = psiconv_write_sheet_file(config,extra_buf,lev+1,
493 (psiconv_sheet_f) value->object->file))) 513 (psiconv_sheet_f) value->object->file)))
494 goto ERROR2; 514 goto ERROR2;
495 break; 515 break;
496*/ 516*/
497 default: 517 default:
498 psiconv_warn(0,psiconv_buffer_length(buf), 518 psiconv_error(config,0,psiconv_buffer_length(buf),
499 "Unknown or unsupported object type"); 519 "Unknown or unsupported object type");
500 res = -PSICONV_E_GENERATE; 520 res = -PSICONV_E_GENERATE;
501 goto ERROR2; 521 goto ERROR2;
502 } 522 }
503 523
… …
513ERROR1: 533ERROR1:
514 return res; 534 return res;
515} 535}
516 536
517 537
518int psiconv_write_object_display_section(psiconv_buffer buf, 538int psiconv_write_object_display_section(const psiconv_config config,
539 psiconv_buffer buf,int lev,
519 const psiconv_object_display_section value) 540 const psiconv_object_display_section value)
520{ 541{
521 int res; 542 int res;
522 543
544 psiconv_progress(config,lev,0,"Writing object display section");
545
523 if (!value) { 546 if (!value) {
524 psiconv_warn(0,psiconv_buffer_length(buf),"Null Object Display Section"); 547 psiconv_error(config,0,psiconv_buffer_length(buf),"Null Object Display Section");
525 res = -PSICONV_E_GENERATE; 548 res = -PSICONV_E_GENERATE;
526 goto ERROR1; 549 goto ERROR1;
527 } 550 }
528 551
529 if ((res = psiconv_write_u8(buf,value->show_icon?0x00:0x01))) 552 if ((res = psiconv_write_u8(config,buf,lev+1,value->show_icon?0x00:0x01)))
530 goto ERROR1; 553 goto ERROR1;
531 if ((res = psiconv_write_length(buf,value->width))) 554 if ((res = psiconv_write_length(config,buf,lev+1,value->width)))
532 goto ERROR1; 555 goto ERROR1;
533 if ((res = psiconv_write_length(buf,value->height))) 556 if ((res = psiconv_write_length(config,buf,lev+1,value->height)))
534 goto ERROR1; 557 goto ERROR1;
535 if ((res = psiconv_write_u32(buf,0x00000000))) 558 if ((res = psiconv_write_u32(config,buf,lev+1,0x00000000)))
536 goto ERROR1; 559 goto ERROR1;
537 560
538 return 0; 561 return 0;
539 562
540ERROR1: 563ERROR1:
541 return res; 564 return res;
542} 565}
543 566
544int psiconv_write_object_icon_section(psiconv_buffer buf, 567int psiconv_write_object_icon_section(const psiconv_config config,
568 psiconv_buffer buf,int lev,
545 const psiconv_object_icon_section value) 569 const psiconv_object_icon_section value)
546{ 570{
547 int res; 571 int res;
548 572
573 psiconv_progress(config,lev,0,"Writing object icon section");
574
549 if (!value) { 575 if (!value) {
550 psiconv_warn(0,psiconv_buffer_length(buf),"Null Object Icon Section"); 576 psiconv_error(config,0,psiconv_buffer_length(buf),"Null Object Icon Section");
551 res = -PSICONV_E_GENERATE; 577 res = -PSICONV_E_GENERATE;
552 goto ERROR1; 578 goto ERROR1;
553 } 579 }
554 580
555 if ((res = psiconv_write_string(buf,value->icon_name))) 581 if ((res = psiconv_write_string(config,buf,lev+1,value->icon_name)))
556 goto ERROR1; 582 goto ERROR1;
557 if ((res = psiconv_write_length(buf,value->icon_width))) 583 if ((res = psiconv_write_length(config,buf,lev+1,value->icon_width)))
558 goto ERROR1; 584 goto ERROR1;
559 if ((res = psiconv_write_length(buf,value->icon_height))) 585 if ((res = psiconv_write_length(config,buf,lev+1,value->icon_height)))
560 goto ERROR1; 586 goto ERROR1;
561 587
562 return 0; 588 return 0;
563 589
564ERROR1: 590ERROR1:
Legend:
Removed from v.167  
changed lines
  Added in v.196
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26