/[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 217
1/* 1/*
2 parse_layout.c - Part of psiconv, a PSION 5 file formats converter 2 parse_layout.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 1999, 2000 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 1999-2004 Frodo Looijaard <frodol@dds.nl>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
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;
… …
224 238
225 if (!(*result = malloc(sizeof(**result)))) 239 if (!(*result = malloc(sizeof(**result))))
226 goto ERROR1; 240 goto ERROR1;
227 (*result)->on = psiconv_bool_true; 241 (*result)->on = psiconv_bool_true;
228 242
229 psiconv_progress(lev+1,off,"Going to parse bullet data"); 243 psiconv_progress(config,lev+1,off,"Going to parse bullet data");
230 psiconv_progress(lev+2,off+len,"Going to read bullet length"); 244 psiconv_progress(config,lev+2,off+len,"Going to read bullet length");
231 bullet_length = psiconv_read_u8(buf,lev+2,off+len,&res); 245 bullet_length = psiconv_read_u8(config,buf,lev+2,off+len,&res);
232 if (res) 246 if (res)
233 goto ERROR2; 247 goto ERROR2;
234 psiconv_debug(lev+2,off+len,"Length: %02x",bullet_length); 248 psiconv_debug(config,lev+2,off+len,"Length: %02x",bullet_length);
235 len ++; 249 len ++;
236 250
237 psiconv_progress(lev+2,off+len,"Going to read bullet font size"); 251 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); 252 (*result)->font_size = psiconv_read_size(config,buf,lev+2,off+len, &leng,&res);
239 if (res) 253 if (res)
240 goto ERROR2; 254 goto ERROR2;
241 len +=leng; 255 len +=leng;
242 256
243 psiconv_progress(lev+2,off+len,"Going to read bullet character"); 257 psiconv_progress(config,lev+2,off+len,"Going to read bullet character");
244 (*result)->character = psiconv_read_u8(buf,lev+2,off+len,&res); 258 (*result)->character = psiconv_unicode_read_char(config,buf,lev+2,
259 off+len,&leng,&res);
245 if (res) 260 if (res)
246 goto ERROR2; 261 goto ERROR2;
247 psiconv_debug(lev+2,off+len,"Character: %02x",(*result)->character); 262 psiconv_debug(config,lev+2,off+len,"Character: %02x",(*result)->character);
248 len ++; 263 len += leng;
249 264
250 psiconv_progress(lev+2,off+len,"Going to read indent on/off"); 265 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))) 266 if ((res = psiconv_parse_bool(config,buf,lev+2,off+len,&leng,&(*result)->indent)))
252 goto ERROR2; 267 goto ERROR2;
253 psiconv_debug(lev+2,off+len,"Indent on: %02x",(*result)->indent); 268 psiconv_debug(config,lev+2,off+len,"Indent on: %02x",(*result)->indent);
254 len += leng; 269 len += leng;
255 270
256 psiconv_progress(lev+2,off+len,"Going to read bullet color"); 271 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))) 272 if ((res = psiconv_parse_color(config,buf,lev+2,off+len,&leng,&(*result)->color)))
258 goto ERROR2; 273 goto ERROR2;
259 len += leng; 274 len += leng;
260 275
261 psiconv_progress(lev+2,off+len,"Going to read bullet font"); 276 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))) 277 if ((res = psiconv_parse_font(config,buf,lev+2,off+len,&leng,&(*result)->font)))
263 goto ERROR3; 278 goto ERROR3;
264 len += leng; 279 len += leng;
265 280
266 if (len != bullet_length + 1) { 281 if (len != bullet_length + 1) {
267 psiconv_warn(lev+2,off,"Bullet data structure length mismatch"); 282 psiconv_warn(config,lev+2,off,"Bullet data structure length mismatch");
268 psiconv_debug(lev+2,off,"Length: specified %02x, found %02x", 283 psiconv_debug(config,lev+2,off,"Length: specified %02x, found %02x",
269 bullet_length,len-1); 284 bullet_length,len-1);
270 } 285 }
271 286
272 psiconv_progress(lev+1,off + len - 1, 287 psiconv_progress(config,lev+1,off + len - 1,
273 "End of bullet data (total length: %08x)",len); 288 "End of bullet data (total length: %08x)",len);
274 289
275 if (length) 290 if (length)
276 *length = len; 291 *length = len;
277 return 0; 292 return 0;
… …
279ERROR3: 294ERROR3:
280 psiconv_free_color((*result)->color); 295 psiconv_free_color((*result)->color);
281ERROR2: 296ERROR2:
282 free (result); 297 free (result);
283ERROR1: 298ERROR1:
284 psiconv_warn(lev+1,off,"Reading of Bullet failed"); 299 psiconv_error(config,lev+1,off,"Reading of Bullet failed");
285 if (length) 300 if (length)
286 *length = 0; 301 *length = 0;
287 if (!res) 302 if (!res)
288 return -PSICONV_E_NOMEM; 303 return -PSICONV_E_NOMEM;
289 else 304 else
290 return res; 305 return res;
291} 306}
292 307
293int psiconv_parse_tab(const psiconv_buffer buf, int lev, psiconv_u32 off, 308int psiconv_parse_tab(const psiconv_config config,
309 const psiconv_buffer buf, int lev, psiconv_u32 off,
294 int *length, psiconv_tab *result) 310 int *length, psiconv_tab *result)
295{ 311{
296 int res = 0; 312 int res = 0;
297 int len = 0; 313 int len = 0;
298 int leng; 314 int leng;
299 psiconv_u8 temp; 315 psiconv_u8 temp;
300 316
301 psiconv_progress(lev+1,off,"Going to parse tab"); 317 psiconv_progress(config,lev+1,off,"Going to parse tab");
302 if (!(*result = malloc(sizeof(**result)))) 318 if (!(*result = malloc(sizeof(**result))))
303 goto ERROR1; 319 goto ERROR1;
304 320
305 psiconv_progress(lev+2,off,"Going to read tab location"); 321 psiconv_progress(config,lev+2,off,"Going to read tab location");
306 (*result)->location = psiconv_read_length(buf,lev+2,off+len,&leng,&res); 322 (*result)->location = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
307 if (res) 323 if (res)
308 goto ERROR2; 324 goto ERROR2;
309 len += leng; 325 len += leng;
310 326
311 psiconv_progress(lev+2,off+len,"Going to read the tab kind"); 327 psiconv_progress(config,lev+2,off+len,"Going to read the tab kind");
312 temp = psiconv_read_u8(buf,lev+2,off+len,&res); 328 temp = psiconv_read_u8(config,buf,lev+2,off+len,&res);
313 if (res) 329 if (res)
314 goto ERROR2; 330 goto ERROR2;
315 if (temp == 1) 331 if (temp == 1)
316 (*result)->kind = psiconv_tab_left; 332 (*result)->kind = psiconv_tab_left;
317 else if (temp == 2) 333 else if (temp == 2)
318 (*result)->kind = psiconv_tab_centre; 334 (*result)->kind = psiconv_tab_centre;
319 else if (temp == 3) 335 else if (temp == 3)
320 (*result)->kind = psiconv_tab_right; 336 (*result)->kind = psiconv_tab_right;
321 else { 337 else {
322 psiconv_warn(lev+2,off+len,"Unknown tab kind argument"); 338 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)", 339 psiconv_debug(config,lev+2,off+len,"Kind found: %02x (defaulted to left tab)",
324 temp); 340 temp);
325 (*result)->kind = psiconv_tab_left; 341 (*result)->kind = psiconv_tab_left;
326 } 342 }
327 psiconv_debug(lev+2,off+len,"Kind: %02x",temp); 343 psiconv_debug(config,lev+2,off+len,"Kind: %02x",temp);
328 len ++; 344 len ++;
329 345
330 if (length) 346 if (length)
331 *length = len; 347 *length = len;
332 348
333 psiconv_progress(lev+1,off+len-1,"End of tab (total length: %08x)",len); 349 psiconv_progress(config,lev+1,off+len-1,"End of tab (total length: %08x)",len);
334 return 0; 350 return 0;
335 351
336ERROR2: 352ERROR2:
337 free (result); 353 free (result);
338ERROR1: 354ERROR1:
339 psiconv_warn(lev+1,off,"Reading of Tab failed"); 355 psiconv_error(config,lev+1,off,"Reading of Tab failed");
340 if (length) 356 if (length)
341 *length = 0; 357 *length = 0;
342 if (!res) 358 if (!res)
343 return -PSICONV_E_NOMEM; 359 return -PSICONV_E_NOMEM;
344 else 360 else
345 return res; 361 return res;
346} 362}
347 363
348int psiconv_parse_paragraph_layout_list(const psiconv_buffer buf, int lev, 364int psiconv_parse_paragraph_layout_list(const psiconv_config config,
365 const psiconv_buffer buf, int lev,
349 psiconv_u32 off, int *length, 366 psiconv_u32 off, int *length,
350 psiconv_paragraph_layout result) 367 psiconv_paragraph_layout result)
351{ 368{
352 int res=0; 369 int res=0;
353 int len=0; 370 int len=0;
… …
357 psiconv_tab temp_tab; 374 psiconv_tab temp_tab;
358 psiconv_color temp_color; 375 psiconv_color temp_color;
359 psiconv_border temp_border; 376 psiconv_border temp_border;
360 psiconv_bullet temp_bullet; 377 psiconv_bullet temp_bullet;
361 378
362 psiconv_progress(lev+1,off,"Going to read paragraph layout list"); 379 psiconv_progress(config,lev+1,off,"Going to read paragraph layout list");
363 380
364 psiconv_progress(lev+2,off,"Going to read the list length"); 381 psiconv_progress(config,lev+2,off,"Going to read the list length");
365 list_length = psiconv_read_u32(buf,lev+2,off + len,&res); 382 list_length = psiconv_read_u32(config,buf,lev+2,off + len,&res);
366 if (res) 383 if (res)
367 goto ERROR1; 384 goto ERROR1;
368 psiconv_debug(lev+2,off,"Length in bytes: %08x",list_length); 385 psiconv_debug(config,lev+2,off,"Length in bytes: %08x",list_length);
369 len += 4; 386 len += 4;
370 387
371 nr = 0; 388 nr = 0;
372 while(len - 4 < list_length) { 389 while(len - 4 < list_length) {
373 psiconv_progress(lev+2,off+len,"Going to read element %d",nr); 390 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"); 391 psiconv_progress(config,lev+3,off+len,"Going to read the element id");
375 id = psiconv_read_u8(buf,lev+2,off+len,&res); 392 id = psiconv_read_u8(config,buf,lev+2,off+len,&res);
376 if (res) 393 if (res)
377 goto ERROR1; 394 goto ERROR1;
378 psiconv_debug(lev+3,off+len,"Id: %02x",id); 395 psiconv_debug(config,lev+3,off+len,"Id: %02x",id);
379 len ++; 396 len ++;
380 switch(id) { 397 switch(id) {
381 case 0x01: 398 case 0x01:
382 psiconv_progress(lev+3,off+len,"Going to read background color"); 399 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))) 400 if ((res = psiconv_parse_color(config,buf,lev+3,off+len,&leng,&temp_color)))
384 goto ERROR1; 401 goto ERROR1;
385 psiconv_free_color(result->back_color); 402 psiconv_free_color(result->back_color);
386 result->back_color = temp_color; 403 result->back_color = temp_color;
387 len += leng; 404 len += leng;
388 break; 405 break;
389 case 0x02: 406 case 0x02:
390 psiconv_progress(lev+3,off+len ,"Going to read indent left"); 407 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); 408 result->indent_left = psiconv_read_length(config,buf,lev+3,off+len,&leng,&res);
392 if (res) 409 if (res)
393 goto ERROR1; 410 goto ERROR1;
394 len += leng; 411 len += leng;
395 break; 412 break;
396 case 0x03: 413 case 0x03:
397 psiconv_progress(lev+3,off+len,"Going to read indent right"); 414 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, 415 result->indent_right = psiconv_read_length(config,buf,lev+2,off+len,&leng,
399 &res); 416 &res);
400 if (res) 417 if (res)
401 goto ERROR1; 418 goto ERROR1;
402 len += leng; 419 len += leng;
403 break; 420 break;
404 case 0x04: 421 case 0x04:
405 psiconv_progress(lev+3,off+len,"Going to read indent left first line"); 422 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, 423 result->indent_first = psiconv_read_length(config,buf,lev+2,off+len, &leng,
407 &res); 424 &res);
408 if (res) 425 if (res)
409 goto ERROR1; 426 goto ERROR1;
410 len += leng; 427 len += leng;
411 break; 428 break;
412 case 0x05: 429 case 0x05:
413 psiconv_progress(lev+3,off+len,"Going to read horizontal justify"); 430 psiconv_progress(config,lev+3,off+len,"Going to read horizontal justify");
414 temp = psiconv_read_u8(buf,lev+3,off+len,&res); 431 temp = psiconv_read_u8(config,buf,lev+3,off+len,&res);
415 if (res) 432 if (res)
416 goto ERROR1; 433 goto ERROR1;
417 if (temp == 0x00) 434 if (temp == 0x00)
418 result->justify_hor = psiconv_justify_left; 435 result->justify_hor = psiconv_justify_left;
419 else if (temp == 0x01) 436 else if (temp == 0x01)
… …
421 else if (temp == 0x02) 438 else if (temp == 0x02)
422 result->justify_hor = psiconv_justify_right; 439 result->justify_hor = psiconv_justify_right;
423 else if (temp == 0x03) 440 else if (temp == 0x03)
424 result->justify_hor = psiconv_justify_full; 441 result->justify_hor = psiconv_justify_full;
425 else { 442 else {
426 psiconv_warn(lev+3,off+len, "Unknown horizontal justify argument " 443 psiconv_warn(config,lev+3,off+len, "Unknown horizontal justify argument "
427 "in paragraph layout codes list"); 444 "in paragraph layout codes list");
428 result->justify_hor = psiconv_justify_left; 445 result->justify_hor = psiconv_justify_left;
429 } 446 }
430 psiconv_debug(lev+3,off+len,"Justify: %02x",temp); 447 psiconv_debug(config,lev+3,off+len,"Justify: %02x",temp);
431 len ++; 448 len ++;
432 break; 449 break;
433 case 0x06: 450 case 0x06:
434 psiconv_progress(lev+3,off+len,"Going to read vertical justify"); 451 psiconv_progress(config,lev+3,off+len,"Going to read vertical justify");
435 temp = psiconv_read_u8(buf,lev+3,off+len,&res); 452 temp = psiconv_read_u8(config,buf,lev+3,off+len,&res);
436 if (res) 453 if (res)
437 goto ERROR1; 454 goto ERROR1;
438 if (temp == 0x00) 455 if (temp == 0x00)
439 result->justify_ver = psiconv_justify_top; 456 result->justify_ver = psiconv_justify_top;
440 else if (temp == 0x01) 457 else if (temp == 0x01)
441 result->justify_ver = psiconv_justify_middle; 458 result->justify_ver = psiconv_justify_middle;
442 else if (temp == 0x02) 459 else if (temp == 0x02)
443 result->justify_ver = psiconv_justify_bottom; 460 result->justify_ver = psiconv_justify_bottom;
444 else { 461 else {
445 psiconv_warn(lev+3,off+len, "Unknown vertical justify argument " 462 psiconv_warn(config,lev+3,off+len, "Unknown vertical justify argument "
446 "in paragraph layout codes list"); 463 "in paragraph layout codes list");
447 result->justify_ver = psiconv_justify_bottom; 464 result->justify_ver = psiconv_justify_bottom;
448 } 465 }
449 psiconv_debug(lev+3,off+len,"Justify: %02x",temp); 466 psiconv_debug(config,lev+3,off+len,"Justify: %02x",temp);
450 len ++; 467 len ++;
468 break;
451 case 0x07: 469 case 0x07:
452 psiconv_progress(lev+3,off+len,"Going to read linespacing distance"); 470 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); 471 result->linespacing = psiconv_read_size(config,buf,lev+3,off+len,&leng,&res);
454 if (res) 472 if (res)
455 goto ERROR1; 473 goto ERROR1;
456 len += leng; 474 len += leng;
457 break; 475 break;
458 case 0x08: 476 case 0x08:
459 psiconv_progress(lev+3,off+len,"Going to read linespacing exact"); 477 psiconv_progress(config,lev+3,off+len,"Going to read linespacing exact");
460 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, 478 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
461 &result->linespacing_exact))) 479 &result->linespacing_exact)))
462 goto ERROR1; 480 goto ERROR1;
463 len += leng; 481 len += leng;
464 break; 482 break;
465 case 0x09: 483 case 0x09:
466 psiconv_progress(lev+3,off+len,"Going to read top space"); 484 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); 485 result->space_above = psiconv_read_size(config,buf,lev+3,off+len,&leng,&res);
468 if (res) 486 if (res)
469 goto ERROR1; 487 goto ERROR1;
470 len += leng; 488 len += leng;
471 break; 489 break;
472 case 0x0a: 490 case 0x0a:
473 psiconv_progress(lev+3,off+len,"Going to read bottom space"); 491 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); 492 result->space_below = psiconv_read_size(config,buf,lev+3,off+len,&leng,&res);
475 if (res) 493 if (res)
476 goto ERROR1; 494 goto ERROR1;
477 len += leng; 495 len += leng;
478 break; 496 break;
479 case 0x0b: 497 case 0x0b:
480 psiconv_progress(lev+3,off+len,"Going to read on one page"); 498 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, 499 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
482 &result->keep_together))) 500 &result->keep_together)))
483 goto ERROR1; 501 goto ERROR1;
484 len += leng; 502 len += leng;
485 break; 503 break;
486 case 0x0c: 504 case 0x0c:
487 psiconv_progress(lev+3,off+len,"Going to read together with"); 505 psiconv_progress(config,lev+3,off+len,"Going to read together with");
488 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, 506 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
489 &result->keep_with_next))) 507 &result->keep_with_next)))
490 goto ERROR1; 508 goto ERROR1;
491 len += leng; 509 len += leng;
492 break; 510 break;
493 case 0x0d: 511 case 0x0d:
494 psiconv_progress(lev+3,off+len,"Going to read on next page"); 512 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, 513 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
496 &result->on_next_page))) 514 &result->on_next_page)))
497 goto ERROR1; 515 goto ERROR1;
498 len += leng; 516 len += leng;
499 break; 517 break;
500 case 0x0e: 518 case 0x0e:
501 psiconv_progress(lev+3,off+len,"Going to read no widow protection"); 519 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, 520 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
503 &result->no_widow_protection))) 521 &result->no_widow_protection)))
504 goto ERROR1; 522 goto ERROR1;
505 len += leng; 523 len += leng;
506 break; 524 break;
525 case 0x0f:
526 psiconv_progress(config,lev+3,off+len,"Going to read wrap to fit cell limits");
527 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
528 &result->wrap_to_fit_cell)))
529 goto ERROR1;
530 len += leng;
531 break;
507 case 0x10: 532 case 0x10:
508 psiconv_progress(lev+3,off+len,"Going to read border distance to text"); 533 psiconv_progress(config,lev+3,off+len,"Going to read border distance to text");
509 result->border_distance = psiconv_read_length(buf,lev+3, 534 result->border_distance = psiconv_read_length(config,buf,lev+3,
510 off+len,&leng,&res); 535 off+len,&leng,&res);
511 if (res) 536 if (res)
512 goto ERROR1; 537 goto ERROR1;
513 len += leng; 538 len += leng;
514 break; 539 break;
515 case 0x11: 540 case 0x11:
516 psiconv_progress(lev+3,off+len,"Going to read top border"); 541 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))) 542 if ((res = psiconv_parse_border(config,buf,lev+3,off+len,&leng,&temp_border)))
518 goto ERROR1; 543 goto ERROR1;
519 psiconv_free_border(result->top_border); 544 psiconv_free_border(result->top_border);
520 result->top_border = temp_border; 545 result->top_border = temp_border;
521 len += leng; 546 len += leng;
522 break; 547 break;
523 case 0x12: 548 case 0x12:
524 psiconv_progress(lev+3,off+len,"Going to read bottom border"); 549 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))) 550 if ((res = psiconv_parse_border(config,buf,lev+3,off+len,&leng,&temp_border)))
526 goto ERROR1; 551 goto ERROR1;
527 psiconv_free_border(result->bottom_border); 552 psiconv_free_border(result->bottom_border);
528 result->bottom_border = temp_border; 553 result->bottom_border = temp_border;
529 len += leng; 554 len += leng;
530 break; 555 break;
531 case 0x13: 556 case 0x13:
532 psiconv_progress(lev+3,off+len,"Going to read left border"); 557 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))) 558 if ((res = psiconv_parse_border(config,buf,lev+3,off+len,&leng,&temp_border)))
534 goto ERROR1; 559 goto ERROR1;
535 psiconv_free_border(result->left_border); 560 psiconv_free_border(result->left_border);
536 result->left_border = temp_border; 561 result->left_border = temp_border;
537 len += leng; 562 len += leng;
538 break; 563 break;
539 case 0x14: 564 case 0x14:
540 psiconv_progress(lev+3,off+len,"Going to read right border"); 565 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))) 566 if ((res = psiconv_parse_border(config,buf,lev+3,off+len,&leng,&temp_border)))
542 goto ERROR1; 567 goto ERROR1;
543 psiconv_free_border(result->right_border); 568 psiconv_free_border(result->right_border);
544 result->right_border = temp_border; 569 result->right_border = temp_border;
545 len += leng; 570 len += leng;
546 break; 571 break;
547 case 0x15: 572 case 0x15:
548 psiconv_progress(lev+3,off+len,"Going to read bullet"); 573 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))) 574 if ((res = psiconv_parse_bullet(config,buf,lev+3,off+len,&leng,&temp_bullet)))
550 goto ERROR1; 575 goto ERROR1;
551 psiconv_free_bullet(result->bullet); 576 psiconv_free_bullet(result->bullet);
552 result->bullet = temp_bullet; 577 result->bullet = temp_bullet;
553 len += leng; 578 len += leng;
554 break; 579 break;
555 case 0x16: 580 case 0x16:
556 psiconv_progress(lev+3,off+len,"Going to read standard tabs"); 581 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, 582 result->tabs->normal = psiconv_read_length(config,buf,lev+3,off+len,&leng,
558 &res); 583 &res);
559 if (res) 584 if (res)
560 goto ERROR1; 585 goto ERROR1;
561 len += leng; 586 len += leng;
562 break; 587 break;
563 case 0x17: 588 case 0x17:
564 psiconv_progress(lev+3,off+len,"Going to read extra tab"); 589 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))) 590 if ((res = psiconv_parse_tab(config,buf,lev+3,off+len,&leng,&temp_tab)))
566 goto ERROR1; 591 goto ERROR1;
567 if ((res = psiconv_list_add(result->tabs->extras,temp_tab))) { 592 if ((res = psiconv_list_add(result->tabs->extras,temp_tab))) {
568 psiconv_free_tab(temp_tab); 593 psiconv_free_tab(temp_tab);
569 goto ERROR1; 594 goto ERROR1;
570 } 595 }
596 psiconv_free_tab(temp_tab);
571 len += leng; 597 len += leng;
572 break; 598 break;
573 default: 599 default:
574 psiconv_warn(lev+3,off+len, 600 psiconv_warn(config,lev+3,off+len,
575 "Unknown code in paragraph layout codes list"); 601 "Unknown code in paragraph layout codes list");
576 psiconv_debug(lev+3,off+len,"Code: %02x",id); 602 psiconv_debug(config,lev+3,off+len,"Code: %02x",id);
577 len ++; 603 len ++;
578 break; 604 break;
579 } 605 }
580 nr ++; 606 nr ++;
581 } 607 }
582 608
583 if (len - 4 != list_length) { 609 if (len - 4 != list_length) {
584 psiconv_warn(lev+2,off+len, 610 psiconv_error(config,lev+2,off+len,
585 "Read past end of paragraph layout codes list. I probably lost track" 611 "Read past end of paragraph layout codes list. I probably lost track "
586 "somewhere!"); 612 "somewhere!");
587 psiconv_debug(lev+2,off+len,"Read %d characters instead of %d", 613 psiconv_debug(config,lev+2,off+len,"Read %d characters instead of %d",
588 len-4,list_length); 614 len-4,list_length);
589 res = PSICONV_E_PARSE; 615 res = PSICONV_E_PARSE;
590 goto ERROR1; 616 goto ERROR1;
591 } 617 }
592 618
593 len = list_length + 4; 619 len = list_length + 4;
594 620
595 psiconv_progress(lev+1,off+len, 621 psiconv_progress(config,lev+1,off+len,
596 "End of paragraph layout list (total length: %08x)",len); 622 "End of paragraph layout list (total length: %08x)",len);
597 623
598 if (length) 624 if (length)
599 *length = len; 625 *length = len;
600 return 0; 626 return 0;
601 627
602ERROR1: 628ERROR1:
603 psiconv_warn(lev+1,off,"Reading of paragraph_layout_list failed"); 629 psiconv_error(config,lev+1,off,"Reading of paragraph_layout_list failed");
604 if (length) 630 if (length)
605 *length = 0; 631 *length = 0;
606 if (!res) 632 if (!res)
607 return -PSICONV_E_NOMEM; 633 return -PSICONV_E_NOMEM;
608 else 634 else
609 return res; 635 return res;
610} 636}
611 637
612int psiconv_parse_character_layout_list(const psiconv_buffer buf, int lev, 638int psiconv_parse_character_layout_list(const psiconv_config config,
639 const psiconv_buffer buf, int lev,
613 psiconv_u32 off, int *length, 640 psiconv_u32 off, int *length,
614 psiconv_character_layout result) 641 psiconv_character_layout result)
615{ 642{
616 int res=0; 643 int res=0;
617 int len=0; 644 int len=0;
… …
619 psiconv_u8 id; 646 psiconv_u8 id;
620 psiconv_u32 temp; 647 psiconv_u32 temp;
621 psiconv_color temp_color; 648 psiconv_color temp_color;
622 psiconv_font temp_font; 649 psiconv_font temp_font;
623 650
624 psiconv_progress(lev+1,off,"Going to read character layout codes"); 651 psiconv_progress(config,lev+1,off,"Going to read character layout codes");
625 652
626 psiconv_progress(lev+2,off,"Going to read the list length"); 653 psiconv_progress(config,lev+2,off,"Going to read the list length");
627 list_length = psiconv_read_u32(buf,lev+2,off + len,&res); 654 list_length = psiconv_read_u32(config,buf,lev+2,off + len,&res);
628 if (res) 655 if (res)
629 goto ERROR1; 656 goto ERROR1;
630 psiconv_debug(lev+2,off,"Length in bytes: %08x",list_length); 657 psiconv_debug(config,lev+2,off,"Length in bytes: %08x",list_length);
631 len += 4; 658 len += 4;
632 659
633 nr = 0; 660 nr = 0;
634 while(len-4 < list_length) { 661 while(len-4 < list_length) {
635 psiconv_progress(lev+2,off+len,"Going to read element %d",nr); 662 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"); 663 psiconv_progress(config,lev+3,off+len,"Going to read the element id");
637 id = psiconv_read_u8(buf,lev+2,off+len,&res); 664 id = psiconv_read_u8(config,buf,lev+2,off+len,&res);
638 if (res) 665 if (res)
639 goto ERROR1; 666 goto ERROR1;
640 psiconv_debug(lev+3,off+len,"Id: %02x",id); 667 psiconv_debug(config,lev+3,off+len,"Id: %02x",id);
641 len ++; 668 len ++;
642 switch(id) { 669 switch(id) {
670 case 0x18:
671 psiconv_progress(config,lev+3,off+len,"Going to skip an unknown setting");
672 len ++;
673 break;
643 case 0x19: 674 case 0x19:
644 psiconv_progress(lev+3,off+len,"Going to read text color"); 675 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))) 676 if ((res = psiconv_parse_color(config,buf,lev+3,off+len, &leng,&temp_color)))
646 goto ERROR1; 677 goto ERROR1;
647 psiconv_free_color(result->color); 678 psiconv_free_color(result->color);
648 result->color = temp_color; 679 result->color = temp_color;
649 len += leng; 680 len += leng;
650 break; 681 break;
651 case 0x1a: 682 case 0x1a:
652 psiconv_progress(lev+3,off+len,"Going to read background color (?)"); 683 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))) 684 if ((res = psiconv_parse_color(config,buf,lev+2,off+len, &leng,&temp_color)))
654 goto ERROR1; 685 goto ERROR1;
655 psiconv_free_color(result->back_color); 686 psiconv_free_color(result->back_color);
656 result->back_color = temp_color; 687 result->back_color = temp_color;
657 len += leng; 688 len += leng;
658 break; 689 break;
690 case 0x1b:
691 psiconv_progress(config,lev+3,off+len,"Going to skip an unknown setting");
692 len ++;
693 break;
659 case 0x1c: 694 case 0x1c:
660 psiconv_progress(lev+3,off+len,"Going to read font size"); 695 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); 696 result->font_size = psiconv_read_size(config,buf,lev+3,off+len,&leng,&res);
662 if (res) 697 if (res)
663 goto ERROR1; 698 goto ERROR1;
664 len += leng; 699 len += leng;
665 break; 700 break;
666 case 0x1d: 701 case 0x1d:
667 psiconv_progress(lev+3,off+len,"Going to read italic"); 702 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))) 703 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,&result->italic)))
669 goto ERROR1; 704 goto ERROR1;
670 len += leng; 705 len += leng;
671 break; 706 break;
672 case 0x1e: 707 case 0x1e:
673 psiconv_progress(lev+3,off+len,"Going to read bold"); 708 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))) 709 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,&result->bold)))
675 goto ERROR1; 710 goto ERROR1;
676 len += leng; 711 len += leng;
677 break; 712 break;
678 case 0x1f: 713 case 0x1f:
679 psiconv_progress(lev+3,off+len,"Going to read super_sub"); 714 psiconv_progress(config,lev+3,off+len,"Going to read super_sub");
680 temp = psiconv_read_u8(buf,lev+3,off+len,&res); 715 temp = psiconv_read_u8(config,buf,lev+3,off+len,&res);
681 if (res) 716 if (res)
682 goto ERROR1; 717 goto ERROR1;
683 if (temp == 0x00) 718 if (temp == 0x00)
684 result->super_sub = psiconv_normalscript; 719 result->super_sub = psiconv_normalscript;
685 else if (temp == 0x01) 720 else if (temp == 0x01)
686 result->super_sub = psiconv_superscript; 721 result->super_sub = psiconv_superscript;
687 else if (temp == 0x02) 722 else if (temp == 0x02)
688 result->super_sub = psiconv_subscript; 723 result->super_sub = psiconv_subscript;
689 else { 724 else {
690 psiconv_warn(lev+3,off+len, 725 psiconv_warn(config,lev+3,off+len,
691 "Unknown super_sub argument in character layout codes list"); 726 "Unknown super_sub argument in character layout codes list");
692 } 727 }
693 psiconv_debug(lev+3,off+len,"Super_sub: %02x",temp); 728 psiconv_debug(config,lev+3,off+len,"Super_sub: %02x",temp);
694 len ++; 729 len ++;
695 break; 730 break;
696 case 0x20: 731 case 0x20:
697 psiconv_progress(lev+3,off+len,"Going to read underline"); 732 psiconv_progress(config,lev+3,off+len,"Going to read underline");
698 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, 733 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
699 &result->underline))) 734 &result->underline)))
700 goto ERROR1; 735 goto ERROR1;
701 len += leng; 736 len += leng;
702 break; 737 break;
703 case 0x21: 738 case 0x21:
704 psiconv_progress(lev+3,off+len,"Going to read strikethrough"); 739 psiconv_progress(config,lev+3,off+len,"Going to read strikethrough");
705 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, 740 if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,
706 &result->strikethrough))) 741 &result->strikethrough)))
707 goto ERROR1; 742 goto ERROR1;
708 len += leng; 743 len += leng;
709 break; 744 break;
710 case 0x22: 745 case 0x22:
711 psiconv_progress(lev+3,off+len,"Going to read font"); 746 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))) 747 if ((res = psiconv_parse_font(config,buf,lev+3,off+len, &leng, &temp_font)))
713 goto ERROR1; 748 goto ERROR1;
714 psiconv_free_font(result->font); 749 psiconv_free_font(result->font);
715 result->font = temp_font; 750 result->font = temp_font;
716 len += leng; 751 len += leng;
717 break; 752 break;
753 case 0x23:
754 psiconv_progress(config,lev+3,off+len,"Going to skip an unknown setting");
755 len ++;
756 break;
718 case 0x24: 757 case 0x24:
719 psiconv_progress(lev+3,off+len, 758 psiconv_progress(config,lev+3,off+len,
720 "Going to read unknown code 0x24 (%02x expected)", 0); 759 "Going to read unknown code 0x24 (%02x expected)", 0);
721 temp = psiconv_read_u8(buf,lev+3,off+len,&res); 760 temp = psiconv_read_u8(config,buf,lev+3,off+len,&res);
722 if (res) 761 if (res)
723 goto ERROR1; 762 goto ERROR1;
724 if (temp != 0) { 763 if (temp != 0) {
725 psiconv_warn(lev+3,off+len, 764 psiconv_warn(config,lev+3,off+len,
726 "Unknown code 0x24 value != 0x0 (0x%02x)", temp); 765 "Unknown code 0x24 value != 0x0 (0x%02x)", temp);
727 } 766 }
728 len ++; 767 len ++;
729 break; 768 break;
730 default: 769 default:
731 psiconv_warn(lev+3,off+len,"Unknown code in character layout list"); 770 psiconv_warn(config,lev+3,off+len,"Unknown code in character layout list");
732 psiconv_debug(lev+3,off+len,"Code: %02x",id); 771 psiconv_debug(config,lev+3,off+len,"Code: %02x",id);
733 len ++; 772 len ++;
734 break; 773 break;
735 } 774 }
736 nr ++; 775 nr ++;
737 } 776 }
738 777
739 if (len - 4 != list_length) { 778 if (len - 4 != list_length) {
740 psiconv_warn(lev+2,off+len, 779 psiconv_error(config,lev+2,off+len,
741 "Read past end of character layout codes list. I probably lost track" 780 "Read past end of character layout codes list. I probably lost track "
742 "somewhere!"); 781 "somewhere!");
743 psiconv_debug(lev+2,off+len,"Read %d characters instead of %d", 782 psiconv_debug(config,lev+2,off+len,"Read %d characters instead of %d",
744 len-4,list_length); 783 len-4,list_length);
745 res = PSICONV_E_PARSE; 784 res = PSICONV_E_PARSE;
746 goto ERROR1; 785 goto ERROR1;
747 } 786 }
748 787
749 len = list_length + 4; 788 len = list_length + 4;
750 789
751 psiconv_progress(lev+1,off+len, 790 psiconv_progress(config,lev+1,off+len,
752 "End of character layout list (total length: %08x)",len); 791 "End of character layout list (total length: %08x)",len);
753 792
754 if (length) 793 if (length)
755 *length = len; 794 *length = len;
756 return res; 795 return res;
757 796
758ERROR1: 797ERROR1:
759 psiconv_warn(lev+1,off,"Reading of character_layout_list failed"); 798 psiconv_error(config,lev+1,off,"Reading of character_layout_list failed");
760 if (length) 799 if (length)
761 *length = 0; 800 *length = 0;
762 if (!res) 801 if (!res)
763 return -PSICONV_E_NOMEM; 802 return -PSICONV_E_NOMEM;
764 else 803 else
Legend:
Removed from v.71  
changed lines
  Added in v.217
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26