nsection) {
@@ -867,12 +872,12 @@ static void xhtml_do_top_file(xhtmlfile *file, paragraph *sourceform)
for (p = sourceform; p; p = p->next)
{
if (p->type == para_Title) {
- xhtml_heading(fp, p);
+ xhtml_heading(fp, p, FALSE);
break;
}
}
- /* Do the preamble and copyright */
+ /* Do the preamble */
for (p = sourceform; p; p = p->next)
{
if (p->type == para_Chapter || p->type == para_Heading ||
@@ -882,19 +887,10 @@ static void xhtml_do_top_file(xhtmlfile *file, paragraph *sourceform)
* We've found the end of the preamble. Do every normal
* paragraph up to there.
*/
- xhtml_do_paras(fp, sourceform, p);
+ xhtml_do_paras(fp, sourceform, p, FALSE);
break;
}
}
- for (p = sourceform; p; p = p->next)
- {
- if (p->type == para_Copyright)
- {
- fprintf(fp, "");
- xhtml_para(fp, p->words);
- fprintf(fp, "
\n");
- }
- }
xhtml_do_contents(fp, file);
xhtml_do_sections(fp, file->sections);
@@ -1051,13 +1047,13 @@ static int xhtml_add_contents_entry(FILE *fp, xhtmlsection *section, int limit)
}
fprintf(fp, "", section->file->filename, section->fragment);
if (section->para->kwtext) {
- xhtml_para(fp, section->para->kwtext);
+ xhtml_para(fp, section->para->kwtext, FALSE);
if (section->para->words) {
fprintf(fp, ": ");
}
}
if (section->para->words) {
- xhtml_para(fp, section->para->words);
+ xhtml_para(fp, section->para->words, FALSE);
}
fprintf(fp, "\n");
return TRUE;
@@ -1071,14 +1067,15 @@ static void xhtml_do_sections(FILE *fp, xhtmlsection *sections)
{
while (sections) {
currentsection = sections;
- xhtml_do_paras(fp, sections->para, NULL);
+ xhtml_do_paras(fp, sections->para, NULL, TRUE);
xhtml_do_sections(fp, sections->child);
sections = sections->next;
}
}
/* Write this list of paragraphs. Close off all lists at the end. */
-static void xhtml_do_paras(FILE *fp, paragraph *p, paragraph *end)
+static void xhtml_do_paras(FILE *fp, paragraph *p, paragraph *end,
+ int indexable)
{
int last_type = -1, ptype, first=TRUE;
stack lcont_stack = stk_new();
@@ -1098,7 +1095,6 @@ static void xhtml_do_paras(FILE *fp, paragraph *p, paragraph *end)
case para_BR:
case para_Biblio: /* only touch BiblioCited */
case para_VersionID:
- case para_Copyright:
case para_NoCite:
case para_Title:
break;
@@ -1109,12 +1105,12 @@ static void xhtml_do_paras(FILE *fp, paragraph *p, paragraph *end)
case para_Chapter:
case para_Appendix:
case para_UnnumberedChapter:
- xhtml_heading(fp, p);
+ xhtml_heading(fp, p, indexable);
break;
case para_Heading:
case para_Subsect:
- xhtml_heading(fp, p);
+ xhtml_heading(fp, p, indexable);
break;
case para_Rule:
@@ -1122,8 +1118,9 @@ static void xhtml_do_paras(FILE *fp, paragraph *p, paragraph *end)
break;
case para_Normal:
+ case para_Copyright:
fprintf(fp, "\n");
- xhtml_para(fp, p->words);
+ xhtml_para(fp, p->words, indexable);
fprintf(fp, "
\n");
break;
@@ -1177,10 +1174,10 @@ static void xhtml_do_paras(FILE *fp, paragraph *p, paragraph *end)
fprintf(fp, "");
} else if (p->type == para_BiblioCited) {
fprintf(fp, "");
- xhtml_para(fp, p->kwtext);
+ xhtml_para(fp, p->kwtext, indexable);
fprintf(fp, "\n");
}
- xhtml_para(fp, p->words);
+ xhtml_para(fp, p->words, indexable);
{
paragraph *p2 = p->next;
if (p2 && xhtml_para_level(p2)==-1 && p2->type == para_LcontPush)
@@ -1246,7 +1243,7 @@ static void xhtml_doheader(FILE *fp, word *title)
if (title==NULL)
fprintf(fp, "The thing with no name!");
else
- xhtml_para(fp, title);
+ xhtml_para(fp, title, FALSE);
fprintf(fp, "\n");
fprintf(fp, "\n", version);
if (conf.author)
@@ -1302,7 +1299,7 @@ static void xhtml_versionid(FILE *fp, word *text, int started)
rdstringc t = { 0, 0, NULL };
rdaddc(&t, '['); /* FIXME: configurability */
- xhtml_rdaddwc(&t, text, NULL);
+ xhtml_rdaddwc(&t, text, NULL, FALSE);
rdaddc(&t, ']'); /* FIXME: configurability */
if (started)
@@ -1392,8 +1389,14 @@ static int xhtml_convert(wchar_t *s, int maxlen, char **result,
/*
* This formats the given words as XHTML.
+ *
+ * `indexable', if FALSE, prohibits adding any index references.
+ * You might use this, for example, if an index reference occurred
+ * in a section title, to prevent phony index references when the
+ * section title is processed in strange places such as contents
+ * sections.
*/
-static void xhtml_rdaddwc(rdstringc *rs, word *text, word *end) {
+static void xhtml_rdaddwc(rdstringc *rs, word *text, word *end, int indexable) {
char *c;
keyword *kwl;
xhtmlsection *sect;
@@ -1440,6 +1443,9 @@ static void xhtml_rdaddwc(rdstringc *rs, word *text, word *end) {
/* what we _do_ need to do is to fix up the backend data
* for any indexentry this points to.
*/
+ if (!indexable)
+ break;
+
for (ti=0; (itag = (indextag *)index234(idx->tags, ti))!=NULL; ti++) {
/* FIXME: really ustricmp() and not ustrcmp()? */
if (ustricmp(itag->name, text->text)==0) {
@@ -1520,7 +1526,7 @@ static void xhtml_rdaddwc(rdstringc *rs, word *text, word *end) {
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, ' ');
@@ -1543,7 +1549,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;
@@ -1574,7 +1580,7 @@ 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, 0, &c, FALSE)) {
@@ -1583,7 +1589,7 @@ static void xhtml_heading(FILE *fp, paragraph *p)
}
}
} 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, 0, &c, FALSE)) {
@@ -1592,7 +1598,7 @@ static void xhtml_heading(FILE *fp, paragraph *p)
}
}
}
- 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
@@ -1612,10 +1618,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);
}