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