summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2010-09-20 20:43:39 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2010-09-20 20:43:39 +0000
commite0de90b81aa0d2e5714e5cbdbe3e19c0cd931058 (patch)
tree22e1e23ce9b27d1ef1ee5e3c915427354ef6ad1a
parent7ece4deb9592fa28714987db16d1c5aadd96c34d (diff)
remove remaining pod2man escapes, mandoc now uses the standard preamble;
from kristaps@
-rw-r--r--usr.bin/mandoc/chars.c8
-rw-r--r--usr.bin/mandoc/chars.in19
2 files changed, 7 insertions, 20 deletions
diff --git a/usr.bin/mandoc/chars.c b/usr.bin/mandoc/chars.c
index 120a66140b0..e3fe1a44d76 100644
--- a/usr.bin/mandoc/chars.c
+++ b/usr.bin/mandoc/chars.c
@@ -1,4 +1,4 @@
-/* $Id: chars.c,v 1.13 2010/09/13 22:04:01 schwarze Exp $ */
+/* $Id: chars.c,v 1.14 2010/09/20 20:43:38 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -36,7 +36,7 @@ struct ln {
#define CHARS_BOTH (CHARS_CHAR | CHARS_STRING)
};
-#define LINES_MAX 362
+#define LINES_MAX 351
#define CHAR(in, ch, code) \
{ NULL, (in), (ch), (code), CHARS_CHAR },
@@ -90,13 +90,13 @@ chars_init(enum chars type)
tab = malloc(sizeof(struct tbl));
if (NULL == tab) {
perror(NULL);
- exit(MANDOCLEVEL_SYSERR);
+ exit((int)MANDOCLEVEL_SYSERR);
}
htab = calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **));
if (NULL == htab) {
perror(NULL);
- exit(MANDOCLEVEL_SYSERR);
+ exit((int)MANDOCLEVEL_SYSERR);
}
for (i = 0; i < LINES_MAX; i++) {
diff --git a/usr.bin/mandoc/chars.in b/usr.bin/mandoc/chars.in
index 4c48e3d3209..8d1ebb287b0 100644
--- a/usr.bin/mandoc/chars.in
+++ b/usr.bin/mandoc/chars.in
@@ -1,4 +1,4 @@
-/* $Id: chars.in,v 1.12 2010/09/13 22:04:01 schwarze Exp $ */
+/* $Id: chars.in,v 1.13 2010/09/20 20:43:38 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -348,19 +348,6 @@ CHAR("Po", "L", 163)
CHAR("Cs", "x", 164)
CHAR("Fn", "f", 402)
-/* pod2man holdovers. */
-STRING("--", "--", 8212)
-STRING("PI", "pi", 960)
-STRING("L\"", "``", 8220)
-STRING("R\"", "\'\'", 8221)
-STRING("C`", "`", 8216)
-STRING("C\'", "\'", 8217)
-STRING("Aq", "\'", 39)
-STRING("^", "^", 94)
-STRING(",", ",", 44)
-STRING("~", "~", 126)
-STRING("/", "/", 47)
-
/* Old style. */
STRING("Am", "&", 38)
STRING("Ba", "|", 124)
@@ -374,9 +361,7 @@ STRING("Na", "NaN", 0)
STRING("Ne", "!=", 8800)
STRING("Pi", "pi", 960)
STRING("Pm", "+-", 177)
-STRING("R", "(R)", 174)
STRING("Rq", "\'\'", 8221)
-STRING("Tm", "tm", 8482)
STRING("left-bracket", "[", 91)
STRING("left-parenthesis", "(", 40)
STRING("left-singlequote", "`", 8216)
@@ -384,10 +369,12 @@ STRING("lp", "(", 40)
STRING("q", "\"", 34)
STRING("quote-left", "`", 8216)
STRING("quote-right", "\'", 8217)
+STRING("R", "(R)", 174)
STRING("right-bracket", "]", 93)
STRING("right-parenthesis", ")", 41)
STRING("right-singlequote", "\'", 8217)
STRING("rp", ")", 41)
+STRING("Tm", "(Tm)", 8482)
/* Lines. */
CHAR("ba", "|", 124)