source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "bar-line.hh"
#include "output-def.hh"
#include "paper-column.hh"
#include "staff-symbol-referencer.hh"
+#include "line-interface.hh"
MAKE_SCHEME_CALLBACK (Bar_line, print, 1);
-
SCM
Bar_line::print (SCM smob)
{
Grob *me = unsmob_grob (smob);
- SCM s = me->get_property ("glyph");
- SCM barsiz_proc = me->get_property ("bar-size-procedure");
- if (scm_is_string (s) && ly_is_procedure (barsiz_proc))
+ SCM s = me->get_property ("glyph-name");
+ SCM barsize = me->get_property ("bar-size");
+
+ if (scm_is_string (s) && scm_is_number (barsize))
{
- String str = ly_scm2string (s);
- SCM siz = scm_call_1 (barsiz_proc, me->self_scm ());
- Real sz = robust_scm2double (siz, 0);
+ string str = ly_scm2string (s);
+ Real sz = robust_scm2double (barsize, 0);
if (sz <= 0)
return SCM_EOL;
}
Stencil
-Bar_line::compound_barline (Grob *me, String str, Real h,
+Bar_line::compound_barline (Grob *me, string str, Real h,
bool rounded)
{
Real kern = robust_scm2double (me->get_property ("kern"), 1);
Real hair = robust_scm2double (me->get_property ("hair-thickness"), 1);
Real fatline = robust_scm2double (me->get_property ("thick-thickness"), 1);
- Real staffline = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+ Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
Real staff_space = Staff_symbol_referencer::staff_space (me);
kern *= staffline;
for (int i = 0; i < c - 1; i++)
{
- Real y = (- (c - 1.0) / 2 + 0.5 + i * staff_space);
+ Real y = (- (c - 1.0) / 2 + 0.5 + i) * staff_space;
Stencil d (dot);
d.translate_axis (y, Y_AXIS);
m.add_stencil (d);
}
}
+ else if (str == "dashed")
+ {
+ m = dashed_bar_line (me, h, hair);
+ }
+ else if (str == ".")
+ {
+ m = dot;
+ }
return m;
}
{
Real blot
= rounded
- ? me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"))
+ ? me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"))
: 0.0;
return Lookup::round_filled_box (Box (Interval (0, w),
Interval (-h / 2, h / 2)), blot);
}
-MAKE_SCHEME_CALLBACK (Bar_line, before_line_breaking, 1);
-
+MAKE_SCHEME_CALLBACK (Bar_line, calc_bar_size, 1);
SCM
-Bar_line::before_line_breaking (SCM smob)
+Bar_line::calc_bar_size (SCM smob)
{
Grob *me = unsmob_grob (smob);
- Item *item = dynamic_cast<Item *> (me);
-
- SCM g = me->get_property ("glyph");
- SCM orig = g;
- Direction bsd = item->break_status_dir ();
- if (scm_is_string (g) && bsd)
- {
- SCM proc = me->get_property ("break-glyph-function");
- g = scm_call_2 (proc, g, scm_from_int (bsd));
- }
-
- if (!scm_is_string (g))
+ if (Grob *staff = Staff_symbol_referencer::get_staff_symbol (me))
{
- me->set_property ("print-function", SCM_EOL);
- me->set_extent (SCM_EOL, X_AXIS);
- // leave y_extent for spanbar?
+ Interval staff_y = staff->extent (staff, Y_AXIS);
+ return scm_from_double (staff_y.is_empty () ? 0.0 : staff_y.length ());
}
-
- if (! ly_is_equal (g, orig))
- me->set_property ("glyph", g);
-
- return SCM_UNSPECIFIED;
+ return scm_from_int (0);
}
-MAKE_SCHEME_CALLBACK (Bar_line, get_staff_bar_size, 1);
-SCM
-Bar_line::get_staff_bar_size (SCM smob)
+
+Stencil
+Bar_line::dashed_bar_line (Grob *me, Real h, Real thick)
{
- Grob *me = unsmob_grob (smob);
+ Real dash_size
+ = 1.0 - robust_scm2double (me->get_property ("gap"), 0.3);
+ /*
+ this is a tad complex for what we want to achieve, but with a
+ simple line, the round blotting interferes with staff line
+ connections.
+ */
Real ss = Staff_symbol_referencer::staff_space (me);
- SCM size = me->get_property ("bar-size");
- if (scm_is_number (size))
- return scm_from_double (scm_to_double (size) * ss);
- else if (Staff_symbol_referencer::get_staff_symbol (me))
+ int count = Staff_symbol_referencer::line_count (me);
+ Real line_thick = Staff_symbol_referencer::line_thickness (me);
+
+ if (fabs (line_thick + (count -1) * ss - h) < 0.1) // ugh.
+ {
+ Real blot =
+ me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
+
+ Real half_space = ss/2;
+ Stencil bar;
+
+ for (int i = (count-1); i >= -(count-1); i -= 2)
+ {
+ Real top_y = min ((i + dash_size) * half_space,
+ (count-1) * half_space + line_thick / 2);
+ 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),
+ Interval (bot_y, top_y)),
+ blot));
+ }
+ return bar;
+ }
+ else
{
/*
- If there is no staff-symbol, we get -1 from the next
- calculation. That's a nonsense value, which would collapse the
- barline so we return 0.0 in the next alternative.
- */
- Real ysize = (Staff_symbol_referencer::line_count (me) -1);
- ysize = ysize * ss + Staff_symbol_referencer::line_thickness (me);
- return scm_from_double (ysize);
+ We have to scale the dashing so it starts and ends with half a
+ dash exactly.
+ */
+ int dashes = int (rint (h / ss));
+ Real total_dash_size = h / dashes;
+ Real factor = (dash_size - thick) / ss;
+
+ SCM at = scm_list_n (ly_symbol2scm ("dashed-line"),
+ scm_from_double (thick),
+ scm_from_double (factor * total_dash_size),
+ scm_from_double ((1-factor) * total_dash_size),
+ scm_from_double (0),
+ scm_from_double (h),
+ scm_from_double (factor * total_dash_size * 0.5),
+ SCM_UNDEFINED);
+
+ Box box;
+ box.add_point (Offset (0, 0));
+ box.add_point (Offset (0, h));
+
+ Stencil s (box, at);
+ s.translate (Offset (thick/2, -h/2));
+ return s;
}
- return scm_from_int (0);
+ return Stencil();
}
-ADD_INTERFACE (Bar_line, "bar-line-interface",
+
+ADD_INTERFACE (Bar_line,
+
"Bar line.\n"
"\n"
"Print a special bar symbol. It replaces the \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",
- "bar-size-procedure kern thin-kern hair-thickness thick-thickness glyph bar-size break-glyph-function");
+ "but a line break is allowed at that spot.\n"
+ "\n\n"
+ "@code{gap} is used for the gaps in dashed barlines."
+
+ ,
+
+
+ /* properties */
+ "gap "
+ "kern "
+ "thin-kern "
+ "hair-thickness "
+ "thick-thickness "
+ "glyph "
+ "glyph-name "
+ "bar-size "
+ );
+
+