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