summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2015-01-23 20:17:25 +0000
committerschwarze <schwarze@openbsd.org>2015-01-23 20:17:25 +0000
commite62d7b36fdc24139bcb20a3cd949f624237e52f7 (patch)
treeb4ef038d60cfaa451bb2a447a45cb7370f96d850
parentbraces to open a function go on their own line like god intended (diff)
downloadwireguard-openbsd-e62d7b36fdc24139bcb20a3cd949f624237e52f7.tar.xz
wireguard-openbsd-e62d7b36fdc24139bcb20a3cd949f624237e52f7.zip
While ignoring the .ta (set tab stops) and .ti (temp indent) requests
is sometimes harmless, it often causes seriously ugly output, so flag these requests as unsupported rather than ignoring them. Discussed with naddy@.
-rw-r--r--share/man/man7/roff.78
-rw-r--r--usr.bin/mandoc/roff.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/share/man/man7/roff.7 b/share/man/man7/roff.7
index 6fdd3753070..be7fc6815df 100644
--- a/share/man/man7/roff.7
+++ b/share/man/man7/roff.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: roff.7,v 1.47 2015/01/23 07:41:16 jmc Exp $
+.\" $OpenBSD: roff.7,v 1.48 2015/01/23 20:17:25 schwarze Exp $
.\"
.\" Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
.\" Copyright (c) 2010, 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -1437,7 +1437,7 @@ Retrieve the bounding box of a PostScript file.
Currently unsupported.
.Ss \&pshape
Set a special shape for the current paragraph.
-This is a Heirloom extension and currently ignored.
+This is a Heirloom extension and currently unsupported.
.Ss \&pso
Include output of a shell command.
Ignored because insecure.
@@ -1570,7 +1570,7 @@ See
.Ss \&ta
Set tab stops.
Takes an arbitrary number of arguments.
-Currently ignored.
+Currently unsupported.
.Ss \&tc
Change tab repetion character.
Currently unsupported.
@@ -1580,7 +1580,7 @@ See
.Sx \&TS .
.Ss \&ti
Temporary indent.
-Currently ignored.
+Currently unsupported.
.Ss \&tkf
Enable track kerning for a font.
Currently ignored.
diff --git a/usr.bin/mandoc/roff.c b/usr.bin/mandoc/roff.c
index 223cc407ff1..75545378fc8 100644
--- a/usr.bin/mandoc/roff.c
+++ b/usr.bin/mandoc/roff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: roff.c,v 1.126 2015/01/23 00:38:42 schwarze Exp $ */
+/* $OpenBSD: roff.c,v 1.127 2015/01/23 20:17:25 schwarze Exp $ */
/*
* Copyright (c) 2010, 2011, 2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -606,7 +606,7 @@ static struct roffmac roffs[ROFF_MAX] = {
{ "po", roff_line_ignore, NULL, NULL, 0, NULL },
{ "ps", roff_line_ignore, NULL, NULL, 0, NULL },
{ "psbb", roff_unsupp, NULL, NULL, 0, NULL },
- { "pshape", roff_line_ignore, NULL, NULL, 0, NULL },
+ { "pshape", roff_unsupp, NULL, NULL, 0, NULL },
{ "pso", roff_insec, NULL, NULL, 0, NULL },
{ "ptr", roff_line_ignore, NULL, NULL, 0, NULL },
{ "pvs", roff_line_ignore, NULL, NULL, 0, NULL },
@@ -638,11 +638,11 @@ static struct roffmac roffs[ROFF_MAX] = {
{ "sv", roff_line_ignore, NULL, NULL, 0, NULL },
{ "sy", roff_insec, NULL, NULL, 0, NULL },
{ "T&", roff_T_, NULL, NULL, 0, NULL },
- { "ta", roff_line_ignore, NULL, NULL, 0, NULL },
+ { "ta", roff_unsupp, NULL, NULL, 0, NULL },
{ "tc", roff_unsupp, NULL, NULL, 0, NULL },
{ "TE", roff_TE, NULL, NULL, 0, NULL },
{ "TH", roff_TH, NULL, NULL, 0, NULL },
- { "ti", roff_line_ignore, NULL, NULL, 0, NULL },
+ { "ti", roff_unsupp, NULL, NULL, 0, NULL },
{ "tkf", roff_line_ignore, NULL, NULL, 0, NULL },
{ "tl", roff_unsupp, NULL, NULL, 0, NULL },
{ "tm", roff_line_ignore, NULL, NULL, 0, NULL },