(class Paper_book):

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

diff --git a/lily/open-type-font-scheme.cc b/lily/open-type-font-scheme.cc
index 43f8c32f8d884d56d81393db8f0874a49cffde4f..db4c89c177d705a7b1e77a00a6eb2f105774c6d8 100644 (file)
--- a/lily/open-type-font-scheme.cc
+++ b/lily/open-type-font-scheme.cc
@@ -51,12 +51,12 @@ LY_DEFINE (ly_otf_font_table_data, "ly:otf-font-table-data", 2, 0, 0,
 
   char ctag [5] = "    ";
 
-  String tag_string = ly_scm2string (tag);
-  strncpy (ctag, tag_string.to_str0 (), tag_string.length ());
+  string tag_string = ly_scm2string (tag);
+  strncpy (ctag, tag_string.c_str (), tag_string.length ());
 
-  String tab = otf->get_otf_table (String (ctag));
+  string tab = otf->get_otf_table (string (ctag));
 
-  return scm_from_locale_stringn ((char const *) tab.to_bytes (), tab.length ());
+  return scm_from_locale_stringn ((char const *) tab.data (), tab.length ());
 }
 
 LY_DEFINE (ly_otf_font_p, "ly:otf-font?", 1, 0, 0,