X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=9901f4c38292987ab9376ac524d1c2e2e53a8a6c;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=1a6e215041df7b8e390263a4c275773c559defc7;hpb=085f80bad751ed2ab6f146884271ade8633389e0;p=lilypond.git diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 1a6e215041..9901f4c382 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -1,22 +1,23 @@ -/* +/* 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) + (c) 1999--2008 Han-Wen Nienhuys + + Mats Bengtsson (the ugly TeX parsing in text_dimension) */ #include "font-metric.hh" -#include +#include #include +using namespace std; +#include "dimensions.hh" #include "modified-font-metric.hh" #include "open-type-font.hh" #include "stencil.hh" -#include "virtual-methods.hh" #include "warn.hh" #include "ly-smobs.icc" @@ -24,32 +25,25 @@ Real Font_metric::design_size () const { - return 1.0; -} - -String -Font_metric::coding_scheme () const -{ - return "FontSpecific"; + return 1.0 * point_constant; } Stencil -Font_metric::find_by_name (String s) const +Font_metric::find_by_name (string s) const { - s.substitute_char ('-', "M"); + replace_all (&s, '-', '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 ()) - ); + ly_string2scm (s)); b = get_indexed_char (idx); } - + Stencil q (b, expr); return q; } @@ -65,37 +59,36 @@ Font_metric::Font_metric (Font_metric const &) { } - Font_metric::~Font_metric () { } -int +size_t Font_metric::count () const { return 0; } -Box -Font_metric::get_ascii_char (int) const +Box +Font_metric::get_ascii_char (size_t) const { return Box (Interval (0, 0), Interval (0, 0)); } -Box -Font_metric::get_indexed_char (int k) const +Box +Font_metric::get_indexed_char (size_t k) const { return get_ascii_char (k); } -int -Font_metric::name_to_index (String) const +size_t +Font_metric::name_to_index (string) const { - return -1; + return (size_t)-1; } Offset -Font_metric::get_indexed_wxwy (int) const +Font_metric::get_indexed_wxwy (size_t) const { return Offset (0, 0); } @@ -108,7 +101,7 @@ 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_; } @@ -118,207 +111,63 @@ Font_metric::print_smob (SCM s, SCM port, scm_print_state *) { Font_metric *m = unsmob_metrics (s); scm_puts ("#<", port); - scm_puts (classname (m), port); + scm_puts (m->class_name (), port); scm_puts (" ", port); scm_write (m->description_, port); scm_puts (">", port); return 1; } - - IMPLEMENT_SMOBS (Font_metric); 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_font_glyph_name_to_index, "ly:font-glyph-name-to-index", - 2, 0, 0, - (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"); - - 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), - "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"); - - 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), - "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 - 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}, " - "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"); - Stencil stc (fm->text_stencil (ly_scm2string (text))); - return scm_cons (ly_interval2scm (stc.extent (X_AXIS)), - ly_interval2scm (stc.extent (Y_AXIS))); -} - -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.") +SCM +Font_metric::font_file_name () const { - Font_metric *fm = unsmob_metrics (font); - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - return scm_car (fm->description_); + return scm_car (description_); } -String +string Font_metric::font_name () const { - String s ("unknown"); + 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"); - return scm_makfrom0str (fm->font_name().to_str0 ()); -} - -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 +size_t +Font_metric::index_to_ascii (size_t i) const { return i; } -unsigned -Font_metric::index_to_charcode (int i) const +size_t +Font_metric::index_to_charcode (size_t i) const { - return (unsigned) index_to_ascii (i); + return index_to_ascii (i); } Stencil -Font_metric::get_ascii_char_stencil (int code) const +Font_metric::get_ascii_char_stencil (size_t code) const { SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (), - scm_int2num (code)); + scm_from_unsigned (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 (size_t code) const { - int idx = index_to_ascii (code); - SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (), scm_int2num (idx)); + size_t idx = index_to_ascii (code); + SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (), + scm_from_unsigned (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 +Font_metric::attachment_point (string) const { return Offset (0, 0); } @@ -330,18 +179,22 @@ Font_metric::sub_fonts () const } Stencil -Font_metric::text_stencil (String str) const +Font_metric::word_stencil (string str) const +{ + return text_stencil (str); +} + +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); + (void) str; + programming_error("Cannot get a text stencil from this font"); + return Stencil (Box (), SCM_EOL); } Box -Font_metric::text_dimension (String) const +Font_metric::text_dimension (string) const { - return Box (Interval (0,0), Interval (0,0)); + return Box (Interval (0, 0), Interval (0, 0)); } +