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

Annotation of /psiconv/trunk/lib/psiconv/generate_layout.c

Parent Directory Parent Directory | Revision Log Revision Log


Revision 231 - (hide annotations)
Wed Feb 25 20:57:10 2004 UTC (20 years, 2 months ago) by frodo
File MIME type: text/plain
File size: 18271 byte(s)
(Frodo) Progress information while generating update

Much better progress information now, and better error reporting.

1 frodo 72 /*
2     generate_layout.c - Part of psiconv, a PSION 5 file formats converter
3 frodo 196 Copyright (c) 2000-2004 Frodo Looijaard <frodol@dds.nl>
4 frodo 72
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
7     the Free Software Foundation; either version 2 of the License, or
8     (at your option) any later version.
9    
10     This program is distributed in the hope that it will be useful,
11     but WITHOUT ANY WARRANTY; without even the implied warranty of
12     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13     GNU General Public License for more details.
14    
15     You should have received a copy of the GNU General Public License
16     along with this program; if not, write to the Free Software
17     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18     */
19    
20     #include "config.h"
21     #include "compat.h"
22    
23 frodo 184 #include <string.h>
24    
25 frodo 72 #include "generate_routines.h"
26     #include "error.h"
27    
28 frodo 142 #ifdef DMALLOC
29     #include <dmalloc.h>
30     #endif
31    
32    
33 frodo 184 int psiconv_write_color(const psiconv_config config, psiconv_buffer buf,
34     int lev, const psiconv_color value)
35 frodo 72 {
36     int res;
37 frodo 184
38     psiconv_progress(config,lev,0,"Writing color");
39    
40 frodo 72 if (!value) {
41 frodo 231 psiconv_error(config,lev,0,"Null color");
42     res = -PSICONV_E_GENERATE;
43     goto ERROR;
44 frodo 72 }
45 frodo 184 if ((res = psiconv_write_u8(config,buf,lev+1,value->red)))
46 frodo 231 goto ERROR;
47 frodo 184 if ((res = psiconv_write_u8(config,buf,lev+1,value->green)))
48 frodo 231 goto ERROR;
49     if ((res = psiconv_write_u8(config,buf,lev+1,value->blue)))
50     goto ERROR;
51     psiconv_progress(config,lev,0,"End of color");
52     return 0;
53    
54     ERROR:
55     psiconv_error(config,lev,0,"Writing of color failed");
56     return res;
57 frodo 72 }
58    
59 frodo 184 int psiconv_write_font(const psiconv_config config, psiconv_buffer buf,
60     int lev, const psiconv_font value)
61 frodo 72 {
62 frodo 184 int res,len;
63    
64     psiconv_progress(config,lev,0,"Writing font");
65 frodo 72 if (!value) {
66 frodo 184 psiconv_error(config,0,psiconv_buffer_length(buf),"Null font");
67 frodo 231 res = -PSICONV_E_GENERATE;
68     goto ERROR;
69 frodo 72 }
70 frodo 184 len = psiconv_unicode_strlen(value->name);
71     if ((res = psiconv_write_u8(config,buf,lev+1,len+1)))
72 frodo 231 goto ERROR;
73 frodo 184 if ((res = psiconv_write_charlist(config,buf,lev+1,value->name)))
74 frodo 231 goto ERROR;
75     if ((res = psiconv_write_u8(config,buf,lev+1,value->screenfont)))
76     goto ERROR;
77     psiconv_progress(config,lev,0,"End of font");
78     return 0;
79    
80     ERROR:
81     psiconv_error(config,lev,0,"Writing of font failed");
82     return res;
83 frodo 72 }
84    
85 frodo 184 int psiconv_write_border(const psiconv_config config, psiconv_buffer buf,int lev, const psiconv_border value)
86 frodo 72 {
87     int res;
88    
89 frodo 184 psiconv_progress(config,lev,0,"Writing border");
90    
91 frodo 72 if (!value) {
92 frodo 231 psiconv_error(config,lev,0,"Null border");
93     res = -PSICONV_E_GENERATE;
94     goto ERROR;
95 frodo 72 }
96     if (value->kind > psiconv_border_dotdotdashed)
97 frodo 231 psiconv_warn(config,lev,0,
98 frodo 72 "Unknown border kind (%d); assuming none",value->kind);
99 frodo 184 if ((res =psiconv_write_u8(config,buf,lev+1,
100     value->kind == psiconv_border_none?0:
101 frodo 72 value->kind == psiconv_border_solid?1:
102     value->kind == psiconv_border_double?2:
103     value->kind == psiconv_border_dotted?3:
104     value->kind == psiconv_border_dashed?4:
105     value->kind == psiconv_border_dotdashed?5:
106     value->kind == psiconv_border_dotdotdashed?6:
107     0)))
108 frodo 231 goto ERROR;
109     if ((res = psiconv_write_size(config,buf,lev+1,
110     (value->kind == psiconv_border_solid) ||
111     (value->kind == psiconv_border_double) ?
112     value->thickness:1.0/20.0)))
113     goto ERROR;
114 frodo 184 if ((res = psiconv_write_color(config,buf,lev+1,value->color)))
115 frodo 231 goto ERROR;
116 frodo 193 /* Unknown byte */
117 frodo 231 if ((res = psiconv_write_u8(config,buf,lev+1,1)))
118     goto ERROR;
119     psiconv_progress(config,lev,0,"End of border");
120     return 0;
121    
122     ERROR:
123     psiconv_error(config,lev,0,"Writing of border failed");
124     return res;
125 frodo 72 }
126    
127 frodo 184 int psiconv_write_bullet(const psiconv_config config, psiconv_buffer buf,int lev, const psiconv_bullet value)
128 frodo 72 {
129     int res;
130     psiconv_buffer extra_buf;
131 frodo 184
132     psiconv_progress(config,lev,0,"Writing bullet");
133    
134 frodo 72 if (!value) {
135 frodo 184 psiconv_error(config,0,psiconv_buffer_length(buf),"Null bullet");
136 frodo 231 res = -PSICONV_E_GENERATE;
137     goto ERROR1;
138 frodo 72 }
139    
140 frodo 231 if (!(extra_buf = psiconv_buffer_new())) {
141     res = -PSICONV_E_NOMEM;
142     goto ERROR1;
143     }
144 frodo 184 if ((res = psiconv_write_size(config,extra_buf,lev+1,value->font_size)))
145 frodo 231 goto ERROR2;
146 frodo 217 if ((res = psiconv_unicode_write_char(config,extra_buf,lev+1,
147     value->character)))
148 frodo 231 goto ERROR2;
149 frodo 184 if ((res = psiconv_write_bool(config,extra_buf,lev+1,value->indent)))
150 frodo 231 goto ERROR2;
151 frodo 184 if ((res = psiconv_write_color(config,extra_buf,lev+1,value->color)))
152 frodo 231 goto ERROR2;
153 frodo 184 if ((res = psiconv_write_font(config,extra_buf,lev+1,value->font)))
154 frodo 231 goto ERROR2;
155 frodo 72
156 frodo 184 if ((res = psiconv_write_u8(config,buf,lev+1,psiconv_buffer_length(extra_buf))))
157 frodo 231 goto ERROR2;
158 frodo 79 res = psiconv_buffer_concat(buf,extra_buf);
159 frodo 72
160 frodo 231 ERROR2:
161 frodo 79 psiconv_buffer_free(extra_buf);
162 frodo 231 ERROR1:
163     if (res)
164     psiconv_error(config,lev,0,"Writing of bullet failed");
165     else
166     psiconv_progress(config,lev,0,"End of bullet");
167 frodo 72 return res;
168     }
169    
170 frodo 184 int psiconv_write_tab(const psiconv_config config, psiconv_buffer buf,int lev, psiconv_tab value)
171 frodo 72 {
172     int res;
173 frodo 184
174     psiconv_progress(config,lev,0,"Writing tab");
175    
176 frodo 72 if (!value) {
177 frodo 231 psiconv_error(config,lev,0,"Null tab");
178     res = -PSICONV_E_GENERATE;
179     goto ERROR;
180 frodo 72 }
181 frodo 184 if ((res = psiconv_write_length(config,buf,lev+1,value->location)))
182 frodo 231 goto ERROR;
183 frodo 72 if ((value->kind != psiconv_tab_left) &&
184     (value->kind != psiconv_tab_right) &&
185     (value->kind != psiconv_tab_centre))
186 frodo 231 psiconv_warn(config,lev,0,
187 frodo 72 "Unknown tab kind (%d); assuming left",value->kind);
188 frodo 231 if ((res = psiconv_write_u8(config,buf,lev+1,
189     value->kind == psiconv_tab_right?2:
190     value->kind == psiconv_tab_centre?3:1)))
191     goto ERROR;
192     psiconv_progress(config,lev,0,"End of tab");
193     return 0;
194     ERROR:
195     psiconv_error(config,lev,0,"Writing of tab failed");
196     return res;
197 frodo 72 }
198    
199 frodo 168 int psiconv_write_paragraph_layout_list(const psiconv_config config,
200 frodo 184 psiconv_buffer buf,int lev,
201 frodo 72 psiconv_paragraph_layout value,
202     psiconv_paragraph_layout base)
203     {
204 frodo 78 int res,i;
205 frodo 72 psiconv_buffer extra_buf;
206 frodo 78 psiconv_tab tab;
207 frodo 72
208 frodo 184 psiconv_progress(config,lev,0,"Writing paragraph layout list");
209    
210 frodo 72 if (!value) {
211 frodo 231 psiconv_error(config,lev,0,"Null paragraph layout list");
212     res = -PSICONV_E_GENERATE;
213     goto ERROR1;
214 frodo 72 }
215 frodo 231 if (!(extra_buf = psiconv_buffer_new())) {
216     res = -PSICONV_E_NOMEM;
217     goto ERROR1;
218     }
219 frodo 72
220 frodo 78 if (!base || psiconv_compare_color(base->back_color,value->back_color)) {
221 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x01)))
222 frodo 231 goto ERROR2;
223 frodo 184 if ((res = psiconv_write_color(config,extra_buf,lev+1,value->back_color)))
224 frodo 231 goto ERROR2;
225 frodo 72 }
226    
227     if (!base || (value->indent_left != base->indent_left)) {
228 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x02)))
229 frodo 231 goto ERROR2;
230 frodo 184 if ((res = psiconv_write_length(config,extra_buf,lev+1,value->indent_left)))
231 frodo 231 goto ERROR2;
232 frodo 72 }
233    
234     if (!base || (value->indent_right != base->indent_right)) {
235 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x03)))
236 frodo 231 goto ERROR2;
237 frodo 184 if ((res = psiconv_write_length(config,extra_buf,lev+1,value->indent_right)))
238 frodo 231 goto ERROR2;
239 frodo 72 }
240    
241     if (!base || (value->indent_first != base->indent_first)) {
242 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x04)))
243 frodo 231 goto ERROR2;
244 frodo 184 if ((res = psiconv_write_length(config,extra_buf,lev+1,value->indent_first)))
245 frodo 231 goto ERROR2;
246 frodo 72 }
247    
248     if (!base || (value->justify_hor != base->justify_hor)) {
249 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x05)))
250 frodo 231 goto ERROR2;
251 frodo 72 if ((value->justify_hor < psiconv_justify_left) ||
252     (value->justify_hor > psiconv_justify_full))
253 frodo 231 psiconv_warn(config,lev,0,
254 frodo 72 "Unknown horizontal justify (%d); assuming left",
255     value->justify_hor);
256 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,
257 frodo 72 value->justify_hor == psiconv_justify_centre?1:
258     value->justify_hor == psiconv_justify_right?2:
259     value->justify_hor == psiconv_justify_full?3:0)))
260 frodo 231 goto ERROR2;
261 frodo 72 }
262    
263     if (!base || (value->justify_ver != base->justify_ver)) {
264 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x06)))
265 frodo 231 goto ERROR2;
266 frodo 72 if ((value->justify_ver < psiconv_justify_top) ||
267     (value->justify_ver > psiconv_justify_bottom))
268 frodo 168 psiconv_warn(config,0,psiconv_buffer_length(buf),
269 frodo 72 "Unknown vertical justify (%d); assuming middle",
270     value->justify_ver);
271 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,
272 frodo 72 value->justify_ver == psiconv_justify_centre?1:
273     value->justify_ver == psiconv_justify_right?2:0)))
274 frodo 231 goto ERROR2;
275 frodo 72 }
276    
277     if (!base || (value->linespacing != base->linespacing)) {
278 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x07)))
279 frodo 231 goto ERROR2;
280 frodo 184 if ((res = psiconv_write_size(config,extra_buf,lev+1,value->linespacing)))
281 frodo 231 goto ERROR2;
282 frodo 72 }
283    
284     if (!base || (value->linespacing_exact != base->linespacing_exact)) {
285 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x08)))
286 frodo 231 goto ERROR2;
287 frodo 184 if ((res = psiconv_write_bool(config,extra_buf,lev+1,value->linespacing_exact)))
288 frodo 231 goto ERROR2;
289 frodo 72 }
290    
291     if (!base || (value->space_above != base->space_above)) {
292 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x09)))
293 frodo 231 goto ERROR2;
294 frodo 184 if ((res = psiconv_write_size(config,extra_buf,lev+1,value->space_above)))
295 frodo 231 goto ERROR2;
296 frodo 72 }
297    
298     if (!base || (value->space_below != base->space_below)) {
299 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x0a)))
300 frodo 231 goto ERROR2;
301 frodo 184 if ((res = psiconv_write_size(config,extra_buf,lev+1,value->space_below)))
302 frodo 231 goto ERROR2;
303 frodo 72 }
304    
305     if (!base || (value->keep_together != base->keep_together)) {
306 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x0b)))
307 frodo 231 goto ERROR2;
308 frodo 184 if ((res = psiconv_write_bool(config,extra_buf,lev+1,value->keep_together)))
309 frodo 231 goto ERROR2;
310 frodo 72 }
311    
312     if (!base || (value->keep_with_next != base->keep_with_next)) {
313 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x0c)))
314 frodo 231 goto ERROR2;
315 frodo 184 if ((res = psiconv_write_bool(config,extra_buf,lev+1,value->keep_with_next)))
316 frodo 231 goto ERROR2;
317 frodo 72 }
318    
319     if (!base || (value->on_next_page != base->on_next_page)) {
320 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x0d)))
321 frodo 231 goto ERROR2;
322 frodo 184 if ((res = psiconv_write_bool(config,extra_buf,lev+1,value->on_next_page)))
323 frodo 231 goto ERROR2;
324 frodo 72 }
325    
326     if (!base || (value->no_widow_protection != base->no_widow_protection)) {
327 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x0e)))
328 frodo 231 goto ERROR2;
329 frodo 184 if ((res = psiconv_write_bool(config,extra_buf,lev+1,value->no_widow_protection)))
330 frodo 231 goto ERROR2;
331 frodo 72 }
332    
333 frodo 104 if (!base || (value->wrap_to_fit_cell != base->wrap_to_fit_cell)) {
334 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x0f)))
335 frodo 231 goto ERROR2;
336 frodo 184 if ((res = psiconv_write_bool(config,extra_buf,lev+1,value->wrap_to_fit_cell)))
337 frodo 231 goto ERROR2;
338 frodo 104 }
339    
340 frodo 72 if (!base || (value->border_distance != base->border_distance)) {
341 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x10)))
342 frodo 231 goto ERROR2;
343 frodo 184 if ((res = psiconv_write_length(config,extra_buf,lev+1,value->border_distance)))
344 frodo 231 goto ERROR2;
345 frodo 72 }
346    
347 frodo 78 if (!base || psiconv_compare_border(value->top_border,base->top_border)) {
348 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x11)))
349 frodo 231 goto ERROR2;
350 frodo 184 if ((res = psiconv_write_border(config,extra_buf,lev+1,value->top_border)))
351 frodo 231 goto ERROR2;
352 frodo 72 }
353    
354 frodo 78 if (!base || psiconv_compare_border(value->bottom_border,
355     base->bottom_border)) {
356 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x12)))
357 frodo 231 goto ERROR2;
358 frodo 184 if ((res = psiconv_write_border(config,extra_buf,lev+1,value->bottom_border)))
359 frodo 231 goto ERROR2;
360 frodo 72 }
361    
362 frodo 78 if (!base || psiconv_compare_border(value->left_border,
363     base->left_border)) {
364 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x13)))
365 frodo 231 goto ERROR2;
366 frodo 184 if ((res = psiconv_write_border(config,extra_buf,lev+1,value->left_border)))
367 frodo 231 goto ERROR2;
368 frodo 72 }
369    
370 frodo 78 if (!base || psiconv_compare_border(value->right_border,
371     base->right_border)) {
372 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x14)))
373 frodo 231 goto ERROR2;
374 frodo 184 if ((res = psiconv_write_border(config,extra_buf,lev+1,value->right_border)))
375 frodo 231 goto ERROR2;
376 frodo 72 }
377    
378 frodo 78 if (!base || psiconv_compare_bullet(value->bullet,
379     base->bullet)) {
380 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x15)))
381 frodo 231 goto ERROR2;
382 frodo 184 if ((res = psiconv_write_bullet(config,extra_buf,lev+1,value->bullet)))
383 frodo 231 goto ERROR2;
384 frodo 72 }
385    
386     if (!value->tabs || !value->tabs->extras) {
387 frodo 184 psiconv_error(config,0,psiconv_buffer_length(buf),"Null tabs");
388 frodo 72 res = -PSICONV_E_GENERATE;
389 frodo 231 goto ERROR2;
390 frodo 72 }
391 frodo 78
392 frodo 72 /* It is not entirely clear how tabs are inherited. For now, I assume
393     if there is any difference at all, we will have to generate both
394     the normal tab-interval, and all specific tabs */
395 frodo 78 if (!base || psiconv_compare_all_tabs(value->tabs,base->tabs)) {
396 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x16)))
397 frodo 231 goto ERROR2;
398 frodo 184 if ((res = psiconv_write_length(config,extra_buf,lev+1,value->tabs->normal)))
399 frodo 231 goto ERROR2;
400 frodo 72 for (i = 0; i < psiconv_list_length(value->tabs->extras); i++) {
401 frodo 78 if (!(tab = psiconv_list_get(value->tabs->extras,i))) {
402 frodo 231 psiconv_error(config,lev+1,0,"Massive memory corruption");
403 frodo 72 res = -PSICONV_E_NOMEM;
404 frodo 231 goto ERROR2;
405 frodo 72 }
406 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x17)))
407 frodo 231 goto ERROR2;
408 frodo 184 if ((res = psiconv_write_tab(config,extra_buf,lev+1,tab)))
409 frodo 231 goto ERROR2;
410 frodo 72 }
411     }
412    
413 frodo 184 if ((res = psiconv_write_u32(config,buf,lev+1,psiconv_buffer_length(extra_buf))))
414 frodo 231 goto ERROR2;
415 frodo 76
416 frodo 79 res = psiconv_buffer_concat(buf,extra_buf);
417 frodo 72
418 frodo 231 ERROR2:
419 frodo 79 psiconv_buffer_free(extra_buf);
420 frodo 231 ERROR1:
421     if (res)
422     psiconv_error(config,lev,0,"Writing of paragraph layout list failed");
423     else
424     psiconv_progress(config,lev,0,"End of paragraph layout list");
425 frodo 72 return res;
426     }
427    
428 frodo 168 int psiconv_write_character_layout_list(const psiconv_config config,
429 frodo 184 psiconv_buffer buf,int lev,
430 frodo 72 psiconv_character_layout value,
431     psiconv_character_layout base)
432     {
433     int res;
434     psiconv_buffer extra_buf;
435 frodo 184
436     psiconv_progress(config,lev,0,"Writing character layout list");
437    
438 frodo 72 if (!value) {
439 frodo 231 psiconv_error(config,lev,0,"Null character layout list");
440     res = -PSICONV_E_GENERATE;
441     goto ERROR1;
442 frodo 72 }
443 frodo 231 if (!(extra_buf = psiconv_buffer_new())) {
444     res = -PSICONV_E_NOMEM;
445     goto ERROR1;
446     }
447 frodo 72
448 frodo 78 if (!base || psiconv_compare_color(base->color,value->color)) {
449 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x19)))
450 frodo 231 goto ERROR2;
451 frodo 184 if ((res = psiconv_write_color(config,extra_buf,lev+1,value->color)))
452 frodo 231 goto ERROR2;
453 frodo 72 }
454    
455 frodo 78 if (!base || psiconv_compare_color(base->back_color,value->back_color)) {
456 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x1a)))
457 frodo 231 goto ERROR2;
458 frodo 184 if ((res = psiconv_write_color(config,extra_buf,lev+1,value->back_color)))
459 frodo 231 goto ERROR2;
460 frodo 72 }
461    
462     if (!base || (value->font_size != base->font_size)) {
463 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x1c)))
464 frodo 231 goto ERROR2;
465 frodo 184 if ((res = psiconv_write_size(config,extra_buf,lev+1,value->font_size)))
466 frodo 231 goto ERROR2;
467 frodo 72 }
468    
469     if (!base || (value->italic != base->italic)) {
470 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x1d)))
471 frodo 231 goto ERROR2;
472 frodo 184 if ((res = psiconv_write_bool(config,extra_buf,lev+1,value->italic)))
473 frodo 231 goto ERROR2;
474 frodo 72 }
475    
476     if (!base || (value->bold != base->bold)) {
477 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x1e)))
478 frodo 231 goto ERROR2;
479 frodo 184 if ((res = psiconv_write_bool(config,extra_buf,lev+1,value->bold)))
480 frodo 231 goto ERROR2;
481 frodo 72 }
482    
483     if (!base || (value->super_sub != base->super_sub)) {
484     if ((value->super_sub != psiconv_superscript) &&
485     (value->super_sub != psiconv_subscript) &&
486     (value->super_sub != psiconv_normalscript))
487 frodo 231 psiconv_warn(config,lev,0,"Unknown supersubscript (%d); assuming normal",
488 frodo 72 value->super_sub);
489 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x1f)))
490 frodo 231 goto ERROR2;
491 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,
492 frodo 84 value->super_sub == psiconv_superscript?1:
493     value->super_sub == psiconv_subscript?2:0)))
494 frodo 231 goto ERROR2;
495 frodo 72 }
496    
497     if (!base || (value->underline != base->underline)) {
498 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x20)))
499 frodo 231 goto ERROR2;
500 frodo 184 if ((res = psiconv_write_bool(config,extra_buf,lev+1,value->underline)))
501 frodo 231 goto ERROR2;
502 frodo 72 }
503    
504     if (!base || (value->strikethrough != base->strikethrough)) {
505 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x21)))
506 frodo 231 goto ERROR2;
507 frodo 184 if ((res = psiconv_write_bool(config,extra_buf,lev+1,value->strikethrough)))
508 frodo 231 goto ERROR2;
509 frodo 72 }
510    
511 frodo 78 if (!base || psiconv_compare_font(base->font,value->font)) {
512 frodo 184 if ((res = psiconv_write_u8(config,extra_buf,lev+1,0x22)))
513 frodo 231 goto ERROR2;
514 frodo 184 if ((res = psiconv_write_font(config,extra_buf,lev+1,value->font)))
515 frodo 231 goto ERROR2;
516 frodo 72 }
517    
518 frodo 184 if ((res = psiconv_write_u32(config,buf,lev+1,psiconv_buffer_length(extra_buf))))
519 frodo 231 goto ERROR2;
520 frodo 76
521 frodo 79 res = psiconv_buffer_concat(buf,extra_buf);
522 frodo 72
523 frodo 231 ERROR2:
524 frodo 79 psiconv_buffer_free(extra_buf);
525 frodo 231 ERROR1:
526     if (res)
527     psiconv_error(config,lev,0,"Writing of character layout list failed");
528     else
529     psiconv_progress(config,lev,0,"End of character layout list");
530 frodo 72 return res;
531     }

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26