X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric-scheme.cc;h=aa49a29e23ee333607ae290880c0f69165469579;hb=b86ae6ea1169de69d9ade83d7ec1299ef091acf3;hp=8ccb94dbc703ffb468bf7eee3ac2abc1d4797f83;hpb=eea589c2d7bee6ab38bc611eb205d4c74e2011f7;p=lilypond.git diff --git a/lily/font-metric-scheme.cc b/lily/font-metric-scheme.cc index 8ccb94dbc7..aa49a29e23 100644 --- a/lily/font-metric-scheme.cc +++ b/lily/font-metric-scheme.cc @@ -1,26 +1,27 @@ /* - font-metric-scheme.cc -- implement Font_metric scheme bindings + font-metric-scheme.cc -- implement Font_metric scheme bindings source file of the GNU LilyPond music typesetter - (c) 2005 Han-Wen Nienhuys - + (c) 2005--2007 Han-Wen Nienhuys */ -#include "stencil.hh" #include "font-metric.hh" + +#include "warn.hh" +#include "stencil.hh" #include "modified-font-metric.hh" LY_DEFINE (ly_font_get_glyph, "ly:font-get-glyph", 2, 0, 0, - (SCM font, SCM name), + (SCM font, SCM name), "Return a Stencil from @var{font} for the glyph named @var{name}. " "@var{font} must be available as an AFM file. If the glyph " "is not available, return @code{#f}.") { Font_metric *fm = unsmob_metrics (font); - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG2, __FUNCTION__, "string"); + LY_ASSERT_SMOB (Font_metric, font, 1); + LY_ASSERT_TYPE (scm_is_string, name, 2); Stencil m = fm->find_by_name (ly_scm2string (name)); @@ -30,85 +31,88 @@ LY_DEFINE (ly_font_get_glyph, "ly:font-get-glyph", LY_DEFINE (ly_get_glyph, "ly:get-glyph", 2, 0, 0, - (SCM font, SCM index), + (SCM font, SCM index), "Retrieve a Stencil for the glyph numbered @var{index} " "in @var{font}.") { Font_metric *fm = unsmob_metrics (font); - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - SCM_ASSERT_TYPE (scm_is_number (index), index, SCM_ARG2, __FUNCTION__, "number"); + LY_ASSERT_SMOB (Font_metric, font, 1); + LY_ASSERT_TYPE (scm_is_number, index,2); return fm->get_ascii_char_stencil (scm_to_int (index)).smobbed_copy (); } LY_DEFINE (ly_font_glyph_name_to_index, "ly:font-glyph-name-to-index", 2, 0, 0, - (SCM font, SCM name), + (SCM font, SCM name), "Return the index for @var{name} in @var{font}.") { Font_metric *fm = unsmob_metrics (font); - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG2, __FUNCTION__, "string"); + LY_ASSERT_SMOB (Font_metric, font, 1); + LY_ASSERT_TYPE (scm_is_string, name, 2); return scm_from_int (fm->name_to_index (ly_scm2string (name))); } LY_DEFINE (ly_font_index_to_charcode, "ly:font-index-to-charcode", 2, 0, 0, - (SCM font, SCM index), + (SCM font, SCM index), "Return the character code for @var{index} @var{font}.") { Font_metric *fm = unsmob_metrics (font); - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - SCM_ASSERT_TYPE (scm_is_integer (index), index, SCM_ARG2, __FUNCTION__, "index"); + LY_ASSERT_SMOB (Font_metric, font, 1); + LY_ASSERT_TYPE (scm_is_integer, index, 2); return scm_from_unsigned_integer (fm->index_to_charcode (scm_to_int (index))); } LY_DEFINE (ly_font_glyph_name_to_charcode, "ly:font-glyph-name-to-charcode", 2, 0, 0, - (SCM font, SCM name), + (SCM font, SCM name), "Return the character code for glyph @var{name} in @var{font}.") { Font_metric *fm = unsmob_metrics (font); - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG2, __FUNCTION__, "string"); -#if 1 + LY_ASSERT_SMOB (Font_metric, font, 1); + LY_ASSERT_TYPE (scm_is_string, name, 2); + return scm_from_unsigned_integer (fm->index_to_charcode (fm->name_to_index (ly_scm2string (name)))); -#else - return scm_from_unsigned_integer (fm->glyph_name_to_charcode (ly_scm2string (name))); -#endif } LY_DEFINE (ly_text_dimension, "ly:text-dimension", 2, 0, 0, - (SCM font, SCM text), - "Given the font metric in @var{font} and the string @var{text}, " + (SCM font, SCM text), + "Given the font metric in @var{font} and the string @var{text}, " "compute the extents of that text in that font. " "The return value is a pair of number-pairs.") { Box b; - Modified_font_metric*fm = dynamic_cast + Modified_font_metric *fm = dynamic_cast (unsmob_metrics (font)); - - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "modified font metric"); - SCM_ASSERT_TYPE (scm_is_string (text), text, SCM_ARG2, __FUNCTION__, "string"); + + LY_ASSERT_SMOB (Font_metric, font, 1); + LY_ASSERT_TYPE (scm_is_string, text, 2); Stencil stc (fm->text_stencil (ly_scm2string (text))); return scm_cons (ly_interval2scm (stc.extent (X_AXIS)), ly_interval2scm (stc.extent (Y_AXIS))); } + +/* + TODO: when are non string retvals allowed? + */ LY_DEFINE (ly_font_file_name, "ly:font-file-name", 1, 0, 0, (SCM font), "Given the font metric @var{font}, " "return the corresponding file name.") { + 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->font_file_name(); -} + SCM name = fm->font_file_name (); + return name; +} LY_DEFINE (ly_font_name, "ly:font-name", 1, 0, 0, @@ -116,29 +120,31 @@ LY_DEFINE (ly_font_name, "ly:font-name", "Given the font metric @var{font}, " "return the corresponding name.") { + LY_ASSERT_SMOB (Font_metric, font, 1); Font_metric *fm = unsmob_metrics (font); - - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - return scm_makfrom0str (fm->font_name().to_str0 ()); + + return ly_string2scm (fm->font_name ()); } LY_DEFINE (ly_font_magnification, "ly:font-magnification", 1, 0, 0, - (SCM font), + (SCM font), "Given the font metric @var{font}, return the " - "magnification, relative to the current outputscale.") + "magnification, relative to the current output-scale.") { + LY_ASSERT_SMOB (Font_metric, font, 1); + Font_metric *fm = unsmob_metrics (font); - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); return scm_cdr (fm->description_); } LY_DEFINE (ly_font_design_size, "ly:font-design-size", 1, 0, 0, - (SCM font), + (SCM font), "Given the font metric @var{font}, return the " - "design size, relative to the current outputscale.") + "design size, relative to the current output-scale.") { + LY_ASSERT_SMOB (Font_metric, font, 1); + Font_metric *fm = unsmob_metrics (font); - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - return scm_make_real (fm->design_size ()); + return scm_from_double (fm->design_size ()); }