From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 25 Apr 2000 21:32:12 +0000 (+0200)
Subject: patch::: 1.3.46.jcn2: Eindelijk
X-Git-Tag: release/1.3.47~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5b4fa0596c3c3ec3f68d03ac0666ae411cf4d4e6;p=lilypond.git

patch::: 1.3.46.jcn2: Eindelijk

1.3.46.jcn2
===========

* Drastically reduced vertical space used by headers/footers, when using
  ly2dvi.  See input/test/fill-a4.ly.
---

diff --git a/CHANGES b/CHANGES
index 7250774b62..f01f188882 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+1.3.46.jcn2
+===========
+
+* Drastically reduced vertical space used by headers/footers, when using
+  ly2dvi.  See input/test/fill-a4.ly.
+
 1.3.46
 ======
 
diff --git a/VERSION b/VERSION
index 358ef34a53..7ff428f344 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=46
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/buildscripts/set-lily.sh b/buildscripts/set-lily.sh
index fad30f18d3..df01378c45 100755
--- a/buildscripts/set-lily.sh
+++ b/buildscripts/set-lily.sh
@@ -67,7 +67,7 @@ showln -sf $sources/lilypond $prefix/share/lilypond
 
 
 BUILDDIR=`pwd`
-LOCALES="de it nl"
+LOCALES="de it nl fr"
 for i in $LOCALES; do
 	dir=$BUILDDIR/share/locale/$i/LC_MESSAGES
 	if test ! -x $dir ; then
diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly
new file mode 100644
index 0000000000..ff82211fb2
--- /dev/null
+++ b/input/test/fill-a4.ly
@@ -0,0 +1,37 @@
+%
+% test file to get a4 paper really filled,
+% without having to resort to the ever-ugly oversizing hack:
+%
+%   `textheight = 310.0\mm'
+%
+% process this file with ly2dvi, and make sure footskip/headsep are set
+% at a reasonably (small) value.  -- jcn
+%
+\header{
+tagline="Ligly";
+}
+\include "paper13.ly";
+\score{
+	\context Voice \notes\relative c'{
+		\clef alto;
+		\repeat "unfold" 36 c1
+	}
+	\paper{
+		\paper_thirteen
+		indent = 0.0\mm;
+		% URG
+		% Vertical space is rather precious when typesetting
+		% music.  But we can only set textheight here, and must
+		% guess and subtract the height needed for headers and 
+		% footers.  If we want a header or footer on some page,
+		% all other pages suffer shortened `textheight'.
+		% Try the maximum for a4, without loosing footers:
+		textheight = 297.0\mm - 7.0\mm;
+		papersize = "a4";
+		linewidth = 15.0\mm;
+		\translator {
+			\StaffContext
+			StaffMinimumVerticalExtent = #(cons 0 0)
+		}
+	}
+}
diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index bfacbce464..730273ea3c 100644
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -258,11 +258,22 @@ class TeXOutput:
 \usepackage{geometry}
 \usepackage[latin1]{inputenc} 
 %%\usepackage[T1]{fontenc} 
+%%
 %s 
+%% don not waste unused space at bottom of page
+%% (unless we have footnotes ...)
+%%\headheight9pt
+%%\headsep0pt
+%% Maybe this is too drastic, but let us give it a try.
+\headheight0pt
+\headsep2mm
+\footskip2mm
+%%
 %%\addtolength{\oddsidemargin}{-1cm} 
 %%\addtolength{\topmargin}{-1cm} 
 %%\setlength{\textwidth}{%s} 
 %%\setlength{\textheight}{%s} 
+%%
 \geometry{width=%spt, left=%spt, height=%spt, top=%spt} 
 \input lilyponddefs 
 \input titledefs