/*
- bar-line.cc -- implement Bar_line
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "bar-line.hh"
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 == ".")
+ {
+ thick.translate_axis (center, Y_AXIS);
+ return thick;
+ }
else if (str == "|." || (h == 0 && str == ":|"))
{
m.add_at_edge (X_AXIS, LEFT, thick, 0);
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);
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 == "||")
{
/*
{
m = dashed_bar_line (me, h, hair);
}
- else if (str == ".")
+ else if (str == "'")
{
- m = dot;
+ m = tick_bar_line (me, h, rounded);
}
+
+ m.translate_axis (center, Y_AXIS);
return m;
}
Interval (-h / 2, h / 2)), blot);
}
+Stencil
+Bar_line::tick_bar_line (Grob *me, Real h, bool rounded)
+{
+ Real th = Staff_symbol_referencer::staff_space (me) / 2;
+ Real line_thick = Staff_symbol_referencer::line_thickness (me);
+
+ Real blot
+ = rounded
+ ? me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"))
+ : 0.0;
+
+ return Lookup::round_filled_box (Box (Interval (0, line_thick),
+ Interval (h / 2 - th, h / 2 + th)), blot);
+}
+
+
MAKE_SCHEME_CALLBACK (Bar_line, calc_bar_size, 1);
SCM
Bar_line::calc_bar_size (SCM smob)
"\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 to print."
- " Options are @code{:|}, @code{|:}, @code{:|:}, @code{||},"
- " @code{|.}, @code{.|}, and @code{.|.}.\n"
+ " 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{.|.},"
+ " @code{|.|}, @code{:}, @code{dashed} and @code{'}.\n"
"\n"
- "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. In addition, there is an option"
+ "These produce, respectively, a normal bar line, a right repeat, a left repeat,"
+ " a thick double repeat, a thin-thick-thin double repeat,"
+ " a thin-thick double repeat, a thick bar, a double bar, a start bar,"
+ " an end bar, a thick double bar, a thin-thick-thin bar,"
+ " a dotted bar, a dashed bar and a tick as bar bar line."
+ " 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"
"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 barlines.",
+ "@code{gap} is used for the gaps in dashed bar lines.",
/* properties */
"allow-span-bar "
"bar-size "
"bar-extent "
);
-
-
projects / lilypond.git / blobdiff