summaryrefslogtreecommitdiffstats
path: root/regress/mdoc/Rs
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2019-01-07 07:26:29 +0000
committerIngo Schwarze <schwarze@openbsd.org>2019-01-07 07:26:29 +0000
commitda0aa06476cbc1023f263447977a576ef15a6090 (patch)
tree8c1cfb19afb2df4bd018faed7a2700e77bfecba4 /regress/mdoc/Rs
parent9586714e823ea16c316ae14d0dcd2a88613c265e (diff)
downloadmandoc-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/mdoc/Rs')
-rw-r--r--regress/mdoc/Rs/Makefile5
-rw-r--r--regress/mdoc/Rs/paragraph.in37
-rw-r--r--regress/mdoc/Rs/paragraph.out_ascii23
-rw-r--r--regress/mdoc/Rs/paragraph.out_html17
-rw-r--r--regress/mdoc/Rs/paragraph.out_markdown32
5 files changed, 112 insertions, 2 deletions
diff --git a/regress/mdoc/Rs/Makefile b/regress/mdoc/Rs/Makefile
index 3732dc0a..2881b874 100644
--- a/regress/mdoc/Rs/Makefile
+++ b/regress/mdoc/Rs/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2015/02/04 18:03:28 schwarze Exp $
+# $OpenBSD: Makefile,v 1.11 2019/01/07 06:51:37 schwarze Exp $
-REGRESS_TARGETS = allch args break empty three_authors
+REGRESS_TARGETS = allch args break empty paragraph three_authors
UTF8_TARGETS = allch break empty three_authors
LINT_TARGETS = allch args empty
+HTML_TARGETS = paragraph
# groff-1.22.3 defect:
# - arguments after .Rs cause the macro to be ignored
diff --git a/regress/mdoc/Rs/paragraph.in b/regress/mdoc/Rs/paragraph.in
new file mode 100644
index 00000000..9a679eb2
--- /dev/null
+++ b/regress/mdoc/Rs/paragraph.in
@@ -0,0 +1,37 @@
+.\" $OpenBSD: paragraph.in,v 1.1 2019/01/07 06:51:37 schwarze Exp $
+.Dd $Mdocdate$
+.Dt RS-PARAGRAPH 1
+.Os
+.Sh NAME
+.Nm Rs-paragraph
+.Nd interaction of paragraphs and reference blocks
+.Sh DESCRIPTION
+BEGINTEST
+.br
+initial reference:
+.Rs
+.%A author name
+.%B book title
+.Re
+.Pp
+in a paragraph:
+.Rs
+.%A another author
+.%B another book
+.Re
+.Sh SEE ALSO
+initial reference:
+.Rs
+.%A author name
+.%B book title
+.Re
+.Pp
+in a paragraph:
+.Rs
+.%A another author
+.%B another book
+.Re
+.nf
+ENDTEST
+.br
+end of file
diff --git a/regress/mdoc/Rs/paragraph.out_ascii b/regress/mdoc/Rs/paragraph.out_ascii
new file mode 100644
index 00000000..821e721d
--- /dev/null
+++ b/regress/mdoc/Rs/paragraph.out_ascii
@@ -0,0 +1,23 @@
+RS-PARAGRAPH(1) General Commands Manual RS-PARAGRAPH(1)
+
+NNAAMMEE
+ RRss--ppaarraaggrraapphh - interaction of paragraphs and reference blocks
+
+DDEESSCCRRIIPPTTIIOONN
+ BEGINTEST
+ initial reference: author name, _b_o_o_k _t_i_t_l_e.
+
+ in a paragraph: another author, _a_n_o_t_h_e_r _b_o_o_k.
+
+SSEEEE AALLSSOO
+ initial reference:
+
+ author name, _b_o_o_k _t_i_t_l_e.
+
+ in a paragraph:
+
+ another author, _a_n_o_t_h_e_r _b_o_o_k.
+ ENDTEST
+ end of file
+
+OpenBSD January 7, 2019 OpenBSD
diff --git a/regress/mdoc/Rs/paragraph.out_html b/regress/mdoc/Rs/paragraph.out_html
new file mode 100644
index 00000000..19e9362c
--- /dev/null
+++ b/regress/mdoc/Rs/paragraph.out_html
@@ -0,0 +1,17 @@
+BEGINTEST
+<br/>
+initial reference: <cite class="Rs" title="Rs"><span class="RsA">author
+ name</span>, <i class="RsB">book title</i>.</cite>
+<p class="Pp">in a paragraph:
+ <cite class="Rs" title="Rs"><span class="RsA">another author</span>,
+ <i class="RsB">another book</i>.</cite></p>
+<h1 class="Sh" title="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
+ ALSO</a></h1>
+initial reference:
+<p class="Pp"><cite class="Rs" title="Rs"><span class="RsA">author name</span>,
+ <i class="RsB">book title</i>.</cite></p>
+<p class="Pp">in a paragraph:</p>
+<p class="Pp"><cite class="Rs" title="Rs"><span class="RsA">another
+ author</span>, <i class="RsB">another book</i>.</cite></p>
+<pre>
+ENDTEST
diff --git a/regress/mdoc/Rs/paragraph.out_markdown b/regress/mdoc/Rs/paragraph.out_markdown
new file mode 100644
index 00000000..c8bb4429
--- /dev/null
+++ b/regress/mdoc/Rs/paragraph.out_markdown
@@ -0,0 +1,32 @@
+RS-PARAGRAPH(1) - General Commands Manual
+
+# NAME
+
+**Rs-paragraph** - interaction of paragraphs and reference blocks
+
+# DESCRIPTION
+
+BEGINTEST
+initial reference:
+author name,
+*book title*.
+
+in a paragraph:
+another author,
+*another book*.
+
+# SEE ALSO
+
+initial reference:
+
+author name,
+*book title*.
+
+in a paragraph:
+
+another author,
+*another book*.
+ENDTEST
+end of file
+
+OpenBSD - January 7, 2019