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

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

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

Revision 71 Revision 182
… …
24#include <math.h> 24#include <math.h>
25 25
26#include "parse_routines.h" 26#include "parse_routines.h"
27#include "error.h" 27#include "error.h"
28 28
29int psiconv_parse_color(const psiconv_buffer buf, int lev, psiconv_u32 off, 29#ifdef DMALLOC
30#include <dmalloc.h>
31#endif
32
33
34int psiconv_parse_color(const psiconv_config config,
35 const psiconv_buffer buf, int lev, psiconv_u32 off,
30 int *length, psiconv_color *result) 36 int *length, psiconv_color *result)
31{ 37{
32 int res = 0; 38 int res = 0;
33 int len = 0; 39 int len = 0;
34 40
35 psiconv_progress(lev+1,off,"Going to parse color"); 41 psiconv_progress(config,lev+1,off,"Going to parse color");
36 if (!(*result = malloc(sizeof(**result)))) 42 if (!(*result = malloc(sizeof(**result))))
37 goto ERROR1; 43 goto ERROR1;
38 44
39 (*result)->red = psiconv_read_u8(buf,lev+2,off+len,&res); 45 (*result)->red = psiconv_read_u8(config,buf,lev+2,off+len,&res);
40 if (res) 46 if (res)
41 goto ERROR2; 47 goto ERROR2;
42 (*result)->green = psiconv_read_u8(buf,lev+2,off+len+1,&res); 48 (*result)->green = psiconv_read_u8(config,buf,lev+2,off+len+1,&res);
43 if (res) 49 if (res)
44 goto ERROR2; 50 goto ERROR2;
45 (*result)->blue = psiconv_read_u8(buf,lev+2,off+len+2,&res); 51 (*result)->blue = psiconv_read_u8(config,buf,lev+2,off+len+2,&res);
46 if (res) 52 if (res)
47 goto ERROR2; 53 goto ERROR2;
48 len += 3; 54 len += 3;
49 55
50 psiconv_debug(lev+2,off,"Color: red %02x, green %02x, blue %02x", 56 psiconv_debug(config,lev+2,off,"Color: red %02x, green %02x, blue %02x",
51 (*result)->red, (*result)->green, (*result)->blue); 57 (*result)->red, (*result)->green, (*result)->blue);
52 if (length) 58 if (length)
53 *length = len; 59 *length = len;
54 60
55 psiconv_progress(lev+1,off+len-1,"End of color (total length: %08x)",len); 61 psiconv_progress(config,lev+1,off+len-1,"End of color (total length: %08x)",len);
56 return 0; 62 return 0;
57 63
58ERROR2: 64ERROR2:
59 free(*result); 65 free(*result);
60ERROR1: 66ERROR1:
61 psiconv_warn(lev+1,off,"Reading of Color failed"); 67 psiconv_warn(config,lev+1,off,"Reading of Color failed");
62 if (length) 68 if (length)
63 *length = 0; 69 *length = 0;
64 if (res == 0) 70 if (res == 0)
65 return -PSICONV_E_NOMEM; 71 return -PSICONV_E_NOMEM;
66 else 72 else
67 return res; 73 return res;
68} 74}
69 75
70 76
71 77
72int psiconv_parse_font(const psiconv_buffer buf, int lev, psiconv_u32 off, 78int psiconv_parse_font(const psiconv_config config,
79 const psiconv_buffer buf, int lev, psiconv_u32 off,
73 int *length, psiconv_font *result) 80 int *length, psiconv_font *result)
74{ 81{
75 int res = 0; 82 int res = 0;
76 int strlength,i;
77 char *str_copy; 83 char *str_copy;
84 int len=0;
78 int len; 85 int leng;
79 86
80 psiconv_progress(lev+1,off,"Going to parse font"); 87 psiconv_progress(config,lev+1,off,"Going to parse font");
81 if (!(*result = malloc(sizeof(**result)))) 88 if (!(*result = malloc(sizeof(**result))))
82 goto ERROR1; 89 goto ERROR1;
83 90
84 strlength = psiconv_read_u8(buf,lev+2,off,&res); 91 (*result)->name = psiconv_read_short_string(config,buf,lev+2,off+len,
92 &leng,&res);
85 if (res) 93 if (res)
86 goto ERROR2;
87 if (!((*result)->name = malloc(strlength))) {
88 goto ERROR2;
89 }
90 for (i = 0; (i < strlength-1) && !res; i++)
91 (*result)->name[i] = psiconv_read_u8(buf,lev+2,off + 1 + i,&res);
92 if (res)
93 goto ERROR3; 94 goto ERROR2;
94 (*result)->name[strlength-1] = 0; 95 len += leng;
96
95 (*result)->screenfont = psiconv_read_u8(buf,lev+2,off + strlength,&res); 97 (*result)->screenfont = psiconv_read_u8(config,buf,lev+2,off+len,&res);
96 if (res) 98 if (res)
97 goto ERROR3; 99 goto ERROR3;
98 100
99 if (!(str_copy = psiconv_make_printable((*result)->name))) 101 if (!(str_copy = psiconv_make_printable((*result)->name)))
100 goto ERROR3; 102 goto ERROR3;
101 103
102 psiconv_debug(lev+2,off+1,"Found font `%s', displayed with screen font %02x", 104 psiconv_debug(config,lev+2,off+len,
105 "Found font `%s', displayed with screen font %02x",
103 str_copy,(*result)->screenfont); 106 str_copy,(*result)->screenfont);
104 free(str_copy); 107 free(str_copy);
105 len = strlength + 1; 108 len ++;
109
106 if (length) 110 if (length)
107 *length = len; 111 *length = len;
108 112
109 psiconv_progress(lev+1,off + len - 1,"End of font (total length: %08x)",len); 113 psiconv_progress(config,lev+1,off + len - 1,
114 "End of font (total length: %08x)",len);
110 return 0; 115 return 0;
111 116
112ERROR3: 117ERROR3:
113 free ((*result)->name); 118 free ((*result)->name);
114ERROR2: 119ERROR2:
115 free (*result); 120 free (*result);
116ERROR1: 121ERROR1:
117 psiconv_warn(lev+1,off,"Reading of Font failed"); 122 psiconv_warn(config,lev+1,off,"Reading of Font failed");
118 if (length) 123 if (length)
119 *length = 0; 124 *length = 0;
120 if (!res) 125 if (!res)
121 return -PSICONV_E_NOMEM; 126 return -PSICONV_E_NOMEM;
122 else 127 else
123 return res; 128 return res;
124} 129}
125 130
126int psiconv_parse_border(const psiconv_buffer buf,int lev,psiconv_u32 off, 131int psiconv_parse_border(const psiconv_config config,
132 const psiconv_buffer buf,int lev,psiconv_u32 off,
127 int *length, psiconv_border *result) 133 int *length, psiconv_border *result)
128{ 134{
129 int res = 0; 135 int res = 0;
130 int len = 0; 136 int len = 0;
131 psiconv_u32 temp; 137 psiconv_u32 temp;
132 int leng; 138 int leng;
133 139
134 psiconv_progress(lev+1,off,"Going to parse border data"); 140 psiconv_progress(config,lev+1,off,"Going to parse border data");
135 if (!(*result = malloc(sizeof(**result)))) { 141 if (!(*result = malloc(sizeof(**result)))) {
136 goto ERROR1; 142 goto ERROR1;
137 } 143 }
138 144
139 psiconv_progress(lev+2,off+len,"Going to read border kind"); 145 psiconv_progress(config,lev+2,off+len,"Going to read border kind");
140 temp = psiconv_read_u8(buf,lev+2,off+len,&res); 146 temp = psiconv_read_u8(config,buf,lev+2,off+len,&res);
141 if (res) 147 if (res)
142 goto ERROR2; 148 goto ERROR2;
143 if (temp == 0x00) 149 if (temp == 0x00)
144 (*result)->kind = psiconv_border_none; 150 (*result)->kind = psiconv_border_none;
145 else if (temp == 0x01) 151 else if (temp == 0x01)
… …
153 else if (temp == 0x05) 159 else if (temp == 0x05)
154 (*result)->kind = psiconv_border_dotdashed; 160 (*result)->kind = psiconv_border_dotdashed;
155 else if (temp == 0x06) 161 else if (temp == 0x06)
156 (*result)->kind = psiconv_border_dotdotdashed; 162 (*result)->kind = psiconv_border_dotdotdashed;
157 else { 163 else {
158 psiconv_warn(lev+2,off,"Unknown border kind (defaults to `none')"); 164 psiconv_warn(config,lev+2,off,"Unknown border kind (defaults to `none')");
159 (*result)->kind = psiconv_border_none; 165 (*result)->kind = psiconv_border_none;
160 } 166 }
161 psiconv_debug(lev+2,off+len,"Kind: %02x",temp); 167 psiconv_debug(config,lev+2,off+len,"Kind: %02x",temp);
162 len ++; 168 len ++;
163 169
164 psiconv_progress(lev+2,off+len,"Going to read border thickness"); 170 psiconv_progress(config,lev+2,off+len,"Going to read border thickness");
165 (*result)->thickness = psiconv_read_size(buf,lev+2,off+len,&leng,&res); 171 (*result)->thickness = psiconv_read_size(config,buf,lev+2,off+len,&leng,&res);
166 if (res) 172 if (res)
167 goto ERROR2; 173 goto ERROR2;
174#if 0
175 /* This seems no longer necessary to test? */
168 if (((*result)->kind != psiconv_border_solid) && 176 if (((*result)->kind != psiconv_border_solid) &&
169 ((*result)->kind != psiconv_border_double) && 177 ((*result)->kind != psiconv_border_double) &&
170 ((*result)->thickness != 0.0) && 178 ((*result)->thickness != 0.0) &&
171 (fabs((*result)->thickness - 1/20) >= 1/1000)) { 179 (fabs((*result)->thickness - 1/20) >= 1/1000)) {
172 psiconv_warn(lev+2,off, 180 psiconv_warn(config,lev+2,off,
173 "Border thickness specified for unlikely border type"); 181 "Border thickness specified for unlikely border type");
174 } 182 }
183#endif
175 psiconv_debug(lev+2,off+len,"Thickness: %f",(*result)->thickness); 184 psiconv_debug(config,lev+2,off+len,"Thickness: %f",(*result)->thickness);
176 len += leng; 185 len += leng;
177 186
178 psiconv_progress(lev+2,off+len,"Going to read the border color"); 187 psiconv_progress(config,lev+2,off+len,"Going to read the border color");
179 if ((psiconv_parse_color(buf,lev+2,off+len,&leng,&(*result)->color))) 188 if ((psiconv_parse_color(config,buf,lev+2,off+len,&leng,&(*result)->color)))
180 goto ERROR2; 189 goto ERROR2;
181 len += leng; 190 len += leng;
182 191
183 psiconv_progress(lev+2,off+len,"Going to read the final unknown byte " 192 psiconv_progress(config,lev+2,off+len,"Going to read the final unknown byte "
184 "(0x01 expected)"); 193 "(0x00 or 0x01 expected)");
185 temp = psiconv_read_u8(buf,lev+2,off + len,&res); 194 temp = psiconv_read_u8(config,buf,lev+2,off + len,&res);
186 if (res) 195 if (res)
187 goto ERROR3; 196 goto ERROR3;
188 if (temp != 0x01) { 197 if ((temp != 0x01) && (temp != 0x00)) {
189 psiconv_warn(lev+2,off,"Unknown last byte in border specification"); 198 psiconv_warn(config,lev+2,off,"Unknown last byte in border specification");
190 psiconv_debug(lev+2,off+len, "Last byte: read %02x, expected %02x", 199 psiconv_debug(config,lev+2,off+len, "Last byte: read %02x, expected %02x or %02x",
191 temp,0x01); 200 temp,0x00,0x01);
192 } 201 }
193 len ++; 202 len ++;
194 203
195 if (length) 204 if (length)
196 *length = len; 205 *length = len;
197 206
198 psiconv_progress(lev+1,off + len - 1, 207 psiconv_progress(config,lev+1,off + len - 1,
199 "End of border (total length: %08x)",len); 208 "End of border (total length: %08x)",len);
200 209
201 return 0; 210 return 0;
202 211
203ERROR3: 212ERROR3:
204 psiconv_free_color((*result)->color); 213 psiconv_free_color((*result)->color);
205ERROR2: 214ERROR2:
206 free (result); 215 free (result);
207ERROR1: 216ERROR1:
208 psiconv_warn(lev+1,off,"Reading of Border failed"); 217 psiconv_warn(config,lev+1,off,"Reading of Border failed");
209 if (length) 218 if (length)
210 *length = 0; 219 *length = 0;
211 if (!res) 220 if (!res)
212 return -PSICONV_E_NOMEM; 221 return -PSICONV_E_NOMEM;
213 else 222 else
214 return res; 223 return res;
215} 224}
216 225
217int psiconv_parse_bullet(const psiconv_buffer buf,int lev,psiconv_u32 off, 226int psiconv_parse_bullet(const psiconv_config config,
227 const psiconv_buffer buf,int lev,psiconv_u32 off,
218 int *length, psiconv_bullet *result) 228 int *length, psiconv_bullet *result)
219{ 229{
220 int res = 0; 230 int res = 0;
221 int len = 0; 231 int len = 0;
222 int leng; 232 int leng;
… …
224 234
225 if (!(*result = malloc(sizeof(**result)))) 235 if (!(*result = malloc(sizeof(**result))))
226 goto ERROR1; 236 goto ERROR1;
227 (*result)->on = psiconv_bool_true; 237 (*result)->on = psiconv_bool_true;
228 238
229 psiconv_progress(lev+1,off,"Going to parse bullet data"); 239 psiconv_progress(config,lev+1,off,"Going to parse bullet data");
230 psiconv_progress(lev+2,off+len,"Going to read bullet length"); 240 psiconv_progress(config,lev+2,off+len,"Going to read bullet length");
231 bullet_length = psiconv_read_u8(buf,lev+2,off+len,&res); 241 bullet_length = psiconv_read_u8(config,buf,lev+2,off+len,&res);
232 if (res) 242 if (res)
233 goto ERROR2; 243 goto ERROR2;
234 psiconv_debug(lev+2,off+len,"Length: %02x",bullet_length); 244 psiconv_debug(config,lev+2,off+len,"Length: %02x",bullet_length);
235 len ++; 245 len ++;
236 246
237 psiconv_progress(lev+2,off+len,"Going to read bullet font size"); 247 psiconv_progress(config,lev+2,off+len,"Going to read bullet font size");
238 (*result)->font_size = psiconv_read_size(buf,lev+2,off+len, &leng,&res); 248 (*result)->font_size = psiconv_read_size(config,buf,lev+2,off+len, &leng,&res);
239 if (res) 249 if (res)
240 goto ERROR2; 250 goto ERROR2;
241 len +=leng; 251 len +=leng;
242 252
243 psiconv_progress(lev+2,off+len,"Going to read bullet character"); 253 psiconv_progress(config,lev+2,off+len,"Going to read bullet character");
244 (*result)->character = psiconv_read_u8(buf,lev+2,off+len,&res); 254 (*result)->character = psiconv_read_u8(config,buf,lev+2,off+len,&res);
245 if (res) 255 if (res)
246 goto ERROR2; 256 goto ERROR2;
247 psiconv_debug(lev+2,off+len,"Character: %02x",(*result)->character); 257 psiconv_debug(config,lev+2,off+len,"Character: %02x",(*result)->character);
248 len ++; 258 len ++;
249 259
250 psiconv_progress(lev+2,off+len,"Going to read indent on/off"); 260 psiconv_progress(config,lev+2,off+len,"Going to read indent on/off");
251 if ((res = psiconv_parse_bool(buf,lev+2,off+len,&leng,&(*result)->indent))) 261 if ((res = psiconv_parse_bool(config,buf,lev+2,off+len,&leng,&(*result)->indent)))
252 goto ERROR2; 262 goto ERROR2;
253 psiconv_debug(lev+2,off+len,"Indent on: %02x",(*result)->indent); 263 psiconv_debug(config,lev+2,off+len,"Indent on: %02x",(*result)->indent);
254 len += leng; 264 len += leng;
255 265
256 psiconv_progress(lev+2,off+len,"Going to read bullet color"); 266 psiconv_progress(config,lev+2,off+len,"Going to read bullet color");
257 if ((res = psiconv_parse_color(buf,lev+2,off+len,&leng,&(*result)->color))) 267 if ((res = psiconv_parse_color(config,buf,lev+2,off+len,&leng,&(*result)->color)))
258 goto ERROR2; 268 goto ERROR2;
259 len += leng; 269 len += leng;
260 270
261 psiconv_progress(lev+2,off+len,"Going to read bullet font"); 271 psiconv_progress(config,lev+2,off+len,"Going to read bullet font");
262 if ((res = psiconv_parse_font(buf,lev+2,off+len,&leng,&(*result)->font))) 272 if ((res = psiconv_parse_font(config,buf,lev+2,off+len,&leng,&(*result)->font)))
263 goto ERROR3; 273 goto ERROR3;
264 len += leng; 274 len += leng;
265 275
266 if (len != bullet_length + 1) { 276 if (len != bullet_length + 1) {
267 psiconv_warn(lev+2,off,"Bullet data structure length mismatch"); 277 psiconv_warn(config,lev+2,off,"Bullet data structure length mismatch");
268 psiconv_debug(lev+2,off,"Length: specified %02x, found %02x", 278 psiconv_debug(config,lev+2,off,"Length: specified %02x, found %02x",
269 bullet_length,len-1); 279 bullet_length,len-1);
270 } 280 }
271 281
272 psiconv_progress(lev+1,off + len - 1, 282 psiconv_progress(config,lev+1,off + len - 1,
273 "End of bullet data (total length: %08x)",len); 283 "End of bullet data (total length: %08x)",len);
274 284
275 if (length) 285 if (length)
276 *length = len; 286 *length = len;
277 return 0; 287 return 0;
… …
279ERROR3: 289ERROR3:
280 psiconv_free_color((*result)->color); 290 psiconv_free_color((*result)->color);
281ERROR2: 291ERROR2:
282 free (result); 292 free (result);
283ERROR1: 293ERROR1:
284 psiconv_warn(lev+1,off,"Reading of Bullet failed"); 294 psiconv_warn(config,lev+1,off,"Reading of Bullet failed");
285 if (length) 295 if (length)
286 *length = 0; 296 *length = 0;
287 if (!res) 297 if (!res)
288 return -PSICONV_E_NOMEM; 298 return -PSICONV_E_NOMEM;
289 else 299 else
290 return res; 300 return res;
291} 301}
292 302
293int psiconv_parse_tab(const psiconv_buffer buf, int lev, psiconv_u32 off, 303int psiconv_parse_tab(const psiconv_config config,
304 const psiconv_buffer buf, int lev, psiconv_u32 off,
294 int *length, psiconv_tab *result) 305 int *length, psiconv_tab *result)
295{ 306{
296 int res = 0; 307 int res = 0;
297 int len = 0; 308 int len = 0;
298 int leng; 309 int leng;
299 psiconv_u8 temp; 310 psiconv_u8 temp;
300 311
301 psiconv_progress(lev+1,off,"Going to parse tab"); 312 psiconv_progress(config,lev+1,off,"Going to parse tab");
302 if (!(*result = malloc(sizeof(**result)))) 313 if (!(*result = malloc(sizeof(**result))))
303 goto ERROR1; 314 goto ERROR1;
304 315
305 psiconv_progress(lev+2,off,"Going to read tab location"); 316 psiconv_progress(config,lev+2,off,"Going to read tab location");
306 (*result)->location = psiconv_read_length(buf,lev+2,off+len,&leng,&res); 317 (*result)->location = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
307 if (res) 318 if (res)
308 goto ERROR2; 319 goto ERROR2;
309 len += leng; 320 len += leng;
310 321
311 psiconv_progress(lev+2,off+len,"Going to read the tab kind"); 322 psiconv_progress(config,lev+2,off+len,"Going to read the tab kind");
312 temp = psiconv_read_u8(buf,lev+2,off+len,&res); 323 temp = psiconv_read_u8(config,buf,lev+2,off+len,&res);
313 if (res) 324 if (res)
314 goto ERROR2; 325 goto ERROR2;
315 if (temp == 1) 326 if (temp == 1)
316 (*result)->kind = psiconv_tab_left; 327 (*result)->kind = psiconv_tab_left;
317 else if (temp == 2) 328 else if (temp == 2)
318 (*result)->kind = psiconv_tab_centre; 329 (*result)->kind = psiconv_tab_centre;
319 else if (temp == 3) 330 else if (temp == 3)
320 (*result)->kind = psiconv_tab_right; 331 (*result)->kind = psiconv_tab_right;
321 else { 332 else {
322 psiconv_warn(lev+2,off+len,"Unknown tab kind argument"); 333 psiconv_warn(config,lev+2,off+len,"Unknown tab kind argument");
323 psiconv_debug(lev+2,off+len,"Kind found: %02x (defaulted to left tab)", 334 psiconv_debug(config,lev+2,off+len,"Kind found: %02x (defaulted to left tab)",
324 temp); 335 temp);
325 (*result)->kind = psiconv_tab_left; 336 (*result)->kind = psiconv_tab_left;
326 } 337 }
327 psiconv_debug(lev+2,off+len,"Kind: %02x",temp); 338 psiconv_debug(config,lev+2,off+len,"Kind: %02x",temp);
328 len ++; 339 len ++;
329 340
330 if (length) 341 if (length)
331 *length = len; 342 *length = len;
332 343
333 psiconv_progress(lev+1,off+len-1,"End of tab (total length: %08x)",len); 344 psiconv_progress(config,lev+1,off+len-1,"End of tab (total length: %08x)",len);
334 return 0; 345 return 0;
335 346
336ERROR2: 347ERROR2:
337 free (result); 348 free (result);
338ERROR1: 349ERROR1:
339 psiconv_warn(lev+1,off,"Reading of Tab failed"); 350 psiconv_warn(config,lev+1,off,"Reading of Tab failed");
340 if (length) 351 if (length)
341 *length = 0; 352 *length = 0;
342 if (!res) 353 if (!res)
343 return -PSICONV_E_NOMEM; 354 return -PSICONV_E_NOMEM;
344 else 355 else
345 return res; 356 return res;
346} 357}
347 358
348int psiconv_parse_paragraph_layout_list(const psiconv_buffer buf, int lev, 359int psiconv_parse_paragraph_layout_list(const psiconv_config config,
360 const psiconv_buffer buf, int lev,
349 psiconv_u32 off, int *length, 361 psiconv_u32 off, int *length,
350 psiconv_paragraph_layout result) 362 psiconv_paragraph_layout result)
351{ 363{
352 int res=0; 364 int res=0;
353 int len=0; 365 int len=0;
… …
357 psiconv_tab temp_tab; 369 psiconv_tab temp_tab;
358 psiconv_color temp_color; 370 psiconv_color temp_color;
359 psiconv_border temp_border; 371 psiconv_border temp_border;
360 psiconv_bullet temp_bullet; 372 psiconv_bullet temp_bullet;
361 373
362 psiconv_progress(lev+1,off,"Going to read paragraph layout list"); 374 psiconv_progress(config,lev+1,off,"Going to read paragraph layout list");
363 375
364 psiconv_progress(lev+2,off,"Going to read the list length"); 376 psiconv_progress(config,lev+2,off,"Going to read the list length");
365 list_length = psiconv_read_u32(buf,lev+2,off + len,&res); 377 list_length = psiconv_read_u32(config,buf,lev+2,off + len,&res);
366 if (res) 378 if (res)
367 goto ERROR1; 379 goto ERROR1;
368 psiconv_debug(lev+2,off,"Length in bytes: %08x",list_length); 380 psiconv_debug(config,lev+2,off,"Length in bytes: %08x",list_length);
369 len += 4; 381 len += 4;
370 382
371 nr = 0; 383 nr = 0;
372 while(len - 4 < list_length) { 384 while(len - 4 < list_length) {
373 psiconv_progress(lev+2,off+len,"Going to read element %d",nr); 385 psiconv_progress(config,lev+2,off+len,"Going to read element %d",nr);
374 psiconv_progress(lev+3,off+len,"Going to read the element id"); 386 psiconv_progress(config,lev+3,off+len,"Going to read the element id");
375 id = psiconv_read_u8(buf,lev+2,off+len,&res); 387 id = psiconv_read_u8(config,buf,lev+2,off+len,&res);
376 if (res) 388 if (res)
377 goto ERROR1; 389 goto ERROR1;
378 psiconv_debug(lev+3,off+len,"Id: %02x",id); 390 psiconv_debug(config,lev+3,off+len,"Id: %02x",id);
379 len ++; 391 len ++;
380 switch(id) { 392 switch(id) {
381 case 0x01: 393 case 0x01:
382 psiconv_progress(lev+3,off+len,"Going to read background color"); 394 psiconv_progress(config,lev+3,off+len,"Going to read background color");
383 if ((res = psiconv_parse_color(buf,lev+3,off+len,&leng,&temp_color))) 395 if ((res = psiconv_parse_color(config,buf,lev+3,off+len,&leng,&temp_color)))
384 goto ERROR1; 396 goto ERROR1;
385 psiconv_free_color(result->back_color); 397 psiconv_free_color(result->back_color);
386 result->back_color = temp_color; 398 result->back_color = temp_color;
387 len += leng; 399 len += leng;
388 break; 400 break;
389 case 0x02: 401 case 0x02:
390 psiconv_progress(lev+3,off+len ,"Going to read indent left"); 402 psiconv_progress(config,lev+3,off+len ,"Going to read indent left");
391 result->indent_left = psiconv_read_length(buf,lev+3,off+len,&leng,&res); 403 result->indent_left = psiconv_read_length(config,buf,lev+3,off+len,&leng,&res);
392 if (res) 404 if (res)
393 goto ERROR1; 405 goto ERROR1;
394 len += leng; 406 len += leng;
395 break; 407 break;
396 case 0x03: 408 case 0x03:
397 psiconv_progress(lev+3,off+len,"Going to read indent right"); 409 psiconv_progress(config,lev+3,off+len,"Going to read indent right");
398 result->indent_right = psiconv_read_length(buf,lev+2,off+len,&leng, 410 result->indent_right = psiconv_read_length(config,buf,lev+2,off+len,&leng,
399 &res); 411 &res);
400 if (res) 412 if (res)
401 goto ERROR1; 413 goto ERROR1;
402 len += leng; 414 len += leng;
403 break; 415 break;
404 case 0x04: 416 case 0x04:
405 psiconv_progress(lev+3,off+len,"Going to read indent left first line"); 417 psiconv_progress(config,lev+3,off+len,"Going to read indent left first line");
406 result->indent_first = psiconv_read_length(buf,lev+2,off+len, &leng, 418 result->indent_first = psiconv_read_length(config,buf,lev+2,off+len, &leng,
407 &res); 419 &res);
408 if (res) 420 if (res)
409 goto ERROR1; 421 goto ERROR1;
410 len += leng; 422 len += leng;
411 break; 423 break;
412 case 0x05: 424 case 0x05:
413 psiconv_progress(lev+3,off+len,"Going to read horizontal justify"); 425 psiconv_progress(config,lev+3,off+len,"Going to read horizontal justify");
414 temp = psiconv_read_u8(buf,lev+3,off+len,&res); 426 temp = psiconv_read_u8(config,buf,lev+3,off+len,&res);
415 if (res) 427 if (res)
416 goto ERROR1; 428 goto ERROR1;
417 if (temp == 0x00) 429 if (temp == 0x00)
418 result->justify_hor = psiconv_justify_left; 430 result->justify_hor = psiconv_justify_left;
419 else if (temp == 0x01) 431 else if (temp == 0x01)
… …
421 else if (temp == 0x02) 433 else if (temp == 0x02)
422 result->justify_hor = psiconv_justify_right; 434 result->justify_hor = psiconv_justify_right;
423 else if (temp == 0x03) 435 else if (temp == 0x03)
424 result->justify_hor = psiconv_justify_full; 436 result->justify_hor = psiconv_justify_full;
425 else { 437 else {
426 psiconv_warn(lev+3,off+len, "Unknown horizontal justify argument " 438 psiconv_warn(config,lev+3,off+len, "Unknown horizontal justify argument "
427 "in paragraph layout codes list"); 439 "in paragraph layout codes list");
428 result->justify_hor = psiconv_justify_left; 440 result->justify_hor = psiconv_justify_left;
429 } 441 }
430 psiconv_debug(lev+3,off+len,"Justify: %02x",temp); 442 psiconv_debug(config,lev+3,off+len,"Justify: %02x",temp);
431 len ++; 443 len ++;
432 break; 444 break;
433 case 0x06: 445 case 0x06:
434 psiconv_progress(lev+3,off+len,"Going to read vertical justify"); 446 psiconv_progress(config,lev+3,off+len,"Going to read vertical justify");
435 temp = psiconv_read_u8(buf,lev+3,off+len,&res); 447 temp = psiconv_read_u8(config,buf,lev+3,off+len,&res);
436 if (res) 448 if (res)
437 goto ERROR1; 449 goto ERROR1;
438 if (temp == 0x00) 450 if (temp == 0x00)
439 result->justify_ver = psiconv_justify_top; 451 result->justify_ver = psiconv_justify_top;
440 else if (temp == 0x01) 452 else if (temp == 0x01)
441 result->justify_ver = psiconv_justify_middle; 453 result->justify_ver = psiconv_justify_middle;
442 else if (temp == 0x02) 454 else if (temp == 0x02)
443 result->justify_ver = psiconv_justify_bottom; 455 result->justify_ver = psiconv_justify_bottom;
444 else { 456 else {
445 psiconv_warn(lev+3,off+len, "Unknown vertical justify argument " 457 psiconv_warn(config,lev+3,off+len, "Unknown vertical justify argument "
446 "in paragraph layout codes list"); 458 "in paragraph layout codes list");
447 result->justify_ver = psiconv_justify_bottom; 459 result->justify_ver = psiconv_justify_bottom;
448 } 460 }
449 psiconv_debug(lev+3,off+len,"Justify: %02x",temp); 461 psiconv_debug(config,lev+3,off+len,"Justify: %02x",temp);
450 len ++; 462 len ++;
463 break;
451 case 0x07: 464 case 0x07:
452 psiconv_progress(lev+3,off+len,"Going to read linespacing distance"); 465 psiconv_progress(config,lev+3,off+len,"Going to read linespacing distance");
453 result->linespacing = psiconv_read_size(buf,lev+3,off+len,&leng,&res); 466 result->linespacing = psiconv_read_size(config,buf,lev+3,off+len,&leng,&res);
454 if (res) 467 if (res)
455 goto ERROR1; 468 goto ERROR1;
456 len += leng; 469 len += leng;
457 break; 470 break;
458 case 0x08: 471 case 0x08:
459 psiconv_progress(lev+3,off+len,"Going to read linespacing exact"); 472 psiconv_progress(config,lev+3,off+len,"Going to read linespacing exact");
460 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, 473 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
461 &result->linespacing_exact))) 474 &result->linespacing_exact)))
462 goto ERROR1; 475 goto ERROR1;
463 len += leng; 476 len += leng;
464 break; 477 break;
465 case 0x09: 478 case 0x09:
466 psiconv_progress(lev+3,off+len,"Going to read top space"); 479 psiconv_progress(config,lev+3,off+len,"Going to read top space");
467 result->space_above = psiconv_read_size(buf,lev+3,off+len,&leng,&res); 480 result->space_above = psiconv_read_size(config,buf,lev+3,off+len,&leng,&res);
468 if (res) 481 if (res)
469 goto ERROR1; 482 goto ERROR1;
470 len += leng; 483 len += leng;
471 break; 484 break;
472 case 0x0a: 485 case 0x0a:
473 psiconv_progress(lev+3,off+len,"Going to read bottom space"); 486 psiconv_progress(config,lev+3,off+len,"Going to read bottom space");
474 result->space_below = psiconv_read_size(buf,lev+3,off+len,&leng,&res); 487 result->space_below = psiconv_read_size(config,buf,lev+3,off+len,&leng,&res);
475 if (res) 488 if (res)
476 goto ERROR1; 489 goto ERROR1;
477 len += leng; 490 len += leng;
478 break; 491 break;
479 case 0x0b: 492 case 0x0b:
480 psiconv_progress(lev+3,off+len,"Going to read on one page"); 493 psiconv_progress(config,lev+3,off+len,"Going to read on one page");
481 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, 494 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
482 &result->keep_together))) 495 &result->keep_together)))
483 goto ERROR1; 496 goto ERROR1;
484 len += leng; 497 len += leng;
485 break; 498 break;
486 case 0x0c: 499 case 0x0c:
487 psiconv_progress(lev+3,off+len,"Going to read together with"); 500 psiconv_progress(config,lev+3,off+len,"Going to read together with");
488 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, 501 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
489 &result->keep_with_next))) 502 &result->keep_with_next)))
490 goto ERROR1; 503 goto ERROR1;
491 len += leng; 504 len += leng;
492 break; 505 break;
493 case 0x0d: 506 case 0x0d:
494 psiconv_progress(lev+3,off+len,"Going to read on next page"); 507 psiconv_progress(config,lev+3,off+len,"Going to read on next page");
495 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, 508 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
496 &result->on_next_page))) 509 &result->on_next_page)))
497 goto ERROR1; 510 goto ERROR1;
498 len += leng; 511 len += leng;
499 break; 512 break;
500 case 0x0e: 513 case 0x0e:
501 psiconv_progress(lev+3,off+len,"Going to read no widow protection"); 514 psiconv_progress(config,lev+3,off+len,"Going to read no widow protection");
502 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, 515 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
503 &result->no_widow_protection))) 516 &result->no_widow_protection)))
504 goto ERROR1; 517 goto ERROR1;
505 len += leng; 518 len += leng;
506 break; 519 break;
520 case 0x0f:
521 psiconv_progress(config,lev+3,off+len,"Going to read wrap to fit cell limits");
522 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
523 &result->wrap_to_fit_cell)))
524 goto ERROR1;
525 len += leng;
526 break;
507 case 0x10: 527 case 0x10:
508 psiconv_progress(lev+3,off+len,"Going to read border distance to text"); 528 psiconv_progress(config,lev+3,off+len,"Going to read border distance to text");
509 result->border_distance = psiconv_read_length(buf,lev+3, 529 result->border_distance = psiconv_read_length(config,buf,lev+3,
510 off+len,&leng,&res); 530 off+len,&leng,&res);
511 if (res) 531 if (res)
512 goto ERROR1; 532 goto ERROR1;
513 len += leng; 533 len += leng;
514 break; 534 break;
515 case 0x11: 535 case 0x11:
516 psiconv_progress(lev+3,off+len,"Going to read top border"); 536 psiconv_progress(config,lev+3,off+len,"Going to read top border");
517 if ((res = psiconv_parse_border(buf,lev+3,off+len,&leng,&temp_border))) 537 if ((res = psiconv_parse_border(config,buf,lev+3,off+len,&leng,&temp_border)))
518 goto ERROR1; 538 goto ERROR1;
519 psiconv_free_border(result->top_border); 539 psiconv_free_border(result->top_border);
520 result->top_border = temp_border; 540 result->top_border = temp_border;
521 len += leng; 541 len += leng;
522 break; 542 break;
523 case 0x12: 543 case 0x12:
524 psiconv_progress(lev+3,off+len,"Going to read bottom border"); 544 psiconv_progress(config,lev+3,off+len,"Going to read bottom border");
525 if ((res = psiconv_parse_border(buf,lev+3,off+len,&leng,&temp_border))) 545 if ((res = psiconv_parse_border(config,buf,lev+3,off+len,&leng,&temp_border)))
526 goto ERROR1; 546 goto ERROR1;
527 psiconv_free_border(result->bottom_border); 547 psiconv_free_border(result->bottom_border);
528 result->bottom_border = temp_border; 548 result->bottom_border = temp_border;
529 len += leng; 549 len += leng;
530 break; 550 break;
531 case 0x13: 551 case 0x13:
532 psiconv_progress(lev+3,off+len,"Going to read left border"); 552 psiconv_progress(config,lev+3,off+len,"Going to read left border");
533 if ((res = psiconv_parse_border(buf,lev+3,off+len,&leng,&temp_border))) 553 if ((res = psiconv_parse_border(config,buf,lev+3,off+len,&leng,&temp_border)))
534 goto ERROR1; 554 goto ERROR1;
535 psiconv_free_border(result->left_border); 555 psiconv_free_border(result->left_border);
536 result->left_border = temp_border; 556 result->left_border = temp_border;
537 len += leng; 557 len += leng;
538 break; 558 break;
539 case 0x14: 559 case 0x14:
540 psiconv_progress(lev+3,off+len,"Going to read right border"); 560 psiconv_progress(config,lev+3,off+len,"Going to read right border");
541 if ((res = psiconv_parse_border(buf,lev+3,off+len,&leng,&temp_border))) 561 if ((res = psiconv_parse_border(config,buf,lev+3,off+len,&leng,&temp_border)))
542 goto ERROR1; 562 goto ERROR1;
543 psiconv_free_border(result->right_border); 563 psiconv_free_border(result->right_border);
544 result->right_border = temp_border; 564 result->right_border = temp_border;
545 len += leng; 565 len += leng;
546 break; 566 break;
547 case 0x15: 567 case 0x15:
548 psiconv_progress(lev+3,off+len,"Going to read bullet"); 568 psiconv_progress(config,lev+3,off+len,"Going to read bullet");
549 if ((res = psiconv_parse_bullet(buf,lev+3,off+len,&leng,&temp_bullet))) 569 if ((res = psiconv_parse_bullet(config,buf,lev+3,off+len,&leng,&temp_bullet)))
550 goto ERROR1; 570 goto ERROR1;
551 psiconv_free_bullet(result->bullet); 571 psiconv_free_bullet(result->bullet);
552 result->bullet = temp_bullet; 572 result->bullet = temp_bullet;
553 len += leng; 573 len += leng;
554 break; 574 break;
555 case 0x16: 575 case 0x16:
556 psiconv_progress(lev+3,off+len,"Going to read standard tabs"); 576 psiconv_progress(config,lev+3,off+len,"Going to read standard tabs");
557 result->tabs->normal = psiconv_read_length(buf,lev+3,off+len,&leng, 577 result->tabs->normal = psiconv_read_length(config,buf,lev+3,off+len,&leng,
558 &res); 578 &res);
559 if (res) 579 if (res)
560 goto ERROR1; 580 goto ERROR1;
561 len += leng; 581 len += leng;
562 break; 582 break;
563 case 0x17: 583 case 0x17:
564 psiconv_progress(lev+3,off+len,"Going to read extra tab"); 584 psiconv_progress(config,lev+3,off+len,"Going to read extra tab");
565 if ((res = psiconv_parse_tab(buf,lev+3,off+len,&leng,&temp_tab))) 585 if ((res = psiconv_parse_tab(config,buf,lev+3,off+len,&leng,&temp_tab)))
566 goto ERROR1; 586 goto ERROR1;
567 if ((res = psiconv_list_add(result->tabs->extras,temp_tab))) { 587 if ((res = psiconv_list_add(result->tabs->extras,temp_tab))) {
568 psiconv_free_tab(temp_tab); 588 psiconv_free_tab(temp_tab);
569 goto ERROR1; 589 goto ERROR1;
570 } 590 }
591 psiconv_free_tab(temp_tab);
571 len += leng; 592 len += leng;
572 break; 593 break;
573 default: 594 default:
574 psiconv_warn(lev+3,off+len, 595 psiconv_warn(config,lev+3,off+len,
575 "Unknown code in paragraph layout codes list"); 596 "Unknown code in paragraph layout codes list");
576 psiconv_debug(lev+3,off+len,"Code: %02x",id); 597 psiconv_debug(config,lev+3,off+len,"Code: %02x",id);
577 len ++; 598 len ++;
578 break; 599 break;
579 } 600 }
580 nr ++; 601 nr ++;
581 } 602 }
582 603
583 if (len - 4 != list_length) { 604 if (len - 4 != list_length) {
584 psiconv_warn(lev+2,off+len, 605 psiconv_warn(config,lev+2,off+len,
585 "Read past end of paragraph layout codes list. I probably lost track" 606 "Read past end of paragraph layout codes list. I probably lost track"
586 "somewhere!"); 607 "somewhere!");
587 psiconv_debug(lev+2,off+len,"Read %d characters instead of %d", 608 psiconv_debug(config,lev+2,off+len,"Read %d characters instead of %d",
588 len-4,list_length); 609 len-4,list_length);
589 res = PSICONV_E_PARSE; 610 res = PSICONV_E_PARSE;
590 goto ERROR1; 611 goto ERROR1;
591 } 612 }
592 613
593 len = list_length + 4; 614 len = list_length + 4;
594 615
595 psiconv_progress(lev+1,off+len, 616 psiconv_progress(config,lev+1,off+len,
596 "End of paragraph layout list (total length: %08x)",len); 617 "End of paragraph layout list (total length: %08x)",len);
597 618
598 if (length) 619 if (length)
599 *length = len; 620 *length = len;
600 return 0; 621 return 0;
601 622
602ERROR1: 623ERROR1:
603 psiconv_warn(lev+1,off,"Reading of paragraph_layout_list failed"); 624 psiconv_warn(config,lev+1,off,"Reading of paragraph_layout_list failed");
604 if (length) 625 if (length)
605 *length = 0; 626 *length = 0;
606 if (!res) 627 if (!res)
607 return -PSICONV_E_NOMEM; 628 return -PSICONV_E_NOMEM;
608 else 629 else
609 return res; 630 return res;
610} 631}
611 632
612int psiconv_parse_character_layout_list(const psiconv_buffer buf, int lev, 633int psiconv_parse_character_layout_list(const psiconv_config config,
634 const psiconv_buffer buf, int lev,
613 psiconv_u32 off, int *length, 635 psiconv_u32 off, int *length,
614 psiconv_character_layout result) 636 psiconv_character_layout result)
615{ 637{
616 int res=0; 638 int res=0;
617 int len=0; 639 int len=0;
… …
619 psiconv_u8 id; 641 psiconv_u8 id;
620 psiconv_u32 temp; 642 psiconv_u32 temp;
621 psiconv_color temp_color; 643 psiconv_color temp_color;
622 psiconv_font temp_font; 644 psiconv_font temp_font;
623 645
624 psiconv_progress(lev+1,off,"Going to read character layout codes"); 646 psiconv_progress(config,lev+1,off,"Going to read character layout codes");
625 647
626 psiconv_progress(lev+2,off,"Going to read the list length"); 648 psiconv_progress(config,lev+2,off,"Going to read the list length");
627 list_length = psiconv_read_u32(buf,lev+2,off + len,&res); 649 list_length = psiconv_read_u32(config,buf,lev+2,off + len,&res);
628 if (res) 650 if (res)
629 goto ERROR1; 651 goto ERROR1;
630 psiconv_debug(lev+2,off,"Length in bytes: %08x",list_length); 652 psiconv_debug(config,lev+2,off,"Length in bytes: %08x",list_length);
631 len += 4; 653 len += 4;
632 654
633 nr = 0; 655 nr = 0;
634 while(len-4 < list_length) { 656 while(len-4 < list_length) {
635 psiconv_progress(lev+2,off+len,"Going to read element %d",nr); 657 psiconv_progress(config,lev+2,off+len,"Going to read element %d",nr);
636 psiconv_progress(lev+3,off+len,"Going to read the element id"); 658 psiconv_progress(config,lev+3,off+len,"Going to read the element id");
637 id = psiconv_read_u8(buf,lev+2,off+len,&res); 659 id = psiconv_read_u8(config,buf,lev+2,off+len,&res);
638 if (res) 660 if (res)
639 goto ERROR1; 661 goto ERROR1;
640 psiconv_debug(lev+3,off+len,"Id: %02x",id); 662 psiconv_debug(config,lev+3,off+len,"Id: %02x",id);
641 len ++; 663 len ++;
642 switch(id) { 664 switch(id) {
665 case 0x18:
666 psiconv_progress(config,lev+3,off+len,"Going to skip an unknown setting");
667 len ++;
668 break;
643 case 0x19: 669 case 0x19:
644 psiconv_progress(lev+3,off+len,"Going to read text color"); 670 psiconv_progress(config,lev+3,off+len,"Going to read text color");
645 if ((res = psiconv_parse_color(buf,lev+3,off+len, &leng,&temp_color))) 671 if ((res = psiconv_parse_color(config,buf,lev+3,off+len, &leng,&temp_color)))
646 goto ERROR1; 672 goto ERROR1;
647 psiconv_free_color(result->color); 673 psiconv_free_color(result->color);
648 result->color = temp_color; 674 result->color = temp_color;
649 len += leng; 675 len += leng;
650 break; 676 break;
651 case 0x1a: 677 case 0x1a:
652 psiconv_progress(lev+3,off+len,"Going to read background color (?)"); 678 psiconv_progress(config,lev+3,off+len,"Going to read background color (?)");
653 if ((res = psiconv_parse_color(buf,lev+2,off+len, &leng,&temp_color))) 679 if ((res = psiconv_parse_color(config,buf,lev+2,off+len, &leng,&temp_color)))
654 goto ERROR1; 680 goto ERROR1;
655 psiconv_free_color(result->back_color); 681 psiconv_free_color(result->back_color);
656 result->back_color = temp_color; 682 result->back_color = temp_color;
657 len += leng; 683 len += leng;
658 break; 684 break;
685 case 0x1b:
686 psiconv_progress(config,lev+3,off+len,"Going to skip an unknown setting");
687 len ++;
688 break;
659 case 0x1c: 689 case 0x1c:
660 psiconv_progress(lev+3,off+len,"Going to read font size"); 690 psiconv_progress(config,lev+3,off+len,"Going to read font size");
661 result->font_size = psiconv_read_size(buf,lev+3,off+len,&leng,&res); 691 result->font_size = psiconv_read_size(config,buf,lev+3,off+len,&leng,&res);
662 if (res) 692 if (res)
663 goto ERROR1; 693 goto ERROR1;
664 len += leng; 694 len += leng;
665 break; 695 break;
666 case 0x1d: 696 case 0x1d:
667 psiconv_progress(lev+3,off+len,"Going to read italic"); 697 psiconv_progress(config,lev+3,off+len,"Going to read italic");
668 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng,&result->italic))) 698 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,&result->italic)))
669 goto ERROR1; 699 goto ERROR1;
670 len += leng; 700 len += leng;
671 break; 701 break;
672 case 0x1e: 702 case 0x1e:
673 psiconv_progress(lev+3,off+len,"Going to read bold"); 703 psiconv_progress(config,lev+3,off+len,"Going to read bold");
674 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng,&result->bold))) 704 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,&result->bold)))
675 goto ERROR1; 705 goto ERROR1;
676 len += leng; 706 len += leng;
677 break; 707 break;
678 case 0x1f: 708 case 0x1f:
679 psiconv_progress(lev+3,off+len,"Going to read super_sub"); 709 psiconv_progress(config,lev+3,off+len,"Going to read super_sub");
680 temp = psiconv_read_u8(buf,lev+3,off+len,&res); 710 temp = psiconv_read_u8(config,buf,lev+3,off+len,&res);
681 if (res) 711 if (res)
682 goto ERROR1; 712 goto ERROR1;
683 if (temp == 0x00) 713 if (temp == 0x00)
684 result->super_sub = psiconv_normalscript; 714 result->super_sub = psiconv_normalscript;
685 else if (temp == 0x01) 715 else if (temp == 0x01)
686 result->super_sub = psiconv_superscript; 716 result->super_sub = psiconv_superscript;
687 else if (temp == 0x02) 717 else if (temp == 0x02)
688 result->super_sub = psiconv_subscript; 718 result->super_sub = psiconv_subscript;
689 else { 719 else {
690 psiconv_warn(lev+3,off+len, 720 psiconv_warn(config,lev+3,off+len,
691 "Unknown super_sub argument in character layout codes list"); 721 "Unknown super_sub argument in character layout codes list");
692 } 722 }
693 psiconv_debug(lev+3,off+len,"Super_sub: %02x",temp); 723 psiconv_debug(config,lev+3,off+len,"Super_sub: %02x",temp);
694 len ++; 724 len ++;
695 break; 725 break;
696 case 0x20: 726 case 0x20:
697 psiconv_progress(lev+3,off+len,"Going to read underline"); 727 psiconv_progress(config,lev+3,off+len,"Going to read underline");
698 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, 728 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
699 &result->underline))) 729 &result->underline)))
700 goto ERROR1; 730 goto ERROR1;
701 len += leng; 731 len += leng;
702 break; 732 break;
703 case 0x21: 733 case 0x21:
704 psiconv_progress(lev+3,off+len,"Going to read strikethrough"); 734 psiconv_progress(config,lev+3,off+len,"Going to read strikethrough");
705 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, 735 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
706 &result->strikethrough))) 736 &result->strikethrough)))
707 goto ERROR1; 737 goto ERROR1;
708 len += leng; 738 len += leng;
709 break; 739 break;
710 case 0x22: 740 case 0x22:
711 psiconv_progress(lev+3,off+len,"Going to read font"); 741 psiconv_progress(config,lev+3,off+len,"Going to read font");
712 if ((res = psiconv_parse_font(buf,lev+3,off+len, &leng, &temp_font))) 742 if ((res = psiconv_parse_font(config,buf,lev+3,off+len, &leng, &temp_font)))
713 goto ERROR1; 743 goto ERROR1;
714 psiconv_free_font(result->font); 744 psiconv_free_font(result->font);
715 result->font = temp_font; 745 result->font = temp_font;
716 len += leng; 746 len += leng;
717 break; 747 break;
748 case 0x23:
749 psiconv_progress(config,lev+3,off+len,"Going to skip an unknown setting");
750 len ++;
751 break;
718 case 0x24: 752 case 0x24:
719 psiconv_progress(lev+3,off+len, 753 psiconv_progress(config,lev+3,off+len,
720 "Going to read unknown code 0x24 (%02x expected)", 0); 754 "Going to read unknown code 0x24 (%02x expected)", 0);
721 temp = psiconv_read_u8(buf,lev+3,off+len,&res); 755 temp = psiconv_read_u8(config,buf,lev+3,off+len,&res);
722 if (res) 756 if (res)
723 goto ERROR1; 757 goto ERROR1;
724 if (temp != 0) { 758 if (temp != 0) {
725 psiconv_warn(lev+3,off+len, 759 psiconv_warn(config,lev+3,off+len,
726 "Unknown code 0x24 value != 0x0 (0x%02x)", temp); 760 "Unknown code 0x24 value != 0x0 (0x%02x)", temp);
727 } 761 }
728 len ++; 762 len ++;
729 break; 763 break;
730 default: 764 default:
731 psiconv_warn(lev+3,off+len,"Unknown code in character layout list"); 765 psiconv_warn(config,lev+3,off+len,"Unknown code in character layout list");
732 psiconv_debug(lev+3,off+len,"Code: %02x",id); 766 psiconv_debug(config,lev+3,off+len,"Code: %02x",id);
733 len ++; 767 len ++;
734 break; 768 break;
735 } 769 }
736 nr ++; 770 nr ++;
737 } 771 }
738 772
739 if (len - 4 != list_length) { 773 if (len - 4 != list_length) {
740 psiconv_warn(lev+2,off+len, 774 psiconv_warn(config,lev+2,off+len,
741 "Read past end of character layout codes list. I probably lost track" 775 "Read past end of character layout codes list. I probably lost track"
742 "somewhere!"); 776 "somewhere!");
743 psiconv_debug(lev+2,off+len,"Read %d characters instead of %d", 777 psiconv_debug(config,lev+2,off+len,"Read %d characters instead of %d",
744 len-4,list_length); 778 len-4,list_length);
745 res = PSICONV_E_PARSE; 779 res = PSICONV_E_PARSE;
746 goto ERROR1; 780 goto ERROR1;
747 } 781 }
748 782
749 len = list_length + 4; 783 len = list_length + 4;
750 784
751 psiconv_progress(lev+1,off+len, 785 psiconv_progress(config,lev+1,off+len,
752 "End of character layout list (total length: %08x)",len); 786 "End of character layout list (total length: %08x)",len);
753 787
754 if (length) 788 if (length)
755 *length = len; 789 *length = len;
756 return res; 790 return res;
757 791
758ERROR1: 792ERROR1:
759 psiconv_warn(lev+1,off,"Reading of character_layout_list failed"); 793 psiconv_warn(config,lev+1,off,"Reading of character_layout_list failed");
760 if (length) 794 if (length)
761 *length = 0; 795 *length = 0;
762 if (!res) 796 if (!res)
763 return -PSICONV_E_NOMEM; 797 return -PSICONV_E_NOMEM;
764 else 798 else
Legend:
Removed from v.71  
changed lines
  Added in v.182
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26