X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/a0f2c1119448e28962703c34326180575f899146..8902e0ed6134c9ecc1177ef535852070d0e7326d:/bk_text.c?ds=sidebyside

diff --git a/bk_text.c b/bk_text.c
index 48e99f4..bde11bb 100644
--- a/bk_text.c
+++ b/bk_text.c
@@ -182,7 +182,9 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
     word spaceword;
     FILE *fp;
     char *prefixextra;
+    int nesting, nestindent;
     int indentb, indenta;
+    int done_copyright;
 
     IGNORE(keywords);		       /* we don't happen to need this */
     IGNORE(idx);		       /* or this */
@@ -207,21 +209,29 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
 	    text_heading(fp, NULL, NULL, p->words,
 			 conf.atitle, conf.indent, conf.width);
 
-    /* Do the preamble and copyright */
-    for (p = sourceform; p; p = p->next)
-	if (p->type == para_Preamble)
-	    text_para(fp, NULL, NULL, p->words,
-		      conf.indent_preambles ? conf.indent : 0, 0,
-		      conf.width + (conf.indent_preambles ? 0 : conf.indent));
-    for (p = sourceform; p; p = p->next)
-	if (p->type == para_Copyright)
-	    text_para(fp, NULL, NULL, p->words,
-		      conf.indent_preambles ? conf.indent : 0, 0,
-		      conf.width + (conf.indent_preambles ? 0 : conf.indent));
+    nestindent = conf.listindentbefore + conf.listindentafter;
+    nesting = (conf.indent_preambles ? 0 : -conf.indent);
+    done_copyright = FALSE;
 
     /* Do the main document */
     for (p = sourceform; p; p = p->next) switch (p->type) {
 
+      case para_QuotePush:
+	nesting += 2;
+	break;
+      case para_QuotePop:
+	nesting -= 2;
+	assert(nesting >= 0);
+	break;
+
+      case para_LcontPush:
+	nesting += nestindent;
+	break;
+      case para_LcontPop:
+	nesting -= nestindent;
+	assert(nesting >= 0);
+	break;
+
 	/*
 	 * Things we ignore because we've already processed them or
 	 * aren't going to touch them in this pass.
@@ -231,7 +241,6 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
       case para_Biblio:		       /* only touch BiblioCited */
       case para_VersionID:
       case para_Copyright:
-      case para_Preamble:
       case para_NoCite:
       case para_Title:
 	break;
@@ -242,8 +251,22 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
       case para_Chapter:
       case para_Appendix:
       case para_UnnumberedChapter:
+	/*
+	 * The copyright should come after the preamble but before
+	 * the first chapter title.
+	 */
+	if (!done_copyright) {
+	    paragraph *p;
+
+	    for (p = sourceform; p; p = p->next)
+		if (p->type == para_Copyright)
+		    text_para(fp, NULL, NULL, p->words,
+			      conf.indent + nesting, 0, conf.width - nesting);
+	    done_copyright = TRUE;
+	}
 	text_heading(fp, p->kwtext, p->kwtext2, p->words,
 		     conf.achapter, conf.indent, conf.width);
+	nesting = 0;
 	break;
 
       case para_Heading:
@@ -254,10 +277,12 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
 	break;
 
       case para_Rule:
-	text_rule(fp, conf.indent, conf.width);
+	text_rule(fp, conf.indent + nesting, conf.width - nesting);
 	break;
 
       case para_Normal:
+      case para_DescribedThing:
+      case para_Description:
       case para_BiblioCited:
       case para_Bullet:
       case para_NumberedList:
@@ -271,6 +296,11 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
 	    prefixextra = ".";	       /* FIXME: configurability */
 	    indentb = conf.listindentbefore;
 	    indenta = conf.listindentafter;
+	} else if (p->type == para_Description) {
+	    prefix = NULL;
+	    prefixextra = NULL;
+	    indentb = conf.listindentbefore;
+	    indenta = conf.listindentafter;
 	} else {
 	    prefix = NULL;
 	    prefixextra = NULL;
@@ -289,8 +319,8 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
 	    body = p->words;
 	}
 	text_para(fp, prefix, prefixextra, body,
-		  conf.indent + indentb, indenta,
-		  conf.width - indentb - indenta);
+		  conf.indent + nesting + indentb, indenta,
+		  conf.width - nesting - indentb - indenta);
 	if (wp) {
 	    wp->next = NULL;
 	    free_word_list(body);
@@ -298,7 +328,9 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
 	break;
 
       case para_Code:
-	text_codepara(fp, p->words, conf.indent + conf.indent_code, conf.width - 2 * conf.indent_code);
+	text_codepara(fp, p->words,
+		      conf.indent + nesting + conf.indent_code,
+		      conf.width - nesting - 2 * conf.indent_code);
 	break;
     }