X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/a0f2c1119448e28962703c34326180575f899146..7136a6c7f094fa423c48ec319748c4fd7e1fa645:/bk_text.c

diff --git a/bk_text.c b/bk_text.c
index 48e99f4..989cdbf 100644
--- a/bk_text.c
+++ b/bk_text.c
@@ -182,6 +182,7 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
     word spaceword;
     FILE *fp;
     char *prefixextra;
+    int nesting, nestindent;
     int indentb, indenta;
 
     IGNORE(keywords);		       /* we don't happen to need this */
@@ -219,9 +220,20 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
 		      conf.indent_preambles ? conf.indent : 0, 0,
 		      conf.width + (conf.indent_preambles ? 0 : conf.indent));
 
+    nestindent = conf.listindentbefore + conf.listindentafter;
+    nesting = 0;
+
     /* Do the main document */
     for (p = sourceform; p; p = p->next) switch (p->type) {
 
+      case para_LcontPush:
+	nesting++;
+	break;
+      case para_LcontPop:
+	assert(nesting > 0);
+	nesting--;
+	break;
+
 	/*
 	 * Things we ignore because we've already processed them or
 	 * aren't going to touch them in this pass.
@@ -254,10 +266,13 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
 	break;
 
       case para_Rule:
-	text_rule(fp, conf.indent, conf.width);
+	text_rule(fp, conf.indent + nestindent*nesting,
+		  conf.width - nestindent*nesting);
 	break;
 
       case para_Normal:
+      case para_DescribedThing:
+      case para_Description:
       case para_BiblioCited:
       case para_Bullet:
       case para_NumberedList:
@@ -271,6 +286,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 +309,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 + nestindent*nesting + indentb, indenta,
+		  conf.width - nestindent*nesting - indentb - indenta);
 	if (wp) {
 	    wp->next = NULL;
 	    free_word_list(body);
@@ -298,7 +318,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 + nestindent*nesting + conf.indent_code,
+		      conf.width - nestindent*nesting - 2 * conf.indent_code);
 	break;
     }