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 7250774b624d1c89650468bc04a1319078b3824b..f01f1888827ef2d00e8b30c5109e25bfec59103a 100644 (file)
--- 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 358ef34a5330612422c98046e43f0ab6c8a88c55..7ff428f3442b6cf1cd492a6b2c4ef4a4ff886779 100644 (file)
--- 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 fad30f18d3e30f7ca3c6695841736066492a31d3..df01378c4567b5e61d2e43ceb28c940078c197a2 100755 (executable)
--- 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 (file)
index 0000000..ff82211
--- /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 bfacbce46464c6bf1696d257c22118f4440abe7d..730273ea3cc0aa9a63fdba29d33545ce36c34501 100644 (file)
--- 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