"); - xhtml_para(fp, p->words); - fprintf(fp, "
\n"); - } - } + /* Do the preamble */ for (p = sourceform; p; p = p->next) { - if (p->type == para_Copyright) - { - fprintf(fp, ""); - xhtml_para(fp, p->words); - fprintf(fp, "
\n"); + if (p->type == para_Chapter || p->type == para_Heading || + p->type == para_Subsect || p->type == para_Appendix || + p->type == para_UnnumberedChapter) { + /* + * We've found the end of the preamble. Do every normal + * paragraph up to there. + */ + xhtml_do_paras(fp, sourceform, p, FALSE); + break; } } @@ -933,7 +933,7 @@ static void xhtml_utostr(wchar_t *in, char **out) */ static int xhtml_do_contents(FILE *fp, xhtmlfile *file) { - int level, limit, start_level, count = 0; + int level, limit, count = 0; if (!file) return 0; @@ -947,7 +947,7 @@ static int xhtml_do_contents(FILE *fp, xhtmlfile *file) if (fp!=NULL) { while (last_level > start_level) { last_level--; - fprintf(fp, "\n"); + fprintf(fp, "\n"); } } return count; @@ -969,7 +969,7 @@ static int xhtml_do_naked_contents(FILE *fp, xhtmlfile *file) if (fp!=NULL) { while (last_level > start_level) { last_level--; - fprintf(fp, "\n"); + fprintf(fp, "\n"); } } return count; @@ -1037,25 +1037,30 @@ static int xhtml_add_contents_entry(FILE *fp, xhtmlsection *section, int limit) return FALSE; if (fp==NULL || section->level < 0) return TRUE; - while (last_level > section->level) { - last_level--; - fprintf(fp, "\n"); - } - while (last_level < section->level) { + if (last_level > section->level) { + while (last_level > section->level) { + last_level--; + fprintf(fp, "\n"); + } + fprintf(fp, "\n"); + } else if (last_level < section->level) { + assert(last_level == section->level - 1); last_level++; fprintf(fp, ""); - xhtml_para(fp, p->words); + xhtml_para(fp, p->words, indexable); fprintf(fp, "
\n"); break; + case para_LcontPush: + { + int *p; + p = mknew(int); + *p = last_type; + stk_push(lcont_stack, p); + last_type = para_Normal; + } + break; + case para_LcontPop: + { + int *p = stk_pop(lcont_stack); + assert(p); + ptype = last_type = *p; + sfree(p); + goto closeofflist; /* ick */ + } + break; + case para_QuotePush: + fprintf(fp, "\n"); + break; + case para_QuotePop: + fprintf(fp, "\n"); + break; + case para_Bullet: case para_NumberedList: + case para_Description: + case para_DescribedThing: case para_BiblioCited: - if (last_type!=p->type) { + if (last_type!=p->type && + !(last_type==para_DescribedThing && p->type==para_Description) && + !(last_type==para_Description && p->type==para_DescribedThing)) { /* start up list if necessary */ if (p->type == para_Bullet) { fprintf(fp, "
");
if (removeattr(text->type) == word_Normal) {
- if (xhtml_convert(text->text, &c, TRUE)) /* spaces in the word are hard */
+ if (xhtml_convert(text->text, 0, &c, TRUE)) /* spaces in the word are hard */
rdaddsc(rs, c);
else
- xhtml_rdaddwc(rs, text->alt, NULL);
+ xhtml_rdaddwc(rs, text->alt, NULL, indexable);
sfree(c);
} else if (removeattr(text->type) == word_WhiteSpace) {
rdaddc(rs, ' ');
@@ -1485,7 +1559,7 @@ static void xhtml_rdaddwc(rdstringc *rs, word *text, word *end) {
/* Output a heading, formatted as XHTML.
*/
-static void xhtml_heading(FILE *fp, paragraph *p)
+static void xhtml_heading(FILE *fp, paragraph *p, int indexable)
{
rdstringc t = { 0, 0, NULL };
word *tprefix = p->kwtext;
@@ -1516,25 +1590,25 @@ static void xhtml_heading(FILE *fp, paragraph *p)
fmt = &conf.fsect[conf.nfsect-1];
if (fmt && fmt->just_numbers && nprefix) {
- xhtml_rdaddwc(&t, nprefix, NULL);
+ xhtml_rdaddwc(&t, nprefix, NULL, indexable);
if (fmt) {
char *c;
- if (xhtml_convert(fmt->number_suffix, &c, FALSE)) {
+ if (xhtml_convert(fmt->number_suffix, 0, &c, FALSE)) {
rdaddsc(&t, c);
sfree(c);
}
}
} else if (fmt && !fmt->just_numbers && tprefix) {
- xhtml_rdaddwc(&t, tprefix, NULL);
+ xhtml_rdaddwc(&t, tprefix, NULL, indexable);
if (fmt) {
char *c;
- if (xhtml_convert(fmt->number_suffix, &c, FALSE)) {
+ if (xhtml_convert(fmt->number_suffix, 0, &c, FALSE)) {
rdaddsc(&t, c);
sfree(c);
}
}
}
- xhtml_rdaddwc(&t, text, NULL);
+ xhtml_rdaddwc(&t, text, NULL, indexable);
/*
* If we're outputting in single-file mode, we need to lower
* the level of each heading by one, because the overall
@@ -1554,10 +1628,10 @@ static void xhtml_heading(FILE *fp, paragraph *p)
/* Output a paragraph. Styles are handled by xhtml_rdaddwc().
* This looks pretty simple; I may have missed something ...
*/
-static void xhtml_para(FILE *fp, word *text)
+static void xhtml_para(FILE *fp, word *text, int indexable)
{
rdstringc out = { 0, 0, NULL };
- xhtml_rdaddwc(&out, text, NULL);
+ xhtml_rdaddwc(&out, text, NULL, indexable);
fprintf(fp, "%s", out.text);
sfree(out.text);
}
@@ -1571,10 +1645,49 @@ static void xhtml_codepara(FILE *fp, word *text)
{
fprintf(fp, "");
for (; text; text = text->next) if (text->type == word_WeakCode) {
+ word *here, *next;
char *c;
- xhtml_convert(text->text, &c, FALSE);
- fprintf(fp, "%s\n", c);
- sfree(c);
+
+ /*
+ * See if this WeakCode is followed by an Emph to indicate
+ * emphasis.
+ */
+ here = text;
+ if (text->next && text->next->type == word_Emph) {
+ next = text = text->next;
+ } else
+ next = NULL;
+
+ if (next) {
+ wchar_t *t, *e;
+ int n;
+
+ t = here->text;
+ e = next->text;
+
+ while (*e) {
+ int ec = *e;
+
+ for (n = 0; t[n] && e[n] && e[n] == ec; n++);
+ xhtml_convert(t, n, &c, FALSE);
+ fprintf(fp, "%s%s%s",
+ (ec == 'i' ? "" : ec == 'b' ? "" : ""),
+ c,
+ (ec == 'i' ? "" : ec == 'b' ? "" : ""));
+ sfree(c);
+
+ t += n;
+ e += n;
+ }
+
+ xhtml_convert(t, 0, &c, FALSE);
+ fprintf(fp, "%s\n", c);
+ sfree(c);
+ } else {
+ xhtml_convert(here->text, 0, &c, FALSE);
+ fprintf(fp, "%s\n", c);
+ sfree(c);
+ }
}
fprintf(fp, "\n");
}