Add a config directive to generate the INFO-DIR-ENTRY things that

appear to be used to automatically construct /usr/info/dir.

[originally from svn r4049]

1 files changed, 49 insertions, 6 deletions

diff --git a/bk_info.c b/bk_info.c
index 088c72d..9834610 100644
--- a/bk_info.c
+++ b/bk_info.c
@@ -3,10 +3,10 @@
  * 
  * TODO:
  * 
- *  - basic vital configuration: Info dir entries in heading, and
- *    how to allocate node names
+ *  - configurable choice of how to allocate node names
  *  - escape, warn or simply remove commas and colons in node
  *    names; also test colons in index terms.
+ *  - might be helpful to diagnose duplicate node names too!
  *  - test everything in info(1), and probably jed too
  * 
  * Later:
@@ -201,10 +201,8 @@ void info_backend(paragraph *sourceform, keywordlist *keywords,
     /*
      * An Info file begins with a piece of introductory text which
      * is apparently never shown anywhere. This seems to me to be a
-     * good place to put the copyright notice and the version IDs.
-     * 
-     * FIXME: also Info directory entries are expected to go here.
-     * This will need to be a configurable thing of some sort.
+     * good place to put the copyright notice and the version IDs. 
+     * Also, Info directory entries are expected to go here.
      */
 
     rdaddsc(&intro_text,
@@ -213,6 +211,51 @@ void info_backend(paragraph *sourceform, keywordlist *keywords,
     rdaddsc(&intro_text, "\n\n");
 
     for (p = sourceform; p; p = p->next)
+	if (p->type == para_Config &&
+	    !ustricmp(p->keyword, L"info-dir-entry")) {
+	    wchar_t *section, *shortname, *longname, *kw;
+	    char *s;
+
+	    section = uadv(p->keyword);
+	    shortname = *section ? uadv(section) : NULL;
+	    longname = *shortname ? uadv(shortname) : NULL;
+	    kw = *longname ? uadv(longname) : NULL;
+
+	    if (!*longname) {
+		error(err_infodirentry, &p->fpos);
+		continue;
+	    }
+
+	    rdaddsc(&intro_text, "INFO-DIR-SECTION ");
+	    s = utoa_dup(section);
+	    rdaddsc(&intro_text, s);
+	    sfree(s);
+	    rdaddsc(&intro_text, "\nSTART-INFO-DIR-ENTRY\n* ");
+	    s = utoa_dup(shortname);
+	    rdaddsc(&intro_text, s);
+	    sfree(s);
+	    rdaddsc(&intro_text, ": (");
+	    s = dupstr(conf.filename);
+	    if (strlen(s) > 5 && !strcmp(s+strlen(s)-5, ".info"))
+		s[strlen(s)-5] = '\0';
+	    rdaddsc(&intro_text, s);
+	    sfree(s);
+	    rdaddsc(&intro_text, ")");
+	    if (*kw) {
+		keyword *kwl = kw_lookup(keywords, kw);
+		if (kwl && kwl->para->private_data) {
+		    node *n = (node *)kwl->para->private_data;
+		    rdaddsc(&intro_text, n->name);
+		}
+	    }
+	    rdaddsc(&intro_text, ".   ");
+	    s = utoa_dup(longname);
+	    rdaddsc(&intro_text, s);
+	    sfree(s);
+	    rdaddsc(&intro_text, "\nEND-INFO-DIR-ENTRY\n\n");
+	}
+
+    for (p = sourceform; p; p = p->next)
 	if (p->type == para_Copyright)
 	    info_para(&intro_text, NULL, NULL, p->words, keywords,
 		      0, 0, width);