Patch and instrument name vertical alignment

[Mats Bengtsson]

Hi,

Here's a patch that solves the problems with empty space 
after the last score line (especially in combination with
lilypond-book or when combining several scores in the same
dvi file).
(auto-knee-gap had been added twice to interface-description.scm,
that's why I patched that file.)

The patch of input/regression/staff-margin.ly illustrates 
a problem with adding instrument names to GrandStaffs.
You have to add not only the Instrument_name_engraver but
also the Vertical_align_engraver, otherwise the name is
centered on the full score line, not on the GrandStaff.

The strange thing is that when I tried to add the 
Vertical_align_engraver to the definition of
GrandStaffContext in engraver.ly, the instrument name
of the PianoStaff moved! I don't understand what's going
on. It would be preferrable if we could make this addition
of the Vertical_align_engraver on GrandStaffs by default, to 
make it as simple as possible to add instrument names.

Another inconvenience is that the instrument property is
inherited to the staffs so you have to set 
Staff.instrument="" explicitly.

   /Mats

Generated by (address unknown),
>From = lilypond-1.3.131, To = lilypond-1.3.131.mb1

usage 

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.131.mb1.diff

Patches do not contain automatically generated files 
or (urg) empty directories, 
i.e., you should rerun autoconf, configure

diff -urN ../lilypond-1.3.131/CHANGES ./CHANGES
--- ../lilypond-1.3.131/CHANGES Sat Feb 24 22:51:46 2001
+++ ./CHANGES   Sun Feb 25 12:44:34 2001
@@ -1,3 +1,10 @@
+1.3.131.mb1
+===========
+
+* Bugfix: don't stretch the space after the last score line.
+
+* Updated a few examples
+
 1.3.130.hwn2
 ============
 
diff -urN ../lilypond-1.3.131/VERSION ./VERSION
--- ../lilypond-1.3.131/VERSION Sat Feb 24 22:56:11 2001
+++ ./VERSION   Sun Feb 25 12:27:04 2001
@@ -2,7 +2,7 @@
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=131
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff -urN ../lilypond-1.3.131/input/regression/staff-margin.ly 
./input/regression/staff-margin.ly
--- ../lilypond-1.3.131/input/regression/staff-margin.ly        Fri Jan 26 
16:56:27 2001
+++ ./input/regression/staff-margin.ly  Sun Feb 25 12:43:38 2001
@@ -1,6 +1,6 @@
 \header{
 texidoc="
-Staff margins are also markings attached to barlines.  They should be
+Instrument names are also markings attached to barlines.  They should be
 left of the staff, and be centered vertically wrt the staff.  They may
 be on normal staffs, but also on compound staffs, like the PianoStaff
 ";
@@ -10,12 +10,21 @@
 \version "1.3.117";
 
 \score {
-
-  \notes \context PianoStaff <
-    \context Staff = treble    {
-      \property PianoStaff.instrument = "Piano "
-      \property Staff.instrument = "Right " { c''4 }}
-    \context Staff = bass { \property Staff.instrument = "Left " \clef bass; 
c4 }>
+  \notes <
+    \context Staff = voice { \property Staff.instrument = "Voice " c''4 }
+    \context PianoStaff <
+      \context Staff = treble    {
+        \property PianoStaff.instrument = "Piano I "
+        \property Staff.instrument = "Right " { c''4 }}
+      \context Staff = bass { \property Staff.instrument = "Left " \clef bass; 
c4 }
+    >
+    \context GrandStaff <
+      \context Staff = treble    {
+        \property GrandStaff.instrument = "Piano II "
+        \property Staff.instrument = "" { c''4 }}
+      \context Staff = bass { \property Staff.instrument = "" \clef bass; c4 }
+    >
+  >
 
 \paper {
 linewidth=-1.0;
@@ -24,5 +33,9 @@
        }
 \translator { \StaffContext \consists "Instrument_name_engraver"; }
 \translator { \PianoStaffContext \consists "Instrument_name_engraver"; }
+\translator { \GrandStaffContext 
+  \consists "Instrument_name_engraver"; 
+  \consists "Vertical_align_engraver";
+}
 }}
 
diff -urN ../lilypond-1.3.131/input/test/asciscript5.ly 
./input/test/asciscript5.ly
--- ../lilypond-1.3.131/input/test/asciscript5.ly       Sun Mar 26 23:00:54 2000
+++ ./input/test/asciscript5.ly Sun Feb 25 12:49:58 2001
@@ -1,3 +1,4 @@
+\version "1.3.122"
 \include "paper-as5.ly"
 
 \score {
@@ -8,7 +9,7 @@
                g4 a b c
        }
        \paper {
-               \paper_as_five
+               \paperAsFive
                \translator { \StaffContext barSize = #5 }
        }
 
diff -urN ../lilypond-1.3.131/input/test/equaliser.ly ./input/test/equaliser.ly
--- ../lilypond-1.3.131/input/test/equaliser.ly Mon Oct 23 11:46:35 2000
+++ ./input/test/equaliser.ly   Sun Feb 25 11:54:48 2001
@@ -1,3 +1,4 @@
+\version "1.3.122"
 
 flauti = \notes \relative c' {
   \property Staff.midiInstrument = #"flute"
@@ -129,7 +130,7 @@
        }
 
   \paper {
-       \paper_sixteen
+       \paperSixteen
        indent=100.0\mm;
        linewidth=150.0\mm;
     \translator {
diff -urN ../lilypond-1.3.131/input/test/fill-a4.ly ./input/test/fill-a4.ly
--- ../lilypond-1.3.131/input/test/fill-a4.ly   Wed Apr 26 10:58:56 2000
+++ ./input/test/fill-a4.ly     Sun Feb 25 11:55:43 2001
@@ -1,3 +1,4 @@
+\version "1.3.122"
 %
 % test file to get a4 paper really filled,
 % without having to resort to the ever-ugly oversizing hack:
@@ -17,7 +18,7 @@
                \repeat "unfold" 36 c1
        }
        \paper{
-               \paper_thirteen
+               \paperThirteen
                indent = 0.0\mm;
                % URG
                % Vertical space is rather precious when typesetting
diff -urN ../lilypond-1.3.131/input/test/font11.ly ./input/test/font11.ly
--- ../lilypond-1.3.131/input/test/font11.ly    Thu Sep  2 02:17:49 1999
+++ ./input/test/font11.ly      Sun Feb 25 11:49:28 2001
@@ -1,3 +1,4 @@
+\version "1.3.122"
 
 \header{
 title= "The Feta Font";
@@ -14,7 +15,7 @@
 \score{
        \FontBody
        \paper{
-           \paper_eleven
+           \paperEleven
            linewidth = 17.5 \cm;
            gourlay_maxmeasures =5.;
        }
diff -urN ../lilypond-1.3.131/input/test/font13.ly ./input/test/font13.ly
--- ../lilypond-1.3.131/input/test/font13.ly    Thu Sep  2 02:17:49 1999
+++ ./input/test/font13.ly      Sun Feb 25 11:49:28 2001
@@ -1,3 +1,4 @@
+\version "1.3.122"
 
 \header{
 title= "The Feta Font";
@@ -14,7 +15,7 @@
 \score{
        \FontBody
        \paper{
-           \paper_thirteen
+           \paperThirteen
            linewidth = 17.5 \cm;
            gourlay_maxmeasures =5.;
        }
diff -urN ../lilypond-1.3.131/input/test/font16.ly ./input/test/font16.ly
--- ../lilypond-1.3.131/input/test/font16.ly    Thu Jan  4 21:33:58 2001
+++ ./input/test/font16.ly      Sun Feb 25 11:49:28 2001
@@ -7,7 +7,7 @@
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.3.120";
+\version "1.3.122";
 \include "paper16.ly"
 \include "font-body.ly"
 
diff -urN ../lilypond-1.3.131/input/test/font26.ly ./input/test/font26.ly
--- ../lilypond-1.3.131/input/test/font26.ly    Thu Sep  2 02:17:49 1999
+++ ./input/test/font26.ly      Sun Feb 25 11:48:12 2001
@@ -1,3 +1,4 @@
+\version "1.3.122"
 \header{
 title= "The Feta Font";
 subtitle = "proofsheet"; 
@@ -13,7 +14,7 @@
 \score{
        \FontBody
        \paper{
-           \paper_twentysix
+           \paperTwentysix
            linewidth = 17.5 \cm;
            gourlay_maxmeasures =5.;
        }
diff -urN ../lilypond-1.3.131/input/test/key-clefs.ly ./input/test/key-clefs.ly
--- ../lilypond-1.3.131/input/test/key-clefs.ly Mon Nov  1 11:54:56 1999
+++ ./input/test/key-clefs.ly   Sun Feb 25 11:54:56 2001
@@ -1,3 +1,4 @@
+\version "1.3.122"
 \include "paper16.ly"
 
 \score { \notes
@@ -20,6 +21,6 @@
 \key cis \major; cis \key ces \major;  ces
 }
 
-       \paper{\paper_sixteen}
+       \paper{\paperSixteen}
 
 }
diff -urN ../lilypond-1.3.131/input/test/standchen-as5.ly 
./input/test/standchen-as5.ly
--- ../lilypond-1.3.131/input/test/standchen-as5.ly     Thu Jan  4 21:33:58 2001
+++ ./input/test/standchen-as5.ly       Sun Feb 25 12:49:39 2001
@@ -22,7 +22,7 @@
                }
        >
        \paper {
-%              \paperAs_nine
+%              \paperAsNine
                indent=4.0\char;
                linewidth=78.0\char;
                \translator { \StaffContext barSize = #4.5 }
diff -urN ../lilypond-1.3.131/input/test/standchen-as9.ly 
./input/test/standchen-as9.ly
--- ../lilypond-1.3.131/input/test/standchen-as9.ly     Fri Nov  3 15:39:57 2000
+++ ./input/test/standchen-as9.ly       Sun Feb 25 12:48:29 2001
@@ -1,3 +1,4 @@
+\version "1.3.122"
 
 \include "paper-as9.ly"
 
@@ -19,7 +20,7 @@
                }
        >
        \paper {
-%              \paper_as_nine
+%              \paperAsNine
                indent=4.0\char;
                linewidth=78.0\char;
                %\translator { \StaffContext barSize = #9 }
diff -urN ../lilypond-1.3.131/ly/paper-as5.ly ./ly/paper-as5.ly
--- ../lilypond-1.3.131/ly/paper-as5.ly Thu Jan  4 21:33:57 2001
+++ ./ly/paper-as5.ly   Sun Feb 25 12:48:16 2001
@@ -35,4 +35,4 @@
        \include "params-as.ly";
 }
 
-\paper { \paperAs_five }
+\paper { \paperAsFive }
diff -urN ../lilypond-1.3.131/ly/paper-as9.ly ./ly/paper-as9.ly
--- ../lilypond-1.3.131/ly/paper-as9.ly Thu Jan  4 21:33:57 2001
+++ ./ly/paper-as9.ly   Sun Feb 25 12:49:39 2001
@@ -38,4 +38,4 @@
        \include "params-as.ly";
 }
 
-\paper { \paperAs_nine }
+\paper { \paperAsNine }
diff -urN ../lilypond-1.3.131/scm/interface-description.scm 
./scm/interface-description.scm
--- ../lilypond-1.3.131/scm/interface-description.scm   Sat Feb 24 22:06:31 2001
+++ ./scm/interface-description.scm     Sun Feb 25 12:28:44 2001
@@ -69,8 +69,8 @@
 
 #'thickness= weight of beams, in staffspace
   "
-   '(auto-knee-gap
-     staff-position
+   '(
+    staff-position
     height
     flag-width-function 
     damping 
diff -urN ../lilypond-1.3.131/tex/lilyponddefs.tex ./tex/lilyponddefs.tex
--- ../lilypond-1.3.131/tex/lilyponddefs.tex    Sun Nov 12 23:29:58 2000
+++ ./tex/lilyponddefs.tex      Sun Feb 25 12:26:22 2001
@@ -57,7 +57,7 @@
 \fi
 
 \def\EndLilyPondOutput{%
- \vskip 0pt plus 100fill\csname bye\endcsname
+ \vskip 0pt plus \lilypondpaperinterscorelinefill00 fill\csname bye\endcsname
 }
 \def\postheader{}