From 9b3bcfda2071ff49dd238b2315b1cc49c09a1552 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sun, 6 Jan 2019 04:55:09 +0000 Subject: Finally, represent the man(7) .PP and .HP macros by the natural choice, which is the

HTML element. On top of the previous fill-mode improvements, the key to making this possible is to automatically close the

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. --- regress/roff/sp/Makefile | 8 +++++--- regress/roff/sp/fill-man.in | 18 ++++++++++++++++++ regress/roff/sp/fill-man.out_ascii | 21 +++++++++++++++++++++ regress/roff/sp/fill-man.out_html | 9 +++++++++ 4 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 regress/roff/sp/fill-man.in create mode 100644 regress/roff/sp/fill-man.out_ascii create mode 100644 regress/roff/sp/fill-man.out_html (limited to 'regress/roff/sp') diff --git a/regress/roff/sp/Makefile b/regress/roff/sp/Makefile index 7a09afb1..8d766a48 100644 --- a/regress/roff/sp/Makefile +++ b/regress/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 diff --git a/regress/roff/sp/fill-man.in b/regress/roff/sp/fill-man.in new file mode 100644 index 00000000..2faf7ca0 --- /dev/null +++ b/regress/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/roff/sp/fill-man.out_ascii b/regress/roff/sp/fill-man.out_ascii new file mode 100644 index 00000000..c111a012 --- /dev/null +++ b/regress/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/roff/sp/fill-man.out_html b/regress/roff/sp/fill-man.out_html new file mode 100644 index 00000000..3fcfa2a6 --- /dev/null +++ b/regress/roff/sp/fill-man.out_html @@ -0,0 +1,9 @@ +BEGINTEST in fill mode: +

switch to no-fill mode:

+
+in no-fill mode:
+
+back to
+fill mode:
+
+ENDTEST -- cgit v1.2.3-56-ge451