~mdw
/
sgt
/
halibut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update deflate.c to include nearly all the changes I've been making
[sgt/halibut]
/
bk_man.c
diff --git
a/bk_man.c
b/bk_man.c
index
343bf06
..
1146150
100644
(file)
--- a/
bk_man.c
+++ b/
bk_man.c
@@
-537,6
+537,13
@@
static int man_rdaddwc_reset(rdstringc *rs, int quote_props, manconfig *conf,
return quote_props;
}
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) {
static int man_rdaddwc(rdstringc *rs, word *text, word *end,
int quote_props, manconfig *conf,
charset_state *state) {
@@
-569,14
+576,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)) {
if (towordstyle(text->type) == word_Emph &&
(attraux(text->aux) == attr_First ||
attraux(text->aux) == attr_Only)) {
- quote_props = man_rdaddwc_reset(rs, quote_props, conf, 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)) {
} else if ((towordstyle(text->type) == word_Code ||
towordstyle(text->type) == word_WeakCode) &&
(attraux(text->aux) == attr_First ||
attraux(text->aux) == attr_Only)) {
- quote_props = man_rdaddwc_reset(rs, quote_props, conf, state);
- rdaddsc(rs, "\\fB");
+ quote_props = man_rdaddctrl(rs, "\\fB", quote_props, conf, state);
}
if (removeattr(text->type) == word_Normal) {
}
if (removeattr(text->type) == word_Normal) {
@@
-599,9
+604,8
@@
static int man_rdaddwc(rdstringc *rs, word *text, word *end,
}
if (hyphen) {
quote_props =
}
if (hyphen) {
quote_props =
- man_rdaddwc_reset(rs, quote_props, conf, state);
- rdaddc(rs, '-');
- quote_props &= ~QUOTE_INITCTRL; /* not at start any more */
+ man_rdaddctrl(rs, "-", quote_props, conf, state);
+ quote_props &= ~QUOTE_INITCTRL;
}
} else {
quote_props = man_rdaddwc(rs, text->alt, NULL,
}
} else {
quote_props = man_rdaddwc(rs, text->alt, NULL,
@@
-610,9
+614,8
@@
static int man_rdaddwc(rdstringc *rs, word *text, word *end,
if (len != 0)
sfree(c);
} else if (removeattr(text->type) == word_WhiteSpace) {
if (len != 0)
sfree(c);
} else if (removeattr(text->type) == word_WhiteSpace) {
- quote_props = man_rdaddwc_reset(rs, quote_props, conf, state);
- rdaddc(rs, ' ');
- quote_props &= ~QUOTE_INITCTRL; /* not at start any more */
+ 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,
} else if (removeattr(text->type) == word_Quote) {
man_convert(quoteaux(text->aux) == quote_Open ?
conf->lquote : conf->rquote, 0,
@@
-625,8
+628,7
@@
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)) {
if (towordstyle(text->type) != word_Normal &&
(attraux(text->aux) == attr_Last ||
attraux(text->aux) == attr_Only)) {
- quote_props = man_rdaddwc_reset(rs, quote_props, conf, state);
- rdaddsc(rs, "\\fP");
+ quote_props = man_rdaddctrl(rs, "\\fP", quote_props, conf, state);
}
break;
}
}
break;
}