/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
*/
#include "stencil.hh"
-#include "horizontal-bracket.hh"
+#include "bracket.hh"
#include "grob.hh"
#include "axis-group-interface.hh"
#include "pointer-group-interface.hh"
struct Enclosing_bracket
{
- DECLARE_GROB_INTERFACE ();
-
+
public:
DECLARE_SCHEME_CALLBACK (print, (SCM));
DECLARE_SCHEME_CALLBACK (width, (SCM));
};
-
ADD_INTERFACE (Enclosing_bracket,
- "Brackets alongside bass figures.",
-
- /* properties */
- "bracket-flare "
- "edge-height "
- "elements "
- "padding "
- "shorten-pair "
- "thickness "
- );
+ "Brackets alongside bass figures.",
-/* ugh: should make bracket interface. */
+ /* properties */
+ "bracket-flare "
+ "edge-height "
+ "elements "
+ "padding "
+ "shorten-pair "
+ "thickness "
+ );
+/* ugh: should make bracket interface. */
MAKE_SCHEME_CALLBACK (Enclosing_bracket, width, 1);
SCM
/*
UGH. cut & paste code.
*/
- Grob *me = unsmob_grob (grob);
+ Grob *me = unsmob<Grob> (grob);
extract_grob_set (me, "elements", elements);
if (elements.empty ())
{
return SCM_EOL;
}
- Grob *common_x = common_refpoint_of_array (elements, me, X_AXIS);
+ Grob *common_x = common_refpoint_of_array (elements, me, X_AXIS);
Interval xext = Axis_group_interface::relative_group_extent (elements, common_x, X_AXIS);
- Stencil left_br = Horizontal_bracket::make_bracket (me, 10.0, Y_AXIS, LEFT);
- Stencil right_br = Horizontal_bracket::make_bracket (me, 10.0, Y_AXIS, LEFT);
-
+ Stencil left_br =
+ Bracket::make_axis_constrained_bracket (me, 10.0, Y_AXIS, LEFT);
+ Stencil right_br =
+ Bracket::make_axis_constrained_bracket (me, 10.0, Y_AXIS, LEFT);
xext.widen (robust_scm2double (me->get_property ("padding"), 0.25));
left_br.translate_axis (xext[LEFT], X_AXIS);
SCM
Enclosing_bracket::print (SCM grob)
{
- Grob *me = unsmob_grob (grob);
+ Grob *me = unsmob<Grob> (grob);
extract_grob_set (me, "elements", elements);
if (elements.empty ())
{
return SCM_EOL;
}
- Grob *common_x = common_refpoint_of_array (elements, me, X_AXIS);
+ Grob *common_x = common_refpoint_of_array (elements, me, X_AXIS);
Interval xext = Axis_group_interface::relative_group_extent (elements, common_x, X_AXIS);
if (xext.is_empty ())
{
xext = Interval (0, 0);
}
- Stencil left_br = Horizontal_bracket::make_enclosing_bracket (me, me, elements,
- Y_AXIS, LEFT);
- Stencil right_br = Horizontal_bracket::make_enclosing_bracket (me, me, elements,
- Y_AXIS, RIGHT);
+ Stencil left_br =
+ Bracket::make_enclosing_bracket (me, me, elements, Y_AXIS, LEFT);
+ Stencil right_br =
+ Bracket::make_enclosing_bracket (me, me, elements, Y_AXIS, RIGHT);
xext.widen (robust_scm2double (me->get_property ("padding"), 0.25));
left_br.translate_axis (xext[LEFT], X_AXIS);
right_br.translate_axis (xext[RIGHT], X_AXIS);
-
+
left_br.add_stencil (right_br);
left_br.translate_axis (-me->relative_coordinate (common_x, X_AXIS), X_AXIS);