/*
- tie-column.cc -- implement Tie_column
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 2000--2005 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 "tie-column.hh"
#include <cmath>
+#include "output-def.hh"
#include "skyline.hh"
#include "warn.hh"
#include "paper-column.hh"
#include "pointer-group-interface.hh"
#include "tie.hh"
#include "directional-element-interface.hh"
-#include "tie-column-format.hh"
#include "tie-formatting-problem.hh"
+#include "tie-configuration.hh"
using namespace std;
void
-Tie_column::add_tie (Grob *me, Grob *tie)
+Tie_column::add_tie (Grob *tc, Grob *tie)
{
+ Spanner *me = dynamic_cast<Spanner *> (tc);
+
if (tie->get_parent (Y_AXIS)
&& Tie_column::has_interface (tie->get_parent (Y_AXIS)))
return;
- if (!Pointer_group_interface::count (me, ly_symbol2scm ("ties")))
+ if (!me->get_bound (LEFT)
+ || (Paper_column::get_rank (me->get_bound (LEFT)->get_column ())
+ > Paper_column::get_rank (dynamic_cast<Spanner *> (tie)->get_bound (LEFT)->get_column ())))
{
- dynamic_cast<Spanner *> (me)->set_bound (LEFT, Tie::head (tie, LEFT));
- dynamic_cast<Spanner *> (me)->set_bound (RIGHT, Tie::head (tie, RIGHT));
+ me->set_bound (LEFT, Tie::head (tie, LEFT));
+ me->set_bound (RIGHT, Tie::head (tie, RIGHT));
}
tie->set_parent (me, Y_AXIS);
SCM
Tie_column::before_line_breaking (SCM smob)
{
- Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
+ Spanner *me = dynamic_cast<Spanner *> (Grob::unsmob (smob));
for (SCM s = me->get_property ("ties"); scm_is_pair (s); s = scm_cdr (s))
{
- Spanner *tie = dynamic_cast<Spanner *> (unsmob_grob (scm_car (s)));
- Direction dir = LEFT;
- do
- {
- if (dir * tie->get_bound (dir)->get_column ()->get_rank ()
- > dir * me->get_bound (dir)->get_column ()->get_rank ())
- me->set_bound (dir, Tie::head (tie, dir));
- }
- while (flip (&dir) != LEFT);
+ Spanner *tie = dynamic_cast<Spanner *> (Grob::unsmob (scm_car (s)));
+ for (LEFT_and_RIGHT (dir))
+ {
+ if (dir * tie->get_bound (dir)->get_column ()->get_rank ()
+ > dir * me->get_bound (dir)->get_column ()->get_rank ())
+ me->set_bound (dir, Tie::head (tie, dir));
+ }
}
-
+
return SCM_UNSPECIFIED;
}
-MAKE_SCHEME_CALLBACK(Tie_column, calc_positioning_done, 1)
+MAKE_SCHEME_CALLBACK (Tie_column, calc_positioning_done, 1)
SCM
Tie_column::calc_positioning_done (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = Grob::unsmob (smob);
extract_grob_set (me, "ties", ro_ties);
- Link_array<Grob> ties (ro_ties);
+ vector<Grob *> ties (ro_ties);
if (!ties.size ())
return SCM_BOOL_T;
- if (ties.size() == 1)
- {
- /*
- Already handled by standard mechanisms.
- */
- return SCM_BOOL_T;
- }
-
- ties.sort (&Tie::compare);
-
- Ties_configuration ties_config;
- for (int i = 0; i < ties.size (); i++)
- {
- Tie_configuration conf;
- if (scm_is_number (ties[i]->get_property_data (ly_symbol2scm ("direction"))))
- conf.dir_ = get_grob_direction (ties[i]);
- conf.position_ = Tie::get_position (ties[i]);
- ties_config.ties_.push (conf);
- }
-
- SCM manual_configs = me->get_property ("tie-configuration");
- bool manual_override = false;
- set_manual_tie_configuration (&ties_config,
- &manual_override,
- manual_configs);
- set_tie_config_directions (&ties_config);
+ me->set_property ("positioning-done", SCM_BOOL_T);
+ vector_sort (ties, Tie::less);
Tie_formatting_problem problem;
problem.from_ties (ties);
-
- /*
- Let the ties flow out, according to our single-tie formatting.
- */
- if (!manual_override)
- {
- Tie::get_configuration (ties[0], &ties_config.ties_.elem_ref (0),
- problem);
- Tie::get_configuration (ties.top (),
- &ties_config.ties_.elem_ref (ties_config.ties_.size()-1),
- problem);
- }
- /*
- Calculate final width and shape of the ties.
- */
- for (int i = 0; i < ties.size(); i++)
+ SCM manual_configs = me->get_property ("tie-configuration");
+ problem.set_manual_tie_configuration (manual_configs);
+
+ Ties_configuration base = problem.generate_optimal_configuration ();
+ for (vsize i = 0; i < base.size (); i++)
{
- if (!manual_override
- && (i == 0 || i == ties.size () -1))
- continue;
+ SCM cp = Tie::get_control_points (ties[i], problem.common_x_refpoint (),
+ base[i],
+ problem.details_);
+ ties[i]->set_property ("control-points", cp);
+ set_grob_direction (ties[i],
+ base[i].dir_);
- final_shape_adjustment (ties_config.ties_[i],
- problem,
- ties[0]);
- }
-
-
- /*
- Try to shift small ties into available spaces.
- */
- if (!manual_override)
- {
- shift_small_ties (&ties_config, ties[0], problem.details_);
- }
-
- for (int i = 0; i < ties.size(); i++)
- {
- Tie::set_control_points (ties[i], problem.common_x_refpoint (), ties_config.ties_[i],
- problem.details_);
- set_grob_direction (ties[i], ties_config.ties_[i].dir_);
+ problem.set_debug_scoring (base);
}
return SCM_BOOL_T;
}
+ADD_INTERFACE (Tie_column,
+ "Object that sets directions of multiple ties in a tied"
+ " chord.",
-
-ADD_INTERFACE (Tie_column, "tie-column-interface",
- "Object that sets directions of multiple ties in a tied chord",
-
- /* properties */
- "positioning-done "
- "tie-configuration "
- );
+ /* properties */
+ "positioning-done "
+ "tie-configuration "
+ "ties "
+ );
projects / lilypond.git / blobdiff