--- psiconv/trunk/program/psiconv/gen_html4.c 2000/12/15 18:52:49 67
+++ psiconv/trunk/program/psiconv/gen_html4.c 2002/01/22 21:45:45 140
@@ -132,11 +132,11 @@
static const char *screenfont_name(psiconv_u8 screenfont)
{
- if (screenfont == 1)
+ if (screenfont == psiconv_font_sansserif)
return "sans-serif";
- else if (screenfont == 2)
+ else if (screenfont == psiconv_font_nonprop)
return "monospace";
- else if (screenfont == 3)
+ else if (screenfont == psiconv_font_serif)
return "serif";
else
return "serif";
@@ -470,12 +470,14 @@
fputs("\n\n\n \n", of);
- if (psiconv_list_length(wf->page_sec->header->text->paragraphs) > 0) {
- fputs(" ", of);
- para = psiconv_list_get(wf->page_sec->header->text->paragraphs, 0);
- i = 0;
- fput_text(of, para->text, strlen(para->text), &i);
- fputs("\n", of);
+ if (wf->page_sec->header->text) {
+ if (psiconv_list_length(wf->page_sec->header->text->paragraphs) > 0) {
+ fputs(" ", of);
+ para = psiconv_list_get(wf->page_sec->header->text->paragraphs, 0);
+ i = 0;
+ fput_text(of, para->text, strlen(para->text), &i);
+ fputs("\n", of);
+ }
}
normal = wf->styles_sec->normal;
@@ -490,9 +492,11 @@
fput_style(of, normal, sty, wf);
}
fputs(" -->\n\n\n", of);
- for (i = 0; i < psiconv_list_length(wf->paragraphs); i++) {
- para = psiconv_list_get(wf->paragraphs, i);
- fput_para(of, para, wf);
+ if (wf->page_sec->header->text) {
+ for (i = 0; i < psiconv_list_length(wf->paragraphs); i++) {
+ para = psiconv_list_get(wf->paragraphs, i);
+ fput_para(of, para, wf);
+ }
}
fputs("\n\n", of);