Merge with master

[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 44d3353770bcfd2e65143fc6a6a599d14b4873fa..c6561b48cb111c9540d1b2b26e34c38e55527562 100644 (file)
--- a/lily/open-type-font-scheme.cc
+++ b/lily/open-type-font-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "modified-font-metric.hh"
@@ -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,
@@ -71,3 +71,19 @@ LY_DEFINE (ly_otf_font_p, "ly:otf-font?", 1, 0, 0,
 
   return scm_from_bool (otf);
 }
+
+LY_DEFINE (ly_otf_glyph_list, "ly:otf-glyph-list",
+          1, 0, 0, (SCM font),
+          "Return a list of glyphnames for @var{font}.")
+{
+  Modified_font_metric *fm
+    = dynamic_cast<Modified_font_metric *> (unsmob_metrics (font));
+
+  Open_type_font *otf = fm ? dynamic_cast<Open_type_font *> (fm->original_font ())
+    : dynamic_cast<Open_type_font *> (unsmob_metrics (font));
+
+
+  SCM_ASSERT_TYPE (otf,font, SCM_ARG1, __FUNCTION__, "OTF font");
+  return otf->glyph_list ();
+
+}