X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fopen-type-font-scheme.cc;h=fd48290aa000bf3ce958e2c5ea7a36fa9d840ca0;hb=05514c83a49dd3dfabd1fa7774c69c3038ecde6b;hp=6f95641325b5cdc977c5ad9f58f08dc1e243c94c;hpb=d2300573cae3c1920400d040faddd33f17b43c2d;p=lilypond.git diff --git a/lily/open-type-font-scheme.cc b/lily/open-type-font-scheme.cc index 6f95641325..fd48290aa0 100644 --- a/lily/open-type-font-scheme.cc +++ b/lily/open-type-font-scheme.cc @@ -1,9 +1,20 @@ /* - 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--2011 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" @@ -11,24 +22,27 @@ 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); 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 (unsmob_metrics (font)); - Open_type_font *otf = dynamic_cast (fm->original_font ()); + Open_type_font *otf = fm + ? dynamic_cast (fm->original_font ()) + : dynamic_cast (unsmob_metrics (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); @@ -37,16 +51,16 @@ 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}.") + "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)); - - Open_type_font *otf = fm ? dynamic_cast (fm->original_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] = " "; @@ -65,25 +79,39 @@ LY_DEFINE (ly_otf_font_p, "ly:otf-font?", 1, 0, 0, { Modified_font_metric *fm = dynamic_cast (unsmob_metrics (font)); - - Open_type_font *otf = fm ? dynamic_cast (fm->original_font ()) + Open_type_font *otf = fm + ? dynamic_cast (fm->original_font ()) : dynamic_cast (unsmob_metrics (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 glyphnames 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)); + Open_type_font *otf = fm + ? dynamic_cast (fm->original_font ()) + : dynamic_cast (unsmob_metrics (font)); - Open_type_font *otf = fm ? dynamic_cast (fm->original_font ()) + SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OpenType font"); + + return scm_from_int ((int) otf->count ()); +} + +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 (unsmob_metrics (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"); - SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OTF font"); return otf->glyph_list (); - }