rename spanned_rank_iv -> spanned_rank_interval

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 9f7c25c6c44e27c34d7b1b6bf60425287183967c..19340c0c1dde0101a17e7c18de73382b759beb01 100644 (file)
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -152,7 +152,7 @@ Axis_group_interface::relative_pure_height (Grob *me,
 
   for (vsize i = 0; i < elts.size (); i++)
     {
-      Interval_t<int> rank_span = elts[i]->spanned_rank_iv ();
+      Interval_t<int> rank_span = elts[i]->spanned_rank_interval ();
       Item *it = dynamic_cast<Item*> (elts[i]);
       if (rank_span[LEFT] <= end && rank_span[RIGHT] >= start && (!it || it->pure_is_visible (start, end)))
        {

diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index 8ff3ffe763cbba2389e835da0e962d2d6290c1cb..757a1a57838bdbfeeec1661ee48baa456b4a5bea 100644 (file)
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -26,7 +26,7 @@ Chord_name::after_line_breaking (SCM smob)
   if (to_boolean (s))
     {
       if (me->get_column ()->get_rank ()
-         - me->get_system ()->spanned_rank_iv ()[LEFT] > 1)
+         - me->get_system ()->spanned_rank_interval ()[LEFT] > 1)
        me->suicide ();
     }
   return SCM_UNSPECIFIED;

diff --git a/lily/grob.cc b/lily/grob.cc
index 18cb6280d3b840b5f0b67820806dd0d2af5f9043..495fe2437f97cbddabfb90712d08afbc9c6f3928 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -446,7 +446,7 @@ Grob::maybe_pure_extent (Grob *refp, Axis a, bool pure, int start, int end)
 }
 
 Interval_t<int>
-Grob::spanned_rank_iv () const
+Grob::spanned_rank_interval () const
 {
   return Interval_t<int> (-1, 0);
 }

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 73fe4d6775dc9b9fe16291e3cd0232f9e1f04825..d554bce21568bca63a4ec900d163d3a3f98ad8ff 100644 (file)
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -86,7 +86,7 @@ Hara_kiri_group_spanner::request_suicide (Grob *me, int start, int end)
 
       for (vsize i = 0; i < worth.size (); i++)
        {
-         Interval_t<int> iv = worth[i]->spanned_rank_iv ();
+         Interval_t<int> iv = worth[i]->spanned_rank_interval ();
          for (int j = iv[LEFT]; j <= iv[RIGHT]; j++)
            ranks.push_back (j);
        }

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 23455d73b1b65ae82fd8243cef509fe4ed4fd0af..29905617a8d74e711f7e0de3fe0bf2cff8ae144b 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -48,7 +48,7 @@ public:
   bool fast_substitute_grob_array (SCM sym, Grob_array *);
 
   Interval_t<Moment> spanned_time () const;
-  virtual Interval_t<int> spanned_rank_iv () const;
+  virtual Interval_t<int> spanned_rank_interval () const;
   void set_bound (Direction d, Grob *);
   Item *get_bound (Direction d) const;
 

diff --git a/lily/item.cc b/lily/item.cc
index 521b285d52d86aa89d7c4ed014a39ac2ace40fd9..f7e832b30b866b13b4ad5333f4aba2ac564fdce0 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -177,7 +177,7 @@ Item::pure_is_visible (int start, int end) const
 }
 
 Interval_t<int>
-Item::spanned_rank_iv () const
+Item::spanned_rank_interval () const
 {
   int c = get_column ()->get_rank ();
   return Interval_t<int> (c, c);

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 8cc223b191ec89554bc7347247139b62a15bbeaf..f507be680a77e29097fc57eed6179366b9a4dc51 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -40,7 +40,7 @@ Spanner::do_break_processing ()
     {
       if (Spanner *parent = dynamic_cast<Spanner *> (get_parent ((Axis)a)))
        {
-         if (!parent->spanned_rank_iv ().superset (this->spanned_rank_iv ()))
+         if (!parent->spanned_rank_interval ().superset (this->spanned_rank_interval ()))
            {
              programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner `%s'.",
                                            name ().c_str (),
@@ -146,7 +146,7 @@ Spanner::set_my_columns ()
 }
 
 Interval_t<int>
-Spanner::spanned_rank_iv () const
+Spanner::spanned_rank_interval () const
 {
   Interval_t<int> iv (0, 0);