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

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

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

Revision 73 Revision 168
23#include <stdlib.h> 23#include <stdlib.h>
24 24
25#include "generate_routines.h" 25#include "generate_routines.h"
26#include "error.h" 26#include "error.h"
27 27
28#ifdef DMALLOC
29#include <dmalloc.h>
30#endif
28 31
32
33
29int psiconv_write_texted_section(psiconv_buffer buf, 34int psiconv_write_texted_section(const psiconv_config config,
35 psiconv_buffer buf,
30 psiconv_texted_section value, 36 const psiconv_texted_section value,
31 psiconv_character_layout base_char, 37 const psiconv_character_layout base_char,
32 psiconv_paragraph_layout base_para) 38 const psiconv_paragraph_layout base_para,
39 psiconv_buffer *extra_buf)
33{ 40{
34 int res; 41 int res,with_layout_section=0;
42 psiconv_u32 layout_id;
35 43
36 if (!value) { 44 if (!value) {
37 psiconv_warn(0,psiconv_list_length(buf),"Null TextEd section"); 45 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null TextEd section");
38 return -PSICONV_E_GENERATE; 46 res = -PSICONV_E_GENERATE;
47 goto ERROR1;
39 } 48 }
40 49
50 if (!(*extra_buf = psiconv_buffer_new())) {
51 res = -PSICONV_E_NOMEM;
52 goto ERROR1;
53 }
54
55 layout_id = psiconv_buffer_unique_id();
56 psiconv_buffer_add_target(*extra_buf,layout_id);
57
58 if (psiconv_list_length(value->paragraphs)) {
59 with_layout_section = 1;
60 if ((res = psiconv_write_styleless_layout_section(config,*extra_buf,
61 value->paragraphs,
62 base_char,base_para)))
63 goto ERROR2;
64 }
65
41 if ((res = psiconv_write_u32(buf,PSICONV_ID_TEXTED_BODY))) 66 if ((res = psiconv_write_u32(config,buf,PSICONV_ID_TEXTED_BODY)))
42 return res; 67 goto ERROR2;
43 68
44 /* TODO: TextEd Jumptable! */ 69 /* Partly dummy TextEd Jumptable */
70 if ((res = psiconv_write_u32(config,buf,PSICONV_ID_TEXTED_REPLACEMENT)))
71 goto ERROR2;
72 if ((res = psiconv_write_u32(config,buf,0)))
73 goto ERROR2;
74 if ((res = psiconv_write_u32(config,buf,PSICONV_ID_TEXTED_UNKNOWN)))
75 goto ERROR2;
76 if ((res = psiconv_write_u32(config,buf,0)))
77 goto ERROR2;
78 if ((res = psiconv_write_u32(config,buf,PSICONV_ID_TEXTED_LAYOUT)))
79 goto ERROR2;
80 if (with_layout_section) {
81 if ((res = psiconv_write_offset(config,buf,layout_id)))
82 goto ERROR2;
83 } else {
84 if ((res = psiconv_write_u32(config,buf,0)))
85 goto ERROR2;
86 }
45 87
46 if ((res = psiconv_write_u32(buf,PSICONV_ID_TEXTED_TEXT))) 88 if ((res = psiconv_write_u32(config,buf,PSICONV_ID_TEXTED_TEXT)))
47 return res; 89 goto ERROR2;
48 90
49 return psiconv_write_text_section(buf,value->paragraphs); 91 return psiconv_write_text_section(config,buf,value->paragraphs);
50 92
93ERROR2:
94 psiconv_buffer_free(*extra_buf);
95ERROR1:
96 return res;
51} 97}

Legend:
Removed from v.73  
changed lines
  Added in v.168

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