} 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 = uadv(source->keyword);
+ ret.achapter.number_suffix = ustrdup(uadv(source->keyword));
} else if (!ustricmp(source->keyword, L"text-section-align")) {
wchar_t *p = uadv(source->keyword);
int n = 0;
ret.asect[i] = ret.asect[ret.nasect-1];
ret.nasect = n+1;
}
- ret.asect[n].number_suffix = p;
+ ret.asect[n].number_suffix = ustrdup(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")) {
word spaceword;
FILE *fp;
char *prefixextra;
+ int nesting, nestindent;
int indentb, indenta;
IGNORE(keywords); /* we don't happen to need this */
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.
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:
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;
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);
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;
}