diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2019-01-06 04:41:16 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2019-01-06 04:41:16 +0000 |
| commit | a7e276d2dd22a043f79e6c0a53b1d01549d585ac (patch) | |
| tree | 5eecbaa7dedd3f82cf5eec045cbcebc09cc788a2 /regress | |
| parent | b564c8b89dc3914a5e9096719a141f1be39731a6 (diff) | |
Finally, represent the man(7) .PP and .HP macros by the natural
choice, which is <p> HTML element. On top of the previous fill-mode
improvements, the key to making this possible is to automatically
close the <p> when required: before headers, subsequent paragraphs,
lists, indented blocks, synopsis blocks, tbl(7) blocks, and before
blocks using no-fill mode.
In man(7) documents, represent the .sp request by a blank line in
no-fill mode and in the same way as .PP in fill mode.
Diffstat (limited to 'regress')
28 files changed, 380 insertions, 45 deletions
diff --git a/regress/usr.bin/mandoc/man/HP/Makefile b/regress/usr.bin/mandoc/man/HP/Makefile index e0d2a3b4aa2..1e33cfb4d4f 100644 --- a/regress/usr.bin/mandoc/man/HP/Makefile +++ b/regress/usr.bin/mandoc/man/HP/Makefile @@ -1,5 +1,6 @@ -# $OpenBSD: Makefile,v 1.2 2014/04/08 04:45:50 schwarze Exp $ +# $OpenBSD: Makefile,v 1.3 2019/01/06 04:41:15 schwarze Exp $ REGRESS_TARGETS = break literal macrotag manyargs spacing +HTML_TARGETS = literal .include <bsd.regress.mk> diff --git a/regress/usr.bin/mandoc/man/HP/literal.in b/regress/usr.bin/mandoc/man/HP/literal.in index 0f256638d62..e5d1b71a995 100644 --- a/regress/usr.bin/mandoc/man/HP/literal.in +++ b/regress/usr.bin/mandoc/man/HP/literal.in @@ -1,27 +1,32 @@ -.\" $OpenBSD: literal.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $ -.TH HP-LITERAL 1 "January 4, 2011" +.\" $OpenBSD: literal.in,v 1.3 2019/01/06 04:41:15 schwarze Exp $ +.TH HP-LITERAL 1 "January 6, 2019" .SH NAME HP-literal \- hanged paragraphs in literal context .SH DESCRIPTION -regular -text +BEGINTEST +before hanged paragraph .HP 10n tag indented text .PP regular -text +paragraph .nf literal text .HP 10n tag -indented -text +literal +hanged +paragraph .PP literal -text +paragraph .fi regular text +.br +ENDTEST +.br +end of file diff --git a/regress/usr.bin/mandoc/man/HP/literal.out_ascii b/regress/usr.bin/mandoc/man/HP/literal.out_ascii index ff7aabf7c28..1e27b1ae0cc 100644 --- a/regress/usr.bin/mandoc/man/HP/literal.out_ascii +++ b/regress/usr.bin/mandoc/man/HP/literal.out_ascii @@ -6,22 +6,25 @@ NNAAMMEE HP-literal - hanged paragraphs in literal context DDEESSCCRRIIPPTTIIOONN - regular text + BEGINTEST before hanged paragraph tag indented text - regular text + regular paragraph literal text tag - indented - text + literal + hanged + paragraph literal - text + paragraph regular text + ENDTEST + end of file -OpenBSD January 4, 2011 HP-LITERAL(1) +OpenBSD January 6, 2019 HP-LITERAL(1) diff --git a/regress/usr.bin/mandoc/man/HP/literal.out_html b/regress/usr.bin/mandoc/man/HP/literal.out_html new file mode 100644 index 00000000000..d40ee9a5847 --- /dev/null +++ b/regress/usr.bin/mandoc/man/HP/literal.out_html @@ -0,0 +1,20 @@ +BEGINTEST before hanged paragraph +<p class="Pp HP">tag indented text</p> +<p class="Pp">regular paragraph</p> +<pre> +literal +text +</pre> +<pre> +tag +literal +hanged +paragraph +</pre> +<pre> +literal +paragraph +</pre> +regular text +<br/> +ENDTEST diff --git a/regress/usr.bin/mandoc/man/IP/Makefile b/regress/usr.bin/mandoc/man/IP/Makefile index 9edc12e1c24..a677b97071e 100644 --- a/regress/usr.bin/mandoc/man/IP/Makefile +++ b/regress/usr.bin/mandoc/man/IP/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.8 2014/07/02 05:51:49 schwarze Exp $ +# $OpenBSD: Makefile,v 1.9 2019/01/06 04:41:15 schwarze Exp $ REGRESS_TARGETS = empty literal longhead manyargs spacing width LINT_TARGETS = empty +HTML_TARGETS = literal .include <bsd.regress.mk> diff --git a/regress/usr.bin/mandoc/man/IP/literal.in b/regress/usr.bin/mandoc/man/IP/literal.in index edb8eb02494..2fb459cb706 100644 --- a/regress/usr.bin/mandoc/man/IP/literal.in +++ b/regress/usr.bin/mandoc/man/IP/literal.in @@ -1,10 +1,10 @@ -.\" $OpenBSD: literal.in,v 1.6 2017/07/04 14:53:23 schwarze Exp $ -.TH IP-LITERAL 1 "January 4, 2011" +.\" $OpenBSD: literal.in,v 1.7 2019/01/06 04:41:15 schwarze Exp $ +.TH IP-LITERAL 1 "January 6, 2019" .SH NAME IP-literal \- indented paragraphs in literal context .SH DESCRIPTION -regular -text +BEGINTEST +before indentation .IP tag 10n indented regular @@ -63,3 +63,7 @@ paragraph .fi regular text +.br +ENDTEST +.br +end of file diff --git a/regress/usr.bin/mandoc/man/IP/literal.out_ascii b/regress/usr.bin/mandoc/man/IP/literal.out_ascii index db020a5ecd3..e4984edee6b 100644 --- a/regress/usr.bin/mandoc/man/IP/literal.out_ascii +++ b/regress/usr.bin/mandoc/man/IP/literal.out_ascii @@ -6,7 +6,7 @@ NNAAMMEE IP-literal - indented paragraphs in literal context DDEESSCCRRIIPPTTIIOONN - regular text + BEGINTEST before indentation tag indented regular text @@ -47,7 +47,9 @@ DDEESSCCRRIIPPTTIIOONN literal paragraph regular text + ENDTEST + end of file -OpenBSD January 4, 2011 IP-LITERAL(1) +OpenBSD January 6, 2019 IP-LITERAL(1) diff --git a/regress/usr.bin/mandoc/man/IP/literal.out_html b/regress/usr.bin/mandoc/man/IP/literal.out_html new file mode 100644 index 00000000000..ae90758bb65 --- /dev/null +++ b/regress/usr.bin/mandoc/man/IP/literal.out_html @@ -0,0 +1,65 @@ +BEGINTEST before indentation +<dl class="Bl-tag"> + <dt>tag</dt> + <dd>indented regular text</dd> +</dl> +<p class="Pp">new regular paragraph</p> +<pre> +literal +text +</pre> +<dl class="Bl-tag"> + <dt>tag</dt> + <dd> + <pre> +indented +literal +text + </pre> + </dd> +</dl> +<pre> +new +literal +paragraph +</pre> +regular text +<h2 class="Ss" title="Ss" id="literal_into_indented_paragraph"><a class="permalink" href="#literal_into_indented_paragraph">literal + into indented paragraph</a></h2> +regular text +<pre> +literal +text +</pre> +<dl class="Bl-tag"> + <dt>tag</dt> + <dd> + <pre> +indented +literal +text + </pre> + indented regular text</dd> +</dl> +<p class="Pp">new regular paragraph</p> +<h2 class="Ss" title="Ss" id="literal_out_of_indented_paragraph"><a class="permalink" href="#literal_out_of_indented_paragraph">literal + out of indented paragraph</a></h2> +regular text +<dl class="Bl-tag"> + <dt>tag</dt> + <dd>indented regular text + <pre> +indented +literal +text + </pre> + </dd> +</dl> +<pre> +new +literal +paragraph +</pre> +regular text +<br/> +ENDTEST diff --git a/regress/usr.bin/mandoc/man/RS/Makefile b/regress/usr.bin/mandoc/man/RS/Makefile index 34c0029c313..e7b64ab1efa 100644 --- a/regress/usr.bin/mandoc/man/RS/Makefile +++ b/regress/usr.bin/mandoc/man/RS/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.13 2019/01/05 20:00:33 schwarze Exp $ +# $OpenBSD: Makefile,v 1.14 2019/01/06 04:41:15 schwarze Exp $ REGRESS_TARGETS = an-margin breaking broken empty literal lonelyRE -REGRESS_TARGETS += nested noRE nowidth REarg width +REGRESS_TARGETS += nested noRE nowidth paragraph REarg width LINT_TARGETS = empty lonelyRE noRE REarg -HTML_TARGETS = literal +HTML_TARGETS = literal paragraph .include <bsd.regress.mk> diff --git a/regress/usr.bin/mandoc/man/RS/paragraph.in b/regress/usr.bin/mandoc/man/RS/paragraph.in new file mode 100644 index 00000000000..01f90f047c1 --- /dev/null +++ b/regress/usr.bin/mandoc/man/RS/paragraph.in @@ -0,0 +1,23 @@ +.\" $OpenBSD: paragraph.in,v 1.1 2019/01/06 04:41:15 schwarze Exp $ +.TH RS-PARAGRAPH 1 "January 6, 2019" +.SH NAME +RS-paragraph \- interaction between regular and indented paragraphs +.SH DESCRIPTION +BEGINTEST +before paragraph +.PP +regular +paragraph +.RS +indented +paragraph +.PP +nested +paragraph +.RE +regular text +after display +.br +ENDTEST +.br +end of file diff --git a/regress/usr.bin/mandoc/man/RS/paragraph.out_ascii b/regress/usr.bin/mandoc/man/RS/paragraph.out_ascii new file mode 100644 index 00000000000..91e0ee3edf7 --- /dev/null +++ b/regress/usr.bin/mandoc/man/RS/paragraph.out_ascii @@ -0,0 +1,21 @@ +RS-PARAGRAPH(1) General Commands Manual RS-PARAGRAPH(1) + + + +NNAAMMEE + RS-paragraph - interaction between regular and indented paragraphs + +DDEESSCCRRIIPPTTIIOONN + BEGINTEST before paragraph + + regular paragraph + indented paragraph + + nested paragraph + regular text after display + ENDTEST + end of file + + + +OpenBSD January 6, 2019 RS-PARAGRAPH(1) diff --git a/regress/usr.bin/mandoc/man/RS/paragraph.out_html b/regress/usr.bin/mandoc/man/RS/paragraph.out_html new file mode 100644 index 00000000000..8b518698a07 --- /dev/null +++ b/regress/usr.bin/mandoc/man/RS/paragraph.out_html @@ -0,0 +1,8 @@ +BEGINTEST before paragraph +<p class="Pp">regular paragraph</p> +<div class="Bd-indent">indented paragraph +<p class="Pp">nested paragraph</p> +</div> +regular text after display +<br/> +ENDTEST diff --git a/regress/usr.bin/mandoc/man/SH/Makefile b/regress/usr.bin/mandoc/man/SH/Makefile index 7fff2ef5873..55133efeb82 100644 --- a/regress/usr.bin/mandoc/man/SH/Makefile +++ b/regress/usr.bin/mandoc/man/SH/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.5 2017/06/03 15:54:09 schwarze Exp $ +# $OpenBSD: Makefile,v 1.6 2019/01/06 04:41:15 schwarze Exp $ -REGRESS_TARGETS = broken broken_eline empty_before longarg noarg +REGRESS_TARGETS = broken broken_eline empty_before longarg noarg paragraph LINT_TARGETS = broken broken_eline empty_before noarg +HTML_TARGETS = paragraph # groff-1.22.3 defects: # - .SH without args just before EOF causes two additional blank lines. diff --git a/regress/usr.bin/mandoc/man/SH/paragraph.in b/regress/usr.bin/mandoc/man/SH/paragraph.in new file mode 100644 index 00000000000..8ea45822586 --- /dev/null +++ b/regress/usr.bin/mandoc/man/SH/paragraph.in @@ -0,0 +1,17 @@ +.\" $OpenBSD: paragraph.in,v 1.1 2019/01/06 04:41:15 schwarze Exp $ +.TH SH-PARAGRAPH 1 "January 6, 2019" +.SH NAME +SH-paragraph \- interaction of section headers with paragraphs +.SH SYNOPSIS +BEGINTEST +.SH DESCRIPTION +This text +immediately follows +a section header. +.PP +This is +a paragraph. +.SH EXAMPLES +ENDTEST +.PP +end of file diff --git a/regress/usr.bin/mandoc/man/SH/paragraph.out_ascii b/regress/usr.bin/mandoc/man/SH/paragraph.out_ascii new file mode 100644 index 00000000000..c7b8a6218d7 --- /dev/null +++ b/regress/usr.bin/mandoc/man/SH/paragraph.out_ascii @@ -0,0 +1,23 @@ +SH-PARAGRAPH(1) General Commands Manual SH-PARAGRAPH(1) + + + +NNAAMMEE + SH-paragraph - interaction of section headers with paragraphs + +SSYYNNOOPPSSIISS + BEGINTEST + +DDEESSCCRRIIPPTTIIOONN + This text immediately follows a section header. + + This is a paragraph. + +EEXXAAMMPPLLEESS + ENDTEST + + end of file + + + +OpenBSD January 6, 2019 SH-PARAGRAPH(1) diff --git a/regress/usr.bin/mandoc/man/SH/paragraph.out_html b/regress/usr.bin/mandoc/man/SH/paragraph.out_html new file mode 100644 index 00000000000..5aef80e28cf --- /dev/null +++ b/regress/usr.bin/mandoc/man/SH/paragraph.out_html @@ -0,0 +1,6 @@ +BEGINTEST +<h1 class="Sh" title="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1> +This text immediately follows a section header. +<p class="Pp">This is a paragraph.</p> +<h1 class="Sh" title="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h1> +ENDTEST diff --git a/regress/usr.bin/mandoc/man/SS/Makefile b/regress/usr.bin/mandoc/man/SS/Makefile index 237830e0ba2..0ae0fbc54d0 100644 --- a/regress/usr.bin/mandoc/man/SS/Makefile +++ b/regress/usr.bin/mandoc/man/SS/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2017/06/03 15:54:09 schwarze Exp $ +# $OpenBSD: Makefile,v 1.4 2019/01/06 04:41:15 schwarze Exp $ -REGRESS_TARGETS = broken broken_eline longarg noarg +REGRESS_TARGETS = broken broken_eline longarg noarg paragraph LINT_TARGETS = broken broken_eline noarg +HTML_TARGETS = paragraph # groff-1.22.3 defects: # - .SS without args just before EOF causes two additional blank lines. diff --git a/regress/usr.bin/mandoc/man/SS/paragraph.in b/regress/usr.bin/mandoc/man/SS/paragraph.in new file mode 100644 index 00000000000..c30ee9c3a4c --- /dev/null +++ b/regress/usr.bin/mandoc/man/SS/paragraph.in @@ -0,0 +1,17 @@ +.\" $OpenBSD: paragraph.in,v 1.1 2019/01/06 04:41:15 schwarze Exp $ +.TH SS-PARAGRAPH 1 "January 6, 2019" +.SH NAME +SS-paragraph \- interaction of subsection headers with paragraphs +.SH DESCRIPTION +BEGINTEST +.SS First subsection +This text +immediately follows +a subsection header. +.PP +This is +a paragraph. +.SS Second subsection +ENDTEST +.PP +end of file diff --git a/regress/usr.bin/mandoc/man/SS/paragraph.out_ascii b/regress/usr.bin/mandoc/man/SS/paragraph.out_ascii new file mode 100644 index 00000000000..3448eedb778 --- /dev/null +++ b/regress/usr.bin/mandoc/man/SS/paragraph.out_ascii @@ -0,0 +1,23 @@ +SS-PARAGRAPH(1) General Commands Manual SS-PARAGRAPH(1) + + + +NNAAMMEE + SS-paragraph - interaction of subsection headers with paragraphs + +DDEESSCCRRIIPPTTIIOONN + BEGINTEST + + FFiirrsstt ssuubbsseeccttiioonn + This text immediately follows a subsection header. + + This is a paragraph. + + SSeeccoonndd ssuubbsseeccttiioonn + ENDTEST + + end of file + + + +OpenBSD January 6, 2019 SS-PARAGRAPH(1) diff --git a/regress/usr.bin/mandoc/man/SS/paragraph.out_html b/regress/usr.bin/mandoc/man/SS/paragraph.out_html new file mode 100644 index 00000000000..e36f2a062dc --- /dev/null +++ b/regress/usr.bin/mandoc/man/SS/paragraph.out_html @@ -0,0 +1,8 @@ +BEGINTEST +<h2 class="Ss" title="Ss" id="First_subsection"><a class="permalink" href="#First_subsection">First + subsection</a></h2> +This text immediately follows a subsection header. +<p class="Pp">This is a paragraph.</p> +<h2 class="Ss" title="Ss" id="Second_subsection"><a class="permalink" href="#Second_subsection">Second + subsection</a></h2> +ENDTEST diff --git a/regress/usr.bin/mandoc/man/TP/Makefile b/regress/usr.bin/mandoc/man/TP/Makefile index 6c76bbbbe17..2fc1074f65d 100644 --- a/regress/usr.bin/mandoc/man/TP/Makefile +++ b/regress/usr.bin/mandoc/man/TP/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.14 2017/06/17 16:47:29 schwarze Exp $ +# $OpenBSD: Makefile,v 1.15 2019/01/06 04:41:15 schwarze Exp $ REGRESS_TARGETS = badarg broken double eof fill indent literal longhead REGRESS_TARGETS += macrotag manyargs sameline spacing width - LINT_TARGETS = broken double eof +HTML_TARGETS = literal # groff-1.22.3 defects: # - If .TP precedes .RE, the latter does not properly reset indentation. diff --git a/regress/usr.bin/mandoc/man/TP/literal.in b/regress/usr.bin/mandoc/man/TP/literal.in index 4fa30fd1a58..a2dc956fe9c 100644 --- a/regress/usr.bin/mandoc/man/TP/literal.in +++ b/regress/usr.bin/mandoc/man/TP/literal.in @@ -1,27 +1,33 @@ -.\" $OpenBSD: literal.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $ -.TH TP-LITERAL 1 "January 4, 2011" +.\" $OpenBSD: literal.in,v 1.4 2019/01/06 04:41:15 schwarze Exp $ +.TH TP-LITERAL 1 "January 6, 2019" .SH NAME TP-literal \- indented paragraphs in literal context .SH DESCRIPTION -regular -text +BEGINTEST +before indentation .TP 10n tag +regular indented text .PP regular -text +paragraph .nf literal text .TP 10n tag indented +literal text .PP literal -text +paragraph .fi regular text +.br +ENDTEST +.br +end of file diff --git a/regress/usr.bin/mandoc/man/TP/literal.out_ascii b/regress/usr.bin/mandoc/man/TP/literal.out_ascii index b8dddb7b39d..6fcaeeb6e3e 100644 --- a/regress/usr.bin/mandoc/man/TP/literal.out_ascii +++ b/regress/usr.bin/mandoc/man/TP/literal.out_ascii @@ -6,21 +6,24 @@ NNAAMMEE TP-literal - indented paragraphs in literal context DDEESSCCRRIIPPTTIIOONN - regular text + BEGINTEST before indentation - tag indented text + tag regular indented text - regular text + regular paragraph literal text tag indented + literal text literal - text + paragraph regular text + ENDTEST + end of file -OpenBSD January 4, 2011 TP-LITERAL(1) +OpenBSD January 6, 2019 TP-LITERAL(1) diff --git a/regress/usr.bin/mandoc/man/TP/literal.out_html b/regress/usr.bin/mandoc/man/TP/literal.out_html new file mode 100644 index 00000000000..14bfb834826 --- /dev/null +++ b/regress/usr.bin/mandoc/man/TP/literal.out_html @@ -0,0 +1,27 @@ +BEGINTEST before indentation +<dl class="Bl-tag"> + <dt>tag</dt> + <dd>regular indented text</dd> +</dl> +<p class="Pp">regular paragraph</p> +<pre> +literal +text +</pre> +<dl class="Bl-tag"> + <dt>tag</dt> + <dd> + <pre> +indented +literal +text + </pre> + </dd> +</dl> +<pre> +literal +paragraph +</pre> +regular text +<br/> +ENDTEST diff --git a/regress/usr.bin/mandoc/roff/sp/Makefile b/regress/usr.bin/mandoc/roff/sp/Makefile index 7a09afb1cf7..8d766a486f8 100644 --- a/regress/usr.bin/mandoc/roff/sp/Makefile +++ b/regress/usr.bin/mandoc/roff/sp/Makefile @@ -1,6 +1,8 @@ -# $OpenBSD: Makefile,v 1.5 2015/02/06 09:38:22 schwarze Exp $ +# $OpenBSD: Makefile,v 1.6 2019/01/06 04:41:15 schwarze Exp $ -REGRESS_TARGETS = badargs-man badargs-mdoc negative scaling-man scaling-mdoc -LINT_TARGETS = badargs-man +REGRESS_TARGETS = badargs-man badargs-mdoc fill-man +REGRESS_TARGETS += negative scaling-man scaling-mdoc +LINT_TARGETS = badargs-man +HTML_TARGETS = fill-man .include <bsd.regress.mk> diff --git a/regress/usr.bin/mandoc/roff/sp/fill-man.in b/regress/usr.bin/mandoc/roff/sp/fill-man.in new file mode 100644 index 00000000000..2faf7ca0a8c --- /dev/null +++ b/regress/usr.bin/mandoc/roff/sp/fill-man.in @@ -0,0 +1,18 @@ +.\" $OpenBSD: fill-man.in,v 1.1 2019/01/06 04:41:15 schwarze Exp $ +.TH SP-FILL-MAN 1 "January 6, 2019" +.SH NAME +sp-fill-man \- interaction of vertical spacing requests with fill modes +.SH DESCRIPTION +BEGINTEST +in fill mode: +.sp +switch to no-fill mode: +.nf +in no-fill mode: +.sp +back to +fill mode: +.fi +ENDTEST +.br +end of file diff --git a/regress/usr.bin/mandoc/roff/sp/fill-man.out_ascii b/regress/usr.bin/mandoc/roff/sp/fill-man.out_ascii new file mode 100644 index 00000000000..c111a012774 --- /dev/null +++ b/regress/usr.bin/mandoc/roff/sp/fill-man.out_ascii @@ -0,0 +1,21 @@ +SP-FILL-MAN(1) General Commands Manual SP-FILL-MAN(1) + + + +NNAAMMEE + sp-fill-man - interaction of vertical spacing requests with fill modes + +DDEESSCCRRIIPPTTIIOONN + BEGINTEST in fill mode: + + switch to no-fill mode: + in no-fill mode: + + back to + fill mode: + ENDTEST + end of file + + + +OpenBSD January 6, 2019 SP-FILL-MAN(1) diff --git a/regress/usr.bin/mandoc/roff/sp/fill-man.out_html b/regress/usr.bin/mandoc/roff/sp/fill-man.out_html new file mode 100644 index 00000000000..3fcfa2a6865 --- /dev/null +++ b/regress/usr.bin/mandoc/roff/sp/fill-man.out_html @@ -0,0 +1,9 @@ +BEGINTEST in fill mode: +<p class="Pp">switch to no-fill mode:</p> +<pre> +in no-fill mode: + +back to +fill mode: +</pre> +ENDTEST |