From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 6 Apr 2004 10:49:43 +0000 (+0000)
Subject: (interpret_markup): whoops, variable
X-Git-Tag: release/2.3.0~82
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4d6eae5796ae819d204d3be6b21cd02a3f74b437;p=lilypond.git

(interpret_markup): whoops, variable
shadowing fixed.
---

diff --git a/ChangeLog b/ChangeLog
index a3e6d0ffad..d3622cf174 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-04-06  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+	* lily/text-item.cc (interpret_markup): whoops, variable
+	shadowing fixed.
+
+2004-04-06  Michael Welsh Duggan  <mwd@sei.cmu.edu>
+
+	* lily/piano-pedal-performer.cc (try_music): Compare symbols to
+	symbols, not symbols to strings.
+	* lily/piano-pedal-engraver.cc (try_music): Compare symbols to
+	symbols, not symbols to strings.
+
 2004-04-06  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* lily/kpath.cc (kpathsea_gulp_file_to_string): 
diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index 2a04aae68d..4f15953c07 100644
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -164,7 +164,7 @@ Piano_pedal_engraver::try_music (Music *m)
 	{
 	  String nm = p->name_ + String ("Event");
 	  if (gh_equal_p (m->get_property ("name") ,
-			  gh_symbol2scm (nm.to_str0())))
+			  scm_str2symbol (nm.to_str0())))
 	    {
 	      Direction d = to_dir (m->get_property ("span-direction"));
 	      p->event_drul_[d] = m;
diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc
index af5d54f065..e3a8d41193 100644
--- a/lily/piano-pedal-performer.cc
+++ b/lily/piano-pedal-performer.cc
@@ -131,7 +131,7 @@ Piano_pedal_performer::try_music (Music* r)
 	{
 	  String nm = p->name_ + String ("Event");
 	  if (gh_equal_p (r->get_property ("name") ,
-			  scm_makfrom0str (nm.to_str0())))
+			  scm_str2symbol (nm.to_str0())))
 	    {
 	      Direction d = to_dir (r->get_property ("span-direction"));
 	      p->req_l_drul_[d] = r;
diff --git a/lily/text-item.cc b/lily/text-item.cc
index aa86ab3cb6..7593845417 100644
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -33,7 +33,7 @@ Text_item::interpret_markup (SCM paper, SCM props, SCM markup)
 	{
 	  lst = fontify_atom (mf, lst);
 	
-	  Box b = mf->text_dimension (str);
+	  b = mf->text_dimension (str);
 	}
       else
 	{