* input/regression/markup-bidi-pango.ly: new file.

[lilypond.git] / lily / note-heads-engraver.cc

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 05345c0aaff949970a883c38cdb9a58d786fc6f1..c5731ab396150f8ed63d70850e8ab15a143a1fe6 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -60,7 +60,7 @@ Note_heads_engraver::process_music ()
 
       Duration dur = *unsmob_duration (ev->get_property ("duration"));
 
-      note->set_property ("duration-log", scm_int2num (dur.duration_log ()));
+      note->set_property ("duration-log", scm_from_int (dur.duration_log ()));
       if (dur.dot_count ())
        {
          Item *d = make_item ("Dots", note->self_scm ());
@@ -68,7 +68,7 @@ Note_heads_engraver::process_music ()
 
          if (dur.dot_count ()
              != robust_scm2int (d->get_property ("dot-count"), 0))
-           d->set_property ("dot-count", scm_int2num (dur.dot_count ()));
+           d->set_property ("dot-count", scm_from_int (dur.dot_count ()));
 
          d->set_parent (note, Y_AXIS);
 
@@ -77,25 +77,21 @@ Note_heads_engraver::process_music ()
 
       Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
 
-#if 0
-      /*
-       TODO: should have a mechanism to switch off these warnings.
-       */
+#if 0 /* TODO: should have a mechanism to switch off these warnings. */
+
       if (!pit)
-       {
-         ev->origin ()->warning (_ ("NoteEvent without pitch"));
-       }
+       ev->origin ()->warning (_ ("NoteEvent without pitch"));
 #endif
-      
+
       int pos = pit ? pit->steps () : 0;
       SCM c0 = get_property ("middleCPosition");
       if (scm_is_number (c0))
        pos += scm_to_int (c0);
 
-      note->set_property ("staff-position", scm_int2num (pos));
+      note->set_property ("staff-position", scm_from_int (pos));
 
       /*
-       Shaped note heads change on step of the scale.
+       Shape note heads change on step of the scale.
       */
       SCM shape_vector = get_property ("shapeNoteStyles");
       if (scm_is_vector (shape_vector))
@@ -110,13 +106,9 @@ Note_heads_engraver::process_music ()
          SCM style = SCM_EOL;
          if (scm_c_vector_length (shape_vector) > delta
              && scm_is_symbol (scm_vector_ref (shape_vector, scm_from_int (delta))))
-           {
-             style = scm_vector_ref (shape_vector, scm_from_int (delta));
-           }
+           style = scm_vector_ref (shape_vector, scm_from_int (delta));
          if (scm_is_symbol (style))
-           {
-             note->set_property ("style", style);
-           }
+           note->set_property ("style", style);
        }
 
       notes_.push (note);
@@ -134,8 +126,8 @@ Note_heads_engraver::stop_translation_timestep ()
 #include "translator.icc"
 
 ADD_TRANSLATOR (Note_heads_engraver,
-               /* descr */ "Generate noteheads.",
-               /* creats*/ "NoteHead Dots",
-               /* accepts */ "note-event busy-playing-event",
-               /* reads */ "middleCPosition",
+               /* doc */ "Generate noteheads.",
+               /* create */ "NoteHead Dots",
+               /* accept */ "note-event busy-playing-event",
+               /* read */ "middleCPosition",
                /* write */ "");