Add a --list-fonts option, since getting PostScript names out of TrueType

[sgt/halibut] / bk_man.c

diff --git a/bk_man.c b/bk_man.c
index 2eff926..1146150 100644 (file)
--- a/bk_man.c
+++ b/bk_man.c
@@ -475,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
@@ -518,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) {
@@ -550,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,
@@ -602,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;
 }