From 0a1eb1cb92c0ed9d34e9b9d9492e7b118a8bb3a0 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 11 Feb 2006 17:33:06 +0000 Subject: [PATCH] (all-grob-descriptions): center instrument names vertically --- ChangeLog | 8 +++- input/typography-demo.ly | 85 ++++++++++++++++++---------------- lily/system-start-delimiter.cc | 7 ++- scm/define-grobs.scm | 5 +- 4 files changed, 57 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index 596d3296cc..14a972cd51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ 2006-02-11 Han-Wen Nienhuys - * 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 2e189d18f2..fd92803c6f 100644 --- 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 306d9289f6..5a4e220500 100644 --- 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 f7b9c530c6..2a267ba39b 100644 --- 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 -- 2.39.5