From 535ca4dad3ad8541b5ac1993ef50b0192763d316 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Wed, 11 Jan 2017 17:39:46 +0000 Subject: Do text production for .Bt, .Ex, .Rv, .Ud at the validation stage rather than in the formatters. Use NODE_NOSRC flag for .Lb and NODE_NOSRC and NODE_NOPRT for .St. Results in a more rigorous syntax tree and in 135 lines less code. This work was triggered by a question from Abhinav Upadhyay (NetBSD) on discuss@. --- regress/usr.bin/mandoc/mdoc/Makefile | 4 ++-- regress/usr.bin/mandoc/mdoc/Ud/Makefile | 6 ++++++ regress/usr.bin/mandoc/mdoc/Ud/arg.in | 19 +++++++++++++++++++ regress/usr.bin/mandoc/mdoc/Ud/arg.out_ascii | 13 +++++++++++++ regress/usr.bin/mandoc/mdoc/Ud/arg.out_lint | 4 ++++ 5 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 regress/usr.bin/mandoc/mdoc/Ud/Makefile create mode 100644 regress/usr.bin/mandoc/mdoc/Ud/arg.in create mode 100644 regress/usr.bin/mandoc/mdoc/Ud/arg.out_ascii create mode 100644 regress/usr.bin/mandoc/mdoc/Ud/arg.out_lint (limited to 'regress') diff --git a/regress/usr.bin/mandoc/mdoc/Makefile b/regress/usr.bin/mandoc/mdoc/Makefile index 532158bebad..86bdcb7a2ff 100644 --- a/regress/usr.bin/mandoc/mdoc/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.31 2014/12/22 23:26:20 schwarze Exp $ +# $OpenBSD: Makefile,v 1.32 2017/01/11 17:39:45 schwarze Exp $ SUBDIR = Ad An Ap Aq Ar At Bd Bf Bk Bl Brq Bx Cd Cm SUBDIR += D1 Db Dd Dl Dq Dt Dv Em Eo Er Ev Ex Fd Fl Fo Ft Ic In Lb Li Lk SUBDIR += Ms Mt Nd Nm No Ns Oo Op Os Ox Pa Pf Pp Qq Rs Rv -SUBDIR += Sh Sm Sq St Sx Sy Tn Ux Va Vt Xr blank break +SUBDIR += Sh Sm Sq St Sx Sy Tn Ud Ux Va Vt Xr blank break .include "../Makefile.sub" .include diff --git a/regress/usr.bin/mandoc/mdoc/Ud/Makefile b/regress/usr.bin/mandoc/mdoc/Ud/Makefile new file mode 100644 index 00000000000..9bc871eed37 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Ud/Makefile @@ -0,0 +1,6 @@ +# $OpenBSD: Makefile,v 1.1 2017/01/11 17:39:45 schwarze Exp $ + +REGRESS_TARGETS = arg +LINT_TARGETS = arg + +.include diff --git a/regress/usr.bin/mandoc/mdoc/Ud/arg.in b/regress/usr.bin/mandoc/mdoc/Ud/arg.in new file mode 100644 index 00000000000..b5245a779a7 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Ud/arg.in @@ -0,0 +1,19 @@ +.Dd January 11, 2017 +.Dt UD-ARG 1 +.Os OpenBSD +.Sh NAME +.Nm Ud-arg +.Nd obsolete text production macros +.Sh DESCRIPTION +The newest branch is +.Ud +The stable branch +.Bt +It will be released shortly. +.Pp +With arg: +.Ud bar +.Bt foo +.Ud one two +.Bt one two +end diff --git a/regress/usr.bin/mandoc/mdoc/Ud/arg.out_ascii b/regress/usr.bin/mandoc/mdoc/Ud/arg.out_ascii new file mode 100644 index 00000000000..ec9f73c72bc --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Ud/arg.out_ascii @@ -0,0 +1,13 @@ +UD-ARG(1) General Commands Manual UD-ARG(1) + +NNAAMMEE + UUdd--aarrgg - obsolete text production macros + +DDEESSCCRRIIPPTTIIOONN + The newest branch is currently under development. The stable branch is + currently in beta test. It will be released shortly. + + With arg: currently under development. is currently in beta test. + currently under development. is currently in beta test. end + +OpenBSD January 11, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Ud/arg.out_lint b/regress/usr.bin/mandoc/mdoc/Ud/arg.out_lint new file mode 100644 index 00000000000..854845cdd40 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Ud/arg.out_lint @@ -0,0 +1,4 @@ +mandoc: arg.in:15:2: ERROR: skipping all arguments: Ud bar +mandoc: arg.in:16:2: ERROR: skipping all arguments: Bt foo +mandoc: arg.in:17:2: ERROR: skipping all arguments: Ud one +mandoc: arg.in:18:2: ERROR: skipping all arguments: Bt one -- cgit v1.2.3