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 "paper-def.hh"
#include "font-interface.hh"
-#include "debug.hh"
+
#include "all-font-metrics.hh"
#include "item.hh"
#include "staff-symbol-referencer.hh"
{
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
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_grob_property ("kern"), 1);
+ Real thinkern = robust_scm2double (me->get_grob_property ("thin-kern"), 1);
+ Real hair = robust_scm2double (me->get_grob_property ("hair-thickness"), 1);
+ Real fatline = robust_scm2double (me->get_grob_property ("thick-thickness"), 1);
- Real staffline = me->paper_l ()->get_var ("stafflinethickness");
+ Real staffline = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
Real staff_space = Staff_symbol_referencer::staff_space (me);
kern *= 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");
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);
+ Molecule colon (dot);
+ colon.translate_axis(dist,Y_AXIS);
colon.add_molecule(dot);
+ colon.translate_axis(-dist/2,Y_AXIS);
Molecule m;
}
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);
+ Molecule d (dot);
+
+ d. translate_axis (y,Y_AXIS);
+ m.add_molecule (d);
+ }
}
-
return m;
}
-
Molecule
-Bar_line::simple_barline (Grob*,Real w, Real h)
+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);
if (gh_string_p (g) && bsd)
{
SCM proc = me->get_grob_property ("break-glyph-function");
- g = gh_call2 (proc, g, gh_int2scm (bsd));
+ g = gh_call2 (proc, g, scm_int2num (bsd));
}
-
if (!gh_string_p (g))
{
me->set_grob_property ("molecule-callback", SCM_EOL);
- me->set_extent_callback (SCM_EOL, X_AXIS);
+ me->set_extent (SCM_EOL, X_AXIS);
// leave y_extent for spanbar?
}
}
-bool
-Bar_line::has_interface (Grob*m)
-{
- return m && m->has_interface (ly_symbol2scm ("bar-line-interface"));
-}
MAKE_SCHEME_CALLBACK (Bar_line,get_staff_bar_size,1);
SCM size = me->get_grob_property ("bar-size");
if (gh_number_p (size))
return gh_double2scm (gh_scm2double (size)*ss);
- else if (Staff_symbol_referencer::staff_symbol_l (me))
+ else if (Staff_symbol_referencer::get_staff_symbol (me))
{
/*
If there is no staff-symbol, we get -1 from the next
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{:|}
-@cindex |A@@@code{:|}
-,
-@code{|:}
-@cindex |B@@@code{|:}
-, @code{:|:}
-@cindex |C@@@code{:|:}
-,
-@code{||}
-@cindex |D@@@code{||}
-, @code{|.}
-@cindex |E@@@code{|.}
-,
-@code{.|}
-@cindex |F@@@code{.|}
-, and @code{.|.}
-@cindex |G@@@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");
projects / lilypond.git / blobdiff