/[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 73 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
37 if (!value) { 38 if (!value) {
38 psiconv_warn(0,psiconv_list_length(buf),"Null page header"); 39 psiconv_warn(0,psiconv_buffer_length(buf),"Null page header");
39 res = -PSICONV_E_GENERATE; 40 res = -PSICONV_E_GENERATE;
40 goto ERROR1; 41 goto ERROR1;
41 } 42 }
42 43
43 if (!(basepara=psiconv_basic_paragraph_layout())) { 44 if (!(basepara=psiconv_basic_paragraph_layout())) {
… …
52 /* Unknown byte */ 53 /* Unknown byte */
53 if ((res = psiconv_write_u8(buf,0x01))) 54 if ((res = psiconv_write_u8(buf,0x01)))
54 goto ERROR3; 55 goto ERROR3;
55 if ((res = psiconv_write_bool(buf,value->on_first_page))) 56 if ((res = psiconv_write_bool(buf,value->on_first_page)))
56 goto ERROR3; 57 goto ERROR3;
58 /* Three unknown bytes */
59 if ((res = psiconv_write_u8(buf,0x00)))
60 goto ERROR3;
61 if ((res = psiconv_write_u8(buf,0x00)))
62 goto ERROR3;
63 if ((res = psiconv_write_u8(buf,0x00)))
64 goto ERROR3;
57 if ((res = psiconv_write_paragraph_layout_list(buf, 65 if ((res = psiconv_write_paragraph_layout_list(buf,
58 value->base_paragraph_layout,basepara))) 66 value->base_paragraph_layout,basepara)))
59 goto ERROR3; 67 goto ERROR3;
60 if ((res = psiconv_write_character_layout_list(buf, 68 if ((res = psiconv_write_character_layout_list(buf,
61 value->base_character_layout,basechar))) 69 value->base_character_layout,basechar)))
62 goto ERROR3; 70 goto ERROR3;
63 res = psiconv_write_texted_section(buf,value->text, 71 res = psiconv_write_texted_section(buf,value->text,
64 value->base_character_layout, 72 value->base_character_layout,
65 value->base_paragraph_layout); 73 value->base_paragraph_layout,extra_buf);
66ERROR3: 74ERROR3:
67 psiconv_free_character_layout(basechar); 75 psiconv_free_character_layout(basechar);
68ERROR2: 76ERROR2:
69 psiconv_free_paragraph_layout(basepara); 77 psiconv_free_paragraph_layout(basepara);
70ERROR1: 78ERROR1:
… …
73 81
74int psiconv_write_page_layout_section(psiconv_buffer buf, 82int psiconv_write_page_layout_section(psiconv_buffer buf,
75 const psiconv_page_layout_section value) 83 const psiconv_page_layout_section value)
76{ 84{
77 int res; 85 int res;
86 psiconv_buffer header_buf,footer_buf;
78 87
79 if (!value) { 88 if (!value) {
80 psiconv_warn(0,psiconv_list_length(buf),"Null page section"); 89 psiconv_warn(0,psiconv_buffer_length(buf),"Null page section");
81 return -PSICONV_E_GENERATE; 90 res = -PSICONV_E_GENERATE;
91 goto ERROR1;
82 } 92 }
83 93
84 if ((res = psiconv_write_u32(buf,value->first_page_nr))) 94 if ((res = psiconv_write_u32(buf,value->first_page_nr)))
85 return res; 95 goto ERROR1;
86 if ((res = psiconv_write_length(buf,value->header_dist))) 96 if ((res = psiconv_write_length(buf,value->header_dist)))
87 return res; 97 goto ERROR1;
88 if ((res = psiconv_write_length(buf,value->footer_dist))) 98 if ((res = psiconv_write_length(buf,value->footer_dist)))
89 return res; 99 goto ERROR1;
90 if ((res = psiconv_write_length(buf,value->left_margin))) 100 if ((res = psiconv_write_length(buf,value->left_margin)))
91 return res; 101 goto ERROR1;
92 if ((res = psiconv_write_length(buf,value->right_margin))) 102 if ((res = psiconv_write_length(buf,value->right_margin)))
93 return res; 103 goto ERROR1;
94 if ((res = psiconv_write_length(buf,value->top_margin))) 104 if ((res = psiconv_write_length(buf,value->top_margin)))
95 return res; 105 goto ERROR1;
96 if ((res = psiconv_write_length(buf,value->bottom_margin))) 106 if ((res = psiconv_write_length(buf,value->bottom_margin)))
97 return res; 107 goto ERROR1;
98 if ((res = psiconv_write_page_header(buf,value->header))) 108 if ((res = psiconv_write_page_header(buf,value->header,&header_buf)))
99 return res; 109 goto ERROR1;
100 if ((res = psiconv_write_page_header(buf,value->footer))) 110 if ((res = psiconv_write_page_header(buf,value->footer,&footer_buf)))
101 return res; 111 goto ERROR2;
102 if ((res = psiconv_write_u32(buf,PSICONV_ID_PAGE_DIMENSIONS))) 112 if ((res = psiconv_write_u32(buf,PSICONV_ID_PAGE_DIMENSIONS2)))
103 return res; 113 goto ERROR3;
104 if ((res = psiconv_write_length(buf,value->page_width))) 114 if ((res = psiconv_write_length(buf,value->page_width)))
115 goto ERROR3;
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:
105 return res; 130 return res;
106 return psiconv_write_length(buf,value->page_height);
107} 131}
Legend:
Removed from v.73  
changed lines
  Added in v.80
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26