X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/ce9921d6366eee6e9237e906e161e0bd220d5720..65151c30376998e87609555c50c7362a54990eee:/bk_xhtml.c diff --git a/bk_xhtml.c b/bk_xhtml.c index 0406f45..4cbe1d6 100644 --- a/bk_xhtml.c +++ b/bk_xhtml.c @@ -730,6 +730,11 @@ static void xhtml_donavlinks(FILE *fp, xhtmlfile *file) fprintf(fp, "Previous | ", xhtml_last_file->filename); } fprintf(fp, "Contents | "); + if (file == NULL) { + fprintf(fp, "Index | "); + } else { + fprintf(fp, "Index | ", xhtml_index_filename); + } if (file != NULL) { /* otherwise we're doing nav links for the index */ if (xhtml_next_file==NULL) xhtml_next_file = file->child; @@ -872,7 +877,7 @@ static void xhtml_do_top_file(xhtmlfile *file, paragraph *sourceform) } } - /* Do the preamble and copyright */ + /* Do the preamble */ for (p = sourceform; p; p = p->next) { if (p->type == para_Chapter || p->type == para_Heading || @@ -886,15 +891,6 @@ static void xhtml_do_top_file(xhtmlfile *file, paragraph *sourceform) break; } } - for (p = sourceform; p; p = p->next) - { - if (p->type == para_Copyright) - { - fprintf(fp, "

"); - xhtml_para(fp, p->words, FALSE); - fprintf(fp, "

\n"); - } - } xhtml_do_contents(fp, file); xhtml_do_sections(fp, file->sections); @@ -1099,7 +1095,6 @@ static void xhtml_do_paras(FILE *fp, paragraph *p, paragraph *end, case para_BR: case para_Biblio: /* only touch BiblioCited */ case para_VersionID: - case para_Copyright: case para_NoCite: case para_Title: break; @@ -1123,6 +1118,7 @@ static void xhtml_do_paras(FILE *fp, paragraph *p, paragraph *end, break; case para_Normal: + case para_Copyright: fprintf(fp, "\n

"); xhtml_para(fp, p->words, indexable); fprintf(fp, "

\n");