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

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

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

Revision 142 Revision 168
28#ifdef DMALLOC 28#ifdef DMALLOC
29#include <dmalloc.h> 29#include <dmalloc.h>
30#endif 30#endif
31 31
32 32
33int psiconv_write_word_status_section(psiconv_buffer buf, 33int psiconv_write_word_status_section(const psiconv_config config,
34 psiconv_buffer buf,
34 psiconv_word_status_section value) 35 psiconv_word_status_section value)
35{ 36{
36 int res; 37 int res;
37 38
38 if (!value) { 39 if (!value) {
39 psiconv_warn(0,psiconv_buffer_length(buf),"Null word status section"); 40 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null word status section");
40 return -PSICONV_E_GENERATE; 41 return -PSICONV_E_GENERATE;
41 } 42 }
42 43
43 if ((res = psiconv_write_u8(buf,0x02))) 44 if ((res = psiconv_write_u8(config,buf,0x02)))
44 return res; 45 return res;
45 if ((res = psiconv_write_u8(buf,(value->show_tabs?0x01:0x00) | 46 if ((res = psiconv_write_u8(config,buf,(value->show_tabs?0x01:0x00) |
46 (value->show_spaces?0x02:0x00) | 47 (value->show_spaces?0x02:0x00) |
47 (value->show_paragraph_ends?0x04:0x00) | 48 (value->show_paragraph_ends?0x04:0x00) |
48 (value->show_line_breaks?0x08:0x00) | 49 (value->show_line_breaks?0x08:0x00) |
49 (value->show_hard_minus?0x20:0x00) | 50 (value->show_hard_minus?0x20:0x00) |
50 (value->show_hard_space?0x40:0x00)))) 51 (value->show_hard_space?0x40:0x00))))
51 return res; 52 return res;
52 if ((res = psiconv_write_u8(buf,(value->show_full_pictures?0x01:0x00) | 53 if ((res = psiconv_write_u8(config,buf,(value->show_full_pictures?0x01:0x00) |
53 (value->show_full_graphs?0x02:0x00)))) 54 (value->show_full_graphs?0x02:0x00))))
54 return res; 55 return res;
55 if ((res = psiconv_write_bool(buf,value->show_top_toolbar))) 56 if ((res = psiconv_write_bool(config,buf,value->show_top_toolbar)))
56 return res; 57 return res;
57 if ((res = psiconv_write_bool(buf,value->show_side_toolbar))) 58 if ((res = psiconv_write_bool(config,buf,value->show_side_toolbar)))
58 return res; 59 return res;
59 if ((res = psiconv_write_u8(buf,(value->fit_lines_to_screen?0x08:0x00)))) 60 if ((res = psiconv_write_u8(config,buf,(value->fit_lines_to_screen?0x08:0x00))))
60 return res; 61 return res;
61 if ((res = psiconv_write_u32(buf,value->cursor_position))) 62 if ((res = psiconv_write_u32(config,buf,value->cursor_position)))
62 return res; 63 return res;
63 return psiconv_write_u32(buf,value->display_size); 64 return psiconv_write_u32(config,buf,value->display_size);
64} 65}
65 66
66int psiconv_write_word_styles_section(psiconv_buffer buf, 67int psiconv_write_word_styles_section(const psiconv_config config,
68 psiconv_buffer buf,
67 psiconv_word_styles_section value) 69 psiconv_word_styles_section value)
68{ 70{
69 int res,i; 71 int res,i;
70 psiconv_word_style style; 72 psiconv_word_style style;
71 psiconv_paragraph_layout basepara; 73 psiconv_paragraph_layout basepara;
72 psiconv_character_layout basechar; 74 psiconv_character_layout basechar;
73 psiconv_font font; 75 psiconv_font font;
74 76
75 77
76 if (!value || !value->normal || !value->styles) { 78 if (!value || !value->normal || !value->styles) {
77 psiconv_warn(0,psiconv_buffer_length(buf),"Null word styles section"); 79 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null word styles section");
78 res = -PSICONV_E_GENERATE; 80 res = -PSICONV_E_GENERATE;
79 goto ERROR1; 81 goto ERROR1;
80 } 82 }
81 83
82 if (!(basepara=psiconv_basic_paragraph_layout())) { 84 if (!(basepara=psiconv_basic_paragraph_layout())) {
88 res = -PSICONV_E_NOMEM; 90 res = -PSICONV_E_NOMEM;
89 goto ERROR2; 91 goto ERROR2;
90 } 92 }
91 93
92 94
93 if ((res = psiconv_write_paragraph_layout_list(buf,value->normal->paragraph, 95 if ((res = psiconv_write_paragraph_layout_list(config,buf,value->normal->paragraph,
94 basepara))) 96 basepara)))
95 goto ERROR3; 97 goto ERROR3;
96 /* Always generate the font for Normal */ 98 /* Always generate the font for Normal */
97 font = basechar->font; 99 font = basechar->font;
98 basechar->font = NULL; 100 basechar->font = NULL;
99 res = psiconv_write_character_layout_list(buf,value->normal->character, 101 res = psiconv_write_character_layout_list(config,buf,value->normal->character,
100 basechar); 102 basechar);
101 basechar->font = font; 103 basechar->font = font;
102 if (res) 104 if (res)
103 goto ERROR3; 105 goto ERROR3;
104 if ((res = psiconv_write_u32(buf,value->normal->hotkey))) 106 if ((res = psiconv_write_u32(config,buf,value->normal->hotkey)))
105 goto ERROR3; 107 goto ERROR3;
106 if ((res = psiconv_write_u8(buf,psiconv_list_length(value->styles)))) 108 if ((res = psiconv_write_u8(config,buf,psiconv_list_length(value->styles))))
107 goto ERROR3; 109 goto ERROR3;
108 110
109 111
110 112
111 for (i = 0; i < psiconv_list_length(value->styles); i++) { 113 for (i = 0; i < psiconv_list_length(value->styles); i++) {
112 if (!(style = psiconv_list_get(value->styles,i))) { 114 if (!(style = psiconv_list_get(value->styles,i))) {
113 psiconv_warn(0,psiconv_buffer_length(buf),"Massive memory corruption"); 115 psiconv_warn(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
114 res = -PSICONV_E_OTHER; 116 res = -PSICONV_E_OTHER;
115 goto ERROR3; 117 goto ERROR3;
116 } 118 }
117 if ((res = psiconv_write_u32(buf,style->hotkey))) 119 if ((res = psiconv_write_u32(config,buf,style->hotkey)))
118 goto ERROR3; 120 goto ERROR3;
119 } 121 }
120 if ((res = psiconv_write_u8(buf,psiconv_list_length(value->styles)))) 122 if ((res = psiconv_write_u8(config,buf,psiconv_list_length(value->styles))))
121 goto ERROR3; 123 goto ERROR3;
122 for (i = 0; i < psiconv_list_length(value->styles); i++) { 124 for (i = 0; i < psiconv_list_length(value->styles); i++) {
123 if (!(style = psiconv_list_get(value->styles,i))) { 125 if (!(style = psiconv_list_get(value->styles,i))) {
124 psiconv_warn(0,psiconv_buffer_length(buf),"Massive memory corruption"); 126 psiconv_warn(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
125 res = -PSICONV_E_OTHER; 127 res = -PSICONV_E_OTHER;
126 goto ERROR3; 128 goto ERROR3;
127 } 129 }
128 if (!style->name) { 130 if (!style->name) {
129 psiconv_warn(0,psiconv_buffer_length(buf),"Null style name"); 131 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null style name");
130 res = -PSICONV_E_GENERATE; 132 res = -PSICONV_E_GENERATE;
131 goto ERROR3; 133 goto ERROR3;
132 } 134 }
133 if ((res = psiconv_write_string(buf,style->name))) 135 if ((res = psiconv_write_string(config,buf,style->name)))
134 goto ERROR3; 136 goto ERROR3;
135 if ((res = psiconv_write_u32(buf,style->built_in?PSICONV_ID_STYLE_BUILT_IN: 137 if ((res = psiconv_write_u32(config,buf,style->built_in?PSICONV_ID_STYLE_BUILT_IN:
136 PSICONV_ID_STYLE_REMOVABLE))) 138 PSICONV_ID_STYLE_REMOVABLE)))
137 goto ERROR3; 139 goto ERROR3;
138 if ((res = psiconv_write_u32(buf,style->outline_level))) 140 if ((res = psiconv_write_u32(config,buf,style->outline_level)))
139 goto ERROR3; 141 goto ERROR3;
140 if ((res = psiconv_write_character_layout_list(buf,style->character, 142 if ((res = psiconv_write_character_layout_list(config,buf,style->character,
141 value->normal->character))) 143 value->normal->character)))
142 goto ERROR3; 144 goto ERROR3;
143 if ((res = psiconv_write_paragraph_layout_list(buf,style->paragraph, 145 if ((res = psiconv_write_paragraph_layout_list(config,buf,style->paragraph,
144 value->normal->paragraph))) 146 value->normal->paragraph)))
145 goto ERROR3; 147 goto ERROR3;
146 } 148 }
147 149
148 for (i = 0; i < psiconv_list_length(value->styles); i++) 150 for (i = 0; i < psiconv_list_length(value->styles); i++)
149 if ((res = psiconv_write_u8(buf,0xff))) 151 if ((res = psiconv_write_u8(config,buf,0xff)))
150 goto ERROR3; 152 goto ERROR3;
151 res = -PSICONV_E_OK; 153 res = -PSICONV_E_OK;
152 154
153ERROR3: 155ERROR3:
154 psiconv_free_character_layout(basechar); 156 psiconv_free_character_layout(basechar);

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

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