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