Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond...

[lilypond.git] / lily / accidental.cc

diff --git a/lily/accidental.cc b/lily/accidental.cc
index afca79720e976390d13ca9beb9d61a44a6a07502..7f3a97b4f77153882a5639396f091af9f7fcc498 100644 (file)
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -67,7 +67,7 @@ Accidental_interface::pure_height (SCM smob, SCM start_scm, SCM)
 
   if (to_boolean (me->get_property ("forced"))
       || !unsmob_grob (me->get_object ("tie"))
-      || rank != start + 1) /* we are in the middle of a line */
+      || rank == start + 1) /* we are at the start of a line */
     {
       Stencil *s = unsmob_stencil (get_stencil (me));
       if (s)
@@ -189,7 +189,7 @@ Accidental_interface::get_stencil (Grob *me)
       return SCM_EOL;
     }
   
-  Stencil mol (fm->find_by_name (scm_i_string_chars (glyph_name)));
+  Stencil mol (fm->find_by_name (ly_scm2string (glyph_name)));
   if (to_boolean (me->get_property ("restore-first")))
     {
       /*
@@ -212,9 +212,9 @@ Accidental_interface::get_stencil (Grob *me)
 
   
 ADD_INTERFACE (Accidental_interface,
-              "a single accidental",
+              "A single accidental.",
               
-              /* props */
+              /* properties */
               "alteration "
               "avoid-slur "
               "forced "