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

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

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