unsmob_pitch -> Pitch::unsmob and related

[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 3ce37b6ef7c060f990a969f4efc6af9bcf0796d5..3ec403c9fcbe7f3b7c8021f926eab0c4aed8a214 100644 (file)
--- a/lily/open-type-font-scheme.cc
+++ b/lily/open-type-font-scheme.cc
@@ -1,35 +1,46 @@
 /*
-  open-type-font.cc -- implement Open_type_font
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2009 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "modified-font-metric.hh"
 #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 = Font_metric::unsmob (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));
+    = dynamic_cast<Modified_font_metric *> (Font_metric::unsmob (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 ())
+                        : dynamic_cast<Open_type_font *> (Font_metric::unsmob (font));
 
   SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OpenType font");
   LY_ASSERT_TYPE (scm_is_string, glyph, 2);
@@ -39,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));
+    = dynamic_cast<Modified_font_metric *> (Font_metric::unsmob (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 ())
+                        : dynamic_cast<Open_type_font *> (Font_metric::unsmob (font));
 
   SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OpenType font");
   LY_ASSERT_TYPE (scm_is_string, tag, 2);
@@ -63,27 +74,27 @@ LY_DEFINE (ly_otf_font_table_data, "ly:otf-font-table-data", 2, 0, 0,
 }
 
 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));
+    = dynamic_cast<Modified_font_metric *> (Font_metric::unsmob (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 ())
+                        : dynamic_cast<Open_type_font *> (Font_metric::unsmob (font));
 
   return scm_from_bool (otf);
 }
 
 LY_DEFINE (ly_otf_glyph_count, "ly:otf-glyph-count", 1, 0, 0,
-          (SCM font),
-          "Return the 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));
+    = dynamic_cast<Modified_font_metric *> (Font_metric::unsmob (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 ())
+                        : dynamic_cast<Open_type_font *> (Font_metric::unsmob (font));
 
   SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OpenType font");
 
@@ -91,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));
+    = dynamic_cast<Modified_font_metric *> (Font_metric::unsmob (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 ())
+                        : dynamic_cast<Open_type_font *> (Font_metric::unsmob (font));
 
   SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OpenType font");