source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <string.h>
#include "box.hh"
-#include "debug.hh"
+#include "warn.hh"
#include "font-interface.hh"
+#include "line-interface.hh"
#include "molecule.hh"
#include "paper-column.hh"
#include "paper-def.hh"
Volta_bracket_interface::brew_molecule (SCM smob)
{
Grob *me = unsmob_grob (smob);
- Link_array<Item> bar_arr
+ Link_array<Item> bars
= Pointer_group_interface__extract_grobs (me, (Item*)0, "bars");
- if (!bar_arr.size ())
+ if (!bars.size ())
return SCM_EOL;
- Spanner *orig_span = dynamic_cast<Spanner*> (me->original_l_);
+ Spanner *orig_span = dynamic_cast<Spanner*> (me->original_);
- bool first_bracket = orig_span && (orig_span->broken_into_l_arr_[0] == (Spanner*)me);
-
- bool last_bracket = orig_span && (orig_span->broken_into_l_arr_.top () == (Spanner*)me);
+ bool broken_first_bracket = orig_span && (orig_span->broken_intos_[0] == (Spanner*)me);
+
+ bool broken_last_bracket = orig_span && (orig_span->broken_intos_.top () == (Spanner*)me);
- bool no_vertical_start = orig_span && !first_bracket;
- bool no_vertical_end = orig_span && !last_bracket;
- SCM bars = me->get_grob_property ("bars");
- Grob * endbar = unsmob_grob (ly_car (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");
+ Grob * endbar = unsmob_grob (ly_car (s));
SCM glyph = endbar->get_grob_property("glyph");
String str;
else
return SCM_EOL;
- const char* cs = str.ch_C();
+ const char* cs = str.to_str0 ();
no_vertical_end |=
(strcmp(cs,":|")!=0 && strcmp(cs,"|:")!=0 && strcmp(cs,"|.")!=0
&& strcmp(cs,":|:")!=0 && strcmp(cs,".|")!=0);
- Real staff_thick = me->paper_l ()->get_var ("linethickness");
+ Paper_def * paper =me->get_paper ();
Real half_space = 0.5;
Item * bound = dynamic_cast<Spanner*> (me)->get_bound (LEFT);
/*
not a start, but really broken in two
- */
+ */
Real left =0.;
if (bound->break_status_dir () == RIGHT)
- {
- Paper_column *pc = bound->column_l ();
- left = pc->extent (pc, X_AXIS)[RIGHT] - bound->relative_coordinate (pc, X_AXIS);
- }
+ {
+ Paper_column *pc = bound->get_column ();
+ left = pc->extent (pc, X_AXIS)[RIGHT] - bound->relative_coordinate (pc, X_AXIS);
+ }
else
- {
- /*
- the volta spanner is attached to the bar-line, which is moved
- to the right. We don't need to compensate for the left edge.
- */
- }
+ {
+ /*
+ the volta spanner is attached to the bar-line, which is moved
+ to the right. We don't need to compensate for the left edge.
+ */
+ }
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_grob_property ("height"), 1);
Molecule 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));
+ Molecule mol = Line_interface::line (me, Offset (0, h), Offset (w,h));
mol.add_molecule (start);
mol.add_molecule (end);
-
- SCM text = me->get_grob_property ("text");
- SCM properties = me->get_property_alist_chain (SCM_EOL);
- Molecule num = Text_item::text2molecule (me, text, properties);
+ if (!orig_span || broken_first_bracket)
+ {
+ SCM text = me->get_grob_property ("text");
+ SCM properties = me->get_property_alist_chain (SCM_EOL);
+ SCM snum = Text_item::interpret_markup (paper->self_scm (), properties, text);
+ Molecule num = *unsmob_molecule (snum);
- mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
- - 1.0);
+ mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
+ - 1.0, 0);
+ }
mol.translate_axis (left, X_AXIS);
return mol.smobbed_copy ();
}
}
ADD_INTERFACE (Volta_bracket_interface,"volta-bracket-interface",
- "Volta bracket with number",
- "bars thickness height");
+ "Volta bracket with number",
+ "bars thickness height");