Merge branch 'master' into translation

[lilypond.git] / lily / multi-measure-rest-engraver.cc

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index 9f460dd981871ea7ab640838d49b5dc71aaf1dd1..30f3435d99708e3f22c1b7e8d746c59f827ca000 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2015 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -132,7 +132,8 @@ Multi_measure_rest_engraver::process_music ()
               Grob *last = 0;
               for (vsize i = 0; i < numbers_.size (); i++)
                 {
-                  if (scm_from_int (d) == numbers_[i]->get_property ("direction"))
+                  if (scm_is_eq (scm_from_int (d),
+                                 numbers_[i]->get_property ("direction")))
                     {
                       if (last)
                         Side_position_interface::add_support (numbers_[i], last);
@@ -146,6 +147,7 @@ Multi_measure_rest_engraver::process_music ()
         {
           Side_position_interface::add_support (numbers_[i], mmrest_);
           numbers_[i]->set_parent (mmrest_, Y_AXIS);
+          numbers_[i]->set_parent (mmrest_, X_AXIS);
         }
 
       start_measure_
@@ -165,7 +167,7 @@ Multi_measure_rest_engraver::stop_translation_timestep ()
      -- jneem */
   if (bar_seen_)
     {
-      Grob *cmc = unsmob_grob (get_property ("currentCommandColumn"));
+      Grob *cmc = unsmob<Grob> (get_property ("currentCommandColumn"));
 
       /* Ugh, this is a kludge - need this for multi-measure-rest-grace.ly  */
       last_command_item_ = dynamic_cast<Item *> (cmc);
@@ -230,7 +232,7 @@ Multi_measure_rest_engraver::start_translation_timestep ()
       numbers_.clear ();
 
       Grob *last = last_numbers_.size () ? last_numbers_[0] : 0;
-      if (last && last->get_property ("text") == SCM_EOL)
+      if (last && scm_is_null (last->get_property ("text")))
         {
           SCM thres = get_property ("restNumberThreshold");
           int t = 1;