X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fopen-type-font-scheme.cc;h=79fe34dcd64f75437eeba4d95c5c2faceca3f079;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=147320521004d006052c76e1a9ebd50c4a61291e;hpb=1dd803cf0f3ed07a0e9e8b49dd66b84152c64b27;p=lilypond.git

diff --git a/lily/open-type-font-scheme.cc b/lily/open-type-font-scheme.cc
index 1473205210..79fe34dcd6 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--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "modified-font-metric.hh"
@@ -11,51 +11,79 @@
 
 LY_DEFINE (ly_font_sub_fonts, "ly:font-sub-fonts", 1, 0, 0,
 	   (SCM font),
-	   "Given the font metric @var{font} of an OpenType font, return the "
-	   "names of the subfonts within @var{font}.")
+	   "Given the font metric @var{font} of an OpenType font, return the"
+	   " names of the subfonts within @var{font}.")
 {
+  LY_ASSERT_SMOB (Font_metric, font, 1);
   Font_metric *fm = unsmob_metrics (font);
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
   return fm->sub_fonts ();
 }
 
 LY_DEFINE (ly_otf_font_glyph_info, "ly:otf-font-glyph-info", 2, 0, 0,
 	   (SCM font, SCM glyph),
-	   "Given the font metric @var{font} of an OpenType font, return the "
-	   "information about named glyph @var{glyph} (a string)")
+	   "Given the font metric @var{font} of an OpenType font, return the"
+	   " information about named glyph @var{glyph} (a string).")
 {
   Modified_font_metric *fm
     = dynamic_cast<Modified_font_metric *> (unsmob_metrics (font));
   Open_type_font *otf = dynamic_cast<Open_type_font *> (fm->original_font ());
+
   SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OTF font-metric");
-  SCM_ASSERT_TYPE (scm_is_string (glyph), glyph, SCM_ARG1,
-		   __FUNCTION__, "string");
+  LY_ASSERT_TYPE (scm_is_string, glyph, 2);
 
   SCM sym = scm_string_to_symbol (glyph);
   return scm_hashq_ref (otf->get_char_table (), sym, SCM_EOL);
 }
 
+LY_DEFINE (ly_otf_font_table_data, "ly:otf-font-table-data", 2, 0, 0,
+	   (SCM font, SCM tag),
+	   "Extract a table @var{tag} from @var{font}.  Return empty string"
+	   " for non-existent @var{tag}.")
+{
+  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__, "Open type font");
+  LY_ASSERT_TYPE (scm_is_string, tag, 2);
+
+  char ctag [5] = "    ";
+
+  string tag_string = ly_scm2string (tag);
+  strncpy (ctag, tag_string.c_str (), tag_string.length ());
+
+  string tab = otf->get_otf_table (string (ctag));
 
-LY_DEFINE(ly_otf_font_table_data, "ly:otf-font-table-data", 2, 0, 0,
-	  (SCM font, SCM tag),
-	  "Extract a table @var{tag} from @var{font}.")
+  return scm_from_locale_stringn ((char const *) tab.data (), tab.length ());
+}
+
+LY_DEFINE (ly_otf_font_p, "ly:otf-font?", 1, 0, 0,
+	   (SCM font),
+	   "Is @var{font} an OpenType 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));
 
+  return scm_from_bool (otf);
+}
 
-  SCM_ASSERT_TYPE (otf, font, SCM_ARG1,  __FUNCTION__, "Open type font");
-  SCM_ASSERT_TYPE (scm_is_string (tag), tag, SCM_ARG1,  __FUNCTION__, "Open type font");
+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));
 
-  char ctag [5] = "    ";
+  Open_type_font *otf = fm ? dynamic_cast<Open_type_font *> (fm->original_font ())
+    : dynamic_cast<Open_type_font *> (unsmob_metrics (font));
 
-  String tag_string = ly_scm2string (tag);
-  strncpy (ctag, tag_string.to_str0 (), tag_string.length());
 
-  String tab = otf->get_otf_table (String (ctag));
+  SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OTF font");
+  return otf->glyph_list ();
 
-  return scm_from_locale_stringn ((char const*) tab.to_bytes (), tab.length ());
 }