* flower/include/std-string.hh:

[lilypond.git] / lily / open-type-font.cc

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 6ad743b0a3378e60691dcfb8cce90aa4467e4936..32bd597df273883916b4becbaa52cc887dec3a84 100644 (file)
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -44,8 +44,8 @@ load_table (char const *tag_str, FT_Face face, FT_ULong *length)
   return 0;
 }
 
-std::string
-Open_type_font::get_otf_table (std::string tag) const
+string
+Open_type_font::get_otf_table (string tag) const
 {
   return ::get_otf_table (face_, tag);
 }
@@ -59,7 +59,7 @@ load_scheme_table (char const *tag_str, FT_Face face)
   SCM tab = SCM_EOL;
   if (buffer)
     {
-      std::string contents ((char const*)buffer, length);
+      string contents ((char const*)buffer, length);
       contents = "(quote (" + contents + "))";
 
       tab = scm_c_eval_string (contents.c_str ());
@@ -89,17 +89,17 @@ Open_type_font::~Open_type_font ()
 /*
   UGH fix naming
 */
-std::string
-get_otf_table (FT_Face face, std::string tag)
+string
+get_otf_table (FT_Face face, string tag)
 {
   FT_ULong len;
   FT_Byte *tab = load_table (tag.c_str (), face, &len);
 
-  return std::string ((char const*) tab, len);
+  return string ((char const*) tab, len);
 }
 
 FT_Face
-open_ft_face (std::string str)
+open_ft_face (string str)
 {
   FT_Face face;
   int error_code = FT_New_Face (freetype2_library, str.c_str (), 0, &face);
@@ -113,7 +113,7 @@ open_ft_face (std::string str)
 }
 
 SCM
-Open_type_font::make_otf (std::string str)
+Open_type_font::make_otf (string str)
 {
   FT_Face face = open_ft_face (str);
   Open_type_font *otf = new Open_type_font (face);
@@ -147,7 +147,7 @@ Open_type_font::derived_mark () const
 }
 
 Offset
-Open_type_font::attachment_point (std::string glyph_name) const
+Open_type_font::attachment_point (string glyph_name) const
 {
   SCM sym = ly_symbol2scm (glyph_name.c_str ());
   SCM entry = scm_hashq_ref (lily_character_table_, sym, SCM_BOOL_F);
@@ -224,7 +224,7 @@ Open_type_font::get_indexed_char (vsize signed_idx) const
 }
 
 vsize
-Open_type_font::name_to_index (std::string nm) const
+Open_type_font::name_to_index (string nm) const
 {
   char *nm_str = (char *) nm.c_str ();
   if (vsize idx = FT_Get_Name_Index (face_, nm_str))
@@ -284,7 +284,7 @@ Open_type_font::get_global_table () const
   return lily_global_table_;
 }
 
-std::string
+string
 Open_type_font::font_name () const
 {
   return FT_Get_Postscript_Name (face_);