source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h>
#include "lookup.hh"
#include "paper-column.hh"
-#include "main.hh"
#include "grob.hh"
#include "bar-line.hh"
#include "string.hh"
-#include "molecule.hh"
+#include "stencil.hh"
#include "paper-def.hh"
#include "font-interface.hh"
#include "item.hh"
#include "staff-symbol-referencer.hh"
-MAKE_SCHEME_CALLBACK (Bar_line,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Bar_line,print,1);
SCM
-Bar_line::brew_molecule (SCM smob)
+Bar_line::print (SCM smob)
{
Grob * me = unsmob_grob (smob);
- SCM s = me->get_grob_property ("glyph");
- SCM barsiz_proc = me->get_grob_property ("bar-size-procedure");
+ SCM s = me->get_property ("glyph");
+ SCM barsiz_proc = me->get_property ("bar-size-procedure");
if (gh_string_p (s) && gh_procedure_p (barsiz_proc))
{
String str =ly_scm2string (s);
SCM siz = gh_call1 (barsiz_proc, me->self_scm ());
- Real sz = gh_scm2double (siz);
+ Real sz = robust_scm2double (siz, 0);
if (sz < 0)
return SCM_EOL;
}
-Molecule
+Stencil
Bar_line::compound_barline (Grob*me, String str, Real h)
{
- Real kern = gh_scm2double (me->get_grob_property ("kern"));
- Real thinkern = gh_scm2double (me->get_grob_property ("thin-kern"));
- Real hair = gh_scm2double (me->get_grob_property ("hair-thickness"));
- Real fatline = gh_scm2double (me->get_grob_property ("thick-thickness"));
+ 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_paper ()->get_var ("linethickness");
+ Real staffline = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
Real staff_space = Staff_symbol_referencer::staff_space (me);
kern *= staffline;
hair *= staffline;
fatline *= staffline;
- Molecule thin = simple_barline (me, hair, h);
- Molecule thick = simple_barline (me, fatline, h);
- Molecule colon;
- Molecule dot = Font_interface::get_default_font (me)->find_by_name ("dots-dot");
+ Stencil thin = simple_barline (me, hair, h);
+ Stencil thick = simple_barline (me, fatline, h);
+ Stencil dot = Font_interface::get_default_font (me)->find_by_name ("dots-dot");
Real dist = ( Staff_symbol_referencer::line_count (me) & 1 ? 1 :
(staff_space<2 ? 2 : .5) ) * staff_space;
- dot.translate_axis(dist/2,Y_AXIS);
- colon.add_molecule(dot);
- dot.translate_axis(-dist,Y_AXIS);
- colon.add_molecule(dot);
+ Stencil colon (dot);
+ colon.translate_axis (dist,Y_AXIS);
+ colon.add_stencil (dot);
+ colon.translate_axis (-dist/2,Y_AXIS);
- Molecule m;
+ Stencil m;
if (str == "")
{
}
else if (str == "|." || (h == 0 && 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, thick, 0, 0);
+ m.add_at_edge (X_AXIS, LEFT, thin, kern,0 );
}
else if (str == ".|" || (h == 0 && str == "|:"))
{
- 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, thick, 0, 0);
+ m.add_at_edge (X_AXIS, RIGHT, thin, kern, 0);
}
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, LEFT, thick, 0, 0);
+ m.add_at_edge (X_AXIS, LEFT, thin, kern, 0);
+ m.add_at_edge (X_AXIS, LEFT, colon, kern, 0);
}
else if (str == "|:")
{
- 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);
+ 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);
}
else if (str == ":|:")
{
- 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);
+ 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);
}
else if (str == ".|.")
{
- m.add_at_edge (X_AXIS, LEFT, thick, thinkern);
- m.add_at_edge (X_AXIS, RIGHT, thick, kern);
+ m.add_at_edge (X_AXIS, LEFT, thick, thinkern, 0);
+ m.add_at_edge (X_AXIS, RIGHT, thick, kern, 0);
}
else if (str == "||")
{
- m.add_at_edge (X_AXIS, RIGHT, thin, 0);
- m.add_at_edge (X_AXIS, RIGHT, thin, thinkern);
+ /*
+ 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);
+ }
+ else if (str == ":")
+ {
+ int c = (Staff_symbol_referencer::line_count (me));
+
+ for (int i = 0 ; i < c - 1; i++)
+ {
+ Real y = (- (c-1.0) / 2 + 0.5 + i * staff_space);
+ Stencil d (dot);
+
+ d. translate_axis (y,Y_AXIS);
+ m.add_stencil (d);
+ }
}
-
return m;
}
-
-Molecule
-Bar_line::simple_barline (Grob*,Real w, Real h)
+Stencil
+Bar_line::simple_barline (Grob *me,Real w, Real h)
{
- return Lookup::filledbox (Box (Interval (0,w), Interval (-h/2, h/2)));
+ Real blot = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
+ return Lookup::round_filled_box (Box (Interval (0,w), Interval (-h/2, h/2)), blot);
}
MAKE_SCHEME_CALLBACK (Bar_line,before_line_breaking ,1);
Grob*me=unsmob_grob (smob);
Item * item = dynamic_cast<Item*> (me);
- SCM g = me->get_grob_property ("glyph");
+ SCM g = me->get_property ("glyph");
SCM orig = g;
Direction bsd = item->break_status_dir ();
if (gh_string_p (g) && bsd)
{
- SCM proc = me->get_grob_property ("break-glyph-function");
- g = gh_call2 (proc, g, gh_int2scm (bsd));
+ SCM proc = me->get_property ("break-glyph-function");
+ g = gh_call2 (proc, g, scm_int2num (bsd));
}
-
if (!gh_string_p (g))
{
- me->set_grob_property ("molecule-callback", SCM_EOL);
+ me->set_property ("print-function", SCM_EOL);
me->set_extent (SCM_EOL, X_AXIS);
// leave y_extent for spanbar?
}
if (! gh_equal_p (g, orig))
- me->set_grob_property ("glyph", g);
+ me->set_property ("glyph", g);
return SCM_UNSPECIFIED;
}
{
Grob*me = unsmob_grob (smob);
Real ss = Staff_symbol_referencer::staff_space (me);
- SCM size = me->get_grob_property ("bar-size");
+ SCM size = me->get_property ("bar-size");
if (gh_number_p (size))
return gh_double2scm (gh_scm2double (size)*ss);
else if (Staff_symbol_referencer::get_staff_symbol (me))
return gh_double2scm ((Staff_symbol_referencer::line_count (me) -1) * ss);
}
else
- return gh_int2scm (0);
+ return scm_int2num (0);
}
ADD_INTERFACE (Bar_line, "bar-line-interface",
- "Bar line.
-
-This is a request to 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 to print. Options are @code{:|},
-@code{|:}, @code{:|:},
-@code{||}, @code{|.},
-@code{.|}, and @code{.|.}.
-
-These produce, respectively, a right repeat, a left repeat, a double
-repeat, a double bar, a start bar, an end bar, and a thick double bar.
-If @var{bartype} is set to @code{empty} then nothing is printed,
-but a line break is allowed at that spot.
-"
-,
+ "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"
+"\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"
+"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");