X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fopen-type-font-scheme.cc;h=6f95641325b5cdc977c5ad9f58f08dc1e243c94c;hb=5bb1618e65e0b8031b9aed8d5f218986e3d3c5a0;hp=b2692d994b6d4c5de60845b713c3a02acb66e918;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/open-type-font-scheme.cc b/lily/open-type-font-scheme.cc
index b2692d994b..6f95641325 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "modified-font-metric.hh"
@@ -14,8 +14,8 @@ LY_DEFINE (ly_font_sub_fonts, "ly:font-sub-fonts", 1, 0, 0,
 	   "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 ();
 }
 
@@ -27,9 +27,9 @@ 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 ());
+
   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);
@@ -47,14 +47,14 @@ LY_DEFINE (ly_otf_font_table_data, "ly:otf-font-table-data", 2, 0, 0,
     : dynamic_cast<Open_type_font *> (unsmob_metrics (font));
 
   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_ASSERT_TYPE (scm_is_string, tag, 2);
 
   char ctag [5] = "    ";
 
-  std::string tag_string = ly_scm2string (tag);
+  string tag_string = ly_scm2string (tag);
   strncpy (ctag, tag_string.c_str (), tag_string.length ());
 
-  std::string tab = otf->get_otf_table (std::string (ctag));
+  string tab = otf->get_otf_table (string (ctag));
 
   return scm_from_locale_stringn ((char const *) tab.data (), tab.length ());
 }
@@ -83,7 +83,7 @@ LY_DEFINE (ly_otf_glyph_list, "ly:otf-glyph-list",
     : dynamic_cast<Open_type_font *> (unsmob_metrics (font));
 
 
-  SCM_ASSERT_TYPE (otf,font, SCM_ARG1, __FUNCTION__, "OTF font");
+  SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OTF font");
   return otf->glyph_list ();
 
 }