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