X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/7de1fb3bb8d23e0fbac52943ca2ddfa24054195b..f02bbc4b49bb91cfd765c7d56e24b59a4b046f4b:/bk_man.c

diff --git a/bk_man.c b/bk_man.c
index 32f731c..204d145 100644
--- 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;
@@ -524,6 +525,26 @@ static int man_convert(wchar_t const *s, int maxlen,
     return !anyerr;
 }
 
+static int man_rdaddwc_reset(rdstringc *rs, int quote_props, manconfig *conf,
+			     charset_state *state) {
+    char *c;
+
+    man_convert(NULL, 0, &c, quote_props, conf->charset, state);
+    rdaddsc(rs, c);
+    if (*c)
+	quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
+    sfree(c);
+    *state = charset_init_state;
+    return quote_props;
+}
+
+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);
+    return quote_props;
+}
+
 static int man_rdaddwc(rdstringc *rs, word *text, word *end,
 		       int quote_props, manconfig *conf,
 		       charset_state *state) {
@@ -556,26 +577,18 @@ static int man_rdaddwc(rdstringc *rs, word *text, word *end,
 	if (towordstyle(text->type) == word_Emph &&
 	    (attraux(text->aux) == attr_First ||
 	     attraux(text->aux) == attr_Only)) {
-	    man_convert(NULL, 0, &c, quote_props, conf->charset, state);
-	    rdaddsc(rs, c);
-	    if (*c)
-		quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
-	    sfree(c);
-	    *state = charset_init_state;
-	    rdaddsc(rs, "\\fI");
+	    quote_props = man_rdaddctrl(rs, "\\fI", quote_props, conf, state);
 	} else if ((towordstyle(text->type) == word_Code ||
 		    towordstyle(text->type) == word_WeakCode) &&
 		   (attraux(text->aux) == attr_First ||
 		    attraux(text->aux) == attr_Only)) {
-	    man_convert(NULL, 0, &c, quote_props, conf->charset, state);
-	    rdaddsc(rs, c);
-	    if (*c)
-		quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
-	    sfree(c);
-	    *state = charset_init_state;
-	    rdaddsc(rs, "\\fB");
+	    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;
@@ -595,8 +608,9 @@ static int man_rdaddwc(rdstringc *rs, word *text, word *end,
 		    *state = s2;
 		}
 		if (hyphen) {
-		    rdaddc(rs, '-');
-		    quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
+		    quote_props =
+			man_rdaddctrl(rs, "-", quote_props, conf, state);
+		    quote_props &= ~QUOTE_INITCTRL;
 		}
 	    } else {
 		quote_props = man_rdaddwc(rs, text->alt, NULL,
@@ -605,8 +619,8 @@ static int man_rdaddwc(rdstringc *rs, word *text, word *end,
 	    if (len != 0)
 		sfree(c);
 	} else if (removeattr(text->type) == word_WhiteSpace) {
-	    rdaddc(rs, ' ');
-	    quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
+	    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,
@@ -619,21 +633,11 @@ static int man_rdaddwc(rdstringc *rs, word *text, word *end,
 	if (towordstyle(text->type) != word_Normal &&
 	    (attraux(text->aux) == attr_Last ||
 	     attraux(text->aux) == attr_Only)) {
-	    man_convert(NULL, 0, &c, quote_props, conf->charset, state);
-	    rdaddsc(rs, c);
-	    if (*c)
-		quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
-	    sfree(c);
-	    *state = charset_init_state;
-	    rdaddsc(rs, "\\fP");
+	    quote_props = man_rdaddctrl(rs, "\\fP", quote_props, conf, state);
 	}
 	break;
     }
-    man_convert(NULL, 0, &c, quote_props, conf->charset, state);
-    rdaddsc(rs, c);
-    if (*c)
-	quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
-    sfree(c);
+    quote_props = man_rdaddwc_reset(rs, quote_props, conf, state);
 
     return quote_props;
 }
@@ -655,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) {