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

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

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

Revision 79 Revision 80
26#include "generate_routines.h" 26#include "generate_routines.h"
27#include "error.h" 27#include "error.h"
28 28
29 29
30int psiconv_write_page_header(psiconv_buffer buf, 30int psiconv_write_page_header(psiconv_buffer buf,
31 const psiconv_page_header value) 31 const psiconv_page_header value,
32 psiconv_buffer *extra_buf)
32{ 33{
33 int res; 34 int res;
34 psiconv_paragraph_layout basepara; 35 psiconv_paragraph_layout basepara;
35 psiconv_character_layout basechar; 36 psiconv_character_layout basechar;
36 37
67 if ((res = psiconv_write_character_layout_list(buf, 68 if ((res = psiconv_write_character_layout_list(buf,
68 value->base_character_layout,basechar))) 69 value->base_character_layout,basechar)))
69 goto ERROR3; 70 goto ERROR3;
70 res = psiconv_write_texted_section(buf,value->text, 71 res = psiconv_write_texted_section(buf,value->text,
71 value->base_character_layout, 72 value->base_character_layout,
72 value->base_paragraph_layout); 73 value->base_paragraph_layout,extra_buf);
73ERROR3: 74ERROR3:
74 psiconv_free_character_layout(basechar); 75 psiconv_free_character_layout(basechar);
75ERROR2: 76ERROR2:
76 psiconv_free_paragraph_layout(basepara); 77 psiconv_free_paragraph_layout(basepara);
77ERROR1: 78ERROR1:
80 81
81int psiconv_write_page_layout_section(psiconv_buffer buf, 82int psiconv_write_page_layout_section(psiconv_buffer buf,
82 const psiconv_page_layout_section value) 83 const psiconv_page_layout_section value)
83{ 84{
84 int res; 85 int res;
86 psiconv_buffer header_buf,footer_buf;
85 87
86 if (!value) { 88 if (!value) {
87 psiconv_warn(0,psiconv_buffer_length(buf),"Null page section"); 89 psiconv_warn(0,psiconv_buffer_length(buf),"Null page section");
88 return -PSICONV_E_GENERATE; 90 res = -PSICONV_E_GENERATE;
91 goto ERROR1;
89 } 92 }
90 93
91 if ((res = psiconv_write_u32(buf,value->first_page_nr))) 94 if ((res = psiconv_write_u32(buf,value->first_page_nr)))
92 return res; 95 goto ERROR1;
93 if ((res = psiconv_write_length(buf,value->header_dist))) 96 if ((res = psiconv_write_length(buf,value->header_dist)))
94 return res; 97 goto ERROR1;
95 if ((res = psiconv_write_length(buf,value->footer_dist))) 98 if ((res = psiconv_write_length(buf,value->footer_dist)))
96 return res; 99 goto ERROR1;
97 if ((res = psiconv_write_length(buf,value->left_margin))) 100 if ((res = psiconv_write_length(buf,value->left_margin)))
98 return res; 101 goto ERROR1;
99 if ((res = psiconv_write_length(buf,value->right_margin))) 102 if ((res = psiconv_write_length(buf,value->right_margin)))
100 return res; 103 goto ERROR1;
101 if ((res = psiconv_write_length(buf,value->top_margin))) 104 if ((res = psiconv_write_length(buf,value->top_margin)))
102 return res; 105 goto ERROR1;
103 if ((res = psiconv_write_length(buf,value->bottom_margin))) 106 if ((res = psiconv_write_length(buf,value->bottom_margin)))
104 return res; 107 goto ERROR1;
105 if ((res = psiconv_write_page_header(buf,value->header))) 108 if ((res = psiconv_write_page_header(buf,value->header,&header_buf)))
106 return res; 109 goto ERROR1;
107 if ((res = psiconv_write_page_header(buf,value->footer))) 110 if ((res = psiconv_write_page_header(buf,value->footer,&footer_buf)))
108 return res; 111 goto ERROR2;
109 if ((res = psiconv_write_u32(buf,PSICONV_ID_PAGE_DIMENSIONS2))) 112 if ((res = psiconv_write_u32(buf,PSICONV_ID_PAGE_DIMENSIONS2)))
110 return res; 113 goto ERROR3;
111 if ((res = psiconv_write_length(buf,value->page_width))) 114 if ((res = psiconv_write_length(buf,value->page_width)))
112 return res; 115 goto ERROR3;
113 if ((res = psiconv_write_length(buf,value->page_height))) 116 if ((res = psiconv_write_length(buf,value->page_height)))
117 goto ERROR3;
118 if ((res = psiconv_write_bool(buf,value->landscape)))
119 goto ERROR3;
120 if ((res = psiconv_buffer_concat(buf,header_buf)))
121 goto ERROR3;
122 res = psiconv_buffer_concat(buf,footer_buf);
123
124
125ERROR3:
126 psiconv_buffer_free(footer_buf);
127ERROR2:
128 psiconv_buffer_free(header_buf);
129ERROR1:
114 return res; 130 return res;
115 return psiconv_write_bool(buf,value->landscape);
116} 131}

Legend:
Removed from v.79  
changed lines
  Added in v.80

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