/*
- bar.cc -- implement Bar
+ bar-line.cc -- implement Bar_line
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 <math.h>
-
#include "bar-line.hh"
+
+#include "all-font-metrics.hh"
+#include "font-interface.hh"
#include "lookup.hh"
-#include "paper-column.hh"
#include "output-def.hh"
-#include "font-interface.hh"
-#include "all-font-metrics.hh"
+#include "paper-column.hh"
#include "staff-symbol-referencer.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_c_procedure_p (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;
- return compound_barline (me, str, sz).smobbed_copy ();
+ return compound_barline (me, str, sz, false).smobbed_copy ();
}
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 thinkern = robust_scm2double (me->get_property ("thin-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;
hair *= staffline;
fatline *= staffline;
- Stencil thin = simple_barline (me, hair, h);
- Stencil thick = simple_barline (me, fatline, h);
+ Stencil thin = simple_barline (me, hair, h, rounded);
+ Stencil thick = simple_barline (me, fatline, h, rounded);
Stencil dot = Font_interface::get_default_font (me)->find_by_name ("dots.dot");
int lines = Staff_symbol_referencer::line_count (me);
str = "|:";
if (str == "")
- {
- return Lookup::blank (Box (Interval (0, 0), Interval (-h / 2, h / 2)));
- }
+ return Lookup::blank (Box (Interval (0, 0), Interval (-h / 2, h / 2)));
else if (str == "|")
- {
- return thin;
- }
+ return thin;
else if (str == "|." || (h == 0 && str == ":|"))
{
m.add_at_edge (X_AXIS, LEFT, thick, 0, 0);
Real y = (- (c - 1.0) / 2 + 0.5 + i * staff_space);
Stencil d (dot);
- d. translate_axis (y, Y_AXIS);
+ d.translate_axis (y, Y_AXIS);
m.add_stencil (d);
}
}
+ else if (str == ".")
+ {
+ m = dot;
+ }
return m;
}
Stencil
Bar_line::simple_barline (Grob *me,
Real w,
- Real h)
+ Real h,
+ bool rounded)
{
- Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+ Real blot
+ = rounded
+ ? 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);
+ 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_int2num (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_c_equal_p (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)
-{
- Grob *me = unsmob_grob (smob);
- Real ss = Staff_symbol_referencer::staff_space (me);
- SCM size = me->get_property ("bar-size");
- if (scm_is_number (size))
- return scm_make_real (scm_to_double (size)*ss);
- else if (Staff_symbol_referencer::get_staff_symbol (me))
- {
- /*
- 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_make_real (ysize);
- }
- else
- return scm_int2num (0);
-}
+ADD_INTERFACE (Bar_line,
+ "bar-line-interface",
-ADD_INTERFACE (Bar_line, "bar-line-interface",
"Bar line.\n"
"\n"
"Print a special bar symbol. It replaces the \n"
"repeat, a double bar, a start bar, an end bar, and a thick double bar.\n"
"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");
+
+
+ /* properties */
+ "kern "
+ "thin-kern "
+ "hair-thickness "
+ "thick-thickness "
+ "glyph "
+ "glyph-name "
+ "bar-size "
+ );
projects / lilypond.git / blobdiff