From 6a6afd0cbfd5a9b6b666e7adc6f2aaa52f1019eb Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Mon, 7 Jun 2010 11:01:15 +0000 Subject: Normalise SYNOPSIS behaviour after I gave up on following groff's inconsistent behaviour. In short: Some macros are displayed differently in the SYNOPSIS section, particularly Nm, Cd, Fd, Fn, Fo, In, Vt, and Ft. All of these macros are output on their own line. If two such dissimilar macros are pair-wise invoked (except for Ft before Fo or Fn), they are separated by a vertical space, unless in the case of Fo, Fn, and Ft, which are always separated by vertical space. Behaviour ok Jason McIntyre, ingo@. Fallout will be treated case-by-case. I had to clear out some regressions that were testing against groff's stranger behaviours: these will now break, as we don't care about such invocations. Also removed the newline for `Cd' invocation in a non-SYNOPSIS context. --- regress/mdoc/Cd/cd.in | 14 ++++++++++++++ regress/mdoc/Fd/fd.in | 22 ---------------------- regress/mdoc/Fn/fn1.in | 21 --------------------- regress/mdoc/Fo/fo0.in | 32 -------------------------------- regress/mdoc/Ft/ft0.in | 25 ------------------------- regress/mdoc/In/in.in | 24 ------------------------ 6 files changed, 14 insertions(+), 124 deletions(-) create mode 100644 regress/mdoc/Cd/cd.in delete mode 100644 regress/mdoc/Fd/fd.in delete mode 100644 regress/mdoc/Fn/fn1.in delete mode 100644 regress/mdoc/Fo/fo0.in delete mode 100644 regress/mdoc/Ft/ft0.in delete mode 100644 regress/mdoc/In/in.in (limited to 'regress') diff --git a/regress/mdoc/Cd/cd.in b/regress/mdoc/Cd/cd.in new file mode 100644 index 00000000..cce3c661 --- /dev/null +++ b/regress/mdoc/Cd/cd.in @@ -0,0 +1,14 @@ +.Dd $Mdocdate: June 7 2010 $ +.Dt FOO 1 +.Os +.Sh NAME +.Nm foo +.Nd bar +.Sh SYNOPSIS +.Cd "it* at isa? port 0x2e" +.Cd "it* at isa? port 0x2e" +.Cd "it* at isa? port 0x2e" +.Sh DESCRIPTION +.Cd "it* at isa? port 0x2e" +.Cd "it* at isa? port 0x2e" +.Cd "it* at isa? port 0x2e" diff --git a/regress/mdoc/Fd/fd.in b/regress/mdoc/Fd/fd.in deleted file mode 100644 index 80285012..00000000 --- a/regress/mdoc/Fd/fd.in +++ /dev/null @@ -1,22 +0,0 @@ -.Dd $Mdocdate: June 4 2010 $ -.Dt FOO -.Os -.Sh NAME -.Nm foo -.Nd bar -.Sh SYNOPSIS -1 -.Fl -.Fd 2 3 4 -.Fd 3 -4 -.Sh DESCRIPTION -1 -.Fd 2 -.Fd 3 -4 -.Sh BLAH -1 -.Fd 2 -.Fd 3 -4 diff --git a/regress/mdoc/Fn/fn1.in b/regress/mdoc/Fn/fn1.in deleted file mode 100644 index 7d7f9757..00000000 --- a/regress/mdoc/Fn/fn1.in +++ /dev/null @@ -1,21 +0,0 @@ -.Dd $Mdocdate: June 4 2010 $ -.Dt FOO 1 -.Os -.Sh NAME -.Nm foo -.Nd bar -.Sh SYNOPSIS -1 -.In 2 -a -.Fn 3 -.Fn 4 5 6 -.Ar a Fn 4 -5 -.Sh DESCRIPTION -1 -.In 2 -.Fn 3 -.Fn 3 4 5 -.Ar a Fn 6 -4 diff --git a/regress/mdoc/Fo/fo0.in b/regress/mdoc/Fo/fo0.in deleted file mode 100644 index 2c7e3886..00000000 --- a/regress/mdoc/Fo/fo0.in +++ /dev/null @@ -1,32 +0,0 @@ -.Dd $Mdocdate: June 6 2010 $ -.Dt FOO 1 -.Os -.Sh NAME -.Nm foo -.Nd bar -.Sh SYNOPSIS -.Fn b -a -.Fo b -.Fc -.Fo "a b c" -.Fc -.Ft "a" -.Fo "b c" -.Fc -.Ft "a b" -.Fo "b c" "d e" -.Fc -.Sh DESCRIPTION -.Fn b -a -.Fo b -.Fc -.Fo "a b c" -.Fc -.Ft "a" -.Fo "b c" -.Fc -.Ft "a b" -.Fo "b c" "d e" -.Fc diff --git a/regress/mdoc/Ft/ft0.in b/regress/mdoc/Ft/ft0.in deleted file mode 100644 index b805127c..00000000 --- a/regress/mdoc/Ft/ft0.in +++ /dev/null @@ -1,25 +0,0 @@ -.Dd $Mdocdate: June 6 2010 $ -.Dt FOO 1 -.Os -.Sh NAME -.Nm foo -.Nd bar -.Sh SYNOPSIS -.Fn b \" Get this out of the way. -.Ft a -.Ft b -a -.Ft "c d" -b -.Ar foo -.Ft "c d" -.Ar bar -.Sh DESCRIPTION -.Ft a -.Ft b -a -.Ft "c d" -b -.Ar foo -.Ft "c d" -.Ar bar diff --git a/regress/mdoc/In/in.in b/regress/mdoc/In/in.in deleted file mode 100644 index ed89f0b4..00000000 --- a/regress/mdoc/In/in.in +++ /dev/null @@ -1,24 +0,0 @@ -.\" THIS WILL PUKE HORRIBLY ON OLD GROFF, WHICH HAS COMPLETELY -.\" DIFFERENT ("BAD") BEHAVIOUR. -.Dd $Mdocdate: June 4 2010 $ -.Dt FOO 1 -.Os -.Sh NAME -.Nm foo -.Nd bar -.Sh SYNOPSIS -1 -.In 2 3 -6 -.In 2 3 -.Qq In 2 -.Fd a -6 -.In 4 -5 -.Sh DESCRIPTION -1 -.In 2 3 -6 -.In 4 -5 -- cgit v1.2.3-56-ge451