source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include <string.h>
+#include <cstring>
-#include "box.hh"
-#include "debug.hh"
+#include "warn.hh"
#include "font-interface.hh"
-#include "molecule.hh"
+#include "line-interface.hh"
#include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "text-item.hh"
#include "volta-bracket.hh"
#include "group-interface.hh"
--
* Should look for system_start_delim to find left edge of staff.
-
-*/
+ */
-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> bar_arr
- = Pointer_group_interface__extract_grobs (me, (Item*)0, "bars");
+ Spanner *orig_span = dynamic_cast<Spanner *> (me->original_);
- if (!bar_arr.size ())
- return SCM_EOL;
+ bool broken_first_bracket = orig_span && (orig_span->broken_intos_[0] == (Spanner *)me);
- Spanner *orig_span = dynamic_cast<Spanner*> (me->original_l_);
+ bool broken_last_bracket = orig_span && (orig_span->broken_intos_.top () == (Spanner *)me);
- 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 no_vertical_start = orig_span && !broken_first_bracket;
+ bool no_vertical_end = orig_span && !broken_last_bracket;
+ SCM s = me->get_property ("bars");
+ Grob *endbar = scm_is_pair (s) ? unsmob_grob (scm_car (s)) : 0;
+ SCM glyph = endbar ? endbar->get_property ("glyph") : SCM_EOL;
- 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));
- SCM glyph = endbar->get_grob_property("glyph");
-
String str;
- if (gh_string_p (glyph))
- str = ly_scm2string(glyph);
+ if (scm_is_string (glyph))
+ str = ly_scm2string (glyph);
else
- return SCM_EOL;
-
- const char* cs = str.ch_C();
- 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");
+ str = "|";
+
+ const char *cs = str.to_str0 ();
+ no_vertical_end
+ |= (strcmp (cs, ":|") != 0 && strcmp (cs, "|:") != 0 && strcmp (cs, "|.") != 0
+ && strcmp (cs, ":|:") != 0 && strcmp (cs, ".|") != 0);
+
+ Output_def *layout = me->get_layout ();
Real half_space = 0.5;
- Item * bound = dynamic_cast<Spanner*> (me)->get_bound (LEFT);
+ Item *bound = dynamic_cast<Spanner *> (me)->get_bound (LEFT);
/*
not a start, but really broken in two
- */
- Real left =0.;
+ */
+ 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 w = dynamic_cast<Spanner *> (me)->spanner_length () - left - half_space;
+ 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));
-
- if (!no_vertical_end)
- end = Lookup::line (t, Offset (w, 0), Offset (w,h));
+ start = Line_interface::line (me, Offset (0, 0), Offset (0, h));
- Molecule mol = Lookup::line (t, 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);
-
- mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
- - 1.0);
+ if (!no_vertical_end)
+ end = Line_interface::line (me, Offset (w, 0), Offset (w, h));
+
+ 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_property ("text");
+ SCM properties = me->get_property_alist_chain (SCM_EOL);
+ SCM snum = Text_interface::interpret_markup (layout->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);
+ }
mol.translate_axis (left, X_AXIS);
return mol.smobbed_copy ();
}
-
void
-Volta_bracket_interface::add_bar (Grob *me, Item* b)
+Volta_bracket_interface::add_bar (Grob *me, Item *b)
{
Pointer_group_interface::add_grob (me, ly_symbol2scm ("bars"), b);
- Side_position_interface::add_support (me,b);
- add_bound_item (dynamic_cast<Spanner*> (me), b);
+ Side_position_interface::add_support (me, b);
+ add_bound_item (dynamic_cast<Spanner *> (me), b);
}
void
-Volta_bracket_interface::add_column (Grob*me, Grob* c)
+Volta_bracket_interface::add_column (Grob *me, Grob *c)
{
- Side_position_interface::add_support (me,c);
+ Side_position_interface::add_support (me, c);
}
-ADD_INTERFACE (Volta_bracket_interface,"volta-bracket-interface",
- "Volta bracket with number",
- "bars thickness height");
+ADD_INTERFACE (Volta_bracket_interface, "volta-bracket-interface",
+ "Volta bracket with number",
+ "bars thickness height");
projects / lilypond.git / blobdiff