X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/e555d8e3eeac56c977154eb42228a1a240edd59b..4105facaec17862f03a6217f93a1609606f2a7cd:/bk_man.c

diff --git a/bk_man.c b/bk_man.c
index b380a1d..1146150 100644
--- a/bk_man.c
+++ b/bk_man.c
@@ -13,7 +13,7 @@ typedef struct {
     int mindepth;
     char *filename;
     int charset;
-    wchar_t *bullet, *lquote, *rquote;
+    wchar_t *bullet, *rule, *lquote, *rquote;
 } manconfig;
 
 static void man_text(FILE *, word *,
@@ -127,6 +127,7 @@ static manconfig man_configure(paragraph *source) {
     ret.filename = dupstr("output.1");
     ret.charset = CS_ASCII;
     ret.bullet = L"\x2022\0o\0\0";
+    ret.rule = L"\x2500\0-\0\0";
     ret.lquote = L"\x2018\0\x2019\0\"\0\"\0\0";
     ret.rquote = uadv(ret.lquote);
 
@@ -170,6 +171,8 @@ static manconfig man_configure(paragraph *source) {
 		ret.filename = dupstr(adv(p->origkeyword));
 	    } else if (!ustricmp(p->keyword, L"man-bullet")) {
 		ret.bullet = uadv(p->keyword);
+	    } else if (!ustricmp(p->keyword, L"man-rule")) {
+		ret.rule = uadv(p->keyword);
 	    } else if (!ustricmp(p->keyword, L"man-quotes")) {
 		if (*uadv(p->keyword) && *uadv(uadv(p->keyword))) {
 		    ret.lquote = uadv(p->keyword);
@@ -180,7 +183,8 @@ static manconfig man_configure(paragraph *source) {
     }
 
     /*
-     * Now process fallbacks on quote characters and bullets.
+     * Now process fallbacks on quote characters, bullets, and the
+     * rule character.
      */
     while (*uadv(ret.rquote) && *uadv(uadv(ret.rquote)) &&
 	   (!troff_ok(ret.charset, ret.lquote) ||
@@ -193,6 +197,10 @@ static manconfig man_configure(paragraph *source) {
 	   !troff_ok(ret.charset, ret.bullet))
 	ret.bullet = uadv(ret.bullet);
 
+    while (*ret.rule && *uadv(ret.rule) &&
+	   !troff_ok(ret.charset, ret.rule))
+	ret.rule = uadv(ret.rule);
+
     return ret;
 }
 
@@ -379,13 +387,19 @@ void man_backend(paragraph *sourceform, keywordlist *keywords,
 	break;
 
       case para_Rule:
-	/*
-	 * New paragraph containing a horizontal line 1/2em above the
-	 * baseline whose length is the line length minus the current
-	 * indent.
-	 */
-	cleanup_described_thing;
-	fprintf(fp, ".PP\n\\u\\l'\\n(.lu-\\n(.iu'\\d\n");
+	{
+	    char *ruletext;
+	    /*
+	     * New paragraph containing a horizontal line 1/2em above
+	     * the baseline, or a line of rule characters, whose
+	     * length is the line length minus the current indent.
+	     */
+	    cleanup_described_thing;
+	    man_convert(conf.rule, -1, &ruletext, 0, conf.charset, NULL);
+	    fprintf(fp, ".PP\n.ie t \\u\\l'\\n(.lu-\\n(.iu'\\d\n"
+		    ".el \\l'\\n(.lu-\\n(.iu\\&%s'\n", ruletext);
+	    sfree(ruletext);
+	}
 	break;
 
       case para_LcontPush:
@@ -461,11 +475,17 @@ static int man_convert(wchar_t const *s, int maxlen,
 		 */
 		rdaddc(&out, '\\');
 		rdaddc(&out, '&');
-	    } else if (*q == '\\' || *q == '`') {
-		/*
-		 * Quote backslashes and backticks 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. */
+		rdaddsc(&out, "\\(hy");
+		continue;
 	    } else if (*q == '"' && (quote_props & QUOTE_QUOTES)) {
 		/*
 		 * Double quote within double quotes. Quote it by
@@ -504,6 +524,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) {
@@ -536,46 +576,46 @@ 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) {
 	    charset_state s2 = *state;
+	    int len = ustrlen(text->text), hyphen = FALSE;
 
-	    if (man_convert(text->text, 0, &c, quote_props, conf->charset, &s2) ||
+	    if (text->breaks && text->text[len - 1] == '-') {
+		len--;
+		hyphen = TRUE;
+	    }
+	    if (len == 0 ||
+		man_convert(text->text, len, &c, quote_props, conf->charset,
+			    &s2) ||
 		!text->alt) {
-		rdaddsc(rs, c);
-		if (*c)
-		    quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
-		*state = s2;
+		if (len != 0) {
+		    rdaddsc(rs, c);
+		    if (*c)
+			quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
+		    *state = s2;
+		}
+		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);
 	    }
-	    sfree(c);
+	    if (len != 0)
+		sfree(c);
 	} else if (removeattr(text->type) == word_WhiteSpace) {
-	    man_convert(L" ", 1, &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_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,
@@ -588,21 +628,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;
 }