#include "system-start-delimiter.hh"
-#include <math.h>
#include "spanner.hh"
#include "axis-group-interface.hh"
#include "lookup.hh"
#include "item.hh"
-Stencil
-System_start_delimiter::old_staff_bracket (Grob *me, Real height)
-{
- Real arc_height = scm_to_double (me->get_property ("arch-height"));
-
- SCM at = scm_list_n (ly_symbol2scm ("bracket"),
- me->get_property ("arch-angle"),
- me->get_property ("arch-width"),
- scm_make_real (arc_height),
- scm_make_real (height),
- me->get_property ("arch-thick"),
- me->get_property ("thickness"),
- SCM_UNDEFINED);
-
- /*
- TODO: sort this out.
-
- Another thing:
- In system-start-delimiter.cc I see the line
-
- Real h = height + 2 * arc_height;
-
- But I really think that you mean
-
- Real h = height + 2 * arc_width;
-
- (arc_height changes the x-axis-size of arc ; arc_width changes the
- y-axis-size)
- Will not fix it since I'm not sure.
-
- */
-
- Real h = height + 2 * arc_height;
- Box b (Interval (0, 1.5), Interval (-h / 2, h / 2));
- Stencil mol (b, at);
- mol.align_to (X_AXIS, CENTER);
- return mol;
-}
-
-
+#include "pointer-group-interface.hh"
Stencil
System_start_delimiter::staff_bracket (Grob *me, Real height)
Real thickness = robust_scm2double (me->get_property ("thickness"), 0.25);
-
Real overlap = 0.1 * thickness;
-
+
Stencil bracket = Lookup::filled_box (Box (Interval (0, thickness),
Interval (-1, 1)
- * (height/2 + overlap)));
+ * (height / 2 + overlap)));
Direction d = DOWN;
do
- {
- bracket.add_at_edge (Y_AXIS, d, tips[d], -overlap, 0.0);
- }
- while (flip (&d) != DOWN);
+ bracket.add_at_edge (Y_AXIS, d, tips[d], -overlap, 0.0);
+ while (flip (&d) != DOWN)
+ ;
return bracket;
}
-
Stencil
System_start_delimiter::simple_bar (Grob *me, Real h)
{
System_start_delimiter::after_line_breaking (SCM smob)
{
Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
-
+
SCM gl = me->get_property ("glyph");
- if (ly_c_equal_p (gl, scm_makfrom0str ("bar-line")))
+ if (ly_is_equal (gl, scm_makfrom0str ("bar-line")))
{
int count = 0;
- Paper_column *left_column = me->get_bound (LEFT)->get_column ();
+ Paper_column *left_column = me->get_bound (LEFT)->get_column ();
/*
Get all coordinates, to trigger Hara kiri.
*/
- SCM elts = me->get_property ("elements");
- Grob *common = common_refpoint_of_list (elts, me, Y_AXIS);
- for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s))
+ extract_grob_set (me, "elements", elts);
+ Grob *common = common_refpoint_of_array (elts, me, Y_AXIS);
+
+ for (int i = elts.size (); i--;)
{
- Spanner *staff = dynamic_cast<Spanner*> (unsmob_grob (scm_car (s)));
- if (!staff ||
- staff->get_bound (LEFT)->get_column () != left_column)
+ Spanner *staff = dynamic_cast<Spanner *> (elts[i]);
+ if (!staff
+ || staff->get_bound (LEFT)->get_column () != left_column)
continue;
-
+
Interval v = staff->extent (common, Y_AXIS);
-
+
if (!v.is_empty ())
count++;
}
if (count <= 1)
- {
- me->suicide ();
- }
+ me->suicide ();
}
return SCM_UNSPECIFIED;
}
Real staff_space = Staff_symbol_referencer::staff_space (me);
- SCM elts = me->get_property ("elements");
- Grob *common = common_refpoint_of_list (elts, me, Y_AXIS);
+ extract_grob_set (me, "elements", elts);
+ Grob *common = common_refpoint_of_array (elts, me, Y_AXIS);
Interval ext;
- for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s))
+
+ for (int i = elts.size (); i--;)
{
- Spanner *sp = unsmob_spanner (scm_car (s));
+ Spanner *sp = dynamic_cast<Spanner *> (elts[i]);
if (sp
&& sp->get_bound (LEFT) == me->get_bound (LEFT))
{
fm = select_font (me->get_layout (), scm_list_n (alist, SCM_UNDEFINED));
int lo = 0;
- int hi = max (fm->count () - 1,2);
- Box b;
+ int hi = max (fm->count () - 1, 2);
/* do a binary search for each Y, not very efficient, but passable? */
+ Box b;
do
{
int cmp = (lo + hi) / 2;
while (hi - lo > 1);
Stencil stil (fm->find_by_name ("brace" + to_string (lo)));
- b = stil.extent_box ();
- b[X_AXIS] = Interval (0, 0);
+ stil.translate_axis (-b[X_AXIS].length()/2, X_AXIS);
- return Stencil (b, stil.expr ());
+ return stil;
}
ADD_INTERFACE (System_start_delimiter, "system-start-delimiter-interface",
"The brace, bracket or bar in front of the system. "
"It is implemented as a spanner.",
- "collapse-height thickness "
- "arch-height arch-angle arch-thick arch-width bracket-thick glyph");
+
+ /* properties */
+ "collapse-height "
+ "glyph "
+ "thickness "
+ );