summaryrefslogtreecommitdiff
path: root/tests/pr/b3f-0FF
diff options
context:
space:
mode:
authorPaul Eggert <eggert@CS.UCLA.EDU>2007-07-03 11:36:43 -0700
committerJim Meyering <jim@meyering.net>2007-07-04 12:45:10 +0200
commit36ce675bb4224a41adafd448f39020e70db14094 (patch)
treea95e48142c69019cc18183738749bfe6720e31b2 /tests/pr/b3f-0FF
parent519d7a95a3f8103925aa84f9bdef326ce88d37cc (diff)
downloadcoreutils-36ce675bb4224a41adafd448f39020e70db14094.tar.xz
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>
Diffstat (limited to 'tests/pr/b3f-0FF')
-rw-r--r--tests/pr/b3f-0FF22
1 files changed, 17 insertions, 5 deletions
diff --git a/tests/pr/b3f-0FF b/tests/pr/b3f-0FF
index 41f07ea51..a97c9dfee 100644
--- a/tests/pr/b3f-0FF
+++ b/tests/pr/b3f-0FF
@@ -1,12 +1,18 @@
+
+
-- Date/Time -- x Page 1
- -- Date/Time -- x Page 2
+
+
+-- Date/Time -- x Page 2
+
+
- -- Date/Time -- x Page 3
+-- Date/Time -- x Page 3
1 FF-Test: FF's at St 6 FF-Arangements: Emp 1
@@ -14,11 +20,15 @@
3 ------------------- 8 \f\ftext; \f\f\ntex 3 line truncation befor
4 3456789 123456789 123 9 3456789 123456789 123 14 456789 123456789 123
5 3 Columns downwards 10 zzzzzzzzzzzzzzzzzzz
- -- Date/Time -- x Page 4
+
+-- Date/Time -- x Page 4
- -- Date/Time -- x Page 5
+
+
+
+-- Date/Time -- x Page 5
15 xyzxyzxyz XYZXYZXYZ 20 DEFGHI 123 5
@@ -26,7 +36,9 @@
7 2 27 no truncation before
8 3 28 no trunc
9 3456789 ab 4
- -- Date/Time -- x Page 6
+
+
+-- Date/Time -- x Page 6
29 xyzxyzxyz XYZXYZXYZ 1 3