","
" ,
+ /* 0x08 */ "
" ," " ,"" ,"" ,"" ,"" ,"" ,"" ,
+ /* 0x10 */ " " ,"" ,"" ,"" ,"" ,"" ,"" ,"" ,
+ /* 0x18 */ "" ,"" ,"" ,"" ,"" ,"" ,"" ,"" ,
+ /* 0x20 */ " " ,"!" ,""","#" ,"$" ,"%" ,"&","'" ,
+ /* 0x28 */ "(" ,")" ,"*" ,"+" ,"," ,"-" ,"." ,"/" ,
+ /* 0x30 */ "0" ,"1" ,"2" ,"3" ,"4" ,"5" ,"6" ,"7" ,
+ /* 0x38 */ "8" ,"9" ,":" ,";" ,"<" ,"=" ,">" ,"?" ,
+ /* 0x40 */ "@" ,"A" ,"B" ,"C" ,"D" ,"E" ,"F" ,"G" ,
+ /* 0x48 */ "H" ,"I" ,"J" ,"K" ,"L" ,"M" ,"N" ,"O" ,
+ /* 0x50 */ "P" ,"Q" ,"R" ,"S" ,"T" ,"U" ,"V" ,"W" ,
+ /* 0x58 */ "X" ,"Y" ,"Z" ,"[" ,"\\" ,"]" ,"^" ,"_" ,
+ /* 0x60 */ "`" ,"a" ,"b" ,"c" ,"d" ,"e" ,"f" ,"g" ,
+ /* 0x68 */ "h" ,"i" ,"j" ,"k" ,"l" ,"m" ,"n" ,"o" ,
+ /* 0x70 */ "p" ,"q" ,"r" ,"s" ,"t" ,"u" ,"v" ,"w" ,
+ /* 0x78 */ "x" ,"y" ,"z" ,"{" ,"|" ,"}" ,"~" ,"" ,
+ /* 0x80 */ "\x80", "\x81", "\x82", "\x83", "\x84", "\x85", "\x86", "\x87",
+ /* 0x88 */ "\x88", "\x89", "\x8a", "\x8b", "\x8c", "\x8d", "\x8e", "\x8f",
+ /* 0x90 */ "\x90", "\x91", "\x92", "\x93", "\x94", "\x95", "\x96", "\x97",
+ /* 0x98 */ "\x98", "\x99", "\x9a", "\x9b", "\x9c", "\x9d", "\x9e", "\x9f",
+ /* 0xa0 */ "\xa0", "\xa1", "\xa2", "\xa3", "\xa4", "\xa5", "\xa6", "\xa7",
+ /* 0xa8 */ "\xa8", "\xa9", "\xaa", "\xab", "\xac", "\xad", "\xae", "\xaf",
+ /* 0xb0 */ "\xb0", "\xb1", "\xb2", "\xb3", "\xb4", "\xb5", "\xb6", "\xb7",
+ /* 0xb8 */ "\xb8", "\xb9", "\xba", "\xbb", "\xbc", "\xbd", "\xbe", "\xbf",
+ /* 0xc0 */ "\xc0", "\xc1", "\xc2", "\xc3", "\xc4", "\xc5", "\xc6", "\xc7",
+ /* 0xc8 */ "\xc8", "\xc9", "\xca", "\xcb", "\xcc", "\xcd", "\xce", "\xcf",
+ /* 0xd0 */ "\xd0", "\xd1", "\xd2", "\xd3", "\xd4", "\xd5", "\xd6", "\xd7",
+ /* 0xd8 */ "\xd8", "\xd9", "\xda", "\xdb", "\xdc", "\xdd", "\xde", "\xdf",
+ /* 0xe0 */ "\xe0", "\xe1", "\xe2", "\xe3", "\xe4", "\xe5", "\xe6", "\xe7",
+ /* 0xe8 */ "\xe8", "\xe9", "\xea", "\xeb", "\xec", "\xed", "\xee", "\xef",
+ /* 0xf0 */ "\xf0", "\xf1", "\xf2", "\xf3", "\xf4", "\xf5", "\xf6", "\xf7",
+ /* 0xf8 */ "\xf8", "\xf9", "\xfa", "\xfb", "\xfc", "\xfd", "\xfe", "\xff",
+};
+
+/* a flag to indicate the use of UTF8 */
+static psiconv_encoding encoding= PSICONV_ENCODING_CP1252;
+
static psiconv_character_layout gen_base_char(const psiconv_font font,
const psiconv_color color,
const psiconv_color back_color);
@@ -93,7 +147,7 @@
const psiconv_color color,
const psiconv_color back_color)
{
- struct psiconv_character_layout base_char_struct =
+ struct psiconv_character_layout_s base_char_struct =
{
NULL, /* color */
NULL, /* back_color */
@@ -102,7 +156,7 @@
psiconv_bool_false, /* bold */
psiconv_normalscript, /* super_sub */
psiconv_bool_false, /* underline */
- psiconv_bool_false, /* strike_out */
+ psiconv_bool_false, /* strikethrough */
NULL, /* font */
};
base_char_struct.color = color;
@@ -133,7 +187,7 @@
fputs("",of);
if (old->underline)
fputs("",of);
- if (old->strike_out)
+ if (old->strikethrough)
fputs("",of);
if (old->super_sub == psiconv_superscript)
fputs("",of);
@@ -160,11 +214,11 @@
fputs("7",of);
fprintf(of," COLOR=#%02x%02x%02x",new->color->red,new->color->green,
new->color->blue);
- if (new->font->screenfont == 1)
+ if (new->font->screenfont == psiconv_font_sansserif)
fprintf(of," FACE=\"%s, Sans-Serif\">",new->font->name);
- else if (new->font->screenfont == 2)
+ else if (new->font->screenfont == psiconv_font_nonprop)
fprintf(of," FACE=\"%s, Monospace\">",new->font-> name);
- else if (new->font->screenfont == 3)
+ else if (new->font->screenfont == psiconv_font_serif)
fprintf(of," FACE=\"%s, Serif\">",new->font-> name);
else
fprintf(of," FACE=\"%s, Serif\">",new->font-> name);
@@ -175,7 +229,7 @@
fputs("",of);
if (new->underline)
fputs("",of);
- if (new->strike_out)
+ if (new->strikethrough)
fputs("",of);
if (new->super_sub == psiconv_superscript)
fputs("",of);
@@ -200,8 +254,8 @@
else
fputs("",of);
}
- if (old->strike_out != new->strike_out) {
- if (old->strike_out)
+ if (old->strikethrough != new->strikethrough) {
+ if (old->strikethrough)
fputs("",of);
else
fputs("",of);
@@ -227,6 +281,14 @@
psiconv_in_line_layout inl;
int flags = 0;
+ char **table;
+ if (encoding == PSICONV_ENCODING_UTF8){
+ table=(char**)utf_table;
+ }else{
+ table=(char**)char_table;
+ }
+
+
fputs("
base_paragraph->justify_hor == psiconv_justify_left) @@ -254,7 +316,7 @@ diff_char(of,cur_char,inl->layout,&flags); cur_char = inl->layout; for (j = loc; j < inl->length + loc; j ++) { - fputs(char_table[(unsigned char) (para->text[j])],of); + fputs(table[(unsigned char) (para->text[j])],of); } loc = j; } @@ -263,7 +325,7 @@ diff_char(of,cur_char,para->base_character,&flags); cur_char = para->base_character; for (j = loc; j < strlen(para->text); j ++) { - fputs(char_table[(unsigned char) (para->text[j])],of); + fputs(table[(unsigned char) (para->text[j])],of); } } @@ -280,12 +342,14 @@ } int psiconv_gen_html(const char * filename,const psiconv_file file, - const char *dest) + const char *dest, const psiconv_encoding encoding_type) { FILE *of = fopen(filename,"w"); if (! of) return -1; + encoding = encoding_type; + if (file->type == psiconv_word_file) { psiconv_gen_html_word(of,(psiconv_word_f) file->file); } else if (file->type == psiconv_texted_file) { @@ -309,6 +373,14 @@ fputs("", of); fputs("\n\n
\n \n", of); + + fputs(" \n", of); + + fputs("\n",of); fputs("\n",of); for (i = 0; i < psiconv_list_length(tf->texted_sec->paragraphs); i++) { para = psiconv_list_get(tf->texted_sec->paragraphs,i); @@ -345,6 +417,13 @@ fputs("", of); fputs("\n\n\n \n", of); + + fputs(" \n", of); + + fputs("\n",of); fputs("\n",of); for (i = 0; i < psiconv_list_length(wf->paragraphs); i++) { @@ -355,7 +434,7 @@ psiconv_free_character_layout(base_char); } -static struct psiconv_fileformat ff = +static struct psiconv_fileformat_s ff = { "HTML3", "HTML 3.2, not verified so probably not completely compliant",