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

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

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

Revision 80 Revision 184
… …
23#include <stdlib.h> 23#include <stdlib.h>
24 24
25#include "generate_routines.h" 25#include "generate_routines.h"
26#include "error.h" 26#include "error.h"
27 27
28#ifdef DMALLOC
29#include <dmalloc.h>
30#endif
28 31
32
33
29int psiconv_write_texted_section(psiconv_buffer buf, 34int psiconv_write_texted_section(const psiconv_config config,
35 psiconv_buffer buf, int lev,
30 const psiconv_texted_section value, 36 const psiconv_texted_section value,
31 const psiconv_character_layout base_char, 37 const psiconv_character_layout base_char,
32 const psiconv_paragraph_layout base_para, 38 const psiconv_paragraph_layout base_para,
33 psiconv_buffer *extra_buf) 39 psiconv_buffer *extra_buf)
34{ 40{
35 int res,with_layout_section=0; 41 int res,with_layout_section=0;
36 psiconv_u32 layout_id; 42 psiconv_u32 layout_id;
37 43
44 psiconv_progress(config,lev,0,"Writing texted section");
45
38 if (!value) { 46 if (!value) {
39 psiconv_warn(0,psiconv_buffer_length(buf),"Null TextEd section"); 47 psiconv_error(config,0,psiconv_buffer_length(buf),"Null TextEd section");
40 res = -PSICONV_E_GENERATE; 48 res = -PSICONV_E_GENERATE;
41 goto ERROR1; 49 goto ERROR1;
42 } 50 }
43 51
44 if (!(*extra_buf = psiconv_buffer_new())) { 52 if (!(*extra_buf = psiconv_buffer_new())) {
… …
49 layout_id = psiconv_buffer_unique_id(); 57 layout_id = psiconv_buffer_unique_id();
50 psiconv_buffer_add_target(*extra_buf,layout_id); 58 psiconv_buffer_add_target(*extra_buf,layout_id);
51 59
52 if (psiconv_list_length(value->paragraphs)) { 60 if (psiconv_list_length(value->paragraphs)) {
53 with_layout_section = 1; 61 with_layout_section = 1;
54 if ((res = psiconv_write_styleless_layout_section(*extra_buf, 62 if ((res = psiconv_write_styleless_layout_section(config,*extra_buf,lev+1,
55 value->paragraphs, 63 value->paragraphs,
56 base_char,base_para))) 64 base_char,base_para)))
57 goto ERROR2; 65 goto ERROR2;
58 } 66 }
59 67
60 if ((res = psiconv_write_u32(buf,PSICONV_ID_TEXTED_BODY))) 68 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_TEXTED_BODY)))
61 goto ERROR2; 69 goto ERROR2;
62 70
63 /* Partly dummy TextEd Jumptable */ 71 /* Partly dummy TextEd Jumptable */
64 if ((res = psiconv_write_u32(buf,PSICONV_ID_TEXTED_REPLACEMENT))) 72 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_TEXTED_REPLACEMENT)))
65 goto ERROR2; 73 goto ERROR2;
66 if ((res = psiconv_write_u32(buf,0))) 74 if ((res = psiconv_write_u32(config,buf,lev+1,0)))
67 goto ERROR2; 75 goto ERROR2;
68 if ((res = psiconv_write_u32(buf,PSICONV_ID_TEXTED_UNKNOWN))) 76 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_TEXTED_UNKNOWN)))
69 goto ERROR2; 77 goto ERROR2;
70 if ((res = psiconv_write_u32(buf,0))) 78 if ((res = psiconv_write_u32(config,buf,lev+1,0)))
71 goto ERROR2; 79 goto ERROR2;
72 if ((res = psiconv_write_u32(buf,PSICONV_ID_TEXTED_LAYOUT))) 80 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_TEXTED_LAYOUT)))
73 goto ERROR2; 81 goto ERROR2;
74 if (with_layout_section) { 82 if (with_layout_section) {
75 if ((res = psiconv_write_offset(buf,layout_id))) 83 if ((res = psiconv_write_offset(config,buf,lev+1,layout_id)))
76 goto ERROR2; 84 goto ERROR2;
77 } else { 85 } else {
78 if ((res = psiconv_write_u32(buf,0))) 86 if ((res = psiconv_write_u32(config,buf,lev+1,0)))
79 goto ERROR2; 87 goto ERROR2;
80 } 88 }
81 89
82 if ((res = psiconv_write_u32(buf,PSICONV_ID_TEXTED_TEXT))) 90 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_TEXTED_TEXT)))
83 goto ERROR2; 91 goto ERROR2;
84 92
85 return psiconv_write_text_section(buf,value->paragraphs); 93 return psiconv_write_text_section(config,buf,lev+1,value->paragraphs);
86 94
87ERROR2: 95ERROR2:
88 psiconv_buffer_free(*extra_buf); 96 psiconv_buffer_free(*extra_buf);
89ERROR1: 97ERROR1:
90 return res; 98 return res;
Legend:
Removed from v.80  
changed lines
  Added in v.184
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26