* fine; the ones for numbered list and bibliociteds are utter
* crap; the ones for indexes _might_ do but it might be worth
* giving some thought to how to do them better.
- * + also set up a mechanism for ensuring that fragment IDs
- * never clash.
*
- * - nonbreaking spaces?
+ * - nonbreaking spaces.
+ *
+ * - free up all the data we have allocated while running this
+ * backend.
*/
#include <stdio.h>
typedef struct {
htmlfile *head, *tail;
htmlfile *single, *index;
+ tree234 *frags;
} htmlfilelist;
typedef struct {
} htmlsectlist;
typedef struct {
+ htmlfile *file;
+ char *fragment;
+} htmlfragment;
+
+typedef struct {
int nrefs, refsize;
word **refs;
} htmlindex;
int contents_level;
} htmloutput;
+static int html_fragment_compare(void *av, void *bv)
+{
+ htmlfragment *a = (htmlfragment *)av;
+ htmlfragment *b = (htmlfragment *)bv;
+ int cmp;
+
+ if ((cmp = strcmp(a->file->filename, b->file->filename)) != 0)
+ return cmp;
+ else
+ return strcmp(a->fragment, b->fragment);
+}
+
static void html_file_section(htmlconfig *cfg, htmlfilelist *files,
htmlsect *sect, int depth);
htmlfile *targetfile, char *targetfrag);
static char *html_format(paragraph *p, char *template_string);
-static void html_sanitise_fragment(char *text);
+static char *html_sanitise_fragment(htmlfilelist *files, htmlfile *file,
+ char *text);
static void html_contents_entry(htmloutput *ho, int depth, htmlsect *s,
htmlfile *thisfile, keywordlist *keywords,
ret.achapter.just_numbers = FALSE;
ret.achapter.number_suffix = L": ";
ret.nasect = 1;
- ret.asect = mknewa(sectlevel, ret.nasect);
+ ret.asect = snewn(ret.nasect, sectlevel);
ret.asect[0].just_numbers = TRUE;
ret.asect[0].number_suffix = L" ";
ret.ncdepths = 0;
}
if (n >= ret.nasect) {
int i;
- ret.asect = resize(ret.asect, n+1);
+ ret.asect = sresize(ret.asect, n+1, sectlevel);
for (i = ret.nasect; i <= n; i++)
ret.asect[i] = ret.asect[ret.nasect-1];
ret.nasect = n+1;
}
if (n >= ret.nasect) {
int i;
- ret.asect = resize(ret.asect, n+1);
+ ret.asect = sresize(ret.asect, n+1, sectlevel);
for (i = ret.nasect; i <= n; i++) {
ret.asect[i] = ret.asect[ret.nasect-1];
}
}
if (n >= ret.ncdepths) {
int i;
- ret.contents_depths = resize(ret.contents_depths, n+1);
+ ret.contents_depths =
+ sresize(ret.contents_depths, n+1, int);
for (i = ret.ncdepths; i <= n; i++) {
ret.contents_depths[i] = i+2;
}
indexdata *idx, void *unused) {
paragraph *p;
htmlconfig conf;
- htmlfilelist files = { NULL, NULL, NULL, NULL };
+ htmlfilelist files = { NULL, NULL, NULL, NULL, NULL };
htmlsectlist sects = { NULL, NULL }, nonsects = { NULL, NULL };
IGNORE(unused);
for (p = sourceform; p; p = p->next)
p->private_data = NULL;
+ files.frags = newtree234(html_fragment_compare);
+
/*
* Start by figuring out into which file each piece of the
* document should be put. We'll do this by inventing an
html_file_section(&conf, &files, sect, d);
sect->fragment = html_format(p, conf.template_fragment);
- html_sanitise_fragment(sect->fragment);
- /* FIXME: clash checking? add to a tree of (file,frag)? */
+ sect->fragment = html_sanitise_fragment(&files, sect->file,
+ sect->fragment);
}
/* And the index. */
sect = html_new_sect(§s, NULL);
- sect->fragment = dupstr("Index"); /* FIXME: this _can't_ be right */
sect->text = NULL;
sect->type = INDEX;
sect->parent = topsect;
html_file_section(&conf, &files, sect, 0); /* peer of chapters */
+ sect->fragment = dupstr("Index"); /* FIXME: this _can't_ be right */
+ sect->fragment = html_sanitise_fragment(&files, sect->file,
+ sect->fragment);
files.index = sect->file;
}
* configuration template. For the moment I'll just
* invent something completely stupid.
*/
- sect->fragment = mknewa(char, 40);
+ sect->fragment = snewn(40, char);
sprintf(sect->fragment, "frag%p", sect);
+ sect->fragment = html_sanitise_fragment(&files, sect->file,
+ sect->fragment);
}
}
}
*/
for (i = 0; (entry = index234(idx->entries, i)) != NULL; i++) {
- htmlindex *hi = mknew(htmlindex);
+ htmlindex *hi = snew(htmlindex);
hi->nrefs = hi->refsize = 0;
hi->refs = NULL;
/*
* Run over the document inventing fragments. Each fragment
* is of the form `i' followed by an integer.
- *
- * FIXME: Probably in the file-organisation pass we should
- * work out the fragment names of every section, so that we
- * could load them all into a tree and hence ensure these
- * index fragments don't clash with them.
*/
lastsect = NULL;
for (p = sourceform; p; p = p->next) {
for (w = p->words; w; w = w->next)
if (w->type == word_IndexRef) {
- htmlindexref *hr = mknew(htmlindexref);
+ htmlindexref *hr = snew(htmlindexref);
indextag *tag;
int i;
hr->section = lastsect;
- /* FIXME: clash checking */
{
char buf[40];
sprintf(buf, "i%d",
lastsect->file->last_fragment_number++);
hr->fragment = dupstr(buf);
+ hr->fragment =
+ html_sanitise_fragment(&files, hr->section->file,
+ hr->fragment);
}
w->private_data = hr;
if (hi->nrefs >= hi->refsize) {
hi->refsize += 32;
- hi->refs = resize(hi->refs, hi->refsize);
+ hi->refs = sresize(hi->refs, hi->refsize, word *);
}
hi->refs[hi->nrefs++] = w;
if (adepth <= a->contents_depth) {
if (ntoc >= tocsize) {
tocsize += 64;
- toc = resize(toc, tocsize);
+ toc = sresize(toc, tocsize, htmlsect *);
}
toc[ntoc++] = s;
}
* Now display the section text.
*/
if (s->text) {
- stackhead = mknew(struct stackelement);
+ stackhead = snew(struct stackelement);
stackhead->next = NULL;
stackhead->listtype = NOLIST;
stackhead->itemtype = NOITEM;
break;
case para_LcontPush:
- se = mknew(struct stackelement);
+ se = snew(struct stackelement);
se->next = stackhead;
se->listtype = NOLIST;
se->itemtype = NOITEM;
}
/*
- * FIXME: Figure out a way to free the htmlindex and
- * htmlindexref structures.
+ * FIXME: Free all the working data.
*/
}
static htmlfile *html_new_file(htmlfilelist *list, char *filename)
{
- htmlfile *ret = mknew(htmlfile);
+ htmlfile *ret = snew(htmlfile);
ret->next = NULL;
if (list->tail)
static htmlsect *html_new_sect(htmlsectlist *list, paragraph *title)
{
- htmlsect *ret = mknew(htmlsect);
+ htmlsect *ret = snew(htmlsect);
ret->next = NULL;
if (list->tail)
return rdtrimc(&rs);
}
-static void html_sanitise_fragment(char *text)
+static char *html_sanitise_fragment(htmlfilelist *files, htmlfile *file,
+ char *text)
{
/*
* The HTML 4 spec's strictest definition of fragment names (<a
while (*p && !((*p>='A' && *p<='Z') || (*p>='a' && *p<='z')))
p++;
- if (!(*q++ = *p++))
- return;
- while (*p) {
- if ((*p>='A' && *p<='Z') ||
- (*p>='a' && *p<='z') ||
- (*p>='0' && *p<='9') ||
- *p=='-' || *p=='_' || *p==':' || *p=='.')
- *q++ = *p;
- p++;
+ if ((*q++ = *p++) != '\0') {
+ while (*p) {
+ if ((*p>='A' && *p<='Z') ||
+ (*p>='a' && *p<='z') ||
+ (*p>='0' && *p<='9') ||
+ *p=='-' || *p=='_' || *p==':' || *p=='.')
+ *q++ = *p;
+ p++;
+ }
+
+ *q = '\0';
+ }
+
+ /*
+ * Now we check for clashes with other fragment names, and
+ * adjust this one if necessary by appending a hyphen followed
+ * by a number.
+ */
+ {
+ htmlfragment *frag = snew(htmlfragment);
+ int len = 0; /* >0 indicates we have resized */
+ int suffix = 1;
+
+ frag->file = file;
+ frag->fragment = text;
+
+ while (add234(files->frags, frag) != frag) {
+ if (!len) {
+ len = strlen(text);
+ frag->fragment = text = sresize(text, len+20, char);
+ }
+
+ sprintf(text + len, "-%d", ++suffix);
+ }
}
- *q = '\0';
+ return text;
}
static void html_contents_entry(htmloutput *ho, int depth, htmlsect *s,
~mdw / sgt / halibut / blobdiff