X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/ba9c1487d811dccd55655fee8ca9a96856fa69f9..e34ba5c3b8a7bcb8fceb437125da3a6a6f6d2dba:/main.c

diff --git a/main.c b/main.c
index b509928..182cbec 100644
--- a/main.c
+++ b/main.c
@@ -11,19 +11,29 @@ static void dbg_prtsource(paragraph *sourceform);
 static void dbg_prtwordlist(int level, word *w);
 static void dbg_prtkws(keywordlist *kws);
 
+static const struct pre_backend {
+    void *(*func)(paragraph *, keywordlist *, indexdata *);
+    int bitfield;
+} pre_backends[] = {
+    {paper_pre_backend, 0x0001}
+};
+
 static const struct backend {
     char *name;
-    void (*func)(paragraph *, keywordlist *, indexdata *);
+    void (*func)(paragraph *, keywordlist *, indexdata *, void *);
     paragraph *(*filename)(char *filename);
-    int bitfield;
+    int bitfield, prebackend_bitfield;
 } backends[] = {
-    {"text", text_backend, text_config_filename, 0x0001},
-    {"xhtml", xhtml_backend, xhtml_config_filename, 0x0002},
-    {"html", xhtml_backend, xhtml_config_filename, 0x0002},
-    {"hlp", whlp_backend, whlp_config_filename, 0x0004},
-    {"whlp", whlp_backend, whlp_config_filename, 0x0004},
-    {"winhelp", whlp_backend, whlp_config_filename, 0x0004},
-    {"man", man_backend, man_config_filename, 0x0008},
+    {"text", text_backend, text_config_filename, 0x0001, 0},
+    {"xhtml", xhtml_backend, xhtml_config_filename, 0x0002, 0},
+    {"html", xhtml_backend, xhtml_config_filename, 0x0002, 0},
+    {"hlp", whlp_backend, whlp_config_filename, 0x0004, 0},
+    {"whlp", whlp_backend, whlp_config_filename, 0x0004, 0},
+    {"winhelp", whlp_backend, whlp_config_filename, 0x0004, 0},
+    {"man", man_backend, man_config_filename, 0x0008, 0},
+    {"info", info_backend, info_config_filename, 0x0010, 0},
+    {"ps", ps_backend, ps_config_filename, 0x0020, 0x0001},
+    {"pdf", pdf_backend, pdf_config_filename, 0x0040, 0x0001},
 };
 
 int main(int argc, char **argv) {
@@ -33,9 +43,10 @@ int main(int argc, char **argv) {
     int errs;
     int reportcols;
     int debug;
-    int backendbits;
+    int backendbits, prebackbits;
     int k, b;
     paragraph *cfg, *cfg_tail;
+    void *pre_backend_data[16];
 
     /*
      * Set up initial (default) parameters.
@@ -259,6 +270,7 @@ int main(int argc, char **argv) {
 	in.pushback = NULL;
 	in.reportcols = reportcols;
 	in.stack = NULL;
+	in.defcharset = CS_ASCII;
 
 	idx = make_index();
 
@@ -295,7 +307,7 @@ int main(int argc, char **argv) {
 
 	for (p = sourceform; p; p = p->next)
 	    if (p->type == para_IM)
-		index_merge(idx, TRUE, p->keyword, p->words);
+		index_merge(idx, TRUE, p->keyword, p->words, &p->fpos);
 
 	build_index(idx);
 
@@ -306,13 +318,39 @@ int main(int argc, char **argv) {
 	}
 
 	/*
+	 * Select and run the pre-backends.
+	 */
+	prebackbits = 0;
+	for (k = 0; k < (int)lenof(backends); k++)
+	    if (backendbits == 0 || (backendbits & backends[k].bitfield))
+		prebackbits |= backends[k].prebackend_bitfield;
+	for (k = 0; k < (int)lenof(pre_backends); k++)
+	    if (prebackbits & pre_backends[k].bitfield) {
+		assert(k < (int)lenof(pre_backend_data));
+		pre_backend_data[k] =
+		    pre_backends[k].func(sourceform, keywords, idx);
+	    }
+
+	/*
 	 * Run the selected set of backends.
 	 */
 	for (k = b = 0; k < (int)lenof(backends); k++)
 	    if (b != backends[k].bitfield) {
 		b = backends[k].bitfield;
-		if (backendbits == 0 || (backendbits & b))
-		    backends[k].func(sourceform, keywords, idx);
+		if (backendbits == 0 || (backendbits & b)) {
+		    void *pbd = NULL;
+		    int pbb = backends[k].prebackend_bitfield;
+		    int m;
+
+		    for (m = 0; m < (int)lenof(pre_backends); m++)
+			if (pbb & pre_backends[m].bitfield) {
+			    assert(m < (int)lenof(pre_backend_data));
+			    pbd = pre_backend_data[m];
+			    break;
+			}
+			    
+		    backends[k].func(sourceform, keywords, idx, pbd);
+		}
 	    }
 
 	free_para_list(sourceform);