From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 9 Jul 2005 08:28:41 +0000 (+0000)
Subject: release commit
X-Git-Tag: release/2.7.0
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1353cd61a27d36b34fd4eb399a7c68fcd8b722be;p=lilypond.git

release commit
---

diff --git a/input/regression/markup-word-wrap.ly b/input/regression/markup-word-wrap.ly
index 1ae9e5d12a..c8929c3816 100644
--- a/input/regression/markup-word-wrap.ly
+++ b/input/regression/markup-word-wrap.ly
@@ -5,6 +5,8 @@
 
 }
 
+\version "2.7.0"
+
 \markup {
   this is normal  text
   \override #'(linewidth . 60)
diff --git a/input/regression/stencil-hacking.ly b/input/regression/stencil-hacking.ly
index 8ab7aa502c..fc13bb2126 100644
--- a/input/regression/stencil-hacking.ly
+++ b/input/regression/stencil-hacking.ly
@@ -1,5 +1,5 @@
 
-\version "2.6.0"
+\version "2.7.0"
 
 \header { texidoc=" You can write stencil callbacks in Scheme, thus
 providing custom glyphs for notation elements.  A simple example is
@@ -28,7 +28,7 @@ Example usage:
 GROB.  The dimensions of the stencil is not affected.
 "
      
-     (let* ((fn (ly:get-default-font grob))
+     (let* ((fn (ly:grob-default-font grob))
 	    (pclose (ly:font-get-glyph fn "accidentals.rightparen"))
 	    (popen (ly:font-get-glyph fn "accidentals.leftparen"))
 	    (subject (callback grob))
diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index 82115d8212..b4f2cd98ea 100644
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -16,7 +16,7 @@ class Figured_bass_engraver : public Engraver
   TRANSLATOR_DECLARATIONS (Figured_bass_engraver);
 protected:
   Link_array<Music> figures_;
-  Music *rest_req_;
+  Music *rest_event_;
 
   Grob *figure_;
 
@@ -28,7 +28,7 @@ protected:
 Figured_bass_engraver::Figured_bass_engraver ()
 {
   figure_ = 0;
-  rest_req_ = 0;
+  rest_event_ = 0;
 }
 
 void
@@ -37,7 +37,7 @@ Figured_bass_engraver::stop_translation_timestep ()
   figure_ = 0;
 
   figures_.clear ();
-  rest_req_ = 0;
+  rest_event_ = 0;
 }
 
 bool
@@ -50,7 +50,7 @@ Figured_bass_engraver::try_music (Music *m)
     }
   else if (m->is_mus_type ("rest-event"))
     {
-      rest_req_ = m;
+      rest_event_ = m;
       return true;
     }
   return false;
@@ -59,9 +59,9 @@ Figured_bass_engraver::try_music (Music *m)
 void
 Figured_bass_engraver::process_music ()
 {
-  if (rest_req_)
+  if (rest_event_)
     {
-      figure_ = make_item ("BassFigure", rest_req_->self_scm ());
+      figure_ = make_item ("BassFigure", rest_event_->self_scm ());
       figure_->set_property ("text", scm_makfrom0str ("-"));
     }
   else if (figures_.size ())