X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fopen-type-font-scheme.cc;h=3ce37b6ef7c060f990a969f4efc6af9bcf0796d5;hb=a0347a5c1bd5d7391e1220536d49c1ac4e94fdbf;hp=173eb56d3794880dcdc152ab1c77883a99e0ae3f;hpb=a200088f8b69a03e02c466feb7ed45722cd6a2f7;p=lilypond.git

diff --git a/lily/open-type-font-scheme.cc b/lily/open-type-font-scheme.cc
index 173eb56d37..3ce37b6ef7 100644
--- 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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "modified-font-metric.hh"
@@ -15,6 +15,7 @@ LY_DEFINE (ly_font_sub_fonts, "ly:font-sub-fonts", 1, 0, 0,
 	   " names of the subfonts within @var{font}.")
 {
   LY_ASSERT_SMOB (Font_metric, font, 1);
+
   Font_metric *fm = unsmob_metrics (font);
   return fm->sub_fonts ();
 }
@@ -26,9 +27,11 @@ LY_DEFINE (ly_otf_font_glyph_info, "ly:otf-font-glyph-info", 2, 0, 0,
 {
   Modified_font_metric *fm
     = dynamic_cast<Modified_font_metric *> (unsmob_metrics (font));
-  Open_type_font *otf = dynamic_cast<Open_type_font *> (fm->original_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-metric");
+  SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OpenType font");
   LY_ASSERT_TYPE (scm_is_string, glyph, 2);
 
   SCM sym = scm_string_to_symbol (glyph);
@@ -42,11 +45,11 @@ LY_DEFINE (ly_otf_font_table_data, "ly:otf-font-table-data", 2, 0, 0,
 {
   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 ())
+  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__, "Open type font");
+  SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OpenType font");
   LY_ASSERT_TYPE (scm_is_string, tag, 2);
 
   char ctag [5] = "    ";
@@ -65,25 +68,39 @@ LY_DEFINE (ly_otf_font_p, "ly:otf-font?", 1, 0, 0,
 {
   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 ())
+  Open_type_font *otf = fm
+    ? dynamic_cast<Open_type_font *> (fm->original_font ())
     : dynamic_cast<Open_type_font *> (unsmob_metrics (font));
 
   return scm_from_bool (otf);
 }
 
-LY_DEFINE (ly_otf_glyph_list, "ly:otf-glyph-list",
-	   1, 0, 0, (SCM font),
-	   "Return a list of glyph names for @var{font}.")
+LY_DEFINE (ly_otf_glyph_count, "ly:otf-glyph-count", 1, 0, 0,
+	   (SCM font),
+	   "Return the the number of glyphs in @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__, "OpenType font");
 
-  Open_type_font *otf = fm ? dynamic_cast<Open_type_font *> (fm->original_font ())
+  return scm_from_int ((int) otf->count ());
+}
+
+LY_DEFINE (ly_otf_glyph_list, "ly:otf-glyph-list", 1, 0, 0,
+	   (SCM font),
+	   "Return a list of glyph names 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__, "OpenType font");
 
-  SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OTF font");
   return otf->glyph_list ();
-
 }