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

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

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

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