summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHan-Wen Nienhuys <hanwen@xs4all.nl>2007-02-03 17:54:47 +0100
committerHan-Wen Nienhuys <hanwen@xs4all.nl>2007-02-03 17:54:47 +0100
commit1f7a800d273f0eecfe4d5d36e3ca06a9a9c2d4d6 (patch)
tree6f51e7b81c223330dd921cad021b95d54bbe07ec
parent1cdc9680f2094525103d335d80bc3950f918ed03 (diff)
rename spanned_rank_iv -> spanned_rank_interval
-rw-r--r--lily/axis-group-interface.cc2
-rw-r--r--lily/chord-name.cc2
-rw-r--r--lily/grob.cc2
-rw-r--r--lily/hara-kiri-group-spanner.cc2
-rw-r--r--lily/include/spanner.hh2
-rw-r--r--lily/item.cc2
-rw-r--r--lily/spanner.cc4
7 files changed, 8 insertions, 8 deletions
diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 9f7c25c6c4..19340c0c1d 100644
--- 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 8ff3ffe763..757a1a5783 100644
--- 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 18cb6280d3..495fe2437f 100644
--- 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 73fe4d6775..d554bce215 100644
--- 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 23455d73b1..29905617a8 100644
--- 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 521b285d52..f7e832b30b 100644
--- 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 8cc223b191..f507be680a 100644
--- 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);