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>
{
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);
/*
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)
{
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
}
Molecule
-System_start_delimiter::staff_brace (Grob*me,Real y)
+System_start_delimiter::staff_brace (Grob*me, Real y)
{
+ 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;
+ }
- /*
- FIXME:
- * should look at afm/tfm file for dimensions.
- (This breaks ascii-art output: it hasn't got 255 symbols)
-
- * more glyphs (or maybe just better sized (fixed # of staff-spaces)),
- the size mismatches with the staffs are very ugly
-
- */
-
- // ugrhn
int lo = 0;
- int hi = 255;
-
- Font_metric *fm = Font_interface::get_default_font (me);
+
+ 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
- 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);