Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

[lilypond.git] / lily / include / font-metric.hh

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 793c0e14a9e065ecb9cd543c05c41585b5fc5baf..5c1eb50be3e06e8e54d9003c69eb838f069a1cbd 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FONT_METRIC_HH
@@ -28,8 +28,8 @@ public:
   SCM description_;
   string file_name_;
 
-  virtual Stencil text_stencil (string) const;
-  virtual Stencil word_stencil (string) const;
+  virtual Stencil text_stencil (string, bool) const;
+  virtual Stencil word_stencil (string, bool) const;
 
   // ugh.
   virtual Box text_dimension (string) const;
@@ -77,8 +77,6 @@ public:
 
 DECLARE_UNSMOB (Font_metric, metrics);
 
-Box lookup_tex_text_dimension (Font_metric *font, SCM text);
-
 char *pfb2pfa (Byte const *pfb, int length);
 
 #endif /* FONT_METRIC_HH */