source file of the GNU LilyPond music typesetter
- (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "bar-line.hh"
#include "staff-symbol-referencer.hh"
#include "line-interface.hh"
+MAKE_SCHEME_CALLBACK (Bar_line, calc_bar_extent, 1)
+SCM
+Bar_line::calc_bar_extent (SCM smob)
+{
+ Grob *me = unsmob_grob (smob);
+
+ SCM size = me->get_property ("bar-size");
+
+ if (!scm_is_number (size)
+ || !Staff_symbol_referencer::get_staff_symbol (me))
+ return ly_interval2scm (Interval ());
+
+ Real h = scm_to_double (size);
+ return ly_interval2scm (Interval (-h/2, h/2));
+}
+
+Interval
+Bar_line::bar_y_extent (Grob *me, Grob *refpoint)
+{
+ Interval iv = robust_scm2interval (me->get_property ("bar-extent"), Interval ());
+
+ iv.translate (me->relative_coordinate (refpoint, Y_AXIS));
+ return iv;
+}
+
MAKE_SCHEME_CALLBACK (Bar_line, print, 1);
SCM
Bar_line::print (SCM smob)
colon.translate_axis (-dist / 2, Y_AXIS);
Stencil m;
+ Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
+ Real center = 0;
+ if (staff)
+ {
+ Interval staff_extent = staff->extent (staff, Y_AXIS);
+ center = staff_extent.center ();
+ }
+
if (str == "||:")
str = "|:";
if (str == "")
- return Lookup::blank (Box (Interval (0, 0), Interval (-h / 2, h / 2)));
+ {
+ Stencil empty = Lookup::blank (Box (Interval (0, 0), Interval (-h / 2, h / 2)));
+ empty.translate_axis (center, Y_AXIS);
+ return empty;
+ }
else if (str == "|")
- return thin;
+ {
+ thin.translate_axis (center, Y_AXIS);
+ return thin;
+ }
else if (str == "|." || (h == 0 && str == ":|"))
{
- m.add_at_edge (X_AXIS, LEFT, thick, 0, 0);
- m.add_at_edge (X_AXIS, LEFT, thin, kern, 0);
+ m.add_at_edge (X_AXIS, LEFT, thick, 0);
+ m.add_at_edge (X_AXIS, LEFT, thin, kern);
}
else if (str == ".|" || (h == 0 && str == "|:"))
{
- m.add_at_edge (X_AXIS, RIGHT, thick, 0, 0);
- m.add_at_edge (X_AXIS, RIGHT, thin, kern, 0);
+ m.add_at_edge (X_AXIS, RIGHT, thick, 0);
+ m.add_at_edge (X_AXIS, RIGHT, thin, kern);
}
else if (str == ":|")
{
- m.add_at_edge (X_AXIS, LEFT, thick, 0, 0);
- m.add_at_edge (X_AXIS, LEFT, thin, kern, 0);
- m.add_at_edge (X_AXIS, LEFT, colon, kern, 0);
+ m.add_at_edge (X_AXIS, LEFT, thick, 0);
+ m.add_at_edge (X_AXIS, LEFT, thin, kern);
+ m.add_at_edge (X_AXIS, LEFT, colon, kern);
}
else if (str == "|:")
{
- m.add_at_edge (X_AXIS, RIGHT, thick, 0, 0);
- m.add_at_edge (X_AXIS, RIGHT, thin, kern, 0);
- m.add_at_edge (X_AXIS, RIGHT, colon, kern, 0);
+ m.add_at_edge (X_AXIS, RIGHT, thick, 0);
+ m.add_at_edge (X_AXIS, RIGHT, thin, kern);
+ m.add_at_edge (X_AXIS, RIGHT, colon, kern);
}
else if (str == ":|:")
{
- m.add_at_edge (X_AXIS, LEFT, thick, thinkern, 0);
- m.add_at_edge (X_AXIS, LEFT, colon, kern, 0);
- m.add_at_edge (X_AXIS, RIGHT, thick, kern, 0);
- m.add_at_edge (X_AXIS, RIGHT, colon, kern, 0);
+ m.add_at_edge (X_AXIS, LEFT, thick, thinkern);
+ m.add_at_edge (X_AXIS, LEFT, colon, kern);
+ m.add_at_edge (X_AXIS, RIGHT, thick, kern);
+ m.add_at_edge (X_AXIS, RIGHT, colon, kern);
+ }
+ else if (str == ":|.|:")
+ {
+ m.add_at_edge (X_AXIS, LEFT, thick, 0);
+ m.add_at_edge (X_AXIS, LEFT, thin, kern);
+ m.add_at_edge (X_AXIS, LEFT, colon, kern);
+ m.add_at_edge (X_AXIS, RIGHT, thin, kern);
+ m.add_at_edge (X_AXIS, RIGHT, colon, kern);
+
+ }
+ else if (str == ":|.:")
+ {
+ m.add_at_edge (X_AXIS, LEFT, thick, 0);
+ m.add_at_edge (X_AXIS, LEFT, thin, kern);
+ m.add_at_edge (X_AXIS, LEFT, colon, kern);
+ m.add_at_edge (X_AXIS, RIGHT, colon, kern);
}
else if (str == ".|.")
{
- m.add_at_edge (X_AXIS, LEFT, thick, thinkern, 0);
- m.add_at_edge (X_AXIS, RIGHT, thick, kern, 0);
+ m.add_at_edge (X_AXIS, LEFT, thick, thinkern);
+ m.add_at_edge (X_AXIS, RIGHT, thick, kern);
+ }
+ else if (str == "|.|")
+ {
+ m.add_at_edge (X_AXIS, LEFT, thick, 0);
+ m.add_at_edge (X_AXIS, LEFT, thin, kern);
+ m.add_at_edge (X_AXIS, RIGHT, thin, kern);
}
else if (str == "||")
{
should align to other side? this never appears
on the system-start?
*/
- m.add_at_edge (X_AXIS, RIGHT, thin, 0, 0);
- m.add_at_edge (X_AXIS, RIGHT, thin, thinkern, 0);
+ m.add_at_edge (X_AXIS, RIGHT, thin, 0);
+ m.add_at_edge (X_AXIS, RIGHT, thin, thinkern);
}
else if (str == ":")
{
{
m = dot;
}
+
+ m.translate_axis (center, Y_AXIS);
return m;
}
Real bot_y = max ((i - dash_size) * half_space,
-(count-1) * half_space - line_thick/2);
- bar.add_stencil (Lookup::round_filled_box (Box (Interval (0,thick),
+ bar.add_stencil (Lookup::round_filled_box (Box (Interval (0, thick),
Interval (bot_y, top_y)),
blot));
}
s.translate (Offset (thick/2, -h/2));
return s;
}
- return Stencil();
+ return Stencil ();
}
+MAKE_SCHEME_CALLBACK (Bar_line, calc_anchor, 1)
+SCM
+Bar_line::calc_anchor (SCM smob)
+{
+ Grob *me = unsmob_grob (smob);
+ Real kern = robust_scm2double (me->get_property ("kern"), 1);
+ Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
+ string str = robust_scm2string (me->get_property ("glyph-name"), "");
+
+ /* we put the anchor in the center of the barline, unless we are
+ a repeat bar, in which case we put the anchor in the center of
+ the barline without the dots. */
+ Interval ext = me->extent (me, X_AXIS);
+ if (ext.is_empty ())
+ return scm_from_double (0);
-ADD_INTERFACE (Bar_line,
+ Real anchor = ext.center ();
+ Stencil dot = Font_interface::get_default_font (me)->find_by_name ("dots.dot");
+ Real dot_width = dot.extent (X_AXIS).length () + kern * staffline;
+ if (str == "|:")
+ anchor -= dot_width / 2;
+ else if (str == ":|")
+ anchor += dot_width / 2;
+
+ return scm_from_double (anchor);
+}
+
+ADD_INTERFACE (Bar_line,
"Bar line.\n"
"\n"
- "Print a special bar symbol. It replaces the \n"
- "regular bar symbol with a special\n"
- "symbol. The argument @var{bartype} is a string which specifies the\n"
- "kind of bar to print. Options are @code{:|}, \n"
- "@code{|:}, @code{:|:},\n"
- "@code{||}, @code{|.},\n"
- "@code{.|}, and @code{.|.}. \n"
+ "Print a special bar symbol. It replaces the regular bar"
+ " symbol with a special symbol. The argument @var{bartype}"
+ " is a string which specifies the kind of bar line to print."
+ " Options are @code{:|}, @code{|:}, @code{:|:}, @code{:|.|:},"
+ " @code{:|.:}, @code{||}, @code{|.}, @code{.|}, @code{.|.},"
+ " @code{|.|}, @code{:} and @code{dashed}.\n"
"\n"
- "These produce, respectively, a right repeat, a left repeat, a double\n"
- "repeat, a double bar, a start bar, an end bar, and a thick double bar.\n"
- "In addition, there is an option @code{||:} which is equivalent to\n"
- "@code{|:} except at line breaks, where it produces a double bar (@code{||})\n"
- "at the end of the line and a repeat sign (@code{|:}) at the beginning\n"
- "of the new line."
- "If @var{bartype} is set to @code{empty} then nothing is printed,\n"
- "but a line break is allowed at that spot.\n"
- "\n\n"
- "@code{gap} is used for the gaps in dashed barlines."
-
- ,
-
+ "These produce, respectively, a right repeat, a left repeat,"
+ " a thick double repeat, a thin-thick-thin double repeat,"
+ " a thin-thick double repeat, a double bar, a start bar,"
+ " an end bar, a thick double bar, a thin-thick-thin bar,"
+ " a dotted bar and a dashed bar."
+ " In addition, there is an option"
+ " @code{||:} which is equivalent to @code{|:} except at line"
+ " breaks, where it produces a double bar (@code{||}) at the"
+ " end of the line and a repeat sign (@code{|:}) at the"
+ " beginning of the new line.\n"
+ "\n"
+ "If @var{bartype} is set to @code{empty} then nothing is"
+ " printed, but a line break is allowed at that spot.\n"
+ "\n"
+ "@code{gap} is used for the gaps in dashed bar lines.",
/* properties */
+ "allow-span-bar "
"gap "
"kern "
"thin-kern "
"glyph "
"glyph-name "
"bar-size "
+ "bar-extent "
);
-
-
projects / lilypond.git / blobdiff