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