X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=655d992123f4859cbc4d73cbdf430d22fbaafc4e;hb=9d9e2e5637e06d98245c3395b58207ec173e7e7d;hp=65ecc6cc6cf073d0d24f28c647cd3c94c473bac7;hpb=349f599ad3c120db8c82e4d7139b0914f484ed19;p=lilypond.git diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 65ecc6cc6c..655d992123 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -1,92 +1,53 @@ -/* - 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) - */ + (c) 1999--2007 Han-Wen Nienhuys -#include -#include + Mats Bengtsson (the ugly TeX parsing in text_dimension) +*/ -#include "virtual-methods.hh" -#include "warn.hh" +#include "font-metric.hh" + +#include +#include +using namespace std; + +#include "dimensions.hh" +#include "modified-font-metric.hh" +#include "open-type-font.hh" #include "stencil.hh" +#include "warn.hh" + #include "ly-smobs.icc" -#include "font-metric.hh" -#include "string.hh" Real Font_metric::design_size () const { - return 1.0; + return 1.0 * point_constant; } -String -Font_metric::coding_scheme () const +Stencil +Font_metric::find_by_name (string s) const { - return "FontSpecific"; -} + replace_all (s, '-', 'M'); + int idx = name_to_index (s); + Box b; -Box -Font_metric::text_dimension (String text) const -{ - Interval ydims; - Real w=0.0; - - for (int i = 0; i < text.length (); i++) + SCM expr = SCM_EOL; + if (idx >= 0) { - - 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; - } + expr = scm_list_3 (ly_symbol2scm ("named-glyph"), + self_scm (), + ly_string2scm (s)); + b = get_indexed_char (idx); } - if (ydims.is_empty ()) - ydims = Interval (0, 0); - return Box (Interval (0, w), ydims); + Stencil q (b, expr); + return q; } - Font_metric::Font_metric () { description_ = SCM_EOL; @@ -98,50 +59,49 @@ 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); } 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_; } @@ -151,134 +111,90 @@ 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?"); -Stencil -Font_metric::find_by_name (String) const +SCM +Font_metric::font_file_name () const { - Stencil m; - return m; + return scm_car (description_); } -LY_DEFINE (ly_find_glyph_by_name, "ly:find-glyph-by-name", - 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. ") +string +Font_metric::font_name () const { - 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"); - - Stencil m = fm->find_by_name (ly_scm2string (name)); - - /* TODO: make optional argument for default if not found. */ - return m.smobbed_copy (); + string s ("unknown"); + return s; } -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}.") +size_t +Font_metric::index_to_ascii (size_t i) const { - 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"); - - return fm->get_ascii_char_stencil (gh_scm2int (index)).smobbed_copy (); + return i; } -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.") +size_t +Font_metric::index_to_charcode (size_t i) const { - 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"); + return index_to_ascii (i); +} - b = fm->text_dimension (ly_scm2string (text)); - - return gh_cons (ly_interval2scm (b[X_AXIS]), ly_interval2scm (b[Y_AXIS])); +Stencil +Font_metric::get_ascii_char_stencil (size_t code) const +{ + SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (), + scm_from_unsigned (code)); + Box b = get_ascii_char (code); + return Stencil (b, at); } -LY_DEFINE (ly_font_name,"ly:font-name", - 1, 0, 0, - (SCM font), - "Given the font metric @var{font}, " - "return the corresponding file name.") +Stencil +Font_metric::get_indexed_char_stencil (size_t code) const { - Font_metric *fm = unsmob_metrics (font); - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - return gh_car (fm->description_); + 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); } -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.") +Offset +Font_metric::attachment_point (string) const { - Font_metric *fm = unsmob_metrics (font); - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - return gh_cdr (fm->description_); + return Offset (0, 0); } -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.") +SCM +Font_metric::sub_fonts () const { - Font_metric *fm = unsmob_metrics (font); - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - return gh_double2scm (fm->design_size ()); + return SCM_EOL; } Stencil -Font_metric::get_ascii_char_stencil (int code) const +Font_metric::word_stencil (string str) const { - SCM at = scm_list_2 (ly_symbol2scm ("char"), gh_int2scm (code)); - at = fontify_atom (this, at); - Box b = get_ascii_char (code); - return Stencil (b, at); + return text_stencil (str); } Stencil -Font_metric::get_indexed_char_stencil (int code) const +Font_metric::text_stencil (string str) const { - SCM at = scm_list_2 (ly_symbol2scm ("char"), gh_int2scm (code)); - at = fontify_atom (this, at); - Box b = get_indexed_char (code); - return Stencil (b, at); + (void) str; + programming_error("Cannot get a text stencil from this font"); + return Stencil (Box (), SCM_EOL); } -int -/*Font_metric::*/ -get_encoded_index (Font_metric *m, String input_coding, int code) +Box +Font_metric::text_dimension (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 gh_scm2int (s); + return Box (Interval (0, 0), Interval (0, 0)); } +