source file of the GNU LilyPond music typesetter
- (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h>
Molecule
System_start_delimiter::simple_bar (Grob*me,Real h)
{
- Real w = me->paper_l ()->get_var ("linethickness") *
+ Real w = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness")) *
gh_scm2double (me->get_grob_property ("thickness"));
return Lookup::filledbox (Box (Interval (0,w), Interval (-h/2, h/2)));
}
{
Grob * me = unsmob_grob (smob);
SCM gl = me->get_grob_property ("glyph");
-
- if (scm_ilength (me->get_grob_property ("elements")) <= 1
- && gh_equal_p (gl,ly_str02scm ("bar-line")))
+ if (gh_equal_p (gl,scm_makfrom0str ("bar-line")))
{
- me->suicide ();
- }
+ int count = 0;
+
+ /*
+ Get all coordinates, to trigger Hara kiri.
+ */
+ SCM elts = me->get_grob_property ("elements");
+ Grob *common = common_refpoint_of_list (elts, me, Y_AXIS);
+ for (SCM s = elts; gh_pair_p (s); s = gh_cdr (s))
+ {
+ Interval v = unsmob_grob (gh_car (s))->extent (common, Y_AXIS);
+ if (!v.empty_b ())
+ count ++;
+ }
+
+
+ if (count <= 1)
+ {
+ me->suicide ();
+ }
+ }
return SCM_UNSPECIFIED;
}
{
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;
- }
+ /* 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"), ly_symbol2scm ("*"));
+
+ SCM alist = scm_list_n (fam, sz, SCM_UNDEFINED);
+ fm = Font_interface::get_font (me->get_paper (), scm_list_n (alist, SCM_UNDEFINED));
+
int lo = 0;
}
while (hi - lo > 1);
- SCM at = scm_list_n (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED);
- at = fontify_atom (fm, at);
-
- b = fm->get_char (lo);
+ Molecule m (fm->get_char_molecule (lo));
+ b=m.extent_box();
b[X_AXIS] = Interval (0,0);
- return Molecule (b, at);
+ return Molecule (b, m.get_expr());
}