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