The Windows Help backend now uses libcharset to the maximum extent

[sgt/halibut] / bk_man.c

diff --git a/bk_man.c b/bk_man.c
index 9a18d20..0854e58 100644 (file)
--- a/bk_man.c
+++ b/bk_man.c
@@ -16,6 +16,7 @@ typedef struct {
     wchar_t *th;
     int headnumbers;
     int mindepth;
+    char *filename;
 } manconfig;
 
 static manconfig man_configure(paragraph *source) {
@@ -27,6 +28,7 @@ static manconfig man_configure(paragraph *source) {
     ret.th = NULL;
     ret.headnumbers = FALSE;
     ret.mindepth = 0;
+    ret.filename = dupstr("output.1");
 
     for (; source; source = source->next) {
        if (source->type == para_Config) {
@@ -37,12 +39,16 @@ static manconfig man_configure(paragraph *source) {
                ep = wp;
                while (*ep)
                    ep = uadv(ep);
+               sfree(ret.th);
                ret.th = mknewa(wchar_t, ep - wp + 1);
                memcpy(ret.th, wp, (ep - wp + 1) * sizeof(wchar_t));
            } else if (!ustricmp(source->keyword, L"man-headnumbers")) {
                ret.headnumbers = utob(uadv(source->keyword));
            } else if (!ustricmp(source->keyword, L"man-mindepth")) {
                ret.mindepth = utoi(uadv(source->keyword));
+           } else if (!ustricmp(source->keyword, L"man-filename")) {
+               sfree(ret.filename);
+               ret.filename = dupstr(adv(source->origkeyword));
            }
        }
     }
@@ -53,31 +59,35 @@ static manconfig man_configure(paragraph *source) {
 static void man_conf_cleanup(manconfig cf)
 {
     sfree(cf.th);
+    sfree(cf.filename);
+}
+
+paragraph *man_config_filename(char *filename)
+{
+    return cmdline_cfg_simple("man-filename", filename, NULL);
 }
 
 #define QUOTE_INITCTRL 1 /* quote initial . and ' on a line */
 #define QUOTE_QUOTES   2 /* quote double quotes by doubling them */
 
 void man_backend(paragraph *sourceform, keywordlist *keywords,
-                indexdata *idx) {
+                indexdata *idx, void *unused) {
     paragraph *p;
     FILE *fp;
     manconfig conf;
 
-    IGNORE(keywords);                 /* we don't happen to need this */
-    IGNORE(idx);                      /* or this */
+    IGNORE(unused);
+    IGNORE(keywords);
+    IGNORE(idx);
 
     conf = man_configure(sourceform);
 
     /*
-     * Determine the output file name, and open the output file
-     *
-     * FIXME: want configurable output file names here. For the
-     * moment, we'll just call it `output.1'.
+     * Open the output file.
      */
-    fp = fopen("output.1", "w");
+    fp = fopen(conf.filename, "w");
     if (!fp) {
-       error(err_cantopenw, "output.1");
+       error(err_cantopenw, conf.filename);
        return;
     }
 
@@ -339,7 +349,7 @@ static void man_rdaddwc(rdstringc *rs, word *text, word *end,
        if (removeattr(text->type) == word_Normal) {
            if (rs->pos > 0)
                quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
-           if (man_convert(text->text, 0, &c, quote_props))
+           if (man_convert(text->text, 0, &c, quote_props) || !text->alt)
                rdaddsc(rs, c);
            else
                man_rdaddwc(rs, text->alt, NULL, quote_props);