/*
- volta-engraver.cc -- implement Volta_engraver
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 2000--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 2000--2008 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 "engraver.hh"
#include "axis-group-interface.hh"
-#include "bar-line.hh"
#include "context.hh"
#include "grob-array.hh"
#include "international.hh"
SCM c = scm_car (cs);
if (scm_is_pair (c)
- && scm_car (c) == ly_symbol2scm ("volta")
- && scm_is_pair (scm_cdr (c)))
- {
- if (scm_cadr (c) == SCM_BOOL_F)
- end = true;
- else
- start_string_ = scm_cadr (c);
- }
+ && scm_car (c) == ly_symbol2scm ("volta")
+ && scm_is_pair (scm_cdr (c)))
+ {
+ if (scm_cadr (c) == SCM_BOOL_F)
+ end = true;
+ else
+ start_string_ = scm_cadr (c);
+ }
cs = scm_cdr (cs);
}
Moment now = now_mom ();
bool early_stop = unsmob_moment (l)
- && *unsmob_moment (l) <= now - started_mom_;
+ && *unsmob_moment (l) <= now - started_mom_;
end = end || early_stop;
}
warning (_ ("already have a volta spanner, ending that one prematurely"));
if (end_volta_bracket_)
- {
- warning (_ ("also already have an ended spanner"));
- warning (_ ("giving up"));
- return;
- }
+ {
+ warning (_ ("also already have an ended spanner"));
+ warning (_ ("giving up"));
+ return;
+ }
end_volta_bracket_ = volta_bracket_;
volta_bracket_ = 0;
volta_bracket_->set_property ("text", start_string_);
if (!volta_spanner_)
- volta_spanner_ = make_spanner ("VoltaBracketSpanner", SCM_EOL);
+ volta_spanner_ = make_spanner ("VoltaBracketSpanner", SCM_EOL);
Axis_group_interface::add_element (volta_spanner_, volta_bracket_);
}
if (volta_bracket_)
Volta_bracket_interface::add_bar (volta_bracket_, i.item ());
if (end_volta_bracket_)
- Volta_bracket_interface::add_bar (end_volta_bracket_, i.item ());
+ {
+ Volta_bracket_interface::add_bar (end_volta_bracket_, i.item ());
+ Grob *endbar = i.grob();
+ SCM glyph = endbar ? endbar->get_property ("glyph-name") : SCM_EOL;
+
+ string str;
+ bool no_vertical_end = false;
+ if (scm_is_string (glyph))
+ str = ly_scm2string (glyph);
+ else
+ str = "|";
+
+ SCM vertical_end_allow_list = get_property ("voltaAllowEndLineOnGlyphs");
+ if (ly_cheap_is_list (vertical_end_allow_list))
+ { // checks based on user settable property
+ bool match_not_found = true;
+ while (scm_is_pair (vertical_end_allow_list) && match_not_found)
+ {
+ if (str == robust_scm2string (scm_car (vertical_end_allow_list), "* invalid *"))
+ match_not_found = false;
+ vertical_end_allow_list = scm_cdr (vertical_end_allow_list);
+ }
+ no_vertical_end |= match_not_found;
+ }
+
+ if (no_vertical_end)
+ {
+ Drul_array<Real> edge_height = robust_scm2interval (end_volta_bracket_->get_property ("edge-height"),
+ Interval (1.0, 1.0));
+
+ if (no_vertical_end)
+ edge_height[RIGHT] = 0.0;
+
+ end_volta_bracket_->set_property ("edge-height", ly_interval2scm (edge_height));
+
+ }
+ }
if (volta_spanner_)
Side_position_interface::add_support (volta_spanner_, i.grob ());
if (end_volta_bracket_ && !volta_bracket_)
{
for (SCM s = get_property ("stavesFound"); scm_is_pair (s); s = scm_cdr (s))
- Side_position_interface::add_support (volta_spanner_, unsmob_grob (scm_car (s)));
+ Side_position_interface::add_support (volta_spanner_, unsmob_grob (scm_car (s)));
volta_spanner_ = 0;
}
*/
ADD_ACKNOWLEDGER (Volta_engraver, bar_line);
ADD_TRANSLATOR (Volta_engraver,
- /* doc */
- "Make volta brackets.",
-
- /* create */
- "VoltaBracket "
- "VoltaBracketSpanner ",
-
- /* read */
- "repeatCommands "
- "voltaSpannerDuration "
- "stavesFound ",
-
- /* write */
- ""
- );
+ /* doc */
+ "Make volta brackets.",
+
+ /* create */
+ "VoltaBracket "
+ "VoltaBracketSpanner ",
+
+ /* read */
+ "voltaAllowEndLineOnGlyphs "
+ "repeatCommands "
+ "voltaSpannerDuration "
+ "stavesFound ",
+
+ /* write */
+ ""
+ );