/[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 142 Revision 184
… …
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
… …
132 psiconv_character_layout character; 143 psiconv_character_layout character;
133 psiconv_paragraph_layout paragraph; 144 psiconv_paragraph_layout paragraph;
134 psiconv_u8 style; 145 psiconv_u8 style;
135 psiconv_u8 nr; 146 psiconv_u8 nr;
136 } *psiconv_paragraph_type_list; 147 } *psiconv_paragraph_type_list;
148 psiconv_u32 obj_id;
137 psiconv_list paragraph_type_list; /* Of psiconv_paragraph_type_list_s */ 149 psiconv_list paragraph_type_list; /* Of psiconv_paragraph_type_list_s */
138 psiconv_paragraph_type_list paragraph_type; 150 psiconv_paragraph_type_list paragraph_type;
139 struct psiconv_paragraph_type_list_s new_type; 151 struct psiconv_paragraph_type_list_s new_type;
140 psiconv_buffer buf_types,buf_elements,buf_inlines; 152 psiconv_buffer buf_types,buf_elements,buf_inlines,buf_objects;
141 psiconv_paragraph paragraph; 153 psiconv_paragraph paragraph;
142 psiconv_in_line_layout in_line; 154 psiconv_in_line_layout in_line = NULL;
143 psiconv_word_style style; 155 psiconv_word_style style;
144 psiconv_character_layout para_charlayout; 156 psiconv_character_layout para_charlayout;
145 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;
146 158
159 psiconv_progress(config,lev,0,"Writing layout section");
147 if (!value) { 160 if (!value) {
148 psiconv_warn(0,psiconv_buffer_length(buf),"Null text section"); 161 psiconv_error(config,0,psiconv_buffer_length(buf),"Null text section");
149 return -PSICONV_E_GENERATE; 162 return -PSICONV_E_GENERATE;
150 } 163 }
151 164
152 if (!(paragraph_type_list = psiconv_list_new(sizeof(new_type)))) { 165 if (!(paragraph_type_list = psiconv_list_new(sizeof(new_type)))) {
153 res = -PSICONV_E_NOMEM; 166 res = -PSICONV_E_NOMEM;
… …
167 if (!(buf_inlines = psiconv_buffer_new())) { 180 if (!(buf_inlines = psiconv_buffer_new())) {
168 res = -PSICONV_E_NOMEM; 181 res = -PSICONV_E_NOMEM;
169 goto ERROR4; 182 goto ERROR4;
170 } 183 }
171 184
185 if (!(buf_objects = psiconv_buffer_new())) {
186 res = -PSICONV_E_NOMEM;
187 goto ERROR5;
188 }
189
172 for (i = 0; i < psiconv_list_length(value); i++) { 190 for (i = 0; i < psiconv_list_length(value); i++) {
173 if (!(paragraph = psiconv_list_get(value,i))) { 191 if (!(paragraph = psiconv_list_get(value,i))) {
174 psiconv_warn(0,psiconv_buffer_length(buf),"Massive memory corruption"); 192 psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
175 res = -PSICONV_E_OTHER; 193 res = -PSICONV_E_NOMEM;
176 goto ERROR5; 194 goto ERROR6;
177 } 195 }
178 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)))
179 goto ERROR5; 198 goto ERROR6;
180 199
200 /* We need it for the next if-statement */
201 if (psiconv_list_length(paragraph->in_lines) == 1)
202 if (!(in_line = psiconv_list_get(paragraph->in_lines,1)))
203 goto ERROR6;
204
181 if (psiconv_list_length(paragraph->in_lines) > 1) { 205 if ((psiconv_list_length(paragraph->in_lines) > 1) ||
206 ((psiconv_list_length(paragraph->in_lines) == 1) &&
207 (in_line->object != NULL))) {
182 /* Inline layouts, so we generate a paragraph element and inline 208 /* Inline layouts, or an object, so we generate a paragraph element
183 elements */ 209 and inline elements */
184 if ((res = psiconv_write_u8(buf_elements,0x00))) 210 if ((res = psiconv_write_u8(config,buf_elements,lev+1,0x00)))
185 goto ERROR5; 211 goto ERROR6;
186 if (!(style = psiconv_get_style(styles,paragraph->base_style))) { 212 if (!(style = psiconv_get_style(styles,paragraph->base_style))) {
187 psiconv_warn(0,psiconv_buffer_length(buf),"Unknown style"); 213 psiconv_error(config,0,psiconv_buffer_length(buf),"Unknown style");
188 res = -PSICONV_E_GENERATE; 214 res = -PSICONV_E_GENERATE;
189 goto ERROR5; 215 goto ERROR6;
190 } 216 }
191 if ((res = psiconv_write_paragraph_layout_list(buf_elements, 217 if ((res = psiconv_write_paragraph_layout_list(config,buf_elements,lev+1,
192 paragraph->base_paragraph, 218 paragraph->base_paragraph,
193 style->paragraph))) 219 style->paragraph)))
194 goto ERROR5; 220 goto ERROR6;
195 if (with_styles) 221 if (with_styles)
196 if ((res = psiconv_write_u8(buf_elements,paragraph->base_style))) 222 if ((res = psiconv_write_u8(config,buf_elements,lev+1,paragraph->base_style)))
197 goto ERROR5; 223 goto ERROR6;
198 if ((res = psiconv_write_u32(buf_elements, 224 if ((res = psiconv_write_u32(config,buf_elements,lev+1,
199 psiconv_list_length(paragraph->in_lines)))) 225 psiconv_list_length(paragraph->in_lines))))
200 goto ERROR5; 226 goto ERROR6;
201 227
202 /* Generate the inlines. NB: Against what are all settings relative?!? */ 228 /* Generate the inlines. NB: Against what are all settings relative?!? */
203 paralen = 0; 229 paralen = 0;
204 for (j = 0; j < psiconv_list_length(paragraph->in_lines); j++) { 230 for (j = 0; j < psiconv_list_length(paragraph->in_lines); j++) {
205 nr_of_inlines ++; 231 nr_of_inlines ++;
206 if (!(in_line = psiconv_list_get(paragraph->in_lines,j))) { 232 if (!(in_line = psiconv_list_get(paragraph->in_lines,j))) {
207 psiconv_warn(0,psiconv_buffer_length(buf), 233 psiconv_error(config,0,psiconv_buffer_length(buf),
208 "Massive memory corruption"); 234 "Massive memory corruption");
209 res = -PSICONV_E_OTHER; 235 res = -PSICONV_E_NOMEM;
210 goto ERROR5; 236 goto ERROR6;
211 } 237 }
212 if ((res = psiconv_write_u8(buf_inlines,0x00))) 238 if ((res = psiconv_write_u8(config,buf_inlines,lev+1,in_line->object?0x01:0x00)))
213 goto ERROR5; 239 goto ERROR6;
214 thislen = in_line->length; 240 thislen = in_line->length;
215 paralen += thislen; 241 paralen += thislen;
216 /* 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
217 complete length of all inlines equals the text length */ 243 complete length of all inlines equals the text length */
218 if (j == psiconv_list_length(paragraph->in_lines)-1) { 244 if (j == psiconv_list_length(paragraph->in_lines)-1) {
219 if (paralen > strlen(paragraph->text)+1) { 245 if (paralen > psiconv_unicode_strlen(paragraph->text)+1) {
220 res = -PSICONV_E_GENERATE; 246 res = -PSICONV_E_GENERATE;
221 goto ERROR5; 247 goto ERROR6;
222 } 248 }
223 thislen += strlen(paragraph->text)+1-paralen; 249 thislen += psiconv_unicode_strlen(paragraph->text)+1-paralen;
224 } 250 }
225 if ((res = psiconv_write_u32(buf_inlines,thislen))) 251 if ((res = psiconv_write_u32(config,buf_inlines,lev+1,thislen)))
226 goto ERROR5; 252 goto ERROR6;
227 if ((res = psiconv_write_character_layout_list(buf_inlines, 253 if ((res = psiconv_write_character_layout_list(config,buf_inlines,lev+1,
228 in_line->layout, 254 in_line->layout,
229 style->character))) 255 style->character)))
230 goto ERROR5; 256 goto ERROR6;
257 if (in_line->object) {
258 if ((res = psiconv_write_u32(config,buf_inlines,lev+1,PSICONV_ID_OBJECT)))
259 goto ERROR6;
260 obj_id = psiconv_buffer_unique_id();
261 if ((res = psiconv_buffer_add_reference(buf_inlines,obj_id)))
262 goto ERROR6;
263 if ((res = psiconv_buffer_add_target(buf_objects,obj_id)))
264 goto ERROR6;
265 if ((res = psiconv_write_embedded_object_section(config,buf_objects,lev+1,
266 in_line->object)))
267 goto ERROR6;
268 if ((res = psiconv_write_length(config,buf_inlines,lev+1,in_line->object_width)))
269 goto ERROR6;
270 if ((res = psiconv_write_length(config,buf_inlines,lev+1,in_line->object_height)))
271 goto ERROR6;
272 }
231 } 273 }
232 } else { 274 } else {
233 /* 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 */
234 para_type = 0; 276 para_type = 0;
235 /* Set para_charlayout to the correct character-level layout */ 277 /* Set para_charlayout to the correct character-level layout */
236 if (psiconv_list_length(paragraph->in_lines) == 0) 278 if (psiconv_list_length(paragraph->in_lines) == 0)
237 para_charlayout = paragraph->base_character; 279 para_charlayout = paragraph->base_character;
238 else { 280 else {
239 if (!(in_line = psiconv_list_get(paragraph->in_lines,0))) { 281 if (!(in_line = psiconv_list_get(paragraph->in_lines,0))) {
240 psiconv_warn(0,psiconv_buffer_length(buf), 282 psiconv_error(config,0,psiconv_buffer_length(buf),
241 "Massive memory corruption"); 283 "Massive memory corruption");
242 res = -PSICONV_E_OTHER; 284 res = -PSICONV_E_NOMEM;
243 goto ERROR5; 285 goto ERROR6;
244 } 286 }
245 para_charlayout = in_line->layout; 287 para_charlayout = in_line->layout;
246 } 288 }
247 for (j = 0; j < psiconv_list_length(paragraph_type_list); j++) { 289 for (j = 0; j < psiconv_list_length(paragraph_type_list); j++) {
248 if (!(paragraph_type = psiconv_list_get(paragraph_type_list,j))) { 290 if (!(paragraph_type = psiconv_list_get(paragraph_type_list,j))) {
249 psiconv_warn(0,psiconv_buffer_length(buf), 291 psiconv_error(config,0,psiconv_buffer_length(buf),
250 "Massive memory corruption"); 292 "Massive memory corruption");
251 res = -PSICONV_E_OTHER; 293 res = -PSICONV_E_NOMEM;
252 goto ERROR5; 294 goto ERROR6;
253 } 295 }
254 if ((paragraph->base_style == paragraph_type->style) && 296 if ((paragraph->base_style == paragraph_type->style) &&
255 !psiconv_compare_character_layout(para_charlayout, 297 !psiconv_compare_character_layout(para_charlayout,
256 paragraph_type->character) && 298 paragraph_type->character) &&
257 !psiconv_compare_paragraph_layout(paragraph->base_paragraph, 299 !psiconv_compare_paragraph_layout(paragraph->base_paragraph,
… …
267 new_type.paragraph = paragraph->base_paragraph; 309 new_type.paragraph = paragraph->base_paragraph;
268 new_type.character = para_charlayout; 310 new_type.character = para_charlayout;
269 new_type.style = paragraph->base_style; 311 new_type.style = paragraph->base_style;
270 paragraph_type = &new_type; 312 paragraph_type = &new_type;
271 if ((res = psiconv_list_add(paragraph_type_list,paragraph_type))) 313 if ((res = psiconv_list_add(paragraph_type_list,paragraph_type)))
272 goto ERROR5; 314 goto ERROR6;
273 if ((res = psiconv_write_u32(buf_types,paragraph_type->nr))) 315 if ((res = psiconv_write_u32(config,buf_types,lev+1,paragraph_type->nr)))
274 goto ERROR5; 316 goto ERROR6;
275 if (!(style = psiconv_get_style(styles,paragraph_type->style))) { 317 if (!(style = psiconv_get_style(styles,paragraph_type->style))) {
276 psiconv_warn(0,psiconv_buffer_length(buf),"Unknown style"); 318 psiconv_error(config,0,psiconv_buffer_length(buf),"Unknown style");
277 res = -PSICONV_E_GENERATE; 319 res = -PSICONV_E_GENERATE;
278 goto ERROR5; 320 goto ERROR6;
279 } 321 }
280 if ((res = psiconv_write_paragraph_layout_list(buf_types, 322 if ((res = psiconv_write_paragraph_layout_list(config,buf_types,lev+1,
281 paragraph_type->paragraph,style->paragraph))) 323 paragraph_type->paragraph,style->paragraph)))
282 goto ERROR5; 324 goto ERROR6;
283 if (with_styles) 325 if (with_styles)
284 if ((res = psiconv_write_u8(buf_types,paragraph_type->style))) 326 if ((res = psiconv_write_u8(config,buf_types,lev+1,paragraph_type->style)))
285 goto ERROR5; 327 goto ERROR6;
286 if ((res = psiconv_write_character_layout_list(buf_types, 328 if ((res = psiconv_write_character_layout_list(config,buf_types,lev+1,
287 paragraph_type->character,style->character))) 329 paragraph_type->character,style->character)))
288 goto ERROR5; 330 goto ERROR6;
289 } 331 }
290 if ((res = psiconv_write_u8(buf_elements,para_type))) 332 if ((res = psiconv_write_u8(config,buf_elements,lev+1,para_type)))
291 goto ERROR5; 333 goto ERROR6;
292 } 334 }
293 } 335 }
294 336
295 /* HACK: special case: no paragraphs at all. We need to improvize. */ 337 /* HACK: special case: no paragraphs at all. We need to improvize. */
296 if (!psiconv_list_length(value)) { 338 if (!psiconv_list_length(value)) {
297 if ((res = psiconv_write_u32(buf_types,1))) 339 if ((res = psiconv_write_u32(config,buf_types,lev+1,1)))
298 goto ERROR5; 340 goto ERROR6;
299 if ((res = psiconv_write_u32(buf_types,0))) 341 if ((res = psiconv_write_u32(config,buf_types,lev+1,0)))
300 goto ERROR5; 342 goto ERROR6;
301 if (with_styles) 343 if (with_styles)
302 if ((res = psiconv_write_u8(buf_types,0))) 344 if ((res = psiconv_write_u8(config,buf_types,lev+1,0)))
303 goto ERROR5; 345 goto ERROR6;
304 if ((res = psiconv_write_u32(buf_types,0))) 346 if ((res = psiconv_write_u32(config,buf_types,lev+1,0)))
305 goto ERROR5; 347 goto ERROR6;
306 348
307 if ((res = psiconv_write_u32(buf_elements,1))) 349 if ((res = psiconv_write_u32(config,buf_elements,lev+1,1)))
308 goto ERROR5; 350 goto ERROR6;
309 if ((res = psiconv_write_u8(buf_elements,1))) 351 if ((res = psiconv_write_u8(config,buf_elements,lev+1,1)))
310 goto ERROR5; 352 goto ERROR6;
311 pel_length = 1; 353 pel_length = 1;
312 ptl_length = 1; 354 ptl_length = 1;
313 } else { 355 } else {
314 pel_length = psiconv_list_length(value); 356 pel_length = psiconv_list_length(value);
315 ptl_length = psiconv_list_length(paragraph_type_list); 357 ptl_length = psiconv_list_length(paragraph_type_list);
316 } 358 }
317 359
318 /* Now append everything */ 360 /* Now append everything */
319 if ((res = psiconv_write_u16(buf,with_styles?0x0001:0x0000))) 361 if ((res = psiconv_write_u16(config,buf,lev+1,with_styles?0x0001:0x0000)))
320 goto ERROR5; 362 goto ERROR6;
321 if ((res = psiconv_write_u8(buf, ptl_length))) 363 if ((res = psiconv_write_u8(config,buf,lev+1, ptl_length)))
322 goto ERROR5; 364 goto ERROR6;
323 if ((res = psiconv_buffer_concat(buf,buf_types))) 365 if ((res = psiconv_buffer_concat(buf,buf_types)))
324 goto ERROR5; 366 goto ERROR6;
325 if ((res = psiconv_write_u32(buf,pel_length))) 367 if ((res = psiconv_write_u32(config,buf,lev+1,pel_length)))
326 goto ERROR5; 368 goto ERROR6;
327 if ((res = psiconv_buffer_concat(buf,buf_elements))) 369 if ((res = psiconv_buffer_concat(buf,buf_elements)))
328 goto ERROR5; 370 goto ERROR6;
329 if ((res = psiconv_write_u32(buf,nr_of_inlines))) 371 if ((res = psiconv_write_u32(config,buf,lev+1,nr_of_inlines)))
330 goto ERROR5; 372 goto ERROR6;
331 res = psiconv_buffer_concat(buf,buf_inlines); 373 if ((res = psiconv_buffer_concat(buf,buf_inlines)))
374 goto ERROR6;
375 if ((res = psiconv_buffer_concat(buf,buf_objects)))
376 goto ERROR6;
332 377
378ERROR6:
379 psiconv_buffer_free(buf_objects);
333ERROR5: 380ERROR5:
334 psiconv_buffer_free(buf_inlines); 381 psiconv_buffer_free(buf_inlines);
335ERROR4: 382ERROR4:
336 psiconv_buffer_free(buf_elements); 383 psiconv_buffer_free(buf_elements);
337ERROR3: 384ERROR3:
… …
340 psiconv_list_free(paragraph_type_list); 387 psiconv_list_free(paragraph_type_list);
341ERROR1: 388ERROR1:
342 return res; 389 return res;
343} 390}
344 391
345int psiconv_write_styled_layout_section(psiconv_buffer buf, 392int psiconv_write_styled_layout_section(const psiconv_config config,
393 psiconv_buffer buf,int lev,
346 psiconv_text_and_layout result, 394 psiconv_text_and_layout result,
347 psiconv_word_styles_section styles) 395 psiconv_word_styles_section styles)
348{ 396{
397 psiconv_progress(config,lev,0,"Writing styled layout section");
349 return psiconv_write_layout_section(buf,result,styles,1); 398 return psiconv_write_layout_section(config,buf,lev+1,result,styles,1);
350} 399}
351 400
352int psiconv_write_styleless_layout_section(psiconv_buffer buf, 401int psiconv_write_styleless_layout_section(const psiconv_config config,
402 psiconv_buffer buf,int lev,
353 const psiconv_text_and_layout value, 403 const psiconv_text_and_layout value,
354 const psiconv_character_layout base_char, 404 const psiconv_character_layout base_char,
355 const psiconv_paragraph_layout base_para) 405 const psiconv_paragraph_layout base_para)
356{ 406{
357 int res = 0; 407 int res = 0;
358 psiconv_word_styles_section styles_section; 408 psiconv_word_styles_section styles_section;
359 409
410 psiconv_progress(config,lev,0,"Writing styleless layout section");
360 if (!(styles_section = malloc(sizeof(*styles_section)))) 411 if (!(styles_section = malloc(sizeof(*styles_section))))
361 goto ERROR1; 412 goto ERROR1;
362 if (!(styles_section->normal = malloc(sizeof(*styles_section->normal)))) 413 if (!(styles_section->normal = malloc(sizeof(*styles_section->normal))))
363 goto ERROR2; 414 goto ERROR2;
364 if (!(styles_section->normal->character = 415 if (!(styles_section->normal->character =
… …
366 goto ERROR3; 417 goto ERROR3;
367 if (!(styles_section->normal->paragraph = 418 if (!(styles_section->normal->paragraph =
368 psiconv_clone_paragraph_layout(base_para))) 419 psiconv_clone_paragraph_layout(base_para)))
369 goto ERROR4; 420 goto ERROR4;
370 styles_section->normal->hotkey = 0; 421 styles_section->normal->hotkey = 0;
371 if (!(styles_section->normal->name = strdup(""))) 422 if ((res = psiconv_unicode_from_chars(config,"",
423 &styles_section->normal->name)))
372 goto ERROR5; 424 goto ERROR5;
373 if (!(styles_section->styles = psiconv_list_new(sizeof( 425 if (!(styles_section->styles = psiconv_list_new(sizeof(
374 struct psiconv_word_style_s)))) 426 struct psiconv_word_style_s))))
375 goto ERROR6; 427 goto ERROR6;
376 428
377 res = psiconv_write_layout_section(buf,value,styles_section,0); 429 res = psiconv_write_layout_section(config,buf,lev+1,value,styles_section,0);
378 psiconv_free_word_styles_section(styles_section); 430 psiconv_free_word_styles_section(styles_section);
379 return res; 431 return res;
380 432
381ERROR6: 433ERROR6:
382 free(styles_section->normal->name); 434 free(styles_section->normal->name);
… …
392 if (!res) 444 if (!res)
393 return -PSICONV_E_NOMEM; 445 return -PSICONV_E_NOMEM;
394 else 446 else
395 return res; 447 return res;
396} 448}
449
450
451int psiconv_write_embedded_object_section(const psiconv_config config,
452 psiconv_buffer buf,int lev,
453 const psiconv_embedded_object_section value)
454{
455 int res;
456 psiconv_u32 display_id,icon_id,table_id;
457 psiconv_buffer extra_buf;
458
459 psiconv_progress(config,lev,0,"Writing embedded object section");
460 if (!value) {
461 psiconv_error(config,0,psiconv_buffer_length(buf),"Null Object");
462 res = -PSICONV_E_GENERATE;
463 goto ERROR1;
464 }
465
466 if (!(extra_buf = psiconv_buffer_new())) {
467 res = -PSICONV_E_NOMEM;
468 goto ERROR1;
469 }
470
471 display_id = psiconv_buffer_unique_id();
472 icon_id = psiconv_buffer_unique_id();
473 table_id = psiconv_buffer_unique_id();
474 if ((res = psiconv_write_u8(config,buf,lev+1,0x06)))
475 goto ERROR2;
476 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_OBJECT_DISPLAY_SECTION)))
477 goto ERROR2;
478 if ((res = psiconv_buffer_add_reference(buf,display_id)))
479 goto ERROR2;
480 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_OBJECT_ICON_SECTION)))
481 goto ERROR2;
482 if ((res = psiconv_buffer_add_reference(buf,icon_id)))
483 goto ERROR2;
484 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_OBJECT_SECTION_TABLE_SECTION)))
485 goto ERROR2;
486 if ((res = psiconv_buffer_add_reference(buf,table_id)))
487 goto ERROR2;
488
489 if ((res = psiconv_buffer_add_target(buf,display_id)))
490 goto ERROR2;
491 if ((res = psiconv_write_object_display_section(config,buf,lev+1,value->display)))
492 goto ERROR2;
493 if ((res = psiconv_buffer_add_target(buf,icon_id)))
494 goto ERROR2;
495 if ((res = psiconv_write_object_icon_section(config,buf,lev+1,value->icon)))
496 goto ERROR2;
497 if ((res = psiconv_buffer_add_target(buf,table_id)))
498 goto ERROR2;
499 switch(value->object->type) {
500 case psiconv_word_file:
501 if ((res = psiconv_write_word_file(config,extra_buf,lev+1,
502 (psiconv_word_f) value->object->file)))
503 goto ERROR2;
504 break;
505 case psiconv_sketch_file:
506 if ((res = psiconv_write_sketch_file(config,extra_buf,lev+1,
507 (psiconv_sketch_f) value->object->file)))
508 goto ERROR2;
509 break;
510/*
511 case psiconv_sheet_file:
512 if ((res = psiconv_write_sheet_file(config,extra_buf,lev+1,
513 (psiconv_sheet_f) value->object->file)))
514 goto ERROR2;
515 break;
516*/
517 default:
518 psiconv_error(config,0,psiconv_buffer_length(buf),
519 "Unknown or unsupported object type");
520 res = -PSICONV_E_GENERATE;
521 goto ERROR2;
522 }
523
524 if ((res = psiconv_buffer_resolve(extra_buf)))
525 goto ERROR2;
526 if ((res = psiconv_buffer_concat(buf,extra_buf)))
527 goto ERROR2;
528
529 return 0;
530
531ERROR2:
532 psiconv_buffer_free(extra_buf);
533ERROR1:
534 return res;
535}
536
537
538int psiconv_write_object_display_section(const psiconv_config config,
539 psiconv_buffer buf,int lev,
540 const psiconv_object_display_section value)
541{
542 int res;
543
544 psiconv_progress(config,lev,0,"Writing object display section");
545
546 if (!value) {
547 psiconv_error(config,0,psiconv_buffer_length(buf),"Null Object Display Section");
548 res = -PSICONV_E_GENERATE;
549 goto ERROR1;
550 }
551
552 if ((res = psiconv_write_u8(config,buf,lev+1,value->show_icon?0x00:0x01)))
553 goto ERROR1;
554 if ((res = psiconv_write_length(config,buf,lev+1,value->width)))
555 goto ERROR1;
556 if ((res = psiconv_write_length(config,buf,lev+1,value->height)))
557 goto ERROR1;
558 if ((res = psiconv_write_u32(config,buf,lev+1,0x00000000)))
559 goto ERROR1;
560
561 return 0;
562
563ERROR1:
564 return res;
565}
566
567int psiconv_write_object_icon_section(const psiconv_config config,
568 psiconv_buffer buf,int lev,
569 const psiconv_object_icon_section value)
570{
571 int res;
572
573 psiconv_progress(config,lev,0,"Writing object icon section");
574
575 if (!value) {
576 psiconv_error(config,0,psiconv_buffer_length(buf),"Null Object Icon Section");
577 res = -PSICONV_E_GENERATE;
578 goto ERROR1;
579 }
580
581 if ((res = psiconv_write_string(config,buf,lev+1,value->icon_name)))
582 goto ERROR1;
583 if ((res = psiconv_write_length(config,buf,lev+1,value->icon_width)))
584 goto ERROR1;
585 if ((res = psiconv_write_length(config,buf,lev+1,value->icon_height)))
586 goto ERROR1;
587
588 return 0;
589
590ERROR1:
591 return res;
592}
Legend:
Removed from v.142  
changed lines
  Added in v.184
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26