--- psiconv/trunk/program/psiconv/gen_html.c 2000/12/10 16:49:40 58
+++ psiconv/trunk/program/psiconv/gen_html.c 2002/01/29 18:38:38 142
@@ -26,6 +26,10 @@
#include "gen.h"
#include "psiconv.h"
+#ifdef DMALLOC
+#include "dmalloc.h"
+#endif
+
/* This determines for each character how it is displayed */
static const char *char_table[0x100] =
{
@@ -102,7 +106,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 +137,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 +164,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 +179,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 +204,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);