X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=32f8307442e6031858ffd30c9cbbec8a785e2dc4;hb=b4994741ec30d86c983462965089fe2eb3e3dae3;hp=c9d9159a4cfff26591f12404053947c623ef6cba;hpb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;p=lilypond.git diff --git a/lily/bar-line.cc b/lily/bar-line.cc index c9d9159a4c..32f8307442 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -1,9 +1,20 @@ /* - 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--2009 Han-Wen Nienhuys - (c) 1997--2009 Han-Wen Nienhuys + 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 . */ #include "bar-line.hh" @@ -116,6 +127,11 @@ Bar_line::compound_barline (Grob *me, string str, Real h, 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); @@ -202,10 +218,6 @@ Bar_line::compound_barline (Grob *me, string str, Real h, { m = tick_bar_line (me, h, rounded); } - else if (str == ".") - { - m = dot; - } m.translate_axis (center, Y_AXIS); return m; @@ -355,15 +367,15 @@ ADD_INTERFACE (Bar_line, "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} and @code{'}.\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." + " 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"