summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <alx.manpages@gmail.com>2022-08-28 12:53:11 +0200
committerAlejandro Colomar <alx.manpages@gmail.com>2022-08-28 12:53:13 +0200
commitc28449d0929c3242fb62887bb8aa52dc02c667f4 (patch)
tree0e371ffaad45d03ac5350f254829874f0460c025
parentdebe632e23bf21a38127a60dd1026743e94d8dfe (diff)
lint-man.mk: Remove highlighting in a more robust way
'grotty -c | col -bx' is more reliable, and far more readable. Suggested-by: Ralph Corderoy <ralph@inputplus.co.uk> Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>
-rw-r--r--lib/lint-man.mk15
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/lint-man.mk b/lib/lint-man.mk
index 2a196819f..93c1ef8a0 100644
--- a/lib/lint-man.mk
+++ b/lib/lint-man.mk
@@ -40,7 +40,16 @@ EXTRA_TROFFFLAGS :=
TROFFFLAGS := $(DEFAULT_TROFFFLAGS) $(EXTRA_TROFFFLAGS)
TROFF := troff
-GROTTY := grotty
+DEFAULT_GROTTYFLAGS := -c
+EXTRA_GROTTYFLAGS :=
+GROTTYFLAGS := $(DEFAULT_GROTTYFLAGS) $(EXTRA_GROTTYFLAGS)
+GROTTY := grotty
+
+DEFAULT_COLFLAGS := -b
+DEFAULT_COLFLAGS += -x
+EXTRA_COLFLAGS :=
+COLFLAGS := $(DEFAULT_COLFLAGS) $(EXTRA_COLFLAGS)
+COL := col
DEFAULT_MANDOCFLAGS := -man
DEFAULT_MANDOCFLAGS += -Tlint
@@ -62,8 +71,8 @@ $(_LINT_man_groff): $(_LINTDIR)/%.lint-man.groff.touch: $(MANDIR)/% | $$(@D)/.
$(TBL) $< \
| $(EQN) $(EQNFLAGS) \
| $(TROFF) $(TROFFFLAGS) \
- | $(GROTTY) \
- | sed 's/\x1b\[[^@-~]*[@-~]//g' \
+ | $(GROTTY) $(GROTTYFLAGS) \
+ | $(COL) $(COLFLAGS) \
| (! grep -n '.\{80\}.')
touch $@