(interpret_markup): whoops, variable

shadowing fixed.

diff --git a/ChangeLog b/ChangeLog
index a3e6d0ffad37beb3fc79db6716d2974db534b2bc..d3622cf17499e6a295621e553360af49a17a94a6 100644 (file)
--- 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 2a04aae68d32a98a8354e628df602f99b4d883de..4f15953c07be874a29ab49aca94277ba64352ff6 100644 (file)
--- 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 af5d54f06548543ad7be9d05424801ce810793c5..e3a8d4119340e86d1cdbd523f666f1b2b9cbfa10 100644 (file)
--- 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 aa86ab3cb6d78850638145a488910ac7e432c7af..759384541724730450c3b70203b7f3af861052a9 100644 (file)
--- 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
        {