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