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

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

diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh
index 823211ddf426e6b43a71dd8534f7a2b8fa2926fe..8b5b244fa108978e2d991f3833cce20e576bfd07 100644 (file)
--- a/lily/include/modified-font-metric.hh
+++ b/lily/include/modified-font-metric.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MODIFIED_FONT_METRIC_HH
@@ -15,15 +15,16 @@
 struct Modified_font_metric : public Font_metric
 {
 public:
-  Box text_dimension (std::string) const;
-  Stencil text_stencil (std::string) const;
+  Box text_dimension (string) const;
+  Box word_dimension (string) const;
+  Stencil text_stencil (string, bool) const;
 
   static SCM make_scaled_font_metric (Font_metric *fm, Real magnification);
-  vsize count () const;
-  Offset get_indexed_wxwy (vsize) const;
-  Offset attachment_point (std::string) const;
-  vsize name_to_index (std::string) const;
-  vsize index_to_charcode (vsize) const;
+  size_t count () const;
+  Offset get_indexed_wxwy (size_t) const;
+  Offset attachment_point (string) const;
+  size_t name_to_index (string) const;
+  size_t index_to_charcode (size_t) const;
   Font_metric *original_font () const;
 
 protected:
@@ -32,13 +33,12 @@ protected:
 
   Modified_font_metric (Font_metric *fm, Real magnification);
   SCM sub_fonts () const;
-  std::string font_name () const;
+  string font_name () const;
   Real design_size () const;
   void derived_mark () const;
-  Box get_indexed_char (vsize) const;
-  vsize index_to_ascii (vsize) const;
-  Box get_ascii_char (vsize) const;
-  Box tex_kludge (std::string) const;
+  Box get_indexed_char (size_t) const;
+  size_t index_to_ascii (size_t) const;
+  Box get_ascii_char (size_t) const;
 };
 
 #endif /* MODIFIED_FONT_METRIC_HH */