#include <assert.h>
#include "halibut.h"
+/*
+ * FILENAME_TEMPLATE (overridable in config of course) allows you
+ * to choose the general form for your HTML file names. It is
+ * slightly printf-styled (% followed by a single character is a
+ * formatting directive, %% is a literal %). Formatting directives
+ * are:
+ *
+ * - %n is the section type-plus-number, minus whitespace (`Chapter1.2').
+ * - %b is the section number on its own (`1.2').
+ * - %k is the section's _internal_ keyword.
+ * - %N is the section's visible title in the output, again minus
+ * whitespace.
+ *
+ * %n, %b and %k will all default to %N if the section is
+ * unnumbered (`Bibliography' is often a good example).
+ *
+ * FRAGMENT_TEMPLATE is the same, but defines the <a name="foo">
+ * markers used to cross-reference to particular subsections of a
+ * file.
+ */
+
+#define FILENAME_SINGLE "Manual.html"
+#define FILENAME_CONTENTS "Contents.html"
+#define FILENAME_INDEX "IndexPage.html"
+#define FILENAME_TEMPLATE "%n.html"
+#define FRAGMENT_TEMPLATE "%b"
+
struct xhtmlsection_Struct {
struct xhtmlsection_Struct *next; /* next sibling (NULL if split across files) */
struct xhtmlsection_Struct *child; /* NULL if split across files */
int suppress_address;
xhtmlheadfmt fchapter, *fsect;
int nfsect;
+ char *contents_filename, *index_filename;
+ char *single_filename, *template_filename, *template_fragment;
} xhtmlconfig;
/*static void xhtml_level(paragraph *, int);
ret.fsect[0].number_suffix = L": ";
ret.fsect[1].just_numbers = TRUE;
ret.fsect[1].number_suffix = L" ";
+ ret.contents_filename = strdup(FILENAME_CONTENTS);
+ ret.single_filename = strdup(FILENAME_SINGLE);
+ ret.index_filename = strdup(FILENAME_INDEX);
+ ret.template_filename = strdup(FILENAME_TEMPLATE);
+ ret.template_fragment = strdup(FRAGMENT_TEMPLATE);
for (; source; source = source->next)
{
if (source->type == para_Config)
{
- if (!ustricmp(source->keyword, L"xhtml-contents-depth-0")) {
+ if (!ustricmp(source->keyword, L"xhtml-contents-filename")) {
+ sfree(ret.contents_filename);
+ ret.contents_filename = dupstr(adv(source->origkeyword));
+ } else if (!ustricmp(source->keyword, L"xhtml-single-filename")) {
+ sfree(ret.single_filename);
+ ret.single_filename = dupstr(adv(source->origkeyword));
+ } else if (!ustricmp(source->keyword, L"xhtml-index-filename")) {
+ sfree(ret.index_filename);
+ ret.index_filename = dupstr(adv(source->origkeyword));
+ } else if (!ustricmp(source->keyword, L"xhtml-template-filename")) {
+ sfree(ret.template_filename);
+ ret.template_filename = dupstr(adv(source->origkeyword));
+ } else if (!ustricmp(source->keyword, L"xhtml-template-fragment")) {
+ sfree(ret.template_fragment);
+ ret.template_fragment = utoa_dup(uadv(source->keyword), CS_ASCII);
+ } else if (!ustricmp(source->keyword, L"xhtml-contents-depth-0")) {
ret.contents_depth[0] = utoi(uadv(source->keyword));
} else if (!ustricmp(source->keyword, L"xhtml-contents-depth-1")) {
ret.contents_depth[1] = utoi(uadv(source->keyword));
return ret;
}
+paragraph *xhtml_config_filename(char *filename)
+{
+ /*
+ * If the user passes in a single filename as a parameter to
+ * the `--html' command-line option, then we should assume it
+ * to imply _two_ config directives:
+ * \cfg{xhtml-single-filename}{whatever} and
+ * \cfg{xhtml-leaf-level}{0}; the rationale being that the user
+ * wants their output _in that file_.
+ */
+ paragraph *p, *q;
+
+ p = cmdline_cfg_simple("xhtml-single-filename", filename, NULL);
+ q = cmdline_cfg_simple("xhtml-leaf-level", "0", NULL);
+ p->next = q;
+ return p;
+}
+
static xhtmlsection *xhtml_new_section(xhtmlsection *last)
{
xhtmlsection *ret = mknew(xhtmlsection);
return ret;
}
+static void xhtml_format(paragraph *p, char *template_string, rdstringc *r)
+{
+ char *c, *t;
+ word *w;
+ wchar_t *ws;
+
+ t = template_string;
+ while (*t) {
+ if (*t == '%' && t[1]) {
+ int fmt;
+
+ t++;
+ fmt = *t++;
+
+ if (fmt == '%') {
+ rdaddc(r, fmt);
+ continue;
+ }
+
+ w = NULL;
+ ws = NULL;
+
+ if (p->kwtext && fmt == 'n')
+ w = p->kwtext;
+ else if (p->kwtext2 && fmt == 'b')
+ w = p->kwtext2;
+ else if (p->keyword && *p->keyword && fmt == 'k')
+ ws = p->keyword;
+ else
+ w = p->words;
+
+ while (w) {
+ switch (removeattr(w->type))
+ {
+ case word_Normal:
+ /*case word_Emph:
+ case word_Code:
+ case word_WeakCode:*/
+ xhtml_utostr(w->text, &c);
+ rdaddsc(r,c);
+ sfree(c);
+ break;
+ }
+ w = w->next;
+ }
+ if (ws) {
+ xhtml_utostr(ws, &c);
+ rdaddsc(r,c);
+ sfree(c);
+ }
+ } else {
+ rdaddc(r, *t++);
+ }
+ }
+}
+
static xhtmlfile *xhtml_new_file(xhtmlsection *sect)
{
xhtmlfile *ret = mknew(xhtmlfile);
ret->is_leaf=(sect!=NULL && sect->level==conf.leaf_level);
if (sect==NULL) {
if (conf.leaf_level==0) { /* currently unused */
-#define FILENAME_MANUAL "Manual.html"
-#define FILENAME_CONTENTS "Contents.html"
- ret->filename = smalloc(strlen(FILENAME_MANUAL)+1);
- sprintf(ret->filename, FILENAME_MANUAL);
+ ret->filename = smalloc(strlen(conf.single_filename)+1);
+ sprintf(ret->filename, conf.single_filename);
} else {
- ret->filename = smalloc(strlen(FILENAME_CONTENTS)+1);
- sprintf(ret->filename, FILENAME_CONTENTS);
+ ret->filename = smalloc(strlen(conf.contents_filename)+1);
+ sprintf(ret->filename, conf.contents_filename);
}
} else {
paragraph *p = sect->para;
rdstringc fname_c = { 0, 0, NULL };
- char *c;
- word *w;
- for (w=(p->kwtext)?(p->kwtext):(p->words); w; w=w->next)
- {
- switch (removeattr(w->type))
- {
- case word_Normal:
- /*case word_Emph:
- case word_Code:
- case word_WeakCode:*/
- xhtml_utostr(w->text, &c);
- rdaddsc(&fname_c,c);
- sfree(c);
- break;
- }
- }
- rdaddsc(&fname_c, ".html");
+ xhtml_format(p, conf.template_filename, &fname_c);
ret->filename = rdtrimc(&fname_c);
}
/* printf(" ! new file '%s', is_leaf == %s\n", ret->filename, (ret->is_leaf)?("true"):("false"));*/
if (level>0) /* actually a section */
{
xhtmlsection *sect;
- word *w;
- char *c;
- rdstringc fname_c = { 0, 0, NULL };
+ rdstringc frag_c = { 0, 0, NULL };
sect = xhtml_new_section(lastsection);
lastsection = sect;
sect->para = p;
- for (w=(p->kwtext2)?(p->kwtext2):(p->words); w; w=w->next) /* kwtext2 because we want numbers only! */
- {
- switch (removeattr(w->type))
- {
- case word_Normal:
- /*case word_Emph:
- case word_Code:
- case word_WeakCode:*/
- xhtml_utostr(w->text, &c);
- rdaddsc(&fname_c,c);
- sfree(c);
- break;
- }
- }
-/* rdaddsc(&fname_c, ".html");*/
- sect->fragment = rdtrimc(&fname_c);
+
+ xhtml_format(p, conf.template_fragment, &frag_c);
+ sect->fragment = rdtrimc(&frag_c);
sect->level = level;
/* printf(" ! adding para @ %p as sect %s, level %i\n", sect->para, sect->fragment, level);*/
* Main function.
*/
void xhtml_backend(paragraph *sourceform, keywordlist *in_keywords,
- indexdata *in_idx)
+ indexdata *in_idx, void *unused)
{
/* int i;*/
indexentry *ientry;
int ti;
xhtmlsection *xsect;
+ IGNORE(unused);
+
sourceparas = sourceform;
conf = xhtml_configure(sourceform);
keywords = in_keywords;
}
}
-static char* xhtml_index_filename = "IndexPage.html";
-
/* Output the nav links for the current file.
* file == NULL means we're doing the index
*/
if (xhtml_last_file==NULL) {
fprintf(fp, "Previous | ");
} else {
- fprintf(fp, "<a href='%s'>Previous</a> | ", xhtml_last_file->filename);
+ fprintf(fp, "<a href=\"%s\">Previous</a> | ", xhtml_last_file->filename);
}
- fprintf(fp, "<a href='Contents.html'>Contents</a> | ");
+ fprintf(fp, "<a href=\"%s\">Contents</a> | ", conf.contents_filename);
if (file == NULL) {
fprintf(fp, "Index | ");
} else {
- fprintf(fp, "<a href='%s'>Index</a> | ", xhtml_index_filename);
+ fprintf(fp, "<a href=\"%s\">Index</a> | ", conf.index_filename);
}
if (file != NULL) { /* otherwise we're doing nav links for the index */
if (xhtml_next_file==NULL)
if (file==NULL) { /* index, so no next file */
fprintf(fp, "Next ");
} else {
- fprintf(fp, "<a href='%s'>Next</a>", xhtml_index_filename);
+ fprintf(fp, "<a href=\"%s\">Next</a>", conf.index_filename);
}
} else {
- fprintf(fp, "<a href='%s'>Next</a>", xhtml_next_file->filename);
+ fprintf(fp, "<a href=\"%s\">Next</a>", xhtml_next_file->filename);
}
fprintf(fp, "</p>\n");
}
for (i=0; i<xi->nsection; i++) {
xhtmlsection *sect = xi->sections[i];
if (sect) {
- fprintf(fp, "<a href='%s#%s'>", sect->file->filename, sect->fragment);
+ fprintf(fp, "<a href=\"%s#%s\">", sect->file->filename, sect->fragment);
if (sect->para->kwtext) {
xhtml_para(fp, sect->para->kwtext, FALSE);
} else if (sect->para->words) {
}
static void xhtml_do_index()
{
- word temp_word = { NULL, NULL, word_Normal, 0, 0, L"Index", { NULL, 0, 0} };
- FILE *fp = fopen(xhtml_index_filename, "w");
+ word temp_word = { NULL, NULL, word_Normal, 0, 0, L"Index",
+ { NULL, 0, 0}, NULL };
+ FILE *fp = fopen(conf.index_filename, "w");
if (fp==NULL)
- fatal(err_cantopenw, xhtml_index_filename);
+ fatal(err_cantopenw, conf.index_filename);
xhtml_doheader(fp, &temp_word);
xhtml_donavlinks(fp, NULL);
{
fprintf(fp, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n");
fprintf(fp, "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n");
- fprintf(fp, "<html xmlns='http://www.w3.org/1999/xhtml'>\n\n<head>\n<title>");
+ fprintf(fp, "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n\n<head>\n<title>");
if (title==NULL)
fprintf(fp, "The thing with no name!");
else
rdaddsc(rs, "<code>");
if (removeattr(text->type) == word_Normal) {
- if (xhtml_convert(text->text, 0, &c, TRUE)) /* spaces in the word are hard */
+ if (xhtml_convert(text->text, 0, &c, TRUE) || !text->alt)
+ /* spaces in the word are hard */
rdaddsc(rs, c);
else
xhtml_rdaddwc(rs, text->alt, NULL, indexable);
~mdw / sgt / halibut / blobdiff