X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=dd1d6245ca2209ced80154bd0492d3972081a524;hb=955a0a8fa4aa5a1539a4dd281bffb1eb8e614e90;hp=cbaa78603cdaead298f736b2be54597c56225ecb;hpb=a75890d466b161695315791db1ae3102fbb130dc;p=lilypond.git diff --git a/lily/font-metric.cc b/lily/font-metric.cc index cbaa78603c..dd1d6245ca 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -13,40 +13,36 @@ #include #include +#include "dimensions.hh" #include "modified-font-metric.hh" +#include "open-type-font.hh" +#include "stencil.hh" #include "virtual-methods.hh" #include "warn.hh" -#include "stencil.hh" #include "ly-smobs.icc" Real Font_metric::design_size () const { - return 1.0; + return 1.0 * point_constant; } -String -Font_metric::coding_scheme () const -{ - return "FontSpecific"; -} Stencil Font_metric::find_by_name (String s) const { - // FIXME: past tense in func name? - // $23 = 0x865ba10 "clefsMG_change" - s = s.substituted ('-', "M"); + s.substitute_char ('-', "M"); int idx = name_to_index (s); Box b; SCM expr = SCM_EOL; if (idx >= 0) { - expr = scm_list_3 (ly_symbol2scm ("char"), + expr = scm_list_3 (ly_symbol2scm ("named-glyph"), self_scm (), - scm_int2num (index_to_ascii (idx))); + scm_makfrom0str (s.to_str0 ()) + ); b = get_indexed_char (idx); } @@ -132,112 +128,21 @@ IMPLEMENT_DEFAULT_EQUAL_P (Font_metric); IMPLEMENT_TYPE_P (Font_metric, "ly:font-metric?"); -LY_DEFINE (ly_font_get_glyph, "ly:font-get-glyph", - 2, 0, 0, - (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"); - - Stencil m = fm->find_by_name (ly_scm2string (name)); - - /* TODO: make optional argument for default if not found. */ - return m.smobbed_copy (); -} - -LY_DEFINE (ly_get_glyph, "ly:get-glyph", - 2, 0, 0, - (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"); - - return fm->get_ascii_char_stencil (scm_to_int (index)).smobbed_copy (); -} - -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}, " - "compute the extents of that text in that font. " - "The return value is a pair of number-pairs.") +SCM +Font_metric::font_file_name () const { - Box b; - 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"); - - b = fm->text_dimension (ly_scm2string (text)); - - return scm_cons (ly_interval2scm (b[X_AXIS]), ly_interval2scm (b[Y_AXIS])); + return scm_car (description_); } -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.") +String +Font_metric::font_name () const { - Font_metric *fm = unsmob_metrics (font); - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - return scm_car (fm->description_); + String s ("unknown"); + return s; } - #include "afm.hh" -LY_DEFINE (ly_font_name,"ly:font-name", - 1, 0, 0, - (SCM font), - "Given the font metric @var{font}, " - "return the corresponding name.") -{ - Font_metric *fm = unsmob_metrics (font); - - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - - - if (Modified_font_metric* mfm = dynamic_cast (fm)) - return ly_font_name (mfm->original_font ()->self_scm ()); - else if (Adobe_font_metric* afm = dynamic_cast (fm)) - { - return scm_makfrom0str (afm->font_info_->gfi->fontName); - } - else - return SCM_BOOL_F; -} - - - -LY_DEFINE (ly_font_magnification,"ly:font-magnification", 1 , 0, 0, - (SCM font), - "Given the font metric @var{font}, return the " - "magnification, relative to the current outputscale.") -{ - 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), - "Given the font metric @var{font}, return the " - "design size, relative to the current outputscale.") -{ - Font_metric *fm = unsmob_metrics (font); - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - return scm_make_real (fm->design_size ()); -} - - int Font_metric::index_to_ascii (int i) const @@ -245,11 +150,16 @@ Font_metric::index_to_ascii (int i) const return i; } +unsigned +Font_metric::index_to_charcode (int i) const +{ + return (unsigned) index_to_ascii (i); +} + Stencil Font_metric::get_ascii_char_stencil (int code) const { - SCM at = scm_list_3 (ly_symbol2scm ("char"), - this->self_scm (), + SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (), scm_int2num (code)); Box b = get_ascii_char (code); return Stencil (b, at); @@ -264,16 +174,33 @@ Font_metric::get_indexed_char_stencil (int code) const return Stencil (b, at); } -int -/*Font_metric::*/ -get_encoded_index (Font_metric *m, String input_coding, int code) + +Offset +Font_metric::attachment_point (String) const { - String font_coding = m->coding_scheme (); - if (font_coding == input_coding) - return code; - SCM s = scm_call_3 (ly_scheme_function ("encoded-index"), - scm_makfrom0str (input_coding.to_str0 ()), - scm_makfrom0str (font_coding.to_str0 ()), - scm_int2num (code)); - return scm_to_int (s); + return Offset (0, 0); } + +SCM +Font_metric::sub_fonts () const +{ + return SCM_EOL; +} + +Stencil +Font_metric::text_stencil (String str) const +{ + SCM lst = scm_list_3 (ly_symbol2scm ("text"), + this->self_scm (), + scm_makfrom0str (str.to_str0 ())); + + Box b = text_dimension (str); + return Stencil (b, lst); +} + +Box +Font_metric::text_dimension (String) const +{ + return Box (Interval (0,0), Interval (0,0)); +} +