(all-grob-descriptions): center instrument

names vertically

diff --git a/ChangeLog b/ChangeLog
index 596d3296ccdbf938919af5359ecbe82e77f46182..14a972cd51b6f2a05a75fbaef4b3ebb053783aab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
 2006-02-11  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
-       * configure.in (LINK_GXX_STATICALLY): strip -DSTRING_UTILS_INLINED options.
-       (reloc_b): excise --enable-framework-dir 
+       * scm/define-grobs.scm (all-grob-descriptions): center instrument
+       names vertically
+
+       * configure.in (LINK_GXX_STATICALLY): strip -DSTRING_UTILS_INLINED
+       options.
+       (reloc_b): excise --enable-framework-dir
 
        * lily/relocate.cc (framework_relocation): use getenv
        LILYPOND_GS_VERSION or -DGHOSTSCRIPT_VERSION to set GS version.

diff --git a/input/typography-demo.ly b/input/typography-demo.ly
index 2e189d18f2e798156fe0a414a96ab5c656fe3877..fd92803c6fc0543ff640e417b8998a070db4adb4 100644 (file)
--- a/input/typography-demo.ly
+++ b/input/typography-demo.ly
@@ -117,51 +117,54 @@ pianoLH =  \relative c'' \repeat volta 2\new Voice {
     g,8 r r g16 r16\fermata 
     }
 
-\book {
+  \book {
     \score {
-       << \time 6/8
-          \new Staff \with {
-            fontSize = #-3
-            \override StaffSymbol #'staff-space = #(magstep -3)
-          } <<
-              \context Staff #(set-accidental-style 'modern)
-              \melody >>
-          \lyricsto "singer" \new Lyrics \firstVerse
-          \lyricsto "singer" \new Lyrics \secondVerse
-          \new PianoStaff << 
-              \set PianoStaff.instrument = \markup {
-                  \bold
-                  \bigger\bigger\bigger\bigger \huge "2." \hspace #1.0 }
-              \context Staff = up <<
-                \pianoRH
-                \pianoLH
-                >>
-              \context Staff = down { \clef bass \skip 1*2 }
-          >> 
+      << \time 6/8
+        \new Staff \with {
+          fontSize = #-3
+          \override StaffSymbol #'staff-space = #(magstep -3)
+        } <<
+          \context Staff #(set-accidental-style 'modern)
+          \melody >>
+        \lyricsto "singer" \new Lyrics \firstVerse
+        \lyricsto "singer" \new Lyrics \secondVerse
+        \new PianoStaff << 
+          \set PianoStaff.instrument = \markup {
+            \bold
+            \bigger\bigger\bigger\bigger
+            \huge
+            "2."
+          }
+          \context Staff = up <<
+            \pianoRH
+            \pianoLH
+          >>
+          \context Staff = down { \clef bass \skip 1*2 }
+        >> 
        >>
 
-       \layout {
-           \context {
-               \Lyrics
-               \override VerticalAxisGroup #'minimum-Y-extent = #'(-0.85 . 2.2)
-               \override LyricText #'font-size = #-1
-           }
-           \context {
-               \Score
-               \override Beam #'thickness = #0.55
-               \override Beam #'auto-knee-gap = #4.0
-               \override SpacingSpanner #'spacing-increment = #1.0
-               \override Stem #'stemlet-length = #0.5
-               \override Slur #'height-limit = #1.5
-           }
-           \context {
-               \PianoStaff
-               \override VerticalAlignment #'forced-distance = #10
-           }
+      \layout {
+       \context {
+         \Lyrics
+         \override VerticalAxisGroup #'minimum-Y-extent = #'(-0.85 . 2.2)
+         \override LyricText #'font-size = #-1
        }
-       \midi {
-           \tempo 4 = 70
+       \context {
+         \Score
+         \override Beam #'thickness = #0.55
+         \override Beam #'auto-knee-gap = #4.0
+         \override SpacingSpanner #'spacing-increment = #1.0
+         \override Stem #'stemlet-length = #0.5
+         \override Slur #'height-limit = #1.5
        }
+       \context {
+         \PianoStaff
+         \override VerticalAlignment #'forced-distance = #10
+       }
+      }
+      \midi {
+       \tempo 4 = 70
+      }
     }
-}
+  }
 

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 306d9289f6b26fe922fbc655f27d03bddc3a508b..5a4e220500519ffbb8f7c9924d11f1fa1c3d4f87 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -85,10 +85,13 @@ System_start_delimiter::text (Grob *me_grob, Real h)
   if (me->get_break_index () == 0)
     t = me->get_property ("long-text");
           
-          
+  
   SCM chain = Font_interface::text_font_alist_chain (me);
 
-  SCM scm_stencil = Text_interface::interpret_markup (me->layout ()->self_scm (), chain, t);
+  SCM scm_stencil = Text_interface::is_markup (t)
+    ? Text_interface::interpret_markup (me->layout ()->self_scm (), chain, t)
+    : SCM_EOL;
+  
   if (Stencil *p = unsmob_stencil (scm_stencil))
     return *p;
   return Stencil();

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index f7b9c530c6fb68a57014b22a0e8f80d93a7a885a..2a267ba39b1feb91aea876d378731a8bd871e642 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -727,11 +727,10 @@
        (style . text)
        (padding . 0.3)
        (stencil . ,ly:system-start-delimiter::print)
-       (collapse-height . 5.0)
        (X-offset . ,ly:side-position-interface::x-aligned-side)
        (direction . ,LEFT)
-       (Y-offset . -0.75)
-       (Y-extent . #f)
+       (Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
+       (self-alignment-Y . ,CENTER)
        (meta . ((class . Spanner)
                 (interfaces . (system-start-text-interface
                                side-position-interface