/[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 184
… …
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
29 32
33
34
30int psiconv_write_page_header(psiconv_buffer buf, 35int psiconv_write_page_header(const psiconv_config config,
36 psiconv_buffer buf, int lev,
31 const psiconv_page_header value) 37 const psiconv_page_header value,
38 psiconv_buffer *extra_buf)
32{ 39{
33 int res; 40 int res;
34 psiconv_paragraph_layout basepara; 41 psiconv_paragraph_layout basepara;
35 psiconv_character_layout basechar; 42 psiconv_character_layout basechar;
36 43
44 psiconv_progress(config,lev,0,"Writing page header");
45
37 if (!value) { 46 if (!value) {
38 psiconv_warn(0,psiconv_list_length(buf),"Null page header"); 47 psiconv_error(config,0,psiconv_buffer_length(buf),"Null page header");
39 res = -PSICONV_E_GENERATE; 48 res = -PSICONV_E_GENERATE;
40 goto ERROR1; 49 goto ERROR1;
41 } 50 }
42 51
43 if (!(basepara=psiconv_basic_paragraph_layout())) { 52 if (!(basepara=psiconv_basic_paragraph_layout())) {
… …
48 res = -PSICONV_E_NOMEM; 57 res = -PSICONV_E_NOMEM;
49 goto ERROR2; 58 goto ERROR2;
50 } 59 }
51 60
52 /* Unknown byte */ 61 /* Unknown byte */
53 if ((res = psiconv_write_u8(buf,0x01))) 62 if ((res = psiconv_write_u8(config,buf,lev+1,0x01)))
54 goto ERROR3; 63 goto ERROR3;
55 if ((res = psiconv_write_bool(buf,value->on_first_page))) 64 if ((res = psiconv_write_bool(config,buf,lev+1,value->on_first_page)))
56 goto ERROR3; 65 goto ERROR3;
66 /* Three unknown bytes */
67 if ((res = psiconv_write_u8(config,buf,lev+1,0x00)))
68 goto ERROR3;
69 if ((res = psiconv_write_u8(config,buf,lev+1,0x00)))
70 goto ERROR3;
71 if ((res = psiconv_write_u8(config,buf,lev+1,0x00)))
72 goto ERROR3;
57 if ((res = psiconv_write_paragraph_layout_list(buf, 73 if ((res = psiconv_write_paragraph_layout_list(config,buf,lev+1,
58 value->base_paragraph_layout,basepara))) 74 value->base_paragraph_layout,basepara)))
59 goto ERROR3; 75 goto ERROR3;
60 if ((res = psiconv_write_character_layout_list(buf, 76 if ((res = psiconv_write_character_layout_list(config,buf,lev+1,
61 value->base_character_layout,basechar))) 77 value->base_character_layout,basechar)))
62 goto ERROR3; 78 goto ERROR3;
63 res = psiconv_write_texted_section(buf,value->text, 79 res = psiconv_write_texted_section(config,buf,lev+1,value->text,
64 value->base_character_layout, 80 value->base_character_layout,
65 value->base_paragraph_layout); 81 value->base_paragraph_layout,extra_buf);
66ERROR3: 82ERROR3:
67 psiconv_free_character_layout(basechar); 83 psiconv_free_character_layout(basechar);
68ERROR2: 84ERROR2:
69 psiconv_free_paragraph_layout(basepara); 85 psiconv_free_paragraph_layout(basepara);
70ERROR1: 86ERROR1:
71 return res; 87 return res;
72} 88}
73 89
74int psiconv_write_page_layout_section(psiconv_buffer buf, 90int psiconv_write_page_layout_section(const psiconv_config config,
91 psiconv_buffer buf, int lev,
75 const psiconv_page_layout_section value) 92 const psiconv_page_layout_section value)
76{ 93{
77 int res; 94 int res;
95 psiconv_buffer header_buf,footer_buf;
96
97 psiconv_progress(config,lev,0,"Writing page layout section");
78 98
79 if (!value) { 99 if (!value) {
80 psiconv_warn(0,psiconv_list_length(buf),"Null page section"); 100 psiconv_error(config,0,psiconv_buffer_length(buf),"Null page section");
81 return -PSICONV_E_GENERATE; 101 res = -PSICONV_E_GENERATE;
102 goto ERROR1;
82 } 103 }
83 104
84 if ((res = psiconv_write_u32(buf,value->first_page_nr))) 105 if ((res = psiconv_write_u32(config,buf,lev+1,value->first_page_nr)))
106 goto ERROR1;
107 if ((res = psiconv_write_length(config,buf,lev+1,value->header_dist)))
108 goto ERROR1;
109 if ((res = psiconv_write_length(config,buf,lev+1,value->footer_dist)))
110 goto ERROR1;
111 if ((res = psiconv_write_length(config,buf,lev+1,value->left_margin)))
112 goto ERROR1;
113 if ((res = psiconv_write_length(config,buf,lev+1,value->right_margin)))
114 goto ERROR1;
115 if ((res = psiconv_write_length(config,buf,lev+1,value->top_margin)))
116 goto ERROR1;
117 if ((res = psiconv_write_length(config,buf,lev+1,value->bottom_margin)))
118 goto ERROR1;
119 if ((res = psiconv_write_page_header(config,buf,lev+1,value->header,&header_buf)))
120 goto ERROR1;
121 if ((res = psiconv_write_page_header(config,buf,lev+1,value->footer,&footer_buf)))
122 goto ERROR2;
123 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_PAGE_DIMENSIONS2)))
124 goto ERROR3;
125 if ((res = psiconv_write_length(config,buf,lev+1,value->page_width)))
126 goto ERROR3;
127 if ((res = psiconv_write_length(config,buf,lev+1,value->page_height)))
128 goto ERROR3;
129 if ((res = psiconv_write_bool(config,buf,lev+1,value->landscape)))
130 goto ERROR3;
131 if ((res = psiconv_buffer_concat(buf,header_buf)))
132 goto ERROR3;
133 res = psiconv_buffer_concat(buf,footer_buf);
134
135
136ERROR3:
137 psiconv_buffer_free(footer_buf);
138ERROR2:
139 psiconv_buffer_free(header_buf);
140ERROR1:
85 return res; 141 return res;
86 if ((res = psiconv_write_length(buf,value->header_dist)))
87 return res;
88 if ((res = psiconv_write_length(buf,value->footer_dist)))
89 return res;
90 if ((res = psiconv_write_length(buf,value->left_margin)))
91 return res;
92 if ((res = psiconv_write_length(buf,value->right_margin)))
93 return res;
94 if ((res = psiconv_write_length(buf,value->top_margin)))
95 return res;
96 if ((res = psiconv_write_length(buf,value->bottom_margin)))
97 return res;
98 if ((res = psiconv_write_page_header(buf,value->header)))
99 return res;
100 if ((res = psiconv_write_page_header(buf,value->footer)))
101 return res;
102 if ((res = psiconv_write_u32(buf,PSICONV_ID_PAGE_DIMENSIONS)))
103 return res;
104 if ((res = psiconv_write_length(buf,value->page_width)))
105 return res;
106 return psiconv_write_length(buf,value->page_height);
107} 142}
Legend:
Removed from v.73  
changed lines
  Added in v.184
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26