/*
- 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--2009 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"
#include "all-font-metrics.hh"
#include "font-interface.hh"
+#include "line-interface.hh"
#include "lookup.hh"
#include "output-def.hh"
#include "paper-column.hh"
#include "staff-symbol-referencer.hh"
-#include "line-interface.hh"
MAKE_SCHEME_CALLBACK (Bar_line, calc_bar_extent, 1)
SCM
return ly_interval2scm (Interval ());
Real h = scm_to_double (size);
- return ly_interval2scm (Interval (-h/2, h/2));
+ return ly_interval2scm (Interval (-h / 2, h / 2));
}
Interval
return iv;
}
+bool
+Bar_line::non_empty_barline (Grob *me)
+{
+ return has_interface (me) && !me->extent (me, X_AXIS).is_empty ();
+}
+
MAKE_SCHEME_CALLBACK (Bar_line, print, 1);
SCM
Bar_line::print (SCM smob)
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);
if (str == "||:")
str = "|:";
+ if (str == "|S" || str == "S|")
+ str = "S";
+
if (str == "")
{
- Stencil empty = 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;
}
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, LEFT, colon, kern);
m.add_at_edge (X_AXIS, RIGHT, thin, kern);
m.add_at_edge (X_AXIS, RIGHT, colon, kern);
-
}
else if (str == ":|.:")
{
/*
should align to other side? this never appears
on the system-start?
+ m.add_at_edge (X_AXIS, RIGHT, thin, 0);
+ m.add_at_edge (X_AXIS, RIGHT, thin, thinkern);
*/
- m.add_at_edge (X_AXIS, RIGHT, thin, 0);
+ m.add_at_edge (X_AXIS, LEFT, thin, thinkern);
m.add_at_edge (X_AXIS, RIGHT, thin, thinkern);
}
+ else if (str.find ("S") != NPOS || str == "|._.|")
+ {
+ // Handle all varsegno stuff
+ Stencil segno;
+ segno.add_at_edge (X_AXIS, LEFT, thin, thinkern);
+ segno.add_at_edge (X_AXIS, RIGHT, thin, thinkern);
+ segno.add_stencil (Font_interface::get_default_font (me)->find_by_name ("scripts.varsegno"));
+
+ if (str == "S")
+ m.add_stencil (segno);
+ else if (str == "S|:" || str == ".S|:")
+ {
+ 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, LEFT, segno, thinkern);
+ }
+ else if (str == ":|S" || str == ":|S.")
+ {
+ 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, segno, thinkern);
+ }
+ else if (str == ":|S|:" || str == ":|S.|:")
+ {
+ 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, segno, thinkern);
+ m.add_at_edge (X_AXIS, RIGHT, thick, thinkern);
+ m.add_at_edge (X_AXIS, RIGHT, thin, kern);
+ m.add_at_edge (X_AXIS, RIGHT, colon, kern);
+ }
+ else if (str == "|._.|") // :|S|: or :|S.|: without segno and colon
+ {
+ // get the width of the segno sign
+ Real segno_width = segno.extent (X_AXIS).length ();
+ 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, thick, segno_width + 2 * thinkern);
+ m.add_at_edge (X_AXIS, RIGHT, thin, kern);
+ }
+ // end varsegno block
+ }
else if (str == ":")
{
int c = (Staff_symbol_referencer::line_count (me));
}
}
else if (str == "dashed")
- {
- m = dashed_bar_line (me, h, hair);
- }
+ m = dashed_bar_line (me, h, hair);
else if (str == "'")
- {
- m = tick_bar_line (me, h, rounded);
- }
- else if (str == ".")
- {
- m = dot;
- }
+ m = tick_bar_line (me, h, rounded);
m.translate_axis (center, Y_AXIS);
return m;
: 0.0;
return Lookup::round_filled_box (Box (Interval (0, line_thick),
- Interval (h / 2 - th, h / 2 + th)), blot);
+ 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)
return scm_from_int (0);
}
-
Stencil
Bar_line::dashed_bar_line (Grob *me, Real h, Real thick)
{
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);
int count = Staff_symbol_referencer::line_count (me);
- Real line_thick = Staff_symbol_referencer::line_thickness (me);
+ Real line_thick = Staff_symbol_referencer::line_thickness (me);
- if (fabs (line_thick + (count -1) * ss - h) < 0.1) // ugh.
+ if (fabs (line_thick + (count -1) * ss - h) < 0.1) // ugh.
{
- Real blot =
- me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
+ Real blot
+ = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
- Real half_space = ss/2;
+ Real half_space = ss / 2;
Stencil bar;
-
- for (int i = (count-1); i >= -(count-1); i -= 2)
+
+ 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);
+ (count - 1) * half_space + line_thick / 2);
Real bot_y = max ((i - dash_size) * half_space,
- -(count-1) * half_space - line_thick/2);
+ -(count - 1) * half_space - line_thick / 2);
bar.add_stencil (Lookup::round_filled_box (Box (Interval (0, thick),
Interval (bot_y, top_y)),
/*
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 ((1 - factor) * total_dash_size),
scm_from_double (0),
scm_from_double (h),
scm_from_double (factor * total_dash_size * 0.5),
box.add_point (Offset (0, h));
Stencil s (box, at);
- s.translate (Offset (thick/2, -h/2));
+ s.translate (Offset (thick / 2, -h / 2));
return s;
}
return Stencil ();
"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 line to print."
- " Options are @code{:|}, @code{|:}, @code{:|:}, @code{:|.|:},"
- " @code{:|.:}, @code{||}, @code{|.}, @code{.|}, @code{.|.},"
- " @code{|.|}, @code{:} and @code{dashed}.\n"
+ " Options are @code{|}, @code{:|}, @code{|:}, @code{:|:}, @code{:|.|:},"
+ " @code{:|.:}, @code{.}, @code{||}, @code{|.}, @code{.|}, @code{.|.},"
+ " @code{|.|}, @code{:}, @code{dashed}, @code{'} and @code{S}.\n"
"\n"
- "These produce, respectively, a right repeat, a left repeat,"
+ "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 double bar, a start bar,"
+ " 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 and a dashed bar."
- " In addition, there is an option"
+ " a dotted bar, a dashed bar, a tick as bar line and a segno bar.\n"
+ "\n"
+ "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"
" beginning of the new line.\n"
"\n"
+ "For segno, @code{S} produces a segno sign except at line breaks,"
+ " where it produces a double bar (@code{||}) at the"
+ " end of the line and a segno sign at the beginning of the new line."
+ " @code{|S} is equivalent to @code{S} but produces a simple bar line"
+ " (@code{|}) instead of a double bar line (@code{||}) at line breaks."
+ " @code{S|} produces the segno sign at line breaks and starts the following"
+ " line without special bar lines.\n"
+ "\n"
+ "@code{S|:} and @code{:|S} are used for repeat/segno combinations that are"
+ " separated at line breaks. Alternatively, @code{.S|:} and @code{:|S.}"
+ " may be used which combine repeat signs and segno at the same line in"
+ " case of a line break. @code{:|S|:} is a combination of a left repeat"
+ " (@code{:|}), a segno (@code{S}) and a right repeat @code{|:} which"
+ " splits before the segno at line breaks; @code{:|S.|:} splits after"
+ " the segno sign.\n"
+ "\n"
"If @var{bartype} is set to @code{empty} then nothing is"
" printed, but a line break is allowed at that spot.\n"
"\n"