aboutsummaryrefslogtreecommitdiffstats
path: root/troff/troff.d/font/devhtml
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2016-12-25 17:53:10 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2016-12-25 17:53:10 +0000
commit80647123fe63c15caa93687028a45f9efee5b669 (patch)
tree6fe6df04e4b2cd506323ad2994b9527dd1ed7193 /troff/troff.d/font/devhtml
parent6db6db4b7f38f7760b90ec861a39b5ccb9df5ba9 (diff)
downloadsrc-80647123fe63c15caa93687028a45f9efee5b669.tar.gz
src-80647123fe63c15caa93687028a45f9efee5b669.zip
Notes
Notes: svn path=/vendor/heirloom-doctools/dist/; revision=310550 svn path=/vendor/heirloom-doctools/20161106/; revision=310551; tag=vendor/heirloom-doctools/20161106
Diffstat (limited to 'troff/troff.d/font/devhtml')
-rw-r--r--troff/troff.d/font/devhtml/B.in (renamed from troff/troff.d/font/devhtml/B)0
-rw-r--r--troff/troff.d/font/devhtml/BI.in (renamed from troff/troff.d/font/devhtml/BI)0
-rw-r--r--troff/troff.d/font/devhtml/C.in (renamed from troff/troff.d/font/devhtml/C)0
-rw-r--r--troff/troff.d/font/devhtml/CB.in (renamed from troff/troff.d/font/devhtml/CB)0
-rw-r--r--troff/troff.d/font/devhtml/CI.in (renamed from troff/troff.d/font/devhtml/CI)0
-rw-r--r--troff/troff.d/font/devhtml/CR.in (renamed from troff/troff.d/font/devhtml/CR)0
-rw-r--r--troff/troff.d/font/devhtml/CW.in (renamed from troff/troff.d/font/devhtml/CW)0
-rw-r--r--troff/troff.d/font/devhtml/H.in (renamed from troff/troff.d/font/devhtml/H)0
-rw-r--r--troff/troff.d/font/devhtml/HB.in (renamed from troff/troff.d/font/devhtml/HB)0
-rw-r--r--troff/troff.d/font/devhtml/HI.in (renamed from troff/troff.d/font/devhtml/HI)0
-rw-r--r--troff/troff.d/font/devhtml/I.in (renamed from troff/troff.d/font/devhtml/I)0
-rw-r--r--troff/troff.d/font/devhtml/Makefile.mk10
-rw-r--r--troff/troff.d/font/devhtml/R.in (renamed from troff/troff.d/font/devhtml/R)0
-rw-r--r--troff/troff.d/font/devhtml/S.in (renamed from troff/troff.d/font/devhtml/S)0
-rw-r--r--troff/troff.d/font/devhtml/makefont.c6
15 files changed, 11 insertions, 5 deletions
diff --git a/troff/troff.d/font/devhtml/B b/troff/troff.d/font/devhtml/B.in
index fc9390a7157e..fc9390a7157e 100644
--- a/troff/troff.d/font/devhtml/B
+++ b/troff/troff.d/font/devhtml/B.in
diff --git a/troff/troff.d/font/devhtml/BI b/troff/troff.d/font/devhtml/BI.in
index 8df0242e857d..8df0242e857d 100644
--- a/troff/troff.d/font/devhtml/BI
+++ b/troff/troff.d/font/devhtml/BI.in
diff --git a/troff/troff.d/font/devhtml/C b/troff/troff.d/font/devhtml/C.in
index e9f9fb1bc169..e9f9fb1bc169 100644
--- a/troff/troff.d/font/devhtml/C
+++ b/troff/troff.d/font/devhtml/C.in
diff --git a/troff/troff.d/font/devhtml/CB b/troff/troff.d/font/devhtml/CB.in
index bb929d1a9aa8..bb929d1a9aa8 100644
--- a/troff/troff.d/font/devhtml/CB
+++ b/troff/troff.d/font/devhtml/CB.in
diff --git a/troff/troff.d/font/devhtml/CI b/troff/troff.d/font/devhtml/CI.in
index 3e241d8c28a7..3e241d8c28a7 100644
--- a/troff/troff.d/font/devhtml/CI
+++ b/troff/troff.d/font/devhtml/CI.in
diff --git a/troff/troff.d/font/devhtml/CR b/troff/troff.d/font/devhtml/CR.in
index 6d5683909145..6d5683909145 100644
--- a/troff/troff.d/font/devhtml/CR
+++ b/troff/troff.d/font/devhtml/CR.in
diff --git a/troff/troff.d/font/devhtml/CW b/troff/troff.d/font/devhtml/CW.in
index 497184ad97db..497184ad97db 100644
--- a/troff/troff.d/font/devhtml/CW
+++ b/troff/troff.d/font/devhtml/CW.in
diff --git a/troff/troff.d/font/devhtml/H b/troff/troff.d/font/devhtml/H.in
index 30e1c356c606..30e1c356c606 100644
--- a/troff/troff.d/font/devhtml/H
+++ b/troff/troff.d/font/devhtml/H.in
diff --git a/troff/troff.d/font/devhtml/HB b/troff/troff.d/font/devhtml/HB.in
index a682337d4cd3..a682337d4cd3 100644
--- a/troff/troff.d/font/devhtml/HB
+++ b/troff/troff.d/font/devhtml/HB.in
diff --git a/troff/troff.d/font/devhtml/HI b/troff/troff.d/font/devhtml/HI.in
index 4b1121c8c189..4b1121c8c189 100644
--- a/troff/troff.d/font/devhtml/HI
+++ b/troff/troff.d/font/devhtml/HI.in
diff --git a/troff/troff.d/font/devhtml/I b/troff/troff.d/font/devhtml/I.in
index 347a976a341e..347a976a341e 100644
--- a/troff/troff.d/font/devhtml/I
+++ b/troff/troff.d/font/devhtml/I.in
diff --git a/troff/troff.d/font/devhtml/Makefile.mk b/troff/troff.d/font/devhtml/Makefile.mk
index 41a74b5d9f18..665b77049bb1 100644
--- a/troff/troff.d/font/devhtml/Makefile.mk
+++ b/troff/troff.d/font/devhtml/Makefile.mk
@@ -2,7 +2,12 @@ BIN= makefont
OBJS= $(BIN).o
FONTS= R I B BI C CW CR CI CB H HI HB S
-all: $(BIN)
+.SUFFIXES: .in
+.in: ${BIN}
+ cat $< > $@
+ ./${BIN} $@ >> $@
+
+all: $(BIN) ${FONTS}
install:
d=$(ROOT)$(FNTDIR)/devhtml; test -d $$d || mkdir $$d; \
@@ -11,11 +16,10 @@ install:
sed '1,2d;s/[[:space:]].*//' charset >> $$d/DESC; \
for i in $(FONTS); do \
install -m 644 $$i $$d/; \
- ./$(BIN) $$i >> $$d/$$i; \
done
clean:
- rm -rf $(BIN) $(OBJS)
+ rm -rf $(BIN) $(OBJS) $(FONTS)
mrproper: clean
diff --git a/troff/troff.d/font/devhtml/R b/troff/troff.d/font/devhtml/R.in
index b58aaa066970..b58aaa066970 100644
--- a/troff/troff.d/font/devhtml/R
+++ b/troff/troff.d/font/devhtml/R.in
diff --git a/troff/troff.d/font/devhtml/S b/troff/troff.d/font/devhtml/S.in
index bfcc84e27c7e..bfcc84e27c7e 100644
--- a/troff/troff.d/font/devhtml/S
+++ b/troff/troff.d/font/devhtml/S.in
diff --git a/troff/troff.d/font/devhtml/makefont.c b/troff/troff.d/font/devhtml/makefont.c
index a9b4da08d591..d0587d98dae3 100644
--- a/troff/troff.d/font/devhtml/makefont.c
+++ b/troff/troff.d/font/devhtml/makefont.c
@@ -49,8 +49,10 @@ main(int argc, char **argv) {
char *b, *b0;
ssize_t s;
progname = argv[0];
- if (argc != 2) return usage();
+ if (argc < 2 || argc > 3) return usage();
fontname = argv[1];
+ if (argc == 3)
+ charfile = argv[2];
s = read_file(&b0);
b = b0;
if (!(i = find_font(&b, &s))) {
@@ -189,7 +191,7 @@ next_line(char **b, ssize_t *s) {
static int
usage(void) {
fprintf(stderr,
-"Usage: ./%s <font_name> >> <font_name>\n"
+"Usage: ./%s <font_name> [charsetfile] >> <font_name>\n"
, progname);
return EXIT_FAILURE;
}