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

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

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