Let's not use parentheses in test.but in a way that tempts Halibut

[sgt/halibut] / bk_man.c

diff --git a/bk_man.c b/bk_man.c
index 2f44818..204d145 100644 (file)
--- a/bk_man.c
+++ b/bk_man.c
@@ -215,8 +215,9 @@ 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 */
+#define QUOTE_INITCTRL    1 /* quote initial . and ' on a line */
+#define QUOTE_QUOTES      2 /* quote double quotes by doubling them */
+#define QUOTE_LITHYPHENS  4 /* don't convert hyphens into \(hy */
 
 void man_backend(paragraph *sourceform, keywordlist *keywords,
                 indexdata *idx, void *unused) {
@@ -482,7 +483,7 @@ static int man_convert(wchar_t const *s, int maxlen,
                /* Turn backslashes into \e. */
                rdaddsc(&out, "\\e");
                continue;
-           } else if (*q == '-') {
+           } else if (*q == '-' && !(quote_props & QUOTE_LITHYPHENS)) {
                /* Turn nonbreakable hyphens into \(hy. */
                rdaddsc(&out, "\\(hy");
                continue;
@@ -541,8 +542,6 @@ static int man_rdaddctrl(rdstringc *rs, char *c, int quote_props,
                         manconfig *conf, charset_state *state) {
     quote_props = man_rdaddwc_reset(rs, quote_props, conf, state);
     rdaddsc(rs, c);
-    if (*c)
-       quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
     return quote_props;
 }
 
@@ -586,6 +585,10 @@ static int man_rdaddwc(rdstringc *rs, word *text, word *end,
            quote_props = man_rdaddctrl(rs, "\\fB", quote_props, conf, state);
        }
 
+       if (towordstyle(text->type) == word_Code ||
+           towordstyle(text->type) == word_WeakCode)
+           quote_props |= QUOTE_LITHYPHENS;
+
        if (removeattr(text->type) == word_Normal) {
            charset_state s2 = *state;
            int len = ustrlen(text->text), hyphen = FALSE;
@@ -604,9 +607,11 @@ static int man_rdaddwc(rdstringc *rs, word *text, word *end,
                        quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
                    *state = s2;
                }
-               if (hyphen)
+               if (hyphen) {
                    quote_props =
                        man_rdaddctrl(rs, "-", quote_props, conf, state);
+                   quote_props &= ~QUOTE_INITCTRL;
+               }
            } else {
                quote_props = man_rdaddwc(rs, text->alt, NULL,
                                          quote_props, conf, state);
@@ -615,6 +620,7 @@ static int man_rdaddwc(rdstringc *rs, word *text, word *end,
                sfree(c);
        } else if (removeattr(text->type) == word_WhiteSpace) {
            quote_props = man_rdaddctrl(rs, " ", quote_props, conf, state);
+           quote_props &= ~QUOTE_INITCTRL;
        } else if (removeattr(text->type) == word_Quote) {
            man_convert(quoteaux(text->aux) == quote_Open ?
                        conf->lquote : conf->rquote, 0,
@@ -653,7 +659,7 @@ static void man_codepara(FILE *fp, word *text, int charset) {
     for (; text; text = text->next) if (text->type == word_WeakCode) {
        char *c;
        wchar_t *t, *e;
-       int quote_props = QUOTE_INITCTRL;
+       int quote_props = QUOTE_INITCTRL | QUOTE_LITHYPHENS;
 
        t = text->text;
        if (text->next && text->next->type == word_Emph) {