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

diff --git a/bk_text.c b/bk_text.c
index 989cdbf..fdb1055 100644
--- a/bk_text.c
+++ b/bk_text.c
@@ -24,6 +24,7 @@ typedef struct {
     int include_version_id;
     int indent_preambles;
     word bullet;
+    char *filename;
 } textconfig;
 
 static int text_convert(wchar_t *, char **);
@@ -65,22 +66,26 @@ static textconfig text_configure(paragraph *source) {
     ret.atitle.underline = L'=';
     ret.achapter.align = LEFT;
     ret.achapter.just_numbers = FALSE;
-    ret.achapter.number_suffix = ustrdup(L": ");
+    ret.achapter.number_suffix = L": ";
     ret.achapter.underline = L'-';
     ret.nasect = 1;
     ret.asect = mknewa(alignstruct, ret.nasect);
     ret.asect[0].align = LEFTPLUS;
     ret.asect[0].just_numbers = TRUE;
-    ret.asect[0].number_suffix = ustrdup(L" ");
+    ret.asect[0].number_suffix = L" ";
     ret.asect[0].underline = L'\0';
     ret.include_version_id = TRUE;
     ret.indent_preambles = FALSE;
-    ret.bullet.text = ustrdup(L"-");
+    ret.bullet.text = L"-";
+    ret.filename = dupstr("output.txt");
 
     for (; source; source = source->next) {
 	if (source->type == para_Config) {
 	    if (!ustricmp(source->keyword, L"text-indent")) {
 		ret.indent = utoi(uadv(source->keyword));
+	    } else if (!ustricmp(source->keyword, L"text-filename")) {
+		sfree(ret.filename);
+		ret.filename = utoa_dup(uadv(source->keyword));
 	    } else if (!ustricmp(source->keyword, L"text-indent-code")) {
 		ret.indent_code = utoi(uadv(source->keyword));
 	    } else if (!ustricmp(source->keyword, L"text-width")) {
@@ -96,7 +101,7 @@ static textconfig text_configure(paragraph *source) {
 	    } else if (!ustricmp(source->keyword, L"text-chapter-numeric")) {
 		ret.achapter.just_numbers = utob(uadv(source->keyword));
 	    } else if (!ustricmp(source->keyword, L"text-chapter-suffix")) {
-		ret.achapter.number_suffix = ustrdup(uadv(source->keyword));
+		ret.achapter.number_suffix = uadv(source->keyword);
 	    } else if (!ustricmp(source->keyword, L"text-section-align")) {
 		wchar_t *p = uadv(source->keyword);
 		int n = 0;
@@ -152,11 +157,12 @@ static textconfig text_configure(paragraph *source) {
 		if (n >= ret.nasect) {
 		    int i;
 		    ret.asect = resize(ret.asect, n+1);
-		    for (i = ret.nasect; i <= n; i++)
+		    for (i = ret.nasect; i <= n; i++) {
 			ret.asect[i] = ret.asect[ret.nasect-1];
+		    }
 		    ret.nasect = n+1;
 		}
-		ret.asect[n].number_suffix = ustrdup(p);
+		ret.asect[n].number_suffix = p;
 	    } else if (!ustricmp(source->keyword, L"text-title-align")) {
 		ret.atitle.align = utoalign(uadv(source->keyword));
 	    } else if (!ustricmp(source->keyword, L"text-title-underline")) {
@@ -174,6 +180,34 @@ static textconfig text_configure(paragraph *source) {
     return ret;
 }
 
+paragraph *text_config_filename(char *filename)
+{
+    paragraph *p;
+    wchar_t *ufilename, *up;
+    int len;
+
+    p = mknew(paragraph);
+    memset(p, 0, sizeof(*p));
+    p->type = para_Config;
+    p->next = NULL;
+    p->fpos.filename = "<command line>";
+    p->fpos.line = p->fpos.col = -1;
+
+    ufilename = ufroma_dup(filename);
+    len = ustrlen(ufilename) + 2 + lenof(L"text-filename");
+    p->keyword = mknewa(wchar_t, len);
+    up = p->keyword;
+    ustrcpy(up, L"text-filename");
+    up = uadv(up);
+    ustrcpy(up, ufilename);
+    up = uadv(up);
+    *up = L'\0';
+    assert(up - p->keyword < len);
+    sfree(ufilename);
+
+    return p;
+}
+
 void text_backend(paragraph *sourceform, keywordlist *keywords,
 		  indexdata *idx) {
     paragraph *p;
@@ -191,14 +225,11 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
     conf = text_configure(sourceform);
 
     /*
-     * Determine the output file name, and open the output file
-     *
-     * FIXME: want configurable output file names here. For the
-     * moment, we'll just call it `output.txt'.
+     * Open the output file.
      */
-    fp = fopen("output.txt", "w");
+    fp = fopen(conf.filename, "w");
     if (!fp) {
-	error(err_cantopenw, "output.txt");
+	error(err_cantopenw, conf.filename);
 	return;
     }
 
@@ -208,30 +239,26 @@ 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 = 0;
+    nesting = (conf.indent_preambles ? 0 : -conf.indent);
 
     /* 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++;
+	nesting += nestindent;
 	break;
       case para_LcontPop:
-	assert(nesting > 0);
-	nesting--;
+	nesting -= nestindent;
+	assert(nesting >= 0);
 	break;
 
 	/*
@@ -242,8 +269,6 @@ void text_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;
@@ -256,6 +281,7 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
       case para_UnnumberedChapter:
 	text_heading(fp, p->kwtext, p->kwtext2, p->words,
 		     conf.achapter, conf.indent, conf.width);
+	nesting = 0;
 	break;
 
       case para_Heading:
@@ -266,11 +292,11 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
 	break;
 
       case para_Rule:
-	text_rule(fp, conf.indent + nestindent*nesting,
-		  conf.width - nestindent*nesting);
+	text_rule(fp, conf.indent + nesting, conf.width - nesting);
 	break;
 
       case para_Normal:
+      case para_Copyright:
       case para_DescribedThing:
       case para_Description:
       case para_BiblioCited:
@@ -309,8 +335,8 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
 	    body = p->words;
 	}
 	text_para(fp, prefix, prefixextra, body,
-		  conf.indent + nestindent*nesting + indentb, indenta,
-		  conf.width - nestindent*nesting - indentb - indenta);
+		  conf.indent + nesting + indentb, indenta,
+		  conf.width - nesting - indentb - indenta);
 	if (wp) {
 	    wp->next = NULL;
 	    free_word_list(body);
@@ -319,8 +345,8 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
 
       case para_Code:
 	text_codepara(fp, p->words,
-		      conf.indent + nestindent*nesting + conf.indent_code,
-		      conf.width - nestindent*nesting - 2 * conf.indent_code);
+		      conf.indent + nesting + conf.indent_code,
+		      conf.width - nesting - 2 * conf.indent_code);
 	break;
     }
 
@@ -335,14 +361,8 @@ void text_backend(paragraph *sourceform, keywordlist *keywords,
      * Tidy up
      */
     fclose(fp);
-    {
-	int i;
-	sfree(conf.achapter.number_suffix);
-	for (i = 0; i < conf.nasect; i++)
-	    sfree(conf.asect[i].number_suffix);
-	sfree(conf.asect);
-	sfree(conf.bullet.text);
-    }
+    sfree(conf.asect);
+    sfree(conf.filename);
 }
 
 /*