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

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

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

Revision 55 Revision 56
258 free(para); 258 free(para);
259 259
260 /* Initialize the remaining parts of each paragraph */ 260 /* Initialize the remaining parts of each paragraph */
261 for (i = 0; i < psiconv_list_length(*result); i ++) { 261 for (i = 0; i < psiconv_list_length(*result); i ++) {
262 para = psiconv_list_get(*result,i); 262 para = psiconv_list_get(*result,i);
263 para->in_lines = psiconv_list_new(sizeof(struct psiconv_in_line_layout)); 263 para->in_lines = psiconv_list_new(sizeof(struct psiconv_in_line_layout_s));
264 para->replacements = psiconv_list_new(sizeof(struct psiconv_replacement)); 264 para->replacements = psiconv_list_new(sizeof(struct psiconv_replacement_s));
265 para->base_style = 0; 265 para->base_style = 0;
266 para->base_character = psiconv_basic_character_layout(); 266 para->base_character = psiconv_basic_character_layout();
267 para->base_paragraph = psiconv_basic_paragraph_layout(); 267 para->base_paragraph = psiconv_basic_paragraph_layout();
268 } 268 }
269 269
290 int res = 0; 290 int res = 0;
291 int len = 0; 291 int len = 0;
292 psiconv_u32 temp; 292 psiconv_u32 temp;
293 int parse_styles,nr,i,j,total,leng,line_length; 293 int parse_styles,nr,i,j,total,leng,line_length;
294 294
295 typedef struct anon_style 295 typedef struct anon_style_s
296 { 296 {
297 int nr; 297 int nr;
298 psiconv_s16 base_style; 298 psiconv_s16 base_style;
299 psiconv_character_layout character; 299 psiconv_character_layout character;
300 psiconv_paragraph_layout paragraph; 300 psiconv_paragraph_layout paragraph;
301 } *anon_style; 301 } *anon_style;
302 302
303 typedef psiconv_list anon_style_list; /* of struct anon_style */ 303 typedef psiconv_list anon_style_list; /* of struct anon_style */
304 304
305 anon_style_list anon_styles; 305 anon_style_list anon_styles;
306 struct anon_style anon; 306 struct anon_style_s anon;
307 anon_style anon_ptr=NULL; 307 anon_style anon_ptr=NULL;
308 308
309 psiconv_paragraph para; 309 psiconv_paragraph para;
310 struct psiconv_in_line_layout in_line; 310 struct psiconv_in_line_layout_s in_line;
311 311
312 int *inline_count; 312 int *inline_count;
313 313
314 314
315 psiconv_progress(lev+1,off,"Going to read the layout section"); 315 psiconv_progress(lev+1,off,"Going to read the layout section");
396 for (i = 0; i < nr; i ++) { 396 for (i = 0; i < nr; i ++) {
397 psiconv_progress(lev+3,off+len,"Element %d",i); 397 psiconv_progress(lev+3,off+len,"Element %d",i);
398 if (i >= psiconv_list_length(result)) { 398 if (i >= psiconv_list_length(result)) {
399 psiconv_debug(lev+4,off+len,"Going to allocate a new element"); 399 psiconv_debug(lev+4,off+len,"Going to allocate a new element");
400 para = malloc(sizeof(*para)); 400 para = malloc(sizeof(*para));
401 para->in_lines = psiconv_list_new(sizeof(struct psiconv_in_line_layout)); 401 para->in_lines = psiconv_list_new(sizeof(struct psiconv_in_line_layout_s));
402 para->base_style = 0; 402 para->base_style = 0;
403 para->base_character = psiconv_basic_character_layout(); 403 para->base_character = psiconv_basic_character_layout();
404 para->base_paragraph = psiconv_basic_paragraph_layout(); 404 para->base_paragraph = psiconv_basic_paragraph_layout();
405 free(para); 405 free(para);
406 } 406 }
586 styles_section->normal = malloc(sizeof(*styles_section->normal)); 586 styles_section->normal = malloc(sizeof(*styles_section->normal));
587 styles_section->normal->character = psiconv_clone_character_layout(base_char); 587 styles_section->normal->character = psiconv_clone_character_layout(base_char);
588 styles_section->normal->paragraph = psiconv_clone_paragraph_layout(base_para); 588 styles_section->normal->paragraph = psiconv_clone_paragraph_layout(base_para);
589 styles_section->normal->hotkey = 0; 589 styles_section->normal->hotkey = 0;
590 styles_section->normal->name = strdup(""); 590 styles_section->normal->name = strdup("");
591 styles_section->styles = psiconv_list_new(sizeof(struct psiconv_word_style)); 591 styles_section->styles = psiconv_list_new(sizeof(struct psiconv_word_style_s));
592 592
593 res = psiconv_parse_layout_section(buf,lev,off,length,result, 593 res = psiconv_parse_layout_section(buf,lev,off,length,result,
594 styles_section,0); 594 styles_section,0);
595 595
596 psiconv_free_word_styles_section(styles_section); 596 psiconv_free_word_styles_section(styles_section);

Legend:
Removed from v.55  
changed lines
  Added in v.56

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