/[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 142 Revision 231
1/* 1/*
2 generate_texted.c - Part of psiconv, a PSION 5 file formats converter 2 generate_texted.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 2000 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 2000-2004 Frodo Looijaard <frodol@dds.nl>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
29#include <dmalloc.h> 29#include <dmalloc.h>
30#endif 30#endif
31 31
32 32
33 33
34int psiconv_write_texted_section(psiconv_buffer buf, 34int psiconv_write_texted_section(const psiconv_config config,
35 psiconv_buffer buf, int lev,
35 const psiconv_texted_section value, 36 const psiconv_texted_section value,
36 const psiconv_character_layout base_char, 37 const psiconv_character_layout base_char,
37 const psiconv_paragraph_layout base_para, 38 const psiconv_paragraph_layout base_para,
38 psiconv_buffer *extra_buf) 39 psiconv_buffer *extra_buf)
39{ 40{
40 int res,with_layout_section=0; 41 int res,with_layout_section=0;
41 psiconv_u32 layout_id; 42 psiconv_u32 layout_id;
42 43
44 psiconv_progress(config,lev,0,"Writing texted section");
45
43 if (!value) { 46 if (!value) {
44 psiconv_warn(0,psiconv_buffer_length(buf),"Null TextEd section"); 47 psiconv_error(config,lev,0,"Null TextEd section");
45 res = -PSICONV_E_GENERATE; 48 res = -PSICONV_E_GENERATE;
46 goto ERROR1; 49 goto ERROR1;
47 } 50 }
48 51
49 if (!(*extra_buf = psiconv_buffer_new())) { 52 if (!(*extra_buf = psiconv_buffer_new())) {
… …
54 layout_id = psiconv_buffer_unique_id(); 57 layout_id = psiconv_buffer_unique_id();
55 psiconv_buffer_add_target(*extra_buf,layout_id); 58 psiconv_buffer_add_target(*extra_buf,layout_id);
56 59
57 if (psiconv_list_length(value->paragraphs)) { 60 if (psiconv_list_length(value->paragraphs)) {
58 with_layout_section = 1; 61 with_layout_section = 1;
59 if ((res = psiconv_write_styleless_layout_section(*extra_buf, 62 if ((res = psiconv_write_styleless_layout_section(config,*extra_buf,lev+1,
60 value->paragraphs, 63 value->paragraphs,
61 base_char,base_para))) 64 base_char,base_para)))
62 goto ERROR2; 65 goto ERROR2;
63 } 66 }
64 67
65 if ((res = psiconv_write_u32(buf,PSICONV_ID_TEXTED_BODY))) 68 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_TEXTED_BODY)))
66 goto ERROR2; 69 goto ERROR2;
67 70
68 /* Partly dummy TextEd Jumptable */ 71 /* Partly dummy TextEd Jumptable */
69 if ((res = psiconv_write_u32(buf,PSICONV_ID_TEXTED_REPLACEMENT))) 72 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_TEXTED_REPLACEMENT)))
70 goto ERROR2; 73 goto ERROR2;
71 if ((res = psiconv_write_u32(buf,0))) 74 if ((res = psiconv_write_u32(config,buf,lev+1,0)))
72 goto ERROR2; 75 goto ERROR2;
73 if ((res = psiconv_write_u32(buf,PSICONV_ID_TEXTED_UNKNOWN))) 76 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_TEXTED_UNKNOWN)))
74 goto ERROR2; 77 goto ERROR2;
75 if ((res = psiconv_write_u32(buf,0))) 78 if ((res = psiconv_write_u32(config,buf,lev+1,0)))
76 goto ERROR2; 79 goto ERROR2;
77 if ((res = psiconv_write_u32(buf,PSICONV_ID_TEXTED_LAYOUT))) 80 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_TEXTED_LAYOUT)))
78 goto ERROR2; 81 goto ERROR2;
79 if (with_layout_section) { 82 if (with_layout_section) {
80 if ((res = psiconv_write_offset(buf,layout_id))) 83 if ((res = psiconv_write_offset(config,buf,lev+1,layout_id)))
81 goto ERROR2; 84 goto ERROR2;
82 } else { 85 } else {
83 if ((res = psiconv_write_u32(buf,0))) 86 if ((res = psiconv_write_u32(config,buf,lev+1,0)))
84 goto ERROR2; 87 goto ERROR2;
85 } 88 }
86 89
87 if ((res = psiconv_write_u32(buf,PSICONV_ID_TEXTED_TEXT))) 90 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_TEXTED_TEXT)))
88 goto ERROR2; 91 goto ERROR2;
89 92
90 return psiconv_write_text_section(buf,value->paragraphs); 93 if ((res = psiconv_write_text_section(config,buf,lev+1,value->paragraphs)))
94 goto ERROR2;
95 psiconv_progress(config,lev,0,"End of texted section");
96 return 0;
91 97
92ERROR2: 98ERROR2:
93 psiconv_buffer_free(*extra_buf); 99 psiconv_buffer_free(*extra_buf);
94ERROR1: 100ERROR1:
101 psiconv_error(config,lev,0,"Writing of texted section failed");
95 return res; 102 return res;
96} 103}
Legend:
Removed from v.142  
changed lines
  Added in v.231
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26