diff options
Diffstat (limited to 'regress/mdoc')
41 files changed, 215 insertions, 36 deletions
diff --git a/regress/mdoc/Bd/Makefile b/regress/mdoc/Bd/Makefile index f05f54b0..a7319e70 100644 --- a/regress/mdoc/Bd/Makefile +++ b/regress/mdoc/Bd/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.22 2019/01/07 06:51:37 schwarze Exp $ +# $OpenBSD: Makefile,v 1.23 2020/04/06 09:55:49 schwarze Exp $ REGRESS_TARGETS = beforeNAME blank centered nested nf paragraph spacing REGRESS_TARGETS += badargs empty offset-empty offset-neg REGRESS_TARGETS += break broken unclosed +TAG_TARGETS = nested paragraph LINT_TARGETS = beforeNAME blank nested badargs break broken unclosed HTML_TARGETS = nf paragraph diff --git a/regress/mdoc/Bd/nested.in b/regress/mdoc/Bd/nested.in index 328fbf1d..c0cb4d12 100644 --- a/regress/mdoc/Bd/nested.in +++ b/regress/mdoc/Bd/nested.in @@ -1,4 +1,4 @@ -.\" $OpenBSD: nested.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $ +.\" $OpenBSD: nested.in,v 1.3 2020/04/06 09:55:49 schwarze Exp $ .Dd $Mdocdate$ .Dt BD-NESTED 1 .Os @@ -8,9 +8,11 @@ .Sh DESCRIPTION regular text +.Tg outer .Bd -ragged -offset indent outer text (default indent) +.Tg inner .Bd -ragged -offset indent inner text (default indent) @@ -20,8 +22,10 @@ text .Ed regular text +.Tg outer .Bd -ragged -offset 4n outer text (4n) +.Tg inner .Bd -ragged -offset 2n inner text (2n) .Ed diff --git a/regress/mdoc/Bd/nested.out_ascii b/regress/mdoc/Bd/nested.out_ascii index 58ee55dd..1d27c178 100644 --- a/regress/mdoc/Bd/nested.out_ascii +++ b/regress/mdoc/Bd/nested.out_ascii @@ -26,4 +26,4 @@ DDEESSCCRRIIPPTTIIOONN inner text (2n) outer text -OpenBSD July 4, 2017 OpenBSD +OpenBSD April 6, 2020 OpenBSD diff --git a/regress/mdoc/Bd/nested.out_lint b/regress/mdoc/Bd/nested.out_lint index d6f7eda2..5a6a6966 100644 --- a/regress/mdoc/Bd/nested.out_lint +++ b/regress/mdoc/Bd/nested.out_lint @@ -1,2 +1,2 @@ -mandoc: nested.in:14:2: WARNING: nested displays are not portable: Bd in Bd -mandoc: nested.in:25:2: WARNING: nested displays are not portable: Bd in Bd +mandoc: nested.in:16:2: WARNING: nested displays are not portable: Bd in Bd +mandoc: nested.in:29:2: WARNING: nested displays are not portable: Bd in Bd diff --git a/regress/mdoc/Bd/nested.out_markdown b/regress/mdoc/Bd/nested.out_markdown index d936b9c0..e647a0df 100644 --- a/regress/mdoc/Bd/nested.out_markdown +++ b/regress/mdoc/Bd/nested.out_markdown @@ -43,4 +43,4 @@ tag > outer text -OpenBSD - July 4, 2017 +OpenBSD - April 6, 2020 diff --git a/regress/mdoc/Bd/nested.out_tag b/regress/mdoc/Bd/nested.out_tag new file mode 100644 index 00000000..7b9c2012 --- /dev/null +++ b/regress/mdoc/Bd/nested.out_tag @@ -0,0 +1,6 @@ +NAME 3 +DESCRIPTION 6 +outer 9 +inner 11 +outer 15 +inner 17 diff --git a/regress/mdoc/Bd/paragraph.in b/regress/mdoc/Bd/paragraph.in index 09629f56..8ac0cc00 100644 --- a/regress/mdoc/Bd/paragraph.in +++ b/regress/mdoc/Bd/paragraph.in @@ -1,4 +1,4 @@ -.\" $OpenBSD: paragraph.in,v 1.1 2019/01/07 06:51:37 schwarze Exp $ +.\" $OpenBSD: paragraph.in,v 1.2 2020/04/06 09:55:49 schwarze Exp $ .Dd $Mdocdate$ .Dt BD-PARAGRAPH 1 .Os @@ -9,12 +9,15 @@ BEGINTEST initial text +.Tg npara .Pp normal paragraph +.Tg filled .Bd -filled filled display +.Tg fpara .Pp paragraph in display @@ -24,9 +27,11 @@ to normal .Pp another paragraph +.Tg unfilled .Bd -unfilled unfilled display +.Tg upara .Pp unfilled paragraph diff --git a/regress/mdoc/Bd/paragraph.out_ascii b/regress/mdoc/Bd/paragraph.out_ascii index 216f4530..bf122ce0 100644 --- a/regress/mdoc/Bd/paragraph.out_ascii +++ b/regress/mdoc/Bd/paragraph.out_ascii @@ -24,4 +24,4 @@ DDEESSCCRRIIPPTTIIOONN ENDTEST end of file -OpenBSD January 7, 2019 OpenBSD +OpenBSD April 6, 2020 OpenBSD diff --git a/regress/mdoc/Bd/paragraph.out_html b/regress/mdoc/Bd/paragraph.out_html index bec13a88..f537335e 100644 --- a/regress/mdoc/Bd/paragraph.out_html +++ b/regress/mdoc/Bd/paragraph.out_html @@ -1,14 +1,14 @@ -<p class="Pp">normal paragraph</p> -<div class="Bd Pp">filled display -<p class="Pp">paragraph in display</p> +<p class="Pp" id="npara">normal paragraph</p> +<div class="Bd Pp" id="filled">filled display +<p class="Pp" id="fpara">paragraph in display</p> </div> back to normal <p class="Pp">another paragraph</p> -<div class="Bd Pp"> +<div class="Bd Pp" id="unfilled"> <pre> unfilled display - +<mark id="upara"></mark> unfilled paragraph </pre> diff --git a/regress/mdoc/Bd/paragraph.out_markdown b/regress/mdoc/Bd/paragraph.out_markdown index 13e43f11..6e569b5d 100644 --- a/regress/mdoc/Bd/paragraph.out_markdown +++ b/regress/mdoc/Bd/paragraph.out_markdown @@ -36,4 +36,4 @@ to normal ENDTEST end of file -OpenBSD - January 7, 2019 +OpenBSD - April 6, 2020 diff --git a/regress/mdoc/Bd/paragraph.out_tag b/regress/mdoc/Bd/paragraph.out_tag new file mode 100644 index 00000000..eab6391f --- /dev/null +++ b/regress/mdoc/Bd/paragraph.out_tag @@ -0,0 +1,7 @@ +NAME 3 +DESCRIPTION 6 +npara 9 +filled 11 +fpara 13 +unfilled 18 +upara 21 diff --git a/regress/mdoc/D1/Makefile b/regress/mdoc/D1/Makefile index b94d5727..170dc2ca 100644 --- a/regress/mdoc/D1/Makefile +++ b/regress/mdoc/D1/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.5 2019/01/07 06:51:37 schwarze Exp $ +# $OpenBSD: Makefile,v 1.6 2020/04/06 09:55:49 schwarze Exp $ REGRESS_TARGETS = spacing +TAG_TARGETS = spacing LINT_TARGETS = spacing HTML_TARGETS = spacing diff --git a/regress/mdoc/D1/spacing.in b/regress/mdoc/D1/spacing.in index 16661257..e76139da 100644 --- a/regress/mdoc/D1/spacing.in +++ b/regress/mdoc/D1/spacing.in @@ -1,4 +1,4 @@ -.\" $OpenBSD: spacing.in,v 1.4 2019/01/07 06:51:37 schwarze Exp $ +.\" $OpenBSD: spacing.in,v 1.5 2020/04/06 09:55:49 schwarze Exp $ .Dd $Mdocdate$ .Dt D1-SPACING 1 .Os @@ -10,6 +10,7 @@ BEGINTEST .Pp preceding paragraph +.Tg display .D1 spacing in and around one-line displays empty display: .D1 diff --git a/regress/mdoc/D1/spacing.out_ascii b/regress/mdoc/D1/spacing.out_ascii index c0d1556d..c6241a38 100644 --- a/regress/mdoc/D1/spacing.out_ascii +++ b/regress/mdoc/D1/spacing.out_ascii @@ -13,4 +13,4 @@ DDEESSCCRRIIPPTTIIOONN ENDTEST end of file -OpenBSD January 7, 2019 OpenBSD +OpenBSD April 6, 2020 OpenBSD diff --git a/regress/mdoc/D1/spacing.out_html b/regress/mdoc/D1/spacing.out_html index 3db40161..3a9affc9 100644 --- a/regress/mdoc/D1/spacing.out_html +++ b/regress/mdoc/D1/spacing.out_html @@ -1,5 +1,7 @@ <p class="Pp">preceding paragraph</p> -<div class="Bd Bd-indent">spacing in and around one-line displays</div> +<div class="Bd + Bd-indent" id="display"><a class="permalink" href="#display">spacing in and + around one-line displays</a></div> empty display: <div class="Bd Bd-indent"></div> following text diff --git a/regress/mdoc/D1/spacing.out_lint b/regress/mdoc/D1/spacing.out_lint index 0a2790bb..532375d7 100644 --- a/regress/mdoc/D1/spacing.out_lint +++ b/regress/mdoc/D1/spacing.out_lint @@ -1 +1 @@ -mandoc: spacing.in:15:2: WARNING: empty block: D1 +mandoc: spacing.in:16:2: WARNING: empty block: D1 diff --git a/regress/mdoc/D1/spacing.out_markdown b/regress/mdoc/D1/spacing.out_markdown index d1f12f63..225b3a0b 100644 --- a/regress/mdoc/D1/spacing.out_markdown +++ b/regress/mdoc/D1/spacing.out_markdown @@ -19,4 +19,4 @@ following text ENDTEST end of file -OpenBSD - January 7, 2019 +OpenBSD - April 6, 2020 diff --git a/regress/mdoc/D1/spacing.out_tag b/regress/mdoc/D1/spacing.out_tag new file mode 100644 index 00000000..73ab507a --- /dev/null +++ b/regress/mdoc/D1/spacing.out_tag @@ -0,0 +1,3 @@ +NAME 3 +DESCRIPTION 6 +display 10 diff --git a/regress/mdoc/Dl/Makefile b/regress/mdoc/Dl/Makefile index bed27d1b..51605be0 100644 --- a/regress/mdoc/Dl/Makefile +++ b/regress/mdoc/Dl/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.2 2015/02/06 02:04:35 schwarze Exp $ +# $OpenBSD: Makefile,v 1.5 2020/04/06 09:55:49 schwarze Exp $ REGRESS_TARGETS = spacing +TAG_TARGETS = spacing LINT_TARGETS = spacing .include <bsd.regress.mk> diff --git a/regress/mdoc/Dl/spacing.in b/regress/mdoc/Dl/spacing.in index 6120504c..bda53bbd 100644 --- a/regress/mdoc/Dl/spacing.in +++ b/regress/mdoc/Dl/spacing.in @@ -1,4 +1,4 @@ -.\" $OpenBSD: spacing.in,v 1.4 2017/07/04 14:53:25 schwarze Exp $ +.\" $OpenBSD: spacing.in,v 1.5 2020/04/06 09:55:49 schwarze Exp $ .Dd $Mdocdate$ .Dt DL-SPACING 1 .Os @@ -7,6 +7,7 @@ .Nd spacing in and around one-line literal displays .Sh DESCRIPTION preceding text +.Tg display .Dl spacing in and around one-line literal displays empty display: .Dl diff --git a/regress/mdoc/Dl/spacing.out_ascii b/regress/mdoc/Dl/spacing.out_ascii index c0928ec0..c96eca32 100644 --- a/regress/mdoc/Dl/spacing.out_ascii +++ b/regress/mdoc/Dl/spacing.out_ascii @@ -9,4 +9,4 @@ DDEESSCCRRIIPPTTIIOONN empty display: following text -OpenBSD July 4, 2017 OpenBSD +OpenBSD April 6, 2020 OpenBSD diff --git a/regress/mdoc/Dl/spacing.out_lint b/regress/mdoc/Dl/spacing.out_lint index a18ed583..a31f329f 100644 --- a/regress/mdoc/Dl/spacing.out_lint +++ b/regress/mdoc/Dl/spacing.out_lint @@ -1 +1 @@ -mandoc: spacing.in:12:2: WARNING: empty block: Dl +mandoc: spacing.in:13:2: WARNING: empty block: Dl diff --git a/regress/mdoc/Dl/spacing.out_markdown b/regress/mdoc/Dl/spacing.out_markdown index 08d15972..27dab22c 100644 --- a/regress/mdoc/Dl/spacing.out_markdown +++ b/regress/mdoc/Dl/spacing.out_markdown @@ -14,4 +14,4 @@ empty display: following text -OpenBSD - July 4, 2017 +OpenBSD - April 6, 2020 diff --git a/regress/mdoc/Dl/spacing.out_tag b/regress/mdoc/Dl/spacing.out_tag new file mode 100644 index 00000000..b036279d --- /dev/null +++ b/regress/mdoc/Dl/spacing.out_tag @@ -0,0 +1,3 @@ +NAME 3 +DESCRIPTION 6 +display 8 diff --git a/regress/mdoc/Pp/Makefile b/regress/mdoc/Pp/Makefile index 04e1bc3b..03d32774 100644 --- a/regress/mdoc/Pp/Makefile +++ b/regress/mdoc/Pp/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.4 2015/02/04 19:11:17 schwarze Exp $ +# $OpenBSD: Makefile,v 1.7 2020/04/06 09:55:50 schwarze Exp $ REGRESS_TARGETS = arg +TAG_TARGETS = arg LINT_TARGETS = arg .include <bsd.regress.mk> diff --git a/regress/mdoc/Pp/arg.in b/regress/mdoc/Pp/arg.in index 4c7ab5fc..70ce93ae 100644 --- a/regress/mdoc/Pp/arg.in +++ b/regress/mdoc/Pp/arg.in @@ -1,4 +1,4 @@ -.\" $OpenBSD: arg.in,v 1.4 2017/07/04 14:53:26 schwarze Exp $ +.\" $OpenBSD: arg.in,v 1.5 2020/04/06 09:55:50 schwarze Exp $ .Dd $Mdocdate$ .Dt PP-ARG 1 .Os @@ -7,9 +7,13 @@ .Nd paragraph macro with arguments .Sh DESCRIPTION line 1 +.Tg first .Pp drop this line 2 .br drop this line 3 .sp 1v drop this line 4 +.Tg last +.Pp +final text diff --git a/regress/mdoc/Pp/arg.out_ascii b/regress/mdoc/Pp/arg.out_ascii index a15f1598..70eebb4d 100644 --- a/regress/mdoc/Pp/arg.out_ascii +++ b/regress/mdoc/Pp/arg.out_ascii @@ -11,4 +11,6 @@ DDEESSCCRRIIPPTTIIOONN line 4 -OpenBSD July 4, 2017 OpenBSD + final text + +OpenBSD April 6, 2020 OpenBSD diff --git a/regress/mdoc/Pp/arg.out_lint b/regress/mdoc/Pp/arg.out_lint index f49d27d4..40d77064 100644 --- a/regress/mdoc/Pp/arg.out_lint +++ b/regress/mdoc/Pp/arg.out_lint @@ -1,3 +1,3 @@ -mandoc: arg.in:12:5: ERROR: skipping all arguments: br drop this -mandoc: arg.in:14:8: ERROR: skipping excess arguments: sp ... drop this -mandoc: arg.in:10:2: ERROR: skipping all arguments: Pp drop +mandoc: arg.in:13:5: ERROR: skipping all arguments: br drop this +mandoc: arg.in:15:8: ERROR: skipping excess arguments: sp ... drop this +mandoc: arg.in:11:2: ERROR: skipping all arguments: Pp drop diff --git a/regress/mdoc/Pp/arg.out_markdown b/regress/mdoc/Pp/arg.out_markdown index 17c7753a..0b06ac9e 100644 --- a/regress/mdoc/Pp/arg.out_markdown +++ b/regress/mdoc/Pp/arg.out_markdown @@ -13,4 +13,6 @@ line 3 line 4 -OpenBSD - July 4, 2017 +final text + +OpenBSD - April 6, 2020 diff --git a/regress/mdoc/Pp/arg.out_tag b/regress/mdoc/Pp/arg.out_tag new file mode 100644 index 00000000..443b1be2 --- /dev/null +++ b/regress/mdoc/Pp/arg.out_tag @@ -0,0 +1,4 @@ +NAME 3 +DESCRIPTION 6 +first 9 +last 14 diff --git a/regress/mdoc/Tg/Makefile b/regress/mdoc/Tg/Makefile index 7f538766..d67ec5af 100644 --- a/regress/mdoc/Tg/Makefile +++ b/regress/mdoc/Tg/Makefile @@ -1,8 +1,10 @@ -# $OpenBSD: Makefile,v 1.1 2020/03/13 00:31:06 schwarze Exp $ +# $OpenBSD: Makefile,v 1.2 2020/04/06 09:55:50 schwarze Exp $ -REGRESS_TARGETS = warn -TAG_TARGETS = warn +REGRESS_TARGETS = column list warn +TAG_TARGETS = column list warn LINT_TARGETS = warn -HTML_TARGETS = warn +HTML_TARGETS = column list warn + +SKIP_TMAN = column .include <bsd.regress.mk> diff --git a/regress/mdoc/Tg/column.in b/regress/mdoc/Tg/column.in new file mode 100644 index 00000000..347e7594 --- /dev/null +++ b/regress/mdoc/Tg/column.in @@ -0,0 +1,17 @@ +.\" $OpenBSD: column.in,v 1.1 2020/04/06 09:55:50 schwarze Exp $ +.Dd $Mdocdate$ +.Dt TG-COLUMN 1 +.Os +.Sh NAME +.Nm Tg-column +.Nd explicit tagging of column lists and rows +.Sh DESCRIPTION +BEGINTEST +.Tg list +.Bl -column one two +.Tg row1 +.It one Ta two +.Tg row2 +.It 1 2 +.El +ENDTEST diff --git a/regress/mdoc/Tg/column.out_ascii b/regress/mdoc/Tg/column.out_ascii new file mode 100644 index 00000000..3051005b --- /dev/null +++ b/regress/mdoc/Tg/column.out_ascii @@ -0,0 +1,13 @@ +TG-COLUMN(1) General Commands Manual TG-COLUMN(1) + +NNAAMMEE + TTgg--ccoolluummnn - explicit tagging of column lists and rows + +DDEESSCCRRIIPPTTIIOONN + BEGINTEST + + one two + 1 2 + ENDTEST + +OpenBSD April 6, 2020 OpenBSD diff --git a/regress/mdoc/Tg/column.out_html b/regress/mdoc/Tg/column.out_html new file mode 100644 index 00000000..8374fb9c --- /dev/null +++ b/regress/mdoc/Tg/column.out_html @@ -0,0 +1,10 @@ +<table class="Bl-column" id="list"> + <tr id="row1"> + <td>one</td> + <td>two</td> + </tr> + <tr id="row2"> + <td>1</td> + <td>2</td> + </tr> +</table> diff --git a/regress/mdoc/Tg/column.out_markdown b/regress/mdoc/Tg/column.out_markdown new file mode 100644 index 00000000..a6820fd0 --- /dev/null +++ b/regress/mdoc/Tg/column.out_markdown @@ -0,0 +1,16 @@ +TG-COLUMN(1) - General Commands Manual + +# NAME + +**Tg-column** - explicit tagging of column lists and rows + +# DESCRIPTION + +BEGINTEST + + one two + 1 2 + +ENDTEST + +OpenBSD - April 6, 2020 diff --git a/regress/mdoc/Tg/column.out_tag b/regress/mdoc/Tg/column.out_tag new file mode 100644 index 00000000..f34a94b9 --- /dev/null +++ b/regress/mdoc/Tg/column.out_tag @@ -0,0 +1,5 @@ +NAME 3 +DESCRIPTION 6 +list 8 +row1 9 +row2 10 diff --git a/regress/mdoc/Tg/list.in b/regress/mdoc/Tg/list.in new file mode 100644 index 00000000..64b2dd6b --- /dev/null +++ b/regress/mdoc/Tg/list.in @@ -0,0 +1,22 @@ +.\" $OpenBSD: list.in,v 1.1 2020/04/06 09:55:50 schwarze Exp $ +.Dd $Mdocdate$ +.Dt TG-LIST 1 +.Os +.Sh NAME +.Nm Tg-list +.Nd explicit tagging of lists and list elements +.Sh DESCRIPTION +BEGINTEST +.Tg dashlist +.Bl -dash +.Tg dashitem +.It +item +.El +.Tg taglist +.Bl -tag -width Ds +.Tg tagitem +.It tag +text +.El +ENDTEST diff --git a/regress/mdoc/Tg/list.out_ascii b/regress/mdoc/Tg/list.out_ascii new file mode 100644 index 00000000..adc476e0 --- /dev/null +++ b/regress/mdoc/Tg/list.out_ascii @@ -0,0 +1,14 @@ +TG-LIST(1) General Commands Manual TG-LIST(1) + +NNAAMMEE + TTgg--lliisstt - explicit tagging of lists and list elements + +DDEESSCCRRIIPPTTIIOONN + BEGINTEST + + -- item + + tag text + ENDTEST + +OpenBSD April 6, 2020 OpenBSD diff --git a/regress/mdoc/Tg/list.out_html b/regress/mdoc/Tg/list.out_html new file mode 100644 index 00000000..001c994b --- /dev/null +++ b/regress/mdoc/Tg/list.out_html @@ -0,0 +1,7 @@ +<ul class="Bl-dash" id="dashlist"> + <li id="dashitem"><a class="permalink" href="#dashitem">item</a></li> +</ul> +<dl class="Bl-tag" id="taglist"> + <dt id="tagitem"><a class="permalink" href="#tagitem">tag</a></dt> + <dd>text</dd> +</dl> diff --git a/regress/mdoc/Tg/list.out_markdown b/regress/mdoc/Tg/list.out_markdown new file mode 100644 index 00000000..836e5cab --- /dev/null +++ b/regress/mdoc/Tg/list.out_markdown @@ -0,0 +1,19 @@ +TG-LIST(1) - General Commands Manual + +# NAME + +**Tg-list** - explicit tagging of lists and list elements + +# DESCRIPTION + +BEGINTEST + +- item + +tag + +> text + +ENDTEST + +OpenBSD - April 6, 2020 diff --git a/regress/mdoc/Tg/list.out_tag b/regress/mdoc/Tg/list.out_tag new file mode 100644 index 00000000..48eb6d44 --- /dev/null +++ b/regress/mdoc/Tg/list.out_tag @@ -0,0 +1,6 @@ +NAME 3 +DESCRIPTION 6 +dashlist 8 +dashitem 9 +taglist 10 +tagitem 11 |