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