X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/4b3c5afb39849b3d0e738248daec9ab7dd8aac6d..9057a0a8b88a40b9e842ea583a71a49eff306f63:/bk_whlp.c

diff --git a/bk_whlp.c b/bk_whlp.c
index 85b51eb..690bb7c 100644
--- a/bk_whlp.c
+++ b/bk_whlp.c
@@ -55,6 +55,7 @@ void whlp_backend(paragraph *sourceform, keywordlist *keywords,
     int i;
     int nesting;
     indexentry *ie;
+    int done_contents_topic;
 
     filename = "output.hlp";	       /* FIXME: configurability */
     cntname = "output.cnt";	       /* corresponding contents file */
@@ -144,8 +145,7 @@ void whlp_backend(paragraph *sourceform, keywordlist *keywords,
     whlp_prepare(h);
 
     /* ------------------------------------------------------------------
-     * Do the contents page, containing title, preamble and
-     * copyright.
+     * Begin the contents page.
      */
 
     whlp_begin_topic(h, contents_topic, "Contents", "DB(\"btn_up\")", NULL);
@@ -174,32 +174,13 @@ void whlp_backend(paragraph *sourceform, keywordlist *keywords,
     }
 
     /*
-     * Next comes the preamble, which just goes into the ordinary
-     * scrolling region.
-     */
-    for (p = sourceform; p; p = p->next) {
-	if (p->type == para_Preamble) {
-	    whlp_para_attr(h, WHLP_PARA_SPACEBELOW, 12);
-	    whlp_begin_para(h, WHLP_PARA_SCROLL);
-	    whlp_mkparagraph(&state, FONT_NORMAL, p->words, FALSE);
-	    whlp_end_para(h);
-	}
-    }
-
-    /*
-     * The copyright goes to two places, again: into the contents
-     * page and also into the system section.
+     * Put the copyright into the system section.
      */
     {
 	rdstringc rs = {0, 0, NULL};
 	for (p = sourceform; p; p = p->next) {
-	    if (p->type == para_Copyright) {
-		whlp_para_attr(h, WHLP_PARA_SPACEBELOW, 12);
-		whlp_begin_para(h, WHLP_PARA_SCROLL);
-		whlp_mkparagraph(&state, FONT_NORMAL, p->words, FALSE);
-		whlp_end_para(h);
+	    if (p->type == para_Copyright)
 		whlp_rdaddwc(&rs, p->words);
-	    }
 	}
 	if (rs.text) {
 	    whlp_copyright(h, rs.text);
@@ -207,17 +188,6 @@ void whlp_backend(paragraph *sourceform, keywordlist *keywords,
 	}
     }
 
-    /*
-     * Now do the primary navigation menu.
-     */
-    for (p = sourceform; p; p = p->next) {
-	if (p->type == para_Chapter ||
-	    p->type == para_Appendix ||
-	    p->type == para_UnnumberedChapter)
-	    whlp_navmenu(&state, p);
-    }
-
-    state.curr_topic = contents_topic;
     lastsect = NULL;
 
     /* ------------------------------------------------------------------
@@ -234,16 +204,16 @@ void whlp_backend(paragraph *sourceform, keywordlist *keywords,
       case para_BR:
       case para_Biblio:		       /* only touch BiblioCited */
       case para_VersionID:
-      case para_Copyright:
-      case para_Preamble:
       case para_NoCite:
       case para_Title:
 	break;
 
       case para_LcontPush:
+      case para_QuotePush:
 	nesting++;
 	break;
       case para_LcontPop:
+      case para_QuotePop:
 	assert(nesting > 0);
 	nesting--;
 	break;
@@ -256,6 +226,28 @@ void whlp_backend(paragraph *sourceform, keywordlist *keywords,
       case para_UnnumberedChapter:
       case para_Heading:
       case para_Subsect:
+
+	if (!done_contents_topic) {
+	    paragraph *p;
+
+	    /*
+	     * If this is the first section title we've seen, then
+	     * we're currently still in the contents topic. We
+	     * should therefore finish up the contents page by
+	     * writing a nav menu.
+	     */
+	    for (p = sourceform; p; p = p->next) {
+		if (p->type == para_Chapter ||
+		    p->type == para_Appendix ||
+		    p->type == para_UnnumberedChapter)
+		    whlp_navmenu(&state, p);
+	    }
+
+	    state.curr_topic = contents_topic;
+
+	    done_contents_topic = TRUE;
+	}
+
 	if (lastsect && lastsect->child) {
 	    paragraph *q;
 	    /*
@@ -360,6 +352,7 @@ void whlp_backend(paragraph *sourceform, keywordlist *keywords,
 	break;
 
       case para_Normal:
+      case para_Copyright:
       case para_DescribedThing:
       case para_Description:
       case para_BiblioCited: