int mindepth;
char *filename;
int charset;
- wchar_t *bullet, *lquote, *rquote;
+ wchar_t *bullet, *rule, *lquote, *rquote;
} manconfig;
static void man_text(FILE *, word *,
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);
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);
}
/*
- * 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) ||
!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;
}
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) {
/*
* 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);
+ err_cantopenw(conf.filename);
return;
}
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) {
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:
/*
* Tidy up.
*/
- fclose(fp);
+ if (fp != stdout)
+ fclose(fp);
man_conf_cleanup(conf);
}
*/
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
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) {
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,
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;
}
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) {
~mdw / sgt / halibut / blobdiff