… | |
… | |
22 | |
22 | |
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 | |
|
|
28 | #ifdef DMALLOC |
|
|
29 | #include <dmalloc.h> |
|
|
30 | #endif |
|
|
31 | |
27 | |
32 | |
28 | int psiconv_write_word_status_section(psiconv_buffer buf, |
33 | int psiconv_write_word_status_section(psiconv_buffer buf, |
29 | psiconv_word_status_section value) |
34 | psiconv_word_status_section value) |
30 | { |
35 | { |
31 | int res; |
36 | int res; |
… | |
… | |
63 | { |
68 | { |
64 | int res,i; |
69 | int res,i; |
65 | psiconv_word_style style; |
70 | psiconv_word_style style; |
66 | psiconv_paragraph_layout basepara; |
71 | psiconv_paragraph_layout basepara; |
67 | psiconv_character_layout basechar; |
72 | psiconv_character_layout basechar; |
|
|
73 | psiconv_font font; |
68 | |
74 | |
69 | |
75 | |
70 | if (!value || !value->normal || !value->styles) { |
76 | if (!value || !value->normal || !value->styles) { |
71 | psiconv_warn(0,psiconv_buffer_length(buf),"Null word styles section"); |
77 | psiconv_warn(0,psiconv_buffer_length(buf),"Null word styles section"); |
72 | res = -PSICONV_E_GENERATE; |
78 | res = -PSICONV_E_GENERATE; |
… | |
… | |
85 | |
91 | |
86 | |
92 | |
87 | if ((res = psiconv_write_paragraph_layout_list(buf,value->normal->paragraph, |
93 | if ((res = psiconv_write_paragraph_layout_list(buf,value->normal->paragraph, |
88 | basepara))) |
94 | basepara))) |
89 | goto ERROR3; |
95 | goto ERROR3; |
|
|
96 | /* Always generate the font for Normal */ |
|
|
97 | font = basechar->font; |
|
|
98 | basechar->font = NULL; |
90 | if ((res = psiconv_write_character_layout_list(buf,value->normal->character, |
99 | res = psiconv_write_character_layout_list(buf,value->normal->character, |
91 | basechar))) |
100 | basechar); |
|
|
101 | basechar->font = font; |
|
|
102 | if (res) |
92 | goto ERROR3; |
103 | goto ERROR3; |
93 | if ((res = psiconv_write_u32(buf,value->normal->hotkey))) |
104 | if ((res = psiconv_write_u32(buf,value->normal->hotkey))) |
94 | goto ERROR3; |
105 | goto ERROR3; |
95 | if ((res = psiconv_write_u8(buf,psiconv_list_length(value->styles)))) |
106 | if ((res = psiconv_write_u8(buf,psiconv_list_length(value->styles)))) |
96 | goto ERROR3; |
107 | goto ERROR3; |