diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2019-01-07 07:26:29 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2019-01-07 07:26:29 +0000 |
commit | da0aa06476cbc1023f263447977a576ef15a6090 (patch) | |
tree | 8c1cfb19afb2df4bd018faed7a2700e77bfecba4 /regress/roff/string | |
parent | 9586714e823ea16c316ae14d0dcd2a88613c265e (diff) | |
download | mandoc-da0aa06476cbc1023f263447977a576ef15a6090.tar.gz |
Represent mdoc(7) .Pp (and .sp, and some SYNOPSIS and .Rs features)
by the <p> HTML element and use the html_fillmode() mechanism
for .Bd -unfilled, just like it was done for man(7) earlier, finally
getting rid both of the horrible <div class="Pp"></div> hack and
of the worst HTML syntax violations caused by nested displays.
Care is needed because in some situations, paragraphs have to remain
open across several subsequent macros, whereas in other situations,
they must get closed together with a block containing them.
Some implementation details include:
* Always close paragraphs before emitting HTML flow content.
* Let html_close_paragraph() also close <pre> for extra safety.
* Drop the old, now unused function print_paragraph().
* Minor adjustments in the top-level man(7) node formatter for symmetry.
* Bugfix: .Ss heads suspend no-fill mode, even though .Ss doesn't end it.
* Bugfix: give up on .Op semantic markup for now, see the comment.
Diffstat (limited to 'regress/roff/string')
-rw-r--r-- | regress/roff/string/dotT.in | 10 | ||||
-rw-r--r-- | regress/roff/string/dotT.out_ascii | 8 | ||||
-rw-r--r-- | regress/roff/string/dotT.out_html | 8 | ||||
-rw-r--r-- | regress/roff/string/dotT.out_markdown | 10 | ||||
-rw-r--r-- | regress/roff/string/dotT.out_utf8 | 8 |
5 files changed, 14 insertions, 30 deletions
diff --git a/regress/roff/string/dotT.in b/regress/roff/string/dotT.in index 6ff81598..417746cf 100644 --- a/regress/roff/string/dotT.in +++ b/regress/roff/string/dotT.in @@ -1,4 +1,4 @@ -.\" $OpenBSD: dotT.in,v 1.1 2018/08/16 13:49:40 schwarze Exp $ +.\" $OpenBSD: dotT.in,v 1.2 2019/01/07 06:51:37 schwarze Exp $ .Dd $Mdocdate$ .Dt STRING-DOTT 1 .Os @@ -6,15 +6,13 @@ .Nm string-dotT .Nd interpolating the device name .Sh DESCRIPTION -initial text -.Pp BEGINTEST .Pp We are using the \*(.T device. .Pp .ds .T name The device \*(.T can be overridden. -.Pp +.nf ENDTEST -.Pp -final text +.br +end of file diff --git a/regress/roff/string/dotT.out_ascii b/regress/roff/string/dotT.out_ascii index e1737090..26f53380 100644 --- a/regress/roff/string/dotT.out_ascii +++ b/regress/roff/string/dotT.out_ascii @@ -4,16 +4,12 @@ NNAAMMEE ssttrriinngg--ddoottTT - interpolating the device name DDEESSCCRRIIPPTTIIOONN - initial text - BEGINTEST We are using the ascii device. The device name can be overridden. - ENDTEST + end of file - final text - -OpenBSD August 16, 2018 OpenBSD +OpenBSD January 7, 2019 OpenBSD diff --git a/regress/roff/string/dotT.out_html b/regress/roff/string/dotT.out_html index 67cb1eed..8143fd88 100644 --- a/regress/roff/string/dotT.out_html +++ b/regress/roff/string/dotT.out_html @@ -1,7 +1,5 @@ BEGINTEST -<div class="Pp"></div> -We are using the html device. -<div class="Pp"></div> -The device name can be overridden. -<div class="Pp"></div> +<p class="Pp">We are using the html device.</p> +<p class="Pp">The device name can be overridden.</p> +<pre> ENDTEST diff --git a/regress/roff/string/dotT.out_markdown b/regress/roff/string/dotT.out_markdown index 5a1f8d09..d7400eaa 100644 --- a/regress/roff/string/dotT.out_markdown +++ b/regress/roff/string/dotT.out_markdown @@ -6,16 +6,12 @@ STRING-DOTT(1) - General Commands Manual # DESCRIPTION -initial text - BEGINTEST We are using the markdown device. The device name can be overridden. +ENDTEST +end of file -ENDTEST - -final text - -OpenBSD - August 16, 2018 +OpenBSD - January 7, 2019 diff --git a/regress/roff/string/dotT.out_utf8 b/regress/roff/string/dotT.out_utf8 index 827b3994..63bbf5fd 100644 --- a/regress/roff/string/dotT.out_utf8 +++ b/regress/roff/string/dotT.out_utf8 @@ -4,16 +4,12 @@ NNAAMMEE ssttrriinngg--ddoottTT – interpolating the device name DDEESSCCRRIIPPTTIIOONN - initial text - BEGINTEST We are using the utf8 device. The device name can be overridden. - ENDTEST + end of file - final text - -OpenBSD August 16, 2018 OpenBSD +OpenBSD January 7, 2019 OpenBSD |