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