summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2013-10-14 01:42:25 +0000
committerschwarze <schwarze@openbsd.org>2013-10-14 01:42:25 +0000
commiteeca1f01fe2f6c23cd6eab8800560b63d479e2f2 (patch)
tree5b1fb968f2dfd1f133507e9f860fb81f720b9395
parentdefer the first update of the sensor as late in the boot process we can (diff)
downloadwireguard-openbsd-eeca1f01fe2f6c23cd6eab8800560b63d479e2f2.tar.xz
wireguard-openbsd-eeca1f01fe2f6c23cd6eab8800560b63d479e2f2.zip
Parse and ignore the .fam (font family) request.
Fixes irunner(1) in devel/ipython and uim-xim(1) in inputmethods/uim. Thanks to naddy@ for bringing these to my attention.
-rw-r--r--share/man/man7/roff.710
-rw-r--r--usr.bin/mandoc/roff.c4
2 files changed, 11 insertions, 3 deletions
diff --git a/share/man/man7/roff.7 b/share/man/man7/roff.7
index 13b6304563f..e9341875c3f 100644
--- a/share/man/man7/roff.7
+++ b/share/man/man7/roff.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: roff.7,v 1.22 2013/08/08 20:07:24 schwarze Exp $
+.\" $OpenBSD: roff.7,v 1.23 2013/10/14 01:42:25 schwarze Exp $
.\"
.\" Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
.\" Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: August 8 2013 $
+.Dd $Mdocdate: October 14 2013 $
.Dt ROFF 7
.Os
.Sh NAME
@@ -636,6 +636,12 @@ Begin an equation block.
See
.Xr eqn 7
for a description of the equation language.
+.Ss \&fam
+Change the font family.
+This line-scoped request is intended to have one argument specifying
+the font family to be selected.
+It is a groff extension, and currently, it is ignored including its
+arguments, and the number of arguments is not checked.
.Ss \&ft
Change the font.
Its syntax is as follows:
diff --git a/usr.bin/mandoc/roff.c b/usr.bin/mandoc/roff.c
index c9e7832ca88..31394e5a669 100644
--- a/usr.bin/mandoc/roff.c
+++ b/usr.bin/mandoc/roff.c
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.57 2013/10/05 21:17:29 schwarze Exp $ */
+/* $Id: roff.c,v 1.58 2013/10/14 01:42:26 schwarze Exp $ */
/*
* Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -42,6 +42,7 @@ enum rofft {
ROFF_de1,
ROFF_ds,
ROFF_el,
+ ROFF_fam,
ROFF_hy,
ROFF_ie,
ROFF_if,
@@ -231,6 +232,7 @@ static struct roffmac roffs[ROFF_MAX] = {
{ "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL },
{ "ds", roff_ds, NULL, NULL, 0, NULL },
{ "el", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
+ { "fam", roff_line_ignore, NULL, NULL, 0, NULL },
{ "hy", roff_line_ignore, NULL, NULL, 0, NULL },
{ "ie", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
{ "if", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },