Rename Font_metric::get_indexed_char() to

Font_metric::get_indexed_char_dimensions().

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index db50ca67c26122ef92d91bb144608695989b38f1..50f97f419d7c2087e806310b78fdf43b0c52ba0e 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -50,7 +50,7 @@ Font_metric::find_by_name (string s) const
       expr = scm_list_3 (ly_symbol2scm ("named-glyph"),
                         self_scm (),
                         ly_string2scm (s));
-      b = get_indexed_char (idx);
+      b = get_indexed_char_dimensions (idx);
     }
 
   Stencil q (b, expr);
@@ -79,7 +79,7 @@ Font_metric::count () const
 }
 
 Box
-Font_metric::get_indexed_char (size_t k) const
+Font_metric::get_indexed_char_dimensions (size_t k) const
 {
   return Box (Interval (0, 0), Interval (0, 0));
 }
@@ -156,7 +156,7 @@ Font_metric::get_indexed_char_stencil (size_t code) const
   size_t idx = index_to_ascii (code);
   SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (),
                       scm_from_unsigned (idx));
-  Box b = get_indexed_char (code);
+  Box b = get_indexed_char_dimensions (code);
   return Stencil (b, at);
 }
 

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 2d00a270b724e77877b9254f7910947ad3f51739..871666017a04aeba4aee565ddb32cb4c332ec408 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -49,7 +49,6 @@ public:
   virtual Offset attachment_point (string) const;
   virtual Offset get_indexed_wxwy (size_t) const;
   virtual Box get_indexed_char (size_t index) const;
-  virtual Box get_ascii_char (size_t ascii) const;
 
   /*
     WTF are these vsize ?

diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh
index 8cef269fe76d6c1ee1e63a01785bd8215d67a6a4..6f20ffb5fb29fc032bf4ac9cf05e2c8558518d8e 100644 (file)
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -53,7 +53,7 @@ public:
   ~Open_type_font ();
   Offset attachment_point (string) const;
   size_t count () const;
-  Box get_indexed_char (size_t) const;
+  Box get_indexed_char_dimensions (size_t) const;
   size_t name_to_index (string) const;
   //size_t glyph_name_to_charcode (string) const;
   size_t index_to_charcode (size_t) const;

diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc
index d9104917627f3c7d4d43a309d1cc1d7e964b1439..6b3d767669ab4870f450f1c553dd06f8756a767d 100644 (file)
--- a/lily/modified-font-metric.cc
+++ b/lily/modified-font-metric.cc
@@ -54,9 +54,9 @@ Modified_font_metric::design_size () const
 }
 
 Box
-Modified_font_metric::get_indexed_char (vsize i) const
+Modified_font_metric::get_indexed_char_dimensions (vsize i) const
 {
-  Box b = orig_->get_indexed_char (i);
+  Box b = orig_->get_indexed_char_dimensions (i);
   b.scale (magnification_);
   return b;
 }

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 71c4d3bb39cb6573dc790c40c80b75dcd59fb85d..c63622bbc8452ee98c06103eb210ad97562c7676 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -123,7 +123,7 @@ Note_head::get_stem_attachment (Font_metric *fm, string key)
   int k = fm->name_to_index (key);
   if (k >= 0)
     {
-      Box b = fm->get_indexed_char (k);
+      Box b = fm->get_indexed_char_dimensions (k);
       Offset wxwy = fm->attachment_point (key);
       for (int i = X_AXIS ; i < NO_AXES; i++)
        {

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 3b99075ed0846b47639655310a665ad3649bcd6b..48529ef269859dc9b39a0eea9902872a04873056 100644 (file)
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -167,7 +167,7 @@ Open_type_font::attachment_point (string glyph_name) const
 }
 
 Box
-Open_type_font::get_indexed_char (size_t signed_idx) const
+Open_type_font::get_indexed_char_dimensions (size_t signed_idx) const
 {
   if (SCM_HASHTABLE_P (lily_index_to_bbox_table_))
     {

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index bc909daca8b49f794dda83ff631c54754602c5cf..5b987b886b8d2b088a3c0ad83fe9be33b604c250 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -159,7 +159,7 @@ System_start_delimiter::staff_brace (Grob *me, Real y)
   do
     {
       int cmp = (lo + hi) / 2;
-      b = fm->get_indexed_char (cmp);
+      b = fm->get_indexed_char_dimensions (cmp);
       if (b[Y_AXIS].is_empty () || b[Y_AXIS].length () > y)
        hi = cmp;
       else