Skip to content

Commit 6de1c98

Browse files
committed
make xman work again.
if we run into unformatted pages, they're candidate for mandoc (otherwise, groff should have formatted them already). We shouldn't ever try to run them thru tbl first, since mandoc takes care of enough tbl constructs, and will get confused at roff low-level anyways. So, just run thru cat to avoid changing xman too much. Since mandoc doesn't have a -Tlatin1 mode, approximate it with -Tascii. -Tutf8 is definitely out of question until xman talks utf8. okay matthieu@
1 parent 5e8328b commit 6de1c98

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

app/xman/vendor.h

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,9 @@ from the X Consortium.
177177
#endif
178178

179179
#ifndef HANDLE_ROFFSEQ
180-
# if defined(ultrix)
180+
# if defined(__OpenBSD__)
181+
# define FORMAT "| mandoc -Tascii"
182+
# elif defined(ultrix)
181183
# define FORMAT "| nroff -man" /* The format command. */
182184
# elif defined(CSRG_BASED)
183185
# define FORMAT "| eqn | tbl | nroff -mandoc"
@@ -194,14 +196,16 @@ from the X Consortium.
194196
# define ZSOELIM "zsoelim"
195197
# else
196198
# define ZSOELIM "soelim"
197-
#endif
199+
# endif
198200
# define EQN "eqn"
199201
# define TBL "tbl"
200202
# define GRAP "grap"
201203
# define PIC "pic"
202204
# define VGRIND "vgrind"
203205
# define REFER "refer"
204-
# if defined(CSRG_BASED)
206+
# if defined(__OpenBSD__)
207+
# define FORMAT "mandoc -Tascii"
208+
# elif defined(CSRG_BASED)
205209
# define FORMAT "nroff -mandoc"
206210
# elif defined(linux)
207211
# define FORMAT "GROFF_NO_SGR= groff -Tlatin1 -mandoc"
@@ -212,6 +216,9 @@ from the X Consortium.
212216
# endif
213217
# define DEFAULT_MANROFFSEQ "et"
214218
#endif /*HANDLE_ROFFSEQ */
219+
#if defined(__OpenBSD__)
220+
# define TBL "cat"
221+
#endif
215222

216223
/*
217224
* Names of the man and cat dirs.

0 commit comments

Comments
 (0)