/[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 168 Revision 224
1/* 1/*
2 generate_word.c - Part of psiconv, a PSION 5 file formats converter 2 generate_word.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 2000 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 2000-2004 Frodo Looijaard <frodol@dds.nl>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
29#include <dmalloc.h> 29#include <dmalloc.h>
30#endif 30#endif
31 31
32 32
33int psiconv_write_word_status_section(const psiconv_config config, 33int psiconv_write_word_status_section(const psiconv_config config,
34 psiconv_buffer buf, 34 psiconv_buffer buf, int lev,
35 psiconv_word_status_section value) 35 psiconv_word_status_section value)
36{ 36{
37 int res; 37 int res;
38 38
39 psiconv_progress(config,lev,0,"Writing word status section");
40
39 if (!value) { 41 if (!value) {
40 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null word status section"); 42 psiconv_error(config,0,psiconv_buffer_length(buf),"Null word status section");
41 return -PSICONV_E_GENERATE; 43 return -PSICONV_E_GENERATE;
42 } 44 }
43 45
44 if ((res = psiconv_write_u8(config,buf,0x02))) 46 if ((res = psiconv_write_u8(config,buf,lev+1,0x02)))
45 return res; 47 return res;
46 if ((res = psiconv_write_u8(config,buf,(value->show_tabs?0x01:0x00) | 48 if ((res = psiconv_write_u8(config,buf,lev+1,(value->show_tabs?0x01:0x00) |
47 (value->show_spaces?0x02:0x00) | 49 (value->show_spaces?0x02:0x00) |
48 (value->show_paragraph_ends?0x04:0x00) | 50 (value->show_paragraph_ends?0x04:0x00) |
49 (value->show_line_breaks?0x08:0x00) | 51 (value->show_line_breaks?0x08:0x00) |
50 (value->show_hard_minus?0x20:0x00) | 52 (value->show_hard_minus?0x20:0x00) |
51 (value->show_hard_space?0x40:0x00)))) 53 (value->show_hard_space?0x40:0x00))))
52 return res; 54 return res;
53 if ((res = psiconv_write_u8(config,buf,(value->show_full_pictures?0x01:0x00) | 55 if ((res = psiconv_write_u8(config,buf,lev+1,(value->show_full_pictures?0x01:0x00) |
54 (value->show_full_graphs?0x02:0x00)))) 56 (value->show_full_graphs?0x02:0x00))))
55 return res; 57 return res;
56 if ((res = psiconv_write_bool(config,buf,value->show_top_toolbar))) 58 if ((res = psiconv_write_bool(config,buf,lev+1,value->show_top_toolbar)))
57 return res; 59 return res;
58 if ((res = psiconv_write_bool(config,buf,value->show_side_toolbar))) 60 if ((res = psiconv_write_bool(config,buf,lev+1,value->show_side_toolbar)))
59 return res; 61 return res;
60 if ((res = psiconv_write_u8(config,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))))
61 return res; 63 return res;
62 if ((res = psiconv_write_u32(config,buf,value->cursor_position))) 64 if ((res = psiconv_write_u32(config,buf,lev+1,value->cursor_position)))
63 return res; 65 return res;
64 return psiconv_write_u32(config,buf,value->display_size); 66 return psiconv_write_u32(config,buf,lev+1,value->display_size);
65} 67}
66 68
67int psiconv_write_word_styles_section(const psiconv_config config, 69int psiconv_write_word_styles_section(const psiconv_config config,
68 psiconv_buffer buf, 70 psiconv_buffer buf, int lev,
69 psiconv_word_styles_section value) 71 psiconv_word_styles_section value)
70{ 72{
71 int res,i; 73 int res,i,j;
72 psiconv_word_style style; 74 psiconv_word_style style;
73 psiconv_paragraph_layout basepara; 75 psiconv_paragraph_layout basepara;
74 psiconv_character_layout basechar; 76 psiconv_character_layout basechar;
75 psiconv_font font; 77 psiconv_font font;
78 psiconv_u32 buflen;
76 79
80 psiconv_progress(config,lev,0,"Writing word styles section");
77 81
78 if (!value || !value->normal || !value->styles) { 82 if (!value || !value->normal || !value->styles) {
79 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null word styles section"); 83 psiconv_error(config,0,psiconv_buffer_length(buf),"Null word styles section");
80 res = -PSICONV_E_GENERATE; 84 res = -PSICONV_E_GENERATE;
81 goto ERROR1; 85 goto ERROR1;
82 } 86 }
83 87
84 if (!(basepara=psiconv_basic_paragraph_layout())) { 88 if (!(basepara=psiconv_basic_paragraph_layout())) {
… …
90 res = -PSICONV_E_NOMEM; 94 res = -PSICONV_E_NOMEM;
91 goto ERROR2; 95 goto ERROR2;
92 } 96 }
93 97
94 98
95 if ((res = psiconv_write_paragraph_layout_list(config,buf,value->normal->paragraph, 99 if ((res = psiconv_write_paragraph_layout_list(config,buf,lev+1,value->normal->paragraph,
96 basepara))) 100 basepara)))
97 goto ERROR3; 101 goto ERROR3;
98 /* Always generate the font for Normal */ 102 /* Always generate the font for Normal */
99 font = basechar->font; 103 font = basechar->font;
100 basechar->font = NULL; 104 basechar->font = NULL;
101 res = psiconv_write_character_layout_list(config,buf,value->normal->character, 105 res = psiconv_write_character_layout_list(config,buf,lev+1,value->normal->character,
102 basechar); 106 basechar);
103 basechar->font = font; 107 basechar->font = font;
104 if (res) 108 if (res)
105 goto ERROR3; 109 goto ERROR3;
106 if ((res = psiconv_write_u32(config,buf,value->normal->hotkey))) 110 buflen = psiconv_buffer_length(buf);
111 if ((res = psiconv_unicode_write_char(config,buf,lev+1,
112 value->normal->hotkey)))
107 goto ERROR3; 113 goto ERROR3;
114 for (j = psiconv_buffer_length(buf) - buflen; j < 4; j++)
115 if ((res = psiconv_write_u8(config,buf,lev+1,0)))
116 goto ERROR3;
117
108 if ((res = psiconv_write_u8(config,buf,psiconv_list_length(value->styles)))) 118 if ((res = psiconv_write_u8(config,buf,lev+1,psiconv_list_length(value->styles))))
109 goto ERROR3; 119 goto ERROR3;
110 120
111 121
112 122
113 for (i = 0; i < psiconv_list_length(value->styles); i++) { 123 for (i = 0; i < psiconv_list_length(value->styles); i++) {
114 if (!(style = psiconv_list_get(value->styles,i))) { 124 if (!(style = psiconv_list_get(value->styles,i))) {
115 psiconv_warn(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); 125 psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
116 res = -PSICONV_E_OTHER; 126 res = -PSICONV_E_NOMEM;
117 goto ERROR3; 127 goto ERROR3;
118 } 128 }
129 buflen = psiconv_buffer_length(buf);
119 if ((res = psiconv_write_u32(config,buf,style->hotkey))) 130 if ((res = psiconv_unicode_write_char(config,buf,lev+1,style->hotkey)))
120 goto ERROR3; 131 goto ERROR3;
132 for (j = psiconv_buffer_length(buf) - buflen; j < 4; j++)
133 if ((res = psiconv_write_u8(config,buf,lev+1,0)))
134 goto ERROR3;
121 } 135 }
122 if ((res = psiconv_write_u8(config,buf,psiconv_list_length(value->styles)))) 136 if ((res = psiconv_write_u8(config,buf,lev+1,psiconv_list_length(value->styles))))
123 goto ERROR3; 137 goto ERROR3;
124 for (i = 0; i < psiconv_list_length(value->styles); i++) { 138 for (i = 0; i < psiconv_list_length(value->styles); i++) {
125 if (!(style = psiconv_list_get(value->styles,i))) { 139 if (!(style = psiconv_list_get(value->styles,i))) {
126 psiconv_warn(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); 140 psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
127 res = -PSICONV_E_OTHER; 141 res = -PSICONV_E_NOMEM;
128 goto ERROR3; 142 goto ERROR3;
129 } 143 }
130 if (!style->name) { 144 if (!style->name) {
131 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null style name"); 145 psiconv_error(config,0,psiconv_buffer_length(buf),"Null style name");
132 res = -PSICONV_E_GENERATE; 146 res = -PSICONV_E_GENERATE;
133 goto ERROR3; 147 goto ERROR3;
134 } 148 }
135 if ((res = psiconv_write_string(config,buf,style->name))) 149 if ((res = psiconv_write_string(config,buf,lev+1,style->name)))
136 goto ERROR3; 150 goto ERROR3;
137 if ((res = psiconv_write_u32(config,buf,style->built_in?PSICONV_ID_STYLE_BUILT_IN: 151 if ((res = psiconv_write_u32(config,buf,lev+1,style->built_in?PSICONV_ID_STYLE_BUILT_IN:
138 PSICONV_ID_STYLE_REMOVABLE))) 152 PSICONV_ID_STYLE_REMOVABLE)))
139 goto ERROR3; 153 goto ERROR3;
140 if ((res = psiconv_write_u32(config,buf,style->outline_level))) 154 if ((res = psiconv_write_u32(config,buf,lev+1,style->outline_level)))
141 goto ERROR3; 155 goto ERROR3;
142 if ((res = psiconv_write_character_layout_list(config,buf,style->character, 156 if ((res = psiconv_write_character_layout_list(config,buf,lev+1,style->character,
143 value->normal->character))) 157 value->normal->character)))
144 goto ERROR3; 158 goto ERROR3;
145 if ((res = psiconv_write_paragraph_layout_list(config,buf,style->paragraph, 159 if ((res = psiconv_write_paragraph_layout_list(config,buf,lev+1,style->paragraph,
146 value->normal->paragraph))) 160 value->normal->paragraph)))
147 goto ERROR3; 161 goto ERROR3;
148 } 162 }
149 163
150 for (i = 0; i < psiconv_list_length(value->styles); i++) 164 for (i = 0; i < psiconv_list_length(value->styles); i++)
151 if ((res = psiconv_write_u8(config,buf,0xff))) 165 if ((res = psiconv_write_u8(config,buf,lev+1,0xff)))
152 goto ERROR3; 166 goto ERROR3;
153 res = -PSICONV_E_OK; 167 res = -PSICONV_E_OK;
154 168
155ERROR3: 169ERROR3:
156 psiconv_free_character_layout(basechar); 170 psiconv_free_character_layout(basechar);
Legend:
Removed from v.168  
changed lines
  Added in v.224
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26