diff options
author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2012-07-10 19:53:13 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2012-07-10 19:53:13 +0000 |
commit | 80f833cf040f5fefb18badd53d2aa008031c4946 (patch) | |
tree | 19322c57b3a2345bae267d2958370f4a53aab659 /regress/usr.bin/mandoc/man/HP | |
parent | 02452d0882c9712c3bf2f3111250cde6426730bf (diff) |
multiple fixes to -Tascii .HP rendering:
* do not add an excessive blank line before the block
* in literal mode, start a new line after the tag
getting this to work requires some general (print_man_node) fixes:
* in literal mode, break the output line at the end of each
input line, not just after those input lines ending in text
* but don't break it when there was no output on the line
* and adjust the margins after the .HP tag
these general fixes require an adjustment to -Tascii .TP rendering:
* set up NOBREAK mode before the body, not after the head
finally, based on all this, implement -Tman .Bl -hang in terms of .HP
Diffstat (limited to 'regress/usr.bin/mandoc/man/HP')
-rw-r--r-- | regress/usr.bin/mandoc/man/HP/Makefile | 5 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/man/HP/literal.in | 26 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/man/HP/literal.out_ascii | 27 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/man/HP/macrotag.in | 13 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/man/HP/macrotag.out_ascii | 17 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/man/HP/manyargs.in | 45 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/man/HP/manyargs.out_ascii | 43 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/man/HP/spacing.in | 25 | ||||
-rw-r--r-- | regress/usr.bin/mandoc/man/HP/spacing.out_ascii | 27 |
9 files changed, 228 insertions, 0 deletions
diff --git a/regress/usr.bin/mandoc/man/HP/Makefile b/regress/usr.bin/mandoc/man/HP/Makefile new file mode 100644 index 00000000000..50e5e9d8826 --- /dev/null +++ b/regress/usr.bin/mandoc/man/HP/Makefile @@ -0,0 +1,5 @@ +# $OpenBSD: Makefile,v 1.1 2012/07/10 19:53:12 schwarze Exp $ + +REGRESS_TARGETS = literal spacing manyargs macrotag + +.include <bsd.regress.mk> diff --git a/regress/usr.bin/mandoc/man/HP/literal.in b/regress/usr.bin/mandoc/man/HP/literal.in new file mode 100644 index 00000000000..e7caee1cc73 --- /dev/null +++ b/regress/usr.bin/mandoc/man/HP/literal.in @@ -0,0 +1,26 @@ +.TH HP-LITERAL 1 "January 4, 2011" OpenBSD +.SH NAME +HP-literal \- hanged paragraphs in literal context +.SH DESCRIPTION +regular +text +.HP 10n +tag +indented +text +.PP +regular +text +.nf +literal +text +.HP 10n +tag +indented +text +.PP +literal +text +.fi +regular +text diff --git a/regress/usr.bin/mandoc/man/HP/literal.out_ascii b/regress/usr.bin/mandoc/man/HP/literal.out_ascii new file mode 100644 index 00000000000..6facd371dcc --- /dev/null +++ b/regress/usr.bin/mandoc/man/HP/literal.out_ascii @@ -0,0 +1,27 @@ +HP-LITERAL(1) OpenBSD Reference Manual HP-LITERAL(1) + + + +NNAAMMEE + HP-literal - hanged paragraphs in literal context + +DDEESSCCRRIIPPTTIIOONN + regular text + + tag indented text + + regular text + literal + text + + tag + indented + text + + literal + text + regular text + + + +OpenBSD January 4, 2011 HP-LITERAL(1) diff --git a/regress/usr.bin/mandoc/man/HP/macrotag.in b/regress/usr.bin/mandoc/man/HP/macrotag.in new file mode 100644 index 00000000000..6582498c4df --- /dev/null +++ b/regress/usr.bin/mandoc/man/HP/macrotag.in @@ -0,0 +1,13 @@ +.TH HP-MACROTAG 1 "September 20, 2011" OpenBSD +.SH NAME +HP-macrotag \- macro in the head of a tagged paragraph +.SH DESCRIPTION +regular +text +.HP +.B longindent +indented +text +.PP +regular +text diff --git a/regress/usr.bin/mandoc/man/HP/macrotag.out_ascii b/regress/usr.bin/mandoc/man/HP/macrotag.out_ascii new file mode 100644 index 00000000000..deb7daa9d08 --- /dev/null +++ b/regress/usr.bin/mandoc/man/HP/macrotag.out_ascii @@ -0,0 +1,17 @@ +HP-MACROTAG(1) OpenBSD Reference Manual HP-MACROTAG(1) + + + +NNAAMMEE + HP-macrotag - macro in the head of a tagged paragraph + +DDEESSCCRRIIPPTTIIOONN + regular text + + lloonnggiinnddeenntt indented text + + regular text + + + +OpenBSD September 20, 2011 HP-MACROTAG(1) diff --git a/regress/usr.bin/mandoc/man/HP/manyargs.in b/regress/usr.bin/mandoc/man/HP/manyargs.in new file mode 100644 index 00000000000..b49e6649863 --- /dev/null +++ b/regress/usr.bin/mandoc/man/HP/manyargs.in @@ -0,0 +1,45 @@ +.TH HP-MANYARGS 1 "January 4, 2011" OpenBSD +.SH NAME +HP-manyargs \- too many header args for hanged blocks +.SH DESCRIPTION +regular +text +.HP 10n +tag1 +indented +text +.PP +regular +text +.HP 10n tag1 +tag2 +indented +text +.PP +regular +text +.HP 10n tag2 tag1 +tag3 +indented +text +.nf +literal +text +.HP 10n +tag1 +indented +text +.PP +literal +text +.HP 10n tag1 +tag2 +indented +text +.PP +literal +text +.HP 10n tag2 tag1 +tag3 +indented +text diff --git a/regress/usr.bin/mandoc/man/HP/manyargs.out_ascii b/regress/usr.bin/mandoc/man/HP/manyargs.out_ascii new file mode 100644 index 00000000000..087ccda48f5 --- /dev/null +++ b/regress/usr.bin/mandoc/man/HP/manyargs.out_ascii @@ -0,0 +1,43 @@ +HP-MANYARGS(1) OpenBSD Reference Manual HP-MANYARGS(1) + + + +NNAAMMEE + HP-manyargs - too many header args for hanged blocks + +DDEESSCCRRIIPPTTIIOONN + regular text + + tag1 indented text + + regular text + + tag2 indented text + + regular text + + tag3 indented text + literal + text + + tag1 + indented + text + + literal + text + + tag2 + indented + text + + literal + text + + tag3 + indented + text + + + +OpenBSD January 4, 2011 HP-MANYARGS(1) diff --git a/regress/usr.bin/mandoc/man/HP/spacing.in b/regress/usr.bin/mandoc/man/HP/spacing.in new file mode 100644 index 00000000000..550b27fe3d5 --- /dev/null +++ b/regress/usr.bin/mandoc/man/HP/spacing.in @@ -0,0 +1,25 @@ +.TH HP-SPACING 1 "February 5, 2011" OpenBSD +.SH NAME +HP-spacing \- spacing in hanged lists +.SH DESCRIPTION +Normal text. +.HP +tag +Indented text. +.HP +four +Indented text. +.HP +ffive +Indented text. +.HP +sixsix +Indented text. +.HP +seseven +Indented text. +.HP +a much longer tag +Indented text. +.LP +Normal text. diff --git a/regress/usr.bin/mandoc/man/HP/spacing.out_ascii b/regress/usr.bin/mandoc/man/HP/spacing.out_ascii new file mode 100644 index 00000000000..0cd618e17b9 --- /dev/null +++ b/regress/usr.bin/mandoc/man/HP/spacing.out_ascii @@ -0,0 +1,27 @@ +HP-SPACING(1) OpenBSD Reference Manual HP-SPACING(1) + + + +NNAAMMEE + HP-spacing - spacing in hanged lists + +DDEESSCCRRIIPPTTIIOONN + Normal text. + + tag Indented text. + + four Indented text. + + ffive Indented text. + + sixsix Indented text. + + seseven Indented text. + + a much longer tag Indented text. + + Normal text. + + + +OpenBSD February 5, 2011 HP-SPACING(1) |