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