* ttftool/parse.c (readNamingTable): handle Apple/8bit encoding too.

[lilypond.git] / lily / new-fingering-engraver.cc

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 834407530a493ba7df76ab78137a5954e62e9cb6..7ae551bd825d0e1cc0fa65c118211b9e0bb531c4 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -60,7 +60,7 @@ protected:
 void
 New_fingering_engraver::acknowledge_grob (Grob_info inf)
 {
-  if (Rhythmic_head::has_interface (inf.grob_))
+  if (Rhythmic_head::has_interface (inf.grob ()))
     {
       Music *note_ev = inf.music_cause ();
       if (!note_ev)
@@ -77,34 +77,34 @@ New_fingering_engraver::acknowledge_grob (Grob_info inf)
 
          if (m->is_mus_type ("fingering-event"))
            {
-             add_fingering (inf.grob_, m, note_ev);
+             add_fingering (inf.grob (), m, note_ev);
            }
          else if (m->is_mus_type ("text-script-event"))
            {
-             m->origin ()->warning ("Can not add text scripts to individual note heads");
+             m->origin ()->warning (_ ("can't add text scripts to individual note heads"));
            }
          else if (m->is_mus_type ("script-event"))
            {
-             add_script (inf.grob_, m, note_ev);
+             add_script (inf.grob (), m, note_ev);
            }
          else if (m->is_mus_type ("string-number-event"))
            {
-             add_string (inf.grob_, m, note_ev);
+             add_string (inf.grob (), m, note_ev);
            }
          else if (m->is_mus_type ("harmonic-event"))
            {
-             inf.grob_->set_property ("style", ly_symbol2scm ("harmonic"));
-             Grob *d = unsmob_grob (inf.grob_->get_property ("dot"));
+             inf.grob ()->set_property ("style", ly_symbol2scm ("harmonic"));
+             Grob *d = unsmob_grob (inf.grob ()->get_property ("dot"));
              if (d)
                d->suicide ();
            }
        }
 
-      heads_.push (inf.grob_);
+      heads_.push (inf.grob ());
     }
-  else if (Stem::has_interface (inf.grob_))
+  else if (Stem::has_interface (inf.grob ()))
     {
-      stem_ = inf.grob_;
+      stem_ = inf.grob ();
     }
 }
 
@@ -262,7 +262,10 @@ New_fingering_engraver::position_scripts (SCM orientations,
   else
     {
       if (!down_p)
-       warning (_ ("Fingerings are also not down?! Putting them down anyway."));
+       {
+         warning (_ ("no placement found for fingerings"));
+         warning (_ ("placing below"));
+       }
       down.concat (*scripts);
       scripts->clear ();
     }