Bah, there's always one. Missing file.

[sgt/halibut] / bk_xhtml.c

diff --git a/bk_xhtml.c b/bk_xhtml.c
index 0406f45..4cbe1d6 100644 (file)
--- a/bk_xhtml.c
+++ b/bk_xhtml.c
@@ -730,6 +730,11 @@ static void xhtml_donavlinks(FILE *fp, xhtmlfile *file)
     fprintf(fp, "<a href='%s'>Previous</a> | ", xhtml_last_file->filename);
   }
   fprintf(fp, "<a href='Contents.html'>Contents</a> | ");
+  if (file == NULL) {
+    fprintf(fp, "Index | ");
+  } else {
+    fprintf(fp, "<a href='%s'>Index</a> | ", 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, "<p>");
-      xhtml_para(fp, p->words, FALSE);
-      fprintf(fp, "</p>\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<p>");
         xhtml_para(fp, p->words, indexable);
         fprintf(fp, "</p>\n");