Fix 1563: System start bars interpreted collapse-height as absolute length.

[lilypond.git] / lily / system-start-delimiter.cc

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 233808da5e82d95b06bdb4305395e1bd94cf015b..25da0494395a5c158bab33a1f5860e51c6bb5c15 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -1,9 +1,20 @@
 /*
-  system-start-delimiter.cc -- implement System_start_delimiter
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "system-start-delimiter.hh"
@@ -22,11 +33,7 @@
 Stencil
 System_start_delimiter::staff_bracket (Grob *me, Real height)
 {
-  SCM fam = scm_cons (ly_symbol2scm ("font-encoding"),
-                     ly_symbol2scm ("fetaMusic"));
-
-  SCM alist = scm_list_n (fam, SCM_UNDEFINED);
-  Font_metric *fm = select_font (me->layout (), scm_list_n (alist, SCM_UNDEFINED));
+  Font_metric *fm = Font_interface::get_default_font (me);
 
   Drul_array<Stencil> tips (fm->find_by_name ("brackettips.down"),
                            fm->find_by_name ("brackettips.up"));
@@ -93,6 +100,7 @@ System_start_delimiter::print (SCM smob)
   Grob *common = common_refpoint_of_array (elts, me, Y_AXIS);
 
   Interval ext;
+  Real staffspace = 1.0;
   int non_empty_count = 0;
   for (vsize i = elts.size (); i--;)
     {
@@ -106,14 +114,17 @@ System_start_delimiter::print (SCM smob)
            {
              non_empty_count ++;
              ext.unite (dims);
+              staffspace = Staff_symbol_referencer::staff_space (sp);
            }
        }
     }
 
   SCM glyph_sym = me->get_property ("style");
   Real len = ext.length ();
+
+  // Use collapse-height in multiples of the staff-space
   if (ext.is_empty ()
-      || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= ext.length ()))
+      || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= (len / staffspace)))
     {
       me->suicide ();
       return SCM_UNSPECIFIED;
@@ -137,15 +148,11 @@ Stencil
 System_start_delimiter::staff_brace (Grob *me, Real y)
 {
   Font_metric *fm = 0;
-  /* We go through the style sheet to lookup the font file
-     name.  This is better than using find_font directly,
-     esp. because that triggers mktextfm for non-existent
-     fonts. */
-  SCM fam = scm_cons (ly_symbol2scm ("font-encoding"),
-                     ly_symbol2scm ("fetaBraces"));
 
-  SCM alist = scm_list_n (fam, SCM_UNDEFINED);
-  fm = select_font (me->layout (), scm_list_n (alist, SCM_UNDEFINED));
+  /*
+    Find the default brace font if the user overrides it.
+  */
+  fm = Font_interface::get_default_font (me);
 
   int
     lo = 0;
@@ -156,7 +163,7 @@ System_start_delimiter::staff_brace (Grob *me, Real y)
   do
     {
       int cmp = (lo + hi) / 2;
-      b = fm->get_indexed_char (cmp);
+      b = fm->get_indexed_char_dimensions (cmp);
       if (b[Y_AXIS].is_empty () || b[Y_AXIS].length () > y)
        hi = cmp;
       else