--- psiconv/trunk/program/psiconv/gen_xhtml.c	2004/02/02 20:43:04	192
+++ psiconv/trunk/program/psiconv/gen_xhtml.c	2005/11/15 14:41:26	267
@@ -21,9 +21,11 @@
 #include <psiconv/configuration.h>
 #include <psiconv/data.h>
 #include "general.h"
+#include "gen.h"
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 #ifdef DMALLOC
 #include "dmalloc.h"
@@ -39,6 +41,8 @@
             psiconv_border_kind_t border,const encoding enc);
 static void style_name(const psiconv_config config, psiconv_list list,
                 const psiconv_string_t name,const encoding enc);
+static int character_layout_equal(const psiconv_character_layout l1,
+                           const psiconv_character_layout l2);
 static void character_layout_diffs(const psiconv_config config, 
                             psiconv_list list,
                             const psiconv_character_layout new,
@@ -65,6 +69,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 +81,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 +96,7 @@
       output_simple_chars(config,list,"<br/>",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);
@@ -145,6 +156,26 @@
   free(name_copy);
 }
 
+/* Check whether the same layout information would be generated */
+int character_layout_equal(const psiconv_character_layout l1,
+                           const psiconv_character_layout l2)
+{
+  return (l1 && l2 &&
+          (l1->color->red == l2->color->red) &&
+          (l1->color->green == l2->color->green) &&
+          (l1->color->blue == l2->color->blue) &&
+          (l1->back_color->red == l2->back_color->red) &&
+          (l1->back_color->green == l2->back_color->green) &&
+          (l1->back_color->blue == l2->back_color->blue) &&
+          (l1->font_size == l2->font_size) &&
+          (l1->italic == l2->italic) &&
+          (l1->bold == l2->bold) &&
+          (l1->super_sub == l2->super_sub) &&
+          (l1->underline == l2->underline) &&
+          (l1->strikethrough == l2->strikethrough) &&
+          (l1->font->screenfont == l2->font->screenfont));
+}
+
 void character_layout_diffs(const psiconv_config config, psiconv_list list,
                             const psiconv_character_layout new,
 			    const psiconv_character_layout base,
@@ -280,12 +311,15 @@
     output_simple_chars(config,list,";",enc);
   }
 
+#if 0
+  /* This gave bad output... */
   if (!base || (new->linespacing != base->linespacing)) {
     output_simple_chars(config,list,"line-height:",enc);
     snprintf(tempstr,TEMPSTR_LEN,"%f",new->linespacing);
     output_simple_chars(config,list,tempstr,enc);
     output_simple_chars(config,list,"pt;",enc);
   }
+#endif
 
   if (!base || (new->space_above != base->space_above)) {
     output_simple_chars(config,list,"padding-top:",enc);
@@ -522,9 +556,9 @@
 	       const psiconv_word_styles_section styles_sec,
 	       const encoding enc)
 {
-  int i,charnr;
+  int i,charnr,start,len;
   psiconv_string_t text;
-  psiconv_in_line_layout layout;
+  psiconv_in_line_layout layout,next_layout;
   psiconv_word_style style = NULL;
   psiconv_paragraph_layout base_para;
   psiconv_character_layout base_char;
@@ -575,24 +609,45 @@
   output_simple_chars(config,list,">",enc);
                          
   if (psiconv_list_length(para->in_lines) == 0) {
-    characters(config,list,para->text,para->base_character,
-	       para->base_character,enc);
+    if (psiconv_unicode_strlen(para->text))
+      characters(config,list,para->text,para->base_character,
+		 para->base_character,enc);
   } else {
     charnr = 0;
+    start = -1;
     for (i = 0; i < psiconv_list_length(para->in_lines); i++) {
+      if (start < 0)
+	start = charnr;
       if (!(layout = psiconv_list_get(para->in_lines,i))) {
 	fputs("Internal data structures corruption\n",stderr);
 	exit(1);
       }
-      if (!(text = malloc(sizeof (*text) * (layout->length + 1)))) {
-	fputs("Out of memory error\n",stderr);
-        exit(1);
+      if (i+1 < psiconv_list_length(para->in_lines)) {
+        if (!(next_layout = psiconv_list_get(para->in_lines,i+1))) {
+	  fputs("Internal data structures corruption\n",stderr);
+	  exit(1);
+	}
+      } else {
+	next_layout = NULL;
+      }
+      if (next_layout && 
+	  character_layout_equal(layout->layout,next_layout->layout)) {
+        charnr += layout->length;
+	continue;
+      }
+      len = charnr - start + layout->length;
+      if (len) {
+        if (!(text = malloc(sizeof (*text) * (len + 1)))) {
+	  fputs("Out of memory error\n",stderr);
+	  exit(1);
+	}
+	memcpy(text,para->text+start,len * sizeof(*text));
+	text[len] = 0;
+	characters(config,list,text,layout->layout,para->base_character,enc);
+	free(text);
       }
-      memcpy(text,para->text+charnr,layout->length * sizeof(*text));
-      text[layout->length] = 0;
-      characters(config,list,text,layout->layout,para->base_character,enc);
-      free(text);
       charnr += layout->length;
+      start = -1;
     }
   }
   output_simple_chars(config, list,
@@ -664,7 +719,7 @@
 }
                                                                                 
 
-static struct fileformat_s ffs[] =
+static struct fileformat_s fileformats[] =
   {
     {
       "XHTML",
@@ -684,6 +739,6 @@
 void init_xhtml(void)
 {
   int i;
-  for (i = 0; ffs[i].name; i++)
-    psiconv_list_add(fileformat_list,ffs+i);
+  for (i = 0; fileformats[i].name; i++)
+    psiconv_list_add(fileformat_list,fileformats+i);
 }