source file of the GNU LilyPond music typesetter
- (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "paper-column-engraver.hh"
#include "system.hh"
-#include "item.hh"
-#include "paper-column.hh"
-#include "staff-spacing.hh"
+#include "international.hh"
+#include "axis-group-interface.hh"
+#include "context.hh"
#include "note-spacing.hh"
+#include "paper-column.hh"
#include "pointer-group-interface.hh"
-#include "context.hh"
-#include "axis-group-interface.hh"
+#include "staff-spacing.hh"
+#include "system.hh"
#include "warn.hh"
#include "translator.icc"
breaks_ = 0;
system_ = 0;
first_ = true;
- last_breakable_column_ = 0;
- last_breakable_moment_ = Moment (-1);
}
void
if (command_column_)
{
command_column_->set_property ("line-break-permission", ly_symbol2scm ("allow"));
+ command_column_->set_property ("page-turn-permission", ly_symbol2scm ("allow"));
system_->set_bound (RIGHT, command_column_);
}
}
ly_symbol2scm ("spacing-wishes"),
gi.grob ());
}
+
void
Paper_column_engraver::acknowledge_note_spacing (Grob_info gi)
{
system_->add_column (musical_column_);
}
-bool
-Paper_column_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Paper_column_engraver, break);
+void
+Paper_column_engraver::listen_break (Stream_event *ev)
{
- break_events_.push_back (m);
-
- return true;
+ break_events_.push_back (ev);
}
void
for (vsize i = 0; i < break_events_.size (); i++)
{
string prefix;
- SCM name = break_events_[i]->get_property ("name");
- if (name == ly_symbol2scm ("LineBreakEvent"))
- prefix = "line-break";
- else if (name == ly_symbol2scm ("PageBreakEvent"))
- prefix = "page-break";
- else if (name == ly_symbol2scm ("PageTurnEvent"))
- prefix = "page-turn";
+ SCM name_sym = break_events_[i]->get_property ("class");
+ string name = ly_scm2string (scm_symbol_to_string (name_sym));
+ size_t end = name.rfind ("-event");
+ if (end)
+ prefix = name.substr (0, end);
else
{
programming_error ("Paper_column_engraver doesn't know about this break-event");
return;
}
+
string perm_str = prefix + "-permission";
string pen_str = prefix + "-penalty";
else if (Paper_column::is_breakable (command_column_))
{
breaks_++;
- last_breakable_column_ = command_column_;
- last_breakable_moment_ = now_mom ();
+
if (! (breaks_%8))
progress_indication ("[" + to_string (breaks_) + "]");
}
- SCM page_br = get_property ("allowPageTurn");
- if (scm_is_pair (page_br) && last_breakable_moment_ >= Rational (0))
- {
- SCM pen = scm_cdr (page_br);
- Moment *m = unsmob_moment (scm_car (page_br));
- if (m && scm_is_number (pen) && *m <= last_breakable_moment_)
- {
- last_breakable_column_->set_property ("page-turn-permission", ly_symbol2scm ("allow"));
- last_breakable_column_->set_property ("page-turn-penalty", pen);
- }
- }
-
context ()->get_score_context ()->unset_property (ly_symbol2scm ("forbidBreak"));
- context ()->get_score_context ()->unset_property (ly_symbol2scm ("allowPageTurn"));
first_ = false;
break_events_.clear ();
+
+
+ SCM mpos = get_property ("measurePosition");
+ SCM barnum = get_property ("internalBarNumber");
+ if (unsmob_moment (mpos)
+ && scm_is_integer (barnum))
+ {
+ SCM where = scm_cons (barnum,
+ mpos);
+
+ command_column_->set_property ("rhythmic-location", where);
+ musical_column_->set_property ("rhythmic-location", where);
+ }
}
void
/* create */
"PaperColumn "
"NonMusicalPaperColumn",
-
- /* accept */ "break-event",
/* read */
"forbidBreak "
- "allowPageTurn",
+ ,
/* write */
"forbidBreak "
- "allowPageTurn "
"currentCommandColumn "
- "currentMusicalColumn");
+ "currentMusicalColumn "
+ );