release: 1.5.29

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

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 22b993ba3122e8607e820a1cf6b2765f28f718b4..e2c4f02d87f0f3d7e0714eb5a387a68822b005e8 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include <math.h>
@@ -23,13 +23,13 @@ System_start_delimiter::staff_bracket (Grob*me,Real height)
 {
   Real arc_height = gh_scm2double (me->get_grob_property ("arch-height")) ;
   
-  SCM at = gh_list (ly_symbol2scm ("bracket"),
+  SCM at = scm_list_n (ly_symbol2scm ("bracket"),
                    me->get_grob_property ("arch-angle"),
                    me->get_grob_property ("arch-width"),
                    gh_double2scm (arc_height),
                    gh_double2scm (height),
                    me->get_grob_property ("arch-thick"),
-                   me->get_grob_property ("bracket-thick"),
+                   me->get_grob_property ("thickness"),
                    SCM_UNDEFINED);
 
 /*
@@ -82,25 +82,19 @@ MAKE_SCHEME_CALLBACK (System_start_delimiter,after_line_breaking,1);
 SCM
 System_start_delimiter::after_line_breaking (SCM smob)
 {
-  try_collapse (unsmob_grob (smob));
-  return SCM_UNSPECIFIED;
-}
-
-void
-System_start_delimiter::try_collapse (Grob*me)
-{
+  Grob * me = unsmob_grob (smob);
   SCM   gl = me->get_grob_property ("glyph");
   
   if (scm_ilength (me->get_grob_property ("elements")) <=  1 && gl == ly_symbol2scm ("bar-line"))
     {
       me->suicide ();
     }
-  
+
+  return SCM_UNSPECIFIED;
 }
 
 
 MAKE_SCHEME_CALLBACK (System_start_delimiter,brew_molecule,1);
-
 SCM
 System_start_delimiter::brew_molecule (SCM smob)
 {
@@ -110,8 +104,7 @@ System_start_delimiter::brew_molecule (SCM smob)
   if (!gh_symbol_p (s))
     return SCM_EOL;
   
-  SCM c = me->get_grob_property ((ly_symbol2string (s) + "-collapse-height")
-                                .ch_C ());
+  SCM c = me->get_grob_property ("collapse-height");
   
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Interval ext = ly_scm2interval (Axis_group_interface::group_extent_callback
@@ -140,56 +133,48 @@ System_start_delimiter::brew_molecule (SCM smob)
 Molecule
 System_start_delimiter::staff_brace (Grob*me, Real y)
 {
-  Font_metric *fm = Font_interface::get_default_font (me);
-  Box b;
+  Font_metric *fm = 0;
+  
+  for (int i = 0; ; i++)
+    {
+      if (!fm || y > fm->get_char (fm->count ()-1)[Y_AXIS].length ())
+       {
+         /* 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 br = ly_symbol2scm ("braces");
+         SCM fam = gh_cons (ly_symbol2scm ("font-family"), br);
+         SCM sz = gh_cons (ly_symbol2scm ("font-relative-size"), gh_int2scm (i));
+
+         SCM alist = scm_list_n (fam, sz, SCM_UNDEFINED);
+         fm = Font_interface::get_font (me, scm_list_n (alist, SCM_UNDEFINED));
+         /* Hmm, if lookup fails, we get cmr10 anyway */
+         if (ly_scm2string (ly_car (fm->description_)) == "cmr10")
+           break;
+       }
+      else
+       break;
+    }
+
   int lo = 0;
-  int hi = 255; //arg, urg == 0: fm->count () >? 2;
 
-  int big = 1;
-  SCM bigger = gh_list (me->mutable_property_alist_,
-                       me->immutable_property_alist_,
-                       SCM_UNDEFINED);
+  int hi = (fm->count () - 1) >? 2;
+  Box b;
 
   /* do a binary search for each Y, not very efficient, but passable?  */
   do
-  {
-    int cmp = (lo + hi) / 2;
-
-    b = fm->get_char (cmp);
-    if (b[Y_AXIS].empty_b () || b[Y_AXIS].length () > y)
-      {
-         hi = cmp;
-      }
-    else
-      {
-       /*
-         ugh: 7
-         We have four fonts: feta-braces0-3.mf
-         
-         In the style-sheet, all paper relative sizes need to start
-         looking at the feta-braces0 font.
-
-         The smallest paper size, feta11 or -3, has to make 5 steps
-         to get to feta26 or +2.  Only after that, from +3 to +5 are
-         the real bigger sizes, so worst case we need 8 steps to get
-         to the font we need. */
-       if (big < 8)
-         {
-           bigger = gh_cons (gh_cons (ly_symbol2scm ("font-relative-size"),
-                                      gh_int2scm (big++)),
-                             bigger);
-           me->set_grob_property ("font", bigger);
-           fm = Font_interface::get_default_font (me); 
-           lo = 0;
-           hi = 255; //fm->count () >? 2;
-         }
-       else
-         lo = cmp;
-      }
+    {
+      int cmp = (lo + hi) / 2;
+      b = fm->get_char (cmp);
+      if (b[Y_AXIS].empty_b () || b[Y_AXIS].length () > y)
+       hi = cmp;
+      else
+       lo = cmp;
     }
   while (hi - lo > 1);
-
-  SCM at = gh_list (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED);
+      
+  SCM at = scm_list_n (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED);
   at = fontify_atom (fm, at);
   
   b = fm->get_char (lo);