* lily/system.cc (get_line): add System stencil to exprs. Fixes

system-extents.ly.

* ly/engraver-init.ly: decrease minimumVerticalExtent to (-5,5).

* scm/define-grobs.scm (all-grob-descriptions): decrease padding
for MultiMeasureRestNumber

diff --git a/ChangeLog b/ChangeLog
index e89d91bdb5ad55d921a8ee648f486e2b928c7850..c6a9bb7e27bf310cf20345ae039a483225d35f24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2004-08-29  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * lily/system.cc (get_line): add System stencil to exprs. Fixes
+       system-extents.ly.
+
+       * ly/engraver-init.ly: decrease minimumVerticalExtent to (-5,5).
+
+       * scm/define-grobs.scm (all-grob-descriptions): decrease padding
+       for MultiMeasureRestNumber
+
        * VERSION (PACKAGE_NAME): release 2.3.13
 
 2004-08-29  Nicolas Sceaux  <nicolas.sceaux@free.fr>

diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly
index 346d7aea63ccf3b099730ef11957f8c226a05cd2..7f0b40b295ee14241133f34fd724a15818efa673 100644 (file)
--- a/input/regression/system-extents.ly
+++ b/input/regression/system-extents.ly
@@ -6,18 +6,17 @@
 
     }
          
-\score { 
-\context Voice
-{ \unset Staff.minimumVerticalExtent 
-    \slurDown c4 ( g4  c''4)
 
+\paper { 
+    \context {
+       \Score
+       \override System #'print-function = #box-grob-stencil
+    }
 }
 
-    \paper { 
-        \context {
-            \Score
-            \override System #'print-function = #box-grob-stencil
-            }
-    }
+\new Voice
+{
+    \unset Staff.minimumVerticalExtent 
+    \slurDown c4 ( g4  c''4)
 }
 

diff --git a/lily/system.cc b/lily/system.cc
index 0d2ce87b9ddbf9996721207b37373f307d7118dc..ff7d30c43fbadf2b80250a68589f1466efdcce1b 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -328,18 +328,14 @@ System::get_line ()
 {  
   static int const LAYER_COUNT = 3;
 
-  SCM stencils = SCM_EOL;
-  if (Stencil *me = get_stencil ())
-    stencils = scm_cons (me->smobbed_copy (), stencils);
+  SCM exprs = SCM_EOL;
+  SCM *tail = &exprs;
 
   /* Output stencils in three layers: 0, 1, 2.  Default layer: 1.
 
      Start with layer 3, since scm_cons prepends to list.  */
   SCM all = get_property ("all-elements");
 
-  SCM exprs = SCM_EOL;
-  SCM *tail = &exprs;
-
   for (int i = LAYER_COUNT; i--;)
     for (SCM s = all; ly_c_pair_p (s); s = ly_cdr (s))
       {
@@ -368,7 +364,8 @@ System::get_line ()
        
       }
 
-  
+  if (Stencil *me = get_stencil ())
+    exprs = scm_cons (me->expr (), exprs);
 
   Interval x (extent (this, X_AXIS));
   Interval y (extent (this, Y_AXIS));

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index bc7de7e85e2f4d9e819640a514ed9a45821c0572..c2b3a8c2bc968d7de051e9c9370a4b7b0327a937 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -40,7 +40,7 @@
        \consists "String_number_engraver"
        \consists "Axis_group_engraver"
 
-       minimumVerticalExtent = #'(-6 . 6)
+       minimumVerticalExtent = #'(-5 . 5)
        extraVerticalExtent = ##f
        verticalExtent = ##f 
        localKeySignature = #'()

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 99ecc095fb5b14673f45bb6877e36ad8a86b68a0..da6c1b98876e06ac8a8564c46bc9a52ac073c8a0 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -668,8 +668,8 @@
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
        (self-alignment-X . 0)
        (direction . 1)
-       (padding . 1.3)
-       (staff-padding . 1.3)
+       (padding . 0.4)
+       (staff-padding . 0.4)
        (font-encoding . fetaNumber)
        (meta . ((interfaces . (side-position-interface multi-measure-interface self-alignment-interface font-interface spanner-interface text-interface))))
        ))
@@ -905,7 +905,7 @@
        (grace-space-factor . 0.6)
        (shortest-duration-space . 2.0)
        (spacing-increment . 1.2)
-       (base-shortest-duration . ,(ly:make-moment 1 8))
+       (base-shortest-duration . ,(ly:make-moment 3 16))
        (meta . ((interfaces . (spacing-interface spacing-spanner-interface spanner-interface))))
        ))
 

diff --git a/scm/stencil.scm b/scm/stencil.scm
index c8518d76f7d7b125cfa414a3aff81ac99375dc63..f1faee20f87da2038238eff8f165cd016bc15f71 100644 (file)
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -52,7 +52,7 @@ encloses the contents.
   (let* ((xext (ly:grob-extent grob grob 0))
         (yext (ly:grob-extent grob grob 1))
         (thick 0.1))
-
+    
     (ly:stencil-add
      (make-filled-box-stencil xext (cons (- (car yext) thick) (car yext)))
      (make-filled-box-stencil xext (cons  (cdr yext) (+ (cdr yext) thick)))