From 6b9ee16a6eb3cf743488cae5915bb4b4be180b63 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Reuter?= Date: Thu, 12 Oct 2006 20:44:13 +0000 Subject: [PATCH] * lily/vaticana-ligature-engraver.cc: Minor robustness fix / cleanup. --- ChangeLog | 3 +++ lily/vaticana-ligature-engraver.cc | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75231efbec..a1d4e7ee02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,9 @@ * lily/mensural-ligature.cc (internal_brew_primitive): Bugfix: fix Han-Wen's fix (rev. 1.53): scm_is_pair -> scm_is_number. + * lily/vaticana-ligature-engraver.cc: Minor robustness fix / + cleanup. + 2006-10-12 Graham Percival * Documentation/user/ {some}: minor edits that were lost somehow. diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc index 391c32c463..8660ed6e01 100644 --- a/lily/vaticana-ligature-engraver.cc +++ b/lily/vaticana-ligature-engraver.cc @@ -54,7 +54,7 @@ private: Real thickness); void check_for_prefix_loss (Item *primitive); void check_for_ambiguous_dot_pitch (Grob_info primitive); - void add_mora_column (Grob *paper_column); + void add_mora_column (Paper_column *column); vector augmented_primitives_; public: @@ -387,18 +387,18 @@ Vaticana_ligature_engraver::check_for_prefix_loss (Item *primitive) } void -Vaticana_ligature_engraver::add_mora_column (Grob *paper_column) +Vaticana_ligature_engraver::add_mora_column (Paper_column *column) { if (augmented_primitives_.size () == 0) // no dot for column return; - if (!paper_column) // empty ligature??? + if (!column) // empty ligature??? { augmented_primitives_[0].grob ()-> programming_error ("no paper column to add dot"); return; } Item *dotcol = make_item ("DotColumn", SCM_EOL); - dotcol->set_parent (paper_column, X_AXIS); + dotcol->set_parent (column, X_AXIS); for (vsize i = 0; i < augmented_primitives_.size (); i++) { Item *primitive = @@ -699,7 +699,7 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature, align_heads (primitives, flexa_width, thickness); // append all dots to paper column of ligature's last head - add_mora_column (prev_primitive->get_parent (X_AXIS)); + add_mora_column (prev_primitive->get_column ()); #if 0 // experimental code to collapse spacing after ligature /* TODO: set to max (old/new spacing-increment), since other -- 2.39.5