X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/2a2375dbd59337c00fb90c903b0af3669520d9dd..51d05cd0a6de05c0adc8986e1d534e426d6f582c:/bk_man.c

diff --git a/bk_man.c b/bk_man.c
index 2eff926..bb4e5b5 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_LITERAL     4 /* defeat special meaning of `, ', - in troff */
 
 void man_backend(paragraph *sourceform, keywordlist *keywords,
 		 indexdata *idx, void *unused) {
@@ -234,7 +235,10 @@ void man_backend(paragraph *sourceform, keywordlist *keywords,
     /*
      * Open the output file.
      */
-    fp = fopen(conf.filename, "w");
+    if (!strcmp(conf.filename, "-"))
+	fp = stdout;
+    else
+	fp = fopen(conf.filename, "w");
     if (!fp) {
 	error(err_cantopenw, conf.filename);
 	return;
@@ -247,6 +251,12 @@ void man_backend(paragraph *sourceform, keywordlist *keywords,
 	    man_text(fp, p->words, TRUE, 0, &conf);
 	}
 
+    /* Standard preamble */
+    /* Dodge to try to get literal U+0027 in output when required,
+     * bypassing groff's Unicode transform; pinched from pod2man */
+    fprintf(fp, ".ie \\n(.g .ds Aq \\(aq\n"
+	        ".el       .ds Aq '\n");
+
     /* .TH name-of-program manual-section */
     fprintf(fp, ".TH");
     if (conf.th && *conf.th) {
@@ -418,7 +428,8 @@ void man_backend(paragraph *sourceform, keywordlist *keywords,
     /*
      * Tidy up.
      */
-    fclose(fp);
+    if (fp != stdout)
+	fclose(fp);
     man_conf_cleanup(conf);
 }
 
@@ -475,11 +486,36 @@ static int man_convert(wchar_t const *s, int maxlen,
 		 */
 		rdaddc(&out, '\\');
 		rdaddc(&out, '&');
-	    } else if (*q == '\\' || *q == '`') {
-		/*
-		 * Quote backslashes and backticks always.
-		 */
+	    }
+	    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 == '-') {
+		if (quote_props & QUOTE_LITERAL) {
+		    /*
+		     * Try to preserve literal U+002D.
+		     * This is quite awkward. Debian hacks groff so that
+		     * \- and - both produce it; elsewhere it's not necessarily
+		     * possible to get it.
+		     * Apparently \- is the preferred compromise despite
+		     * having minus-sign semantics, as it is non-breaking.
+		     * (pod2man uses it, anyway.)
+		     */
+		    rdaddc(&out, '\\');
+		} else {
+		    /* Turn nonbreakable hyphens into \(hy. */
+		    rdaddsc(&out, "\\(hy");
+		    continue;
+		}
+	    } else if (*q == '\'' && (quote_props & QUOTE_LITERAL)) {
+		/* Try to preserve literal U+0027 (using string defined
+		 * in preamble) */
+		rdaddsc(&out, "\\*(Aq"); /* "apostrophe quote" */
+		continue;
 	    } else if (*q == '"' && (quote_props & QUOTE_QUOTES)) {
 		/*
 		 * Double quote within double quotes. Quote it by
@@ -518,6 +554,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) {
@@ -550,46 +606,50 @@ 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_LITERAL;
+
 	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,
@@ -602,21 +662,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;
 }
@@ -638,7 +688,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_LITERAL;
 
 	t = text->text;
 	if (text->next && text->next->type == word_Emph) {