From: hanwen <hanwen>
Date: Tue, 19 Jul 2005 15:03:22 +0000 (+0000)
Subject: (measure_position): measure_position() is now a
X-Git-Tag: release/2.7.2~16
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c74a0af0492c16bffd84f5965268e19e59db05c6;p=lilypond.git

(measure_position): measure_position() is now a
normal function.
---

diff --git a/ChangeLog b/ChangeLog
index 90dc1cbdb6..13d2c474db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -98,7 +98,7 @@
 	recurse_down_engravers ()
 
 	* lily/note-head.cc (internal_print): only call
-	glyph-name-procedure if  style != default. 3 %  speed increase (wtk2-fugue1).
+	glyph-name-procedure if style != default. 
 
 2005-07-16  Graham Percival  <gperlist@shaw.ca>
 
diff --git a/input/regression/alignment-order.ly b/input/regression/alignment-order.ly
index 56df3f1694..e933deb5ba 100644
--- a/input/regression/alignment-order.ly
+++ b/input/regression/alignment-order.ly
@@ -21,7 +21,10 @@ anywhere in the vertical alignment. "
       }
       \new Staff {
 	\set Staff.alignAboveContext = #"3"
-	c8^"this" d_"staff" e^"above" d_"last" e^"staff" f
+	\times 4/6 {
+	  \override TextScript #'padding = #3
+	  c8^"this" d_"staff" e^"above" d_"last" e^"staff" f
+	}
       }
     >> }
 >>
diff --git a/lily/context-def.cc b/lily/context-def.cc
index 43194b3cac..8adf44f715 100644
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -343,7 +343,7 @@ Context_def::instantiate (SCM ops, Object_key const *key)
 
   g->simple_trans_list_ = trans_list;
 
-  context->implementation_ = g->self_scm ();
+  context->implementation_ = g;
   if (dynamic_cast<Engraver *> (g))
     g->simple_trans_list_ = filter_performers (g->simple_trans_list_);
   else if (dynamic_cast<Performer *> (g))
diff --git a/lily/context.cc b/lily/context.cc
index 4efc562baf..bf70e7a28c 100644
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -94,7 +94,7 @@ Context::Context (Object_key const *key)
   init_ = false;
   aliases_ = SCM_EOL;
   iterator_count_ = 0;
-  implementation_ = SCM_EOL;
+  implementation_ = 0;
   properties_scm_ = SCM_EOL;
   accepts_list_ = SCM_EOL;
   context_list_ = SCM_EOL;
@@ -516,7 +516,8 @@ Context::mark_smob (SCM sm)
   scm_gc_mark (me->definition_);
   scm_gc_mark (me->properties_scm_);
   scm_gc_mark (me->accepts_list_);
-  scm_gc_mark (me->implementation_);
+  if (me->implementation_)
+    scm_gc_mark (me->implementation_->self_scm ());
 
   return me->properties_scm_;
 }
@@ -561,7 +562,7 @@ Context::get_parent_context () const
 Translator_group *
 Context::implementation () const
 {
-  return dynamic_cast<Translator_group *> (unsmob_translator_group (implementation_));
+  return implementation_;
 }
 
 void
diff --git a/lily/include/context.hh b/lily/include/context.hh
index de4f346fdc..15b281110e 100644
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -40,7 +40,7 @@ protected:
   SCM context_list_;
   SCM accepts_list_;
   SCM aliases_;
-  SCM implementation_;
+  Translator_group *implementation_;
   String id_string_;
 
   friend class Context_def;
diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 8cf85f2572..b19844acba 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -128,10 +128,12 @@ Vertical_align_engraver::acknowledge_grob (Grob_info i)
 	      if (arr[i] == before_grob)
 		{
 		  arr.insert (added, i);
+		  break ; 
 		}
 	      else if (arr[i] == after_grob)
 		{
 		  arr.insert (added, i + 1);
+		  break ;
 		}
 	    }
 	}