From 608c48386e89191971c5a4f8a87a13749f5342c5 Mon Sep 17 00:00:00 2001 From: schwarze Date: Thu, 8 Jun 2017 00:21:23 +0000 Subject: [PATCH] Portable mandoc just got a warning about unknown .Lb names which we don't want in OpenBSD, but let's keep the message table and the manual page in sync. --- usr.bin/mandoc/mandoc.1 | 10 ++++++++-- usr.bin/mandoc/mandoc.h | 3 ++- usr.bin/mandoc/read.c | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/usr.bin/mandoc/mandoc.1 b/usr.bin/mandoc/mandoc.1 index 7a98442fb45..6751a91b198 100644 --- a/usr.bin/mandoc/mandoc.1 +++ b/usr.bin/mandoc/mandoc.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mandoc.1,v 1.119 2017/06/07 23:29:31 schwarze Exp $ +.\" $OpenBSD: mandoc.1,v 1.120 2017/06/08 00:21:23 schwarze Exp $ .\" .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons .\" Copyright (c) 2012, 2014-2017 Ingo Schwarze @@ -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: June 7 2017 $ +.Dd $Mdocdate: June 8 2017 $ .Dt MANDOC 1 .Os .Sh NAME @@ -1399,6 +1399,12 @@ or .Ic \&Fn macro contains an opening or closing parenthesis; that's probably wrong, parentheses are added automatically. +.It Sy "unknown library name" +.Pq mdoc, not on Ox +An +.Ic \&Lb +macro has an unknown name argument and will be rendered as +.Qq library Dq Ar name . .It Sy "invalid content in Rs block" .Pq mdoc An diff --git a/usr.bin/mandoc/mandoc.h b/usr.bin/mandoc/mandoc.h index 90910c5ca07..a0c44e1cf85 100644 --- a/usr.bin/mandoc/mandoc.h +++ b/usr.bin/mandoc/mandoc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mandoc.h,v 1.166 2017/06/07 23:29:31 schwarze Exp $ */ +/* $OpenBSD: mandoc.h,v 1.167 2017/06/08 00:21:23 schwarze Exp $ */ /* * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons * Copyright (c) 2010-2017 Ingo Schwarze @@ -135,6 +135,7 @@ enum mandocerr { MANDOCERR_AT_BAD, /* unknown AT&T UNIX version: At version */ MANDOCERR_FA_COMMA, /* comma in function argument: arg */ MANDOCERR_FN_PAREN, /* parenthesis in function name: arg */ + MANDOCERR_LB_BAD, /* unknown library name: Lb ... */ MANDOCERR_RS_BAD, /* invalid content in Rs block: macro */ MANDOCERR_SM_BAD, /* invalid Boolean argument: macro arg */ MANDOCERR_FT_BAD, /* unknown font, skipping request: ft font */ diff --git a/usr.bin/mandoc/read.c b/usr.bin/mandoc/read.c index 0d1089c71bf..70d21328f80 100644 --- a/usr.bin/mandoc/read.c +++ b/usr.bin/mandoc/read.c @@ -1,4 +1,4 @@ -/* $OpenBSD: read.c,v 1.144 2017/06/07 23:29:31 schwarze Exp $ */ +/* $OpenBSD: read.c,v 1.145 2017/06/08 00:21:23 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010-2017 Ingo Schwarze @@ -173,6 +173,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "unknown AT&T UNIX version", "comma in function argument", "parenthesis in function name", + "unknown library name", "invalid content in Rs block", "invalid Boolean argument", "unknown font, skipping request", -- 2.20.1