X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=be4a3a23b631dd3048f8b259a9d5b5c93a4a228b;hb=7a42c24ad876cae059e4425331a3b873575c157b;hp=f8083f5952319fd89fd261aceee42db37ffd890f;hpb=5547ff00446ba0ac2bdbd1fe3205c2fb8411bb2f;p=lilypond.git diff --git a/lily/font-metric.cc b/lily/font-metric.cc index f8083f5952..be4a3a23b6 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -1,22 +1,24 @@ /* - font-metric.cc -- implement Font_metric + font-metric.cc -- implement Font_metric source file of the GNU LilyPond music typesetter (c) 1999--2004 Han-Wen Nienhuys Mats Bengtsson (the ugly TeX parsing in text_dimension) - */ +*/ + +#include "font-metric.hh" #include -#include +#include +#include "modified-font-metric.hh" #include "virtual-methods.hh" #include "warn.hh" #include "stencil.hh" + #include "ly-smobs.icc" -#include "font-metric.hh" -#include "string.hh" Real Font_metric::design_size () const @@ -24,66 +26,31 @@ Font_metric::design_size () const return 1.0; } -Box -Font_metric::text_dimension (String text) const +String +Font_metric::coding_scheme () const { - Interval ydims; - Real w=0.0; - - for (int i = 0; i < text.length (); i++) - { - - switch (text[i]) - { - case '\\': - // accent marks use width of base letter - if (i +1 < text.length ()) - { - if (text[i+1]=='\'' || text[i+1]=='`' || text[i+1]=='"' || - text[i+1]=='^') - { - i++; - break; - } - // for string width \\ is a \ and \_ is a _. - if (text[i+1]=='\\' || text[i+1]=='_') - { - break; - } - } - - for (i++; (i < text.length ()) && !isspace (text[i]) - && text[i]!='{' && text[i]!='}'; i++) - ; - // ugh. - i--; // Compensate for the increment in the outer loop! - break; - case '{': // Skip '{' and '}' - case '}': - break; - - default: - Box b = get_ascii_char ((unsigned char)text[i]); - - // Ugh, use the width of 'x' for unknown characters - if (b[X_AXIS].length () == 0) - b = get_ascii_char ((unsigned char)'x'); - - w += b[X_AXIS].length (); - ydims.unite (b[Y_AXIS]); - break; - } - } - if (ydims.is_empty ()) - ydims = Interval (0,0); - - return Box (Interval (0, w), ydims); + return "FontSpecific"; } - - -Font_metric::~Font_metric () +Stencil +Font_metric::find_by_name (String s) const { + 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 ("named-glyph"), + self_scm (), + scm_makfrom0str (s.to_str0 ()) + ); + b = get_indexed_char (idx); + } + + Stencil q (b, expr); + return q; } Font_metric::Font_metric () @@ -97,6 +64,11 @@ Font_metric::Font_metric (Font_metric const &) { } + +Font_metric::~Font_metric () +{ +} + int Font_metric::count () const { @@ -106,7 +78,7 @@ Font_metric::count () const Box Font_metric::get_ascii_char (int) const { - return Box (Interval (0,0),Interval (0,0)); + return Box (Interval (0, 0), Interval (0, 0)); } Box @@ -115,7 +87,6 @@ Font_metric::get_indexed_char (int k) const return get_ascii_char (k); } - int Font_metric::name_to_index (String) const { @@ -123,22 +94,20 @@ Font_metric::name_to_index (String) const } Offset -Font_metric::get_indexed_wxwy (int )const +Font_metric::get_indexed_wxwy (int) const { - return Offset (0,0); + return Offset (0, 0); } void -Font_metric::derived_mark ()const +Font_metric::derived_mark () const { - } SCM Font_metric::mark_smob (SCM s) { - Font_metric * m = (Font_metric*) SCM_CELL_WORD_1 (s); - + Font_metric *m = (Font_metric*) SCM_CELL_WORD_1 (s); m->derived_mark (); return m->description_; } @@ -161,70 +130,104 @@ IMPLEMENT_SMOBS (Font_metric); IMPLEMENT_DEFAULT_EQUAL_P (Font_metric); IMPLEMENT_TYPE_P (Font_metric, "ly:font-metric?"); -Stencil -Font_metric::find_by_name (String) const -{ - Stencil m ; - return m; -} -LY_DEFINE (ly_find_glyph_by_name, "ly:find-glyph-by-name", 2 , 0, 0, +LY_DEFINE (ly_font_get_glyph, "ly:font-get-glyph", + 2, 0, 0, (SCM font, SCM name), - "This function retrieves a Stencil for the glyph named @var{name} " - "in " - "@var{font}. " - "The font must be available as an AFM file. If the glyph " - "is not found, @code{#f} is returned. ") + "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 (gh_string_p (name), name, SCM_ARG2, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG2, __FUNCTION__, "string"); - Stencil m = fm->find_by_name (ly_scm2string (name)); + Stencil m = fm->find_by_name (ly_scm2string (name)); - /* - TODO: make optional argument for default if not found. - */ + /* TODO: make optional argument for default if not found. */ return m.smobbed_copy (); } -LY_DEFINE (ly_get_glyph, "ly:get-glyph", 2 , 0, 0, +LY_DEFINE (ly_get_glyph, "ly:get-glyph", + 2, 0, 0, (SCM font, SCM index), - "This function retrieves a Stencil for the glyph numbered @var{index} in " -"@var{font}. ") + "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 (gh_number_p (index), index, SCM_ARG2, __FUNCTION__, "number"); + SCM_ASSERT_TYPE (scm_is_number (index), index, SCM_ARG2, __FUNCTION__, "number"); - return fm->get_ascii_char_stencil (gh_scm2int (index)).smobbed_copy (); + 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.") +LY_DEFINE (ly_font_get_glyph_index, "ly:font-get-glyph-index", + 2, 0, 0, + (SCM font, SCM name), + "Return the index for @{name} in @var{font}.") { - Box b; Font_metric *fm = unsmob_metrics (font); SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - SCM_ASSERT_TYPE (gh_string_p (text), text, SCM_ARG2, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG2, __FUNCTION__, "string"); + + return scm_from_int (fm->name_to_index (ly_scm2string (name))); +} +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.") +{ + 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 gh_cons (ly_interval2scm (b[X_AXIS]), ly_interval2scm (b[Y_AXIS])); + return scm_cons (ly_interval2scm (b[X_AXIS]), ly_interval2scm (b[Y_AXIS])); } -LY_DEFINE (ly_font_name,"ly:font-name", 1 , 0, 0, - (SCM font), - "Given the font metric @var{font}, return the corresponding file name. ") +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.") { Font_metric *fm = unsmob_metrics (font); SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - return gh_car (fm->description_); + return scm_car (fm->description_); } + +#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 " @@ -232,7 +235,7 @@ LY_DEFINE (ly_font_magnification,"ly:font-magnification", 1 , 0, 0, { Font_metric *fm = unsmob_metrics (font); SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - return gh_cdr (fm->description_); + return scm_cdr (fm->description_); } LY_DEFINE (ly_font_design_size,"ly:font-design-size", 1 , 0, 0, @@ -242,26 +245,52 @@ LY_DEFINE (ly_font_design_size,"ly:font-design-size", 1 , 0, 0, { Font_metric *fm = unsmob_metrics (font); SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - return gh_cdr (fm->description_); + return scm_make_real (fm->design_size ()); } + +int +Font_metric::index_to_ascii (int i) const +{ + return i; +} + Stencil -Font_metric::get_ascii_char_stencil (int code) const +Font_metric::get_ascii_char_stencil (int code) const { - SCM at = scm_list_n (ly_symbol2scm ("char"), gh_int2scm (code), - SCM_UNDEFINED); - at = fontify_atom (this, at); + SCM at = scm_list_3 (ly_symbol2scm ("char"), + this->self_scm (), + scm_int2num (code)); Box b = get_ascii_char (code); return Stencil (b, at); } Stencil -Font_metric::get_indexed_char_stencil (int code) const +Font_metric::get_indexed_char_stencil (int code) const { - SCM at = scm_list_n (ly_symbol2scm ("char"), gh_int2scm (code), - SCM_UNDEFINED); - at = fontify_atom (this, at); + int idx = index_to_ascii (code); + SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (), scm_int2num (idx)); Box b = get_indexed_char (code); return Stencil (b, at); } + +int +/*Font_metric::*/ +get_encoded_index (Font_metric *m, String input_coding, int code) +{ + 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); +} + +Offset +Font_metric::attachment_point (String) const +{ + return Offset (0, 0); +}