X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/cc7462116703899abaa4f96652a79a07614e75b8..3ae196b46ee9e2850ea7fc91262b746240df84e9:/bk_man.c

diff --git a/bk_man.c b/bk_man.c
index 7bd19ea..2f44818 100644
--- a/bk_man.c
+++ b/bk_man.c
@@ -475,16 +475,15 @@ static int man_convert(wchar_t const *s, int maxlen,
 		 */
 		rdaddc(&out, '\\');
 		rdaddc(&out, '&');
-	    } else if (*q == '\\' || *q == '`' || *q == ' ') {
-		/*
-		 * Quote backslashes, backticks and nonbreakable
-		 * spaces always.
-		 */
+	    } else if (*q == '`' || *q == ' ') {
+		/* Quote backticks and nonbreakable spaces always. */
 		rdaddc(&out, '\\');
+	    } else if (*q == '\\') {
+		/* Turn backslashes into \e. */
+		rdaddsc(&out, "\\e");
+		continue;
 	    } else if (*q == '-') {
-		/*
-		 * Turn nonbreakable hyphens into \(hy.
-		 */
+		/* Turn nonbreakable hyphens into \(hy. */
 		rdaddsc(&out, "\\(hy");
 		continue;
 	    } else if (*q == '"' && (quote_props & QUOTE_QUOTES)) {
@@ -525,6 +524,28 @@ 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);
+    if (*c)
+	quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
+    return quote_props;
+}
+
 static int man_rdaddwc(rdstringc *rs, word *text, word *end,
 		       int quote_props, manconfig *conf,
 		       charset_state *state) {
@@ -557,24 +578,12 @@ 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 (removeattr(text->type) == word_Normal) {
@@ -595,10 +604,9 @@ static int man_rdaddwc(rdstringc *rs, word *text, word *end,
 			quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
 		    *state = s2;
 		}
-		if (hyphen) {
-		    rdaddc(rs, '-');
-		    quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
-		}
+		if (hyphen)
+		    quote_props =
+			man_rdaddctrl(rs, "-", quote_props, conf, state);
 	    } else {
 		quote_props = man_rdaddwc(rs, text->alt, NULL,
 					  quote_props, conf, state);
@@ -606,8 +614,7 @@ 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);
 	} else if (removeattr(text->type) == word_Quote) {
 	    man_convert(quoteaux(text->aux) == quote_Open ?
 			conf->lquote : conf->rquote, 0,
@@ -620,21 +627,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;
 }