Remove unused indirection function Font_metric::text_stencil and

derived versions.

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 49d6964ad4e89146f2db3c3b688c6cb019b02a1b..291aa2333a0b2f1885b7226f427175fd1dff4680 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -188,12 +188,6 @@ Font_metric::sub_fonts () const
   return SCM_EOL;
 }
 
-Stencil
-Font_metric::word_stencil (string str, bool feta) const
-{
-  return text_stencil (str, feta);
-}
-
 Stencil
 Font_metric::text_stencil (string, bool) const
 {

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 7f3168299e322a16aa46d7a6da66aa0a52df2e94..7c83f94095598ba4220e6a544e98285db5520d61 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -40,7 +40,6 @@ public:
   string file_name_;
 
   virtual Stencil text_stencil (string, bool) const;
-  virtual Stencil word_stencil (string, bool) const;
 
   // ugh.
   virtual Box text_dimension (string) const;

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index bb207e22324f7ca7b79b8af3b8a58750fcdf4c33..b87550f716646be6bbd9efb409fddcc2d962939b 100644 (file)
--- a/lily/include/pango-font.hh
+++ b/lily/include/pango-font.hh
@@ -53,7 +53,6 @@ public:
 
   Stencil pango_item_string_stencil (PangoGlyphItem const *, bool) const;
 
-  virtual Stencil word_stencil (string, bool) const;
   virtual Stencil text_stencil (string, bool) const;
   virtual void derived_mark () const;
 };

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 2ed7ccf9724b2b215d277c1bc8bb5db1beaa5249..d08a9c8f401266743eafa4b61755abdbd1438093 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -300,12 +300,6 @@ Pango_font::physical_font_tab () const
   return physical_font_tab_;
 }
 
-Stencil
-Pango_font::word_stencil (string str, bool music_string) const
-{
-  return text_stencil (str, music_string, true);
-}
-
 Stencil
 Pango_font::text_stencil (string str, bool music_string) const
 {

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 5984eef71b1e543814cb55d60651c4eb5de82abb..5d20d6383f667c667ff1fe3b40f17db5010b7d65 100644 (file)
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -76,9 +76,9 @@ Text_interface::interpret_string (SCM layout_smob,
   SCM music_encodings = ly_lily_module_constant ("all-music-font-encodings");
 
   if (scm_memq (encoding, music_encodings) != SCM_BOOL_F)
-    return fm->word_stencil (str, true).smobbed_copy ();
+    return fm->text_stencil (str, true).smobbed_copy ();
   else
-    return fm->word_stencil (str, false).smobbed_copy ();
+    return fm->text_stencil (str, false).smobbed_copy ();
 }
 
 MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Text_interface, interpret_markup, 3, 0,