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