]> git.ipfire.org Git - thirdparty/coreutils.git/commit
pr -F no longer suppresses the footer or the first two blank header lines
authorPaul Eggert <eggert@CS.UCLA.EDU>
Tue, 3 Jul 2007 18:36:43 +0000 (11:36 -0700)
committerJim Meyering <jim@meyering.net>
Wed, 4 Jul 2007 10:45:10 +0000 (12:45 +0200)
commit36ce675bb4224a41adafd448f39020e70db14094
treea95e48142c69019cc18183738749bfe6720e31b2
parent519d7a95a3f8103925aa84f9bdef326ce88d37cc
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>
88 files changed:
NEWS
doc/coreutils.texi
m4/.gitignore [deleted file]
src/pr.c
tests/pr/2-S_f-t_notab
tests/pr/2-Sf-t_notab
tests/pr/2f-t_notab
tests/pr/2s_f-t_notab
tests/pr/2s_w60f-t_nota
tests/pr/2sf-t_notab
tests/pr/2sw60f-t_notab
tests/pr/2w60f-t_notab
tests/pr/3-5l24f-t [moved from tests/pr/3l17f-t with 90% similarity]
tests/pr/3a3f-0F
tests/pr/3a3l15f-t [moved from tests/pr/3a3l8f-t with 74% similarity]
tests/pr/3b3f-0F
tests/pr/3b3f-0FF
tests/pr/3b3f-FF
tests/pr/3b3l15f-t [moved from tests/pr/3b3l8f-t with 74% similarity]
tests/pr/3f-0F
tests/pr/3f-FF
tests/pr/3l24f-t [moved from tests/pr/3-5l17f-t with 90% similarity]
tests/pr/3ml24f-t [moved from tests/pr/3ml17f-t with 89% similarity]
tests/pr/Ja3l24f-lm [moved from tests/pr/Ja3l17f-lm with 68% similarity]
tests/pr/Jb3l24f-lm [moved from tests/pr/Jb3l17f-lm with 68% similarity]
tests/pr/Jml24f-lm-lo [moved from tests/pr/Jml17f-lm-lo with 86% similarity]
tests/pr/Test.pm
tests/pr/W-72l24f-ll [moved from tests/pr/W-72l17f-ll with 69% similarity]
tests/pr/W20l24f-ll [moved from tests/pr/W20l17f-ll with 79% similarity]
tests/pr/W26l24f-ll [moved from tests/pr/W26l17f-ll with 81% similarity]
tests/pr/W27l24f-ll [moved from tests/pr/W27l17f-ll with 80% similarity]
tests/pr/W28l24f-ll [moved from tests/pr/W28l17f-ll with 80% similarity]
tests/pr/W35Ja3l24f-lm [moved from tests/pr/W35Ja3l17f-lm with 80% similarity]
tests/pr/W35Jb3l24f-lm [moved from tests/pr/W35Jb3l17f-lm with 80% similarity]
tests/pr/W35Jml24f-lmlo [moved from tests/pr/W35Jml17f-lmlo with 92% similarity]
tests/pr/W35a3l24f-lm [moved from tests/pr/W35a3l17f-lm with 69% similarity]
tests/pr/W35b3l24f-lm [moved from tests/pr/W35b3l17f-lm with 69% similarity]
tests/pr/W35ml24f-lm-lo [moved from tests/pr/W35ml17f-lm-lo with 86% similarity]
tests/pr/W72Jl24f-ll [moved from tests/pr/w72l17f-ll with 69% similarity]
tests/pr/a3f-0F
tests/pr/a3f-0FF
tests/pr/a3f-FF
tests/pr/a3l15f-t [moved from tests/pr/a3l8f-t with 75% similarity]
tests/pr/a3l24f-lm [moved from tests/pr/a3l17f-lm with 62% similarity]
tests/pr/b3f-0F
tests/pr/b3f-0FF
tests/pr/b3f-FF
tests/pr/b3l15f-t [moved from tests/pr/b3l8f-t with 75% similarity]
tests/pr/b3l24f-lm [moved from tests/pr/b3l17f-lm with 63% similarity]
tests/pr/l24f-t [moved from tests/pr/l17f-t with 89% similarity]
tests/pr/ml24f-0F [moved from tests/pr/ml17f-0F with 83% similarity]
tests/pr/ml24f-lm-lo [moved from tests/pr/ml17f-lm-lo with 85% similarity]
tests/pr/ml24f-t [moved from tests/pr/ml17f-t with 89% similarity]
tests/pr/ml24f-t-0F [moved from tests/pr/ml17f-t-0F with 87% similarity]
tests/pr/n+2-5l24f-0FF [moved from tests/pr/n+2-5l17f-0FF with 85% similarity]
tests/pr/n+2l24f-0FF [moved from tests/pr/n+2l17f-0FF with 83% similarity]
tests/pr/n+2l24f-bl [moved from tests/pr/n+2l17f-bl with 79% similarity]
tests/pr/n+3l24f-0FF [moved from tests/pr/n+3l17f-0FF with 87% similarity]
tests/pr/n+3l24f-bl [moved from tests/pr/n+3l17f-bl with 81% similarity]
tests/pr/n+3ml20f-bl-FF [moved from tests/pr/n+3ml13f-bl-FF with 72% similarity]
tests/pr/n+3ml24f-bl-tn [moved from tests/pr/n+3ml17f-bl-tn with 80% similarity]
tests/pr/n+3ml24f-tn-bl [moved from tests/pr/n+3ml17f-tn-bl with 81% similarity]
tests/pr/n+4b2l17f-0FF [moved from tests/pr/n+4b2l10f-0FF with 73% similarity]
tests/pr/n+5-8b3l17f-FF [moved from tests/pr/n+5-8b3l10f-FF with 67% similarity]
tests/pr/n+5a3l13f-0FF [moved from tests/pr/n+5a3l6f-0FF with 60% similarity]
tests/pr/n+6b3l13f-FF [moved from tests/pr/n+6b3l6f-FF with 51% similarity]
tests/pr/nJml24f-lmlmlo [moved from tests/pr/nJml17f-lmlmlo with 89% similarity]
tests/pr/nJml24f-lmlolm [moved from tests/pr/nJml17f-lmlolm with 89% similarity]
tests/pr/nN1+3l24f-bl [moved from tests/pr/nN1+3l17f-bl with 81% similarity]
tests/pr/nN15l24f-bl [moved from tests/pr/nN15l17f-bl with 80% similarity]
tests/pr/nSml20-bl-FF [moved from tests/pr/nSml13-bl-FF with 75% similarity]
tests/pr/nSml20-t-t-FF [moved from tests/pr/nSml13-t-t-FF with 79% similarity]
tests/pr/nSml20-t-tFFFF [moved from tests/pr/nSml13-t-tFFFF with 83% similarity]
tests/pr/nSml24-bl-FF [moved from tests/pr/nSml17-bl-FF with 81% similarity]
tests/pr/nSml24-t-t-FF [moved from tests/pr/nSml17-t-t-FF with 85% similarity]
tests/pr/nSml24-t-tFFFF [moved from tests/pr/nSml17-t-tFFFF with 87% similarity]
tests/pr/nl24f-bl [moved from tests/pr/nl17f-bl with 80% similarity]
tests/pr/o3Jml24f-lm-lo [moved from tests/pr/o3Jml17f-lm-lo with 84% similarity]
tests/pr/o3a3Sl24f-tn [moved from tests/pr/o3a3Sl17f-tn with 86% similarity]
tests/pr/o3a3Snl24f-tn [moved from tests/pr/o3a3Snl17f-tn with 87% similarity]
tests/pr/o3a3l24f-tn [moved from tests/pr/o3a3l17f-tn with 86% similarity]
tests/pr/o3b3Sl24f-tn [moved from tests/pr/o3b3Sl17f-tn with 86% similarity]
tests/pr/o3b3Snl24f-tn [moved from tests/pr/o3b3Snl17f-tn with 88% similarity]
tests/pr/o3b3l24f-tn [moved from tests/pr/o3b3l17f-tn with 86% similarity]
tests/pr/o3mSl24f-bl-tn [moved from tests/pr/o3mSl17f-bl-tn with 81% similarity]
tests/pr/o3mSnl24fbltn [moved from tests/pr/o3mSnl17fbltn with 82% similarity]
tests/pr/o3ml24f-bl-tn [moved from tests/pr/o3ml17f-bl-tn with 81% similarity]
tests/pr/w72l24f-ll [moved from tests/pr/W72Jl17f-ll with 69% similarity]