X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fopen-type-font-scheme.cc;h=79370fa698dffa4b3eeea8d997c53163ee7ffe4f;hb=48c0f8c8843785c20f84bd113c6dea1a0c95a70c;hp=fd48290aa000bf3ce958e2c5ea7a36fa9d840ca0;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/open-type-font-scheme.cc b/lily/open-type-font-scheme.cc
index fd48290aa0..79370fa698 100644
--- a/lily/open-type-font-scheme.cc
+++ b/lily/open-type-font-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,26 +21,26 @@
 #include "open-type-font.hh"
 
 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}.")
+           (SCM 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);
+  Font_metric *fm = unsmob<Font_metric> (font);
   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).")
+           (SCM font, SCM glyph),
+           "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));
+    = unsmob<Modified_font_metric> (font);
   Open_type_font *otf = fm
-    ? dynamic_cast<Open_type_font *> (fm->original_font ())
-    : dynamic_cast<Open_type_font *> (unsmob_metrics (font));
+                        ? dynamic_cast<Open_type_font *> (fm->original_font ())
+                        : unsmob<Open_type_font> (font);
 
   SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OpenType font");
   LY_ASSERT_TYPE (scm_is_string, glyph, 2);
@@ -50,15 +50,15 @@ LY_DEFINE (ly_otf_font_glyph_info, "ly:otf-font-glyph-info", 2, 0, 0,
 }
 
 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}.")
+           (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));
+    = unsmob<Modified_font_metric> (font);
   Open_type_font *otf = fm
-    ? dynamic_cast<Open_type_font *> (fm->original_font ())
-    : dynamic_cast<Open_type_font *> (unsmob_metrics (font));
+                        ? dynamic_cast<Open_type_font *> (fm->original_font ())
+                        : unsmob<Open_type_font> (font);
 
   SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OpenType font");
   LY_ASSERT_TYPE (scm_is_string, tag, 2);
@@ -70,31 +70,31 @@ LY_DEFINE (ly_otf_font_table_data, "ly:otf-font-table-data", 2, 0, 0,
 
   string tab = otf->get_otf_table (string (ctag));
 
-  return scm_from_locale_stringn ((char const *) tab.data (), tab.length ());
+  return scm_from_latin1_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?")
+           (SCM font),
+           "Is @var{font} an OpenType font?")
 {
   Modified_font_metric *fm
-    = dynamic_cast<Modified_font_metric *> (unsmob_metrics (font));
+    = unsmob<Modified_font_metric> (font);
   Open_type_font *otf = fm
-    ? dynamic_cast<Open_type_font *> (fm->original_font ())
-    : dynamic_cast<Open_type_font *> (unsmob_metrics (font));
+                        ? dynamic_cast<Open_type_font *> (fm->original_font ())
+                        : unsmob<Open_type_font> (font);
 
   return scm_from_bool (otf);
 }
 
 LY_DEFINE (ly_otf_glyph_count, "ly:otf-glyph-count", 1, 0, 0,
-	   (SCM font),
-	   "Return the number of glyphs in @var{font}.")
+           (SCM font),
+           "Return the number of glyphs in @var{font}.")
 {
   Modified_font_metric *fm
-    = dynamic_cast<Modified_font_metric *> (unsmob_metrics (font));
+    = unsmob<Modified_font_metric> (font);
   Open_type_font *otf = fm
-    ? dynamic_cast<Open_type_font *> (fm->original_font ())
-    : dynamic_cast<Open_type_font *> (unsmob_metrics (font));
+                        ? dynamic_cast<Open_type_font *> (fm->original_font ())
+                        : unsmob<Open_type_font> (font);
 
   SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OpenType font");
 
@@ -102,14 +102,14 @@ LY_DEFINE (ly_otf_glyph_count, "ly:otf-glyph-count", 1, 0, 0,
 }
 
 LY_DEFINE (ly_otf_glyph_list, "ly:otf-glyph-list", 1, 0, 0,
-	   (SCM font),
-	   "Return a list of glyph names for @var{font}.")
+           (SCM font),
+           "Return a list of glyph names for @var{font}.")
 {
   Modified_font_metric *fm
-    = dynamic_cast<Modified_font_metric *> (unsmob_metrics (font));
+    = unsmob<Modified_font_metric> (font);
   Open_type_font *otf = fm
-    ? dynamic_cast<Open_type_font *> (fm->original_font ())
-    : dynamic_cast<Open_type_font *> (unsmob_metrics (font));
+                        ? dynamic_cast<Open_type_font *> (fm->original_font ())
+                        : unsmob<Open_type_font> (font);
 
   SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OpenType font");