--- psiconv/trunk/program/psiconv/gen_xhtml.c 2004/02/02 20:43:04 192
+++ psiconv/trunk/program/psiconv/gen_xhtml.c 2004/02/02 21:56:48 193
@@ -21,9 +21,11 @@
#include
#include
#include "general.h"
+#include "gen.h"
#include
#include
+#include
#ifdef DMALLOC
#include "dmalloc.h"
@@ -65,6 +67,10 @@
const psiconv_character_layout layout,
const psiconv_character_layout base,
const encoding enc);
+static void paragraphs(const psiconv_config config, psiconv_list list,
+ psiconv_text_and_layout paragraphs,
+ const psiconv_word_styles_section styles,
+ const encoding enc);
static void paragraph(const psiconv_config config, psiconv_list list,
const psiconv_paragraph para,
const psiconv_word_styles_section styles_sec,
@@ -73,6 +79,9 @@
const psiconv_word_f file, const encoding enc);
static void gen_texted(const psiconv_config config, psiconv_list list,
const psiconv_texted_f file, const encoding enc);
+static int gen_xhtml(const psiconv_config config, psiconv_list list,
+ const psiconv_file file, const char *dest,
+ const encoding enc);
@@ -85,7 +94,7 @@
output_simple_chars(config,list,"
",enc);
else if ((data[i] == 0x0b) || (data[i] == 0x0c))
output_simple_chars(config,list,"-",enc);
- else if (data[i] == 0x0f)
+ else if ((data[i] == 0x0f) || (data[i] == 0x09) || (data[i] == 0x0a))
output_simple_chars(config,list," ",enc);
else if (data[i] >= 0x20)
output_char(config,list,data[i],enc);