X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fopen-type-font-scheme.cc;h=bba695ba00c147c5412cfd3934f877f7322501c2;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;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..bba695ba00 100644 --- a/lily/open-type-font-scheme.cc +++ b/lily/open-type-font-scheme.cc @@ -1,34 +1,48 @@ /* - 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--2015 Han-Wen Nienhuys - (c) 2004--2007 Han-Wen Nienhuys + 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 . */ #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 (unsmob_metrics (font)); - Open_type_font *otf = dynamic_cast (fm->original_font ()); + = dynamic_cast (Font_metric::unsmob (font)); + Open_type_font *otf = fm + ? dynamic_cast (fm->original_font ()) + : dynamic_cast (Font_metric::unsmob (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); @@ -36,17 +50,17 @@ 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 (unsmob_metrics (font)); + = dynamic_cast (Font_metric::unsmob (font)); + Open_type_font *otf = fm + ? dynamic_cast (fm->original_font ()) + : dynamic_cast (Font_metric::unsmob (font)); - Open_type_font *otf = fm ? dynamic_cast (fm->original_font ()) - : dynamic_cast (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] = " "; @@ -60,30 +74,44 @@ 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 (unsmob_metrics (font)); - - Open_type_font *otf = fm ? dynamic_cast (fm->original_font ()) - : dynamic_cast (unsmob_metrics (font)); + = dynamic_cast (Font_metric::unsmob (font)); + Open_type_font *otf = fm + ? dynamic_cast (fm->original_font ()) + : dynamic_cast (Font_metric::unsmob (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 number of glyphs in @var{font}.") { Modified_font_metric *fm - = dynamic_cast (unsmob_metrics (font)); + = dynamic_cast (Font_metric::unsmob (font)); + Open_type_font *otf = fm + ? dynamic_cast (fm->original_font ()) + : dynamic_cast (Font_metric::unsmob (font)); - Open_type_font *otf = fm ? dynamic_cast (fm->original_font ()) - : dynamic_cast (unsmob_metrics (font)); + SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OpenType font"); + return scm_from_int ((int) otf->count ()); +} - SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OTF font"); - return otf->glyph_list (); +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 (Font_metric::unsmob (font)); + Open_type_font *otf = fm + ? dynamic_cast (fm->original_font ()) + : dynamic_cast (Font_metric::unsmob (font)); + SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OpenType font"); + + return otf->glyph_list (); }