source file of the GNU LilyPond music typesetter
- (c) 1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <string.h>
#include "box.hh"
#include "warn.hh"
#include "font-interface.hh"
-#include "molecule.hh"
+#include "line-interface.hh"
+#include "stencil.hh"
#include "paper-column.hh"
#include "paper-def.hh"
#include "text-item.hh"
*/
-MAKE_SCHEME_CALLBACK (Volta_bracket_interface,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Volta_bracket_interface,print,1);
SCM
-Volta_bracket_interface::brew_molecule (SCM smob)
+Volta_bracket_interface::print (SCM smob)
{
Grob *me = unsmob_grob (smob);
Link_array<Item> bars
bool no_vertical_start = orig_span && !broken_first_bracket;
bool no_vertical_end = orig_span && !broken_last_bracket;
- SCM s = me->get_grob_property ("bars");
+ SCM s = me->get_property ("bars");
Grob * endbar = unsmob_grob (ly_car (s));
- SCM glyph = endbar->get_grob_property("glyph");
+ SCM glyph = endbar->get_property ("glyph");
String str;
if (gh_string_p (glyph))
- str = ly_scm2string(glyph);
+ str = ly_scm2string (glyph);
else
return SCM_EOL;
const char* cs = str.to_str0 ();
no_vertical_end |=
- (strcmp(cs,":|")!=0 && strcmp(cs,"|:")!=0 && strcmp(cs,"|.")!=0
- && strcmp(cs,":|:")!=0 && strcmp(cs,".|")!=0);
+ (strcmp (cs,":|")!=0 && strcmp (cs,"|:")!=0 && strcmp (cs,"|.")!=0
+ && strcmp (cs,":|:")!=0 && strcmp (cs,".|")!=0);
- Real staff_thick = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+ Paper_def * paper =me->get_paper ();
Real half_space = 0.5;
Item * bound = dynamic_cast<Spanner*> (me)->get_bound (LEFT);
}
Real w = dynamic_cast<Spanner*> (me)->spanner_length () - left - half_space;
- Real h = gh_scm2double (me->get_grob_property ("height"));
- Real t = staff_thick * gh_scm2double (me->get_grob_property ("thickness"));
+ Real h = robust_scm2double (me->get_property ("height"), 1);
-
- Molecule start,end ;
+ Stencil start,end ;
if (!no_vertical_start)
- start = Lookup::line (t, Offset (0,0), Offset (0, h));
+ start = Line_interface::line (me, Offset (0,0), Offset (0, h));
if (!no_vertical_end)
- end = Lookup::line (t, Offset (w, 0), Offset (w,h));
+ end = Line_interface::line (me, Offset (w, 0), Offset (w,h));
- Molecule mol = Lookup::line (t, Offset (0, h), Offset (w,h));
- mol.add_molecule (start);
- mol.add_molecule (end);
+ Stencil mol = Line_interface::line (me, Offset (0, h), Offset (w,h));
+ mol.add_stencil (start);
+ mol.add_stencil (end);
if (!orig_span || broken_first_bracket)
{
- SCM text = me->get_grob_property ("text");
+ SCM text = me->get_property ("text");
SCM properties = me->get_property_alist_chain (SCM_EOL);
-
- Molecule num = Text_item::interpret_new_markup (smob, properties, text);
+ SCM snum = Text_item::interpret_markup (paper->self_scm (), properties, text);
+ Stencil num = *unsmob_stencil (snum);
mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
- 1.0, 0);