pr -F no longer suppresses the footer or the first two blank header lines

Here's a patch along the lines of
<http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/10849/focus=10857>.
It's a bit large since it changes the test cases to match the behavior,
and the test cases' file names depend on the behavior!

* NEWS: pr -F no longer suppresses the footer or the first two blank
lines in the header.
* doc/coreutils.texi (pr invocation): Likewise.  Also, a too-short
page length implies -t, not -T.
* src/pr.c (lines_per_header, lines_per_footer): Now constants.
(init_parameters): Don't try to change them.
(print_header): Use the same header and footer format regardless of
wither form feeds are being used.
(usage): Adjust to above change when describing too-short page length.
Too-short page length impliesy -t, not -T.
* tests/pr/2-S_f-t_notab: Adjust to the fact that -F now affects
only formfeed handling; it does not change the header.
* tests/pr/2-Sf-t_notab: Likewise.
...
* tests/pr/3-5l17f-t: Remove, since it's been renamed to another
file whose name has a line count 7 larger,
reflecting the new line count needed for this behavior.
* tests/pr/3a3l8f-t: Likewise.
...
* tests/pr/w72l24f-ll: Likewise.

Signed-off-by: Jim Meyering <jim@meyering.net>

1 files changed, 7 insertions, 11 deletions

diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 42558a3ae..4687defbe 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -2040,11 +2040,9 @@ pr [@var{option}]@dots{} [@var{file}]@dots{}
 By default, a 5-line header is printed at each page: two blank lines;
 a line with the date, the file name, and the page count; and two more
 blank lines.  A footer of five blank lines is also printed.
-With the @option{-F}
-option, a 3-line header is printed: the leading two blank lines are
-omitted; no footer is used.  The default @var{page_length} in both cases is 66
-lines.  The default number of text lines changes from 56 (without @option{-F})
-to 63 (with @option{-F}).  The text line of the header takes the form
+The default @var{page_length} is 66
+lines.  The default number of text lines is therefore 56.
+The text line of the header takes the form
 @samp{@var{date} @var{string} @var{page}}, with spaces inserted around
 @var{string} so that the line takes up the full @var{page_width}.  Here,
 @var{date} is the date (see the @option{-D} or @option{--date-format}
@@ -2198,9 +2196,8 @@ is 8).
 @opindex -F
 @opindex -f
 @opindex --form-feed
-Use a form feed instead of newlines to separate output pages.  The default
-page length of 66 lines is not altered.  But the number of lines of text
-per page changes from default 56 to 63 lines.
+Use a form feed instead of newlines to separate output pages.  This does
+not alter the default page length of 66 lines.
 
 @item -h @var{HEADER}
 @itemx --header=@var{HEADER}
@@ -2240,9 +2237,8 @@ to disentangle the old (@acronym{POSIX}-compliant) options @option{-w} and
 @opindex --length
 Set the page length to @var{page_length} (default 66) lines, including
 the lines of the header [and the footer].  If @var{page_length} is less
-than or equal to 10 (or <= 3 with @option{-F}), the header and footer are
-omitted, and all form feeds set in input files are eliminated, as if
-the @option{-T} option had been given.
+than or equal to 10, the header and footer are omitted, as if the
+@option{-t} option had been given.
 
 @item -m
 @itemx --merge