X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=dd1d6245ca2209ced80154bd0492d3972081a524;hb=eea589c2d7bee6ab38bc611eb205d4c74e2011f7;hp=20776e444a6e97c8fc980ca4e9c070b903f518ab;hpb=899a5926b98860f3d5db399616d9211927fbfa3c;p=lilypond.git diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 20776e444a..dd1d6245ca 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -1,82 +1,53 @@ /* - font-metric.cc -- implement Font_metric + font-metric.cc -- implement Font_metric source file of the GNU LilyPond music typesetter - (c) 1999--2002 Han-Wen Nienhuys + (c) 1999--2004 Han-Wen Nienhuys Mats Bengtsson (the ugly TeX parsing in text_dimension) - */ +*/ + +#include "font-metric.hh" #include -#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 "molecule.hh" + #include "ly-smobs.icc" -#include "font-metric.hh" -#include "string.hh" -Box -Font_metric::text_dimension (String text) const +Real +Font_metric::design_size () 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_char ((unsigned char)text[i]); - - // Ugh, use the width of 'x' for unknown characters - if (b[X_AXIS].length () == 0) - b = get_char ((unsigned char)'x'); - - w += b[X_AXIS].length (); - ydims.unite (b[Y_AXIS]); - break; - } - } - if (ydims.empty_b ()) - ydims = Interval (0,0); - - return Box (Interval (0, w), ydims); + return 1.0 * point_constant; } - -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 () @@ -90,6 +61,11 @@ Font_metric::Font_metric (Font_metric const &) { } + +Font_metric::~Font_metric () +{ +} + int Font_metric::count () const { @@ -97,26 +73,39 @@ Font_metric::count () const } Box -Font_metric::get_char (int)const +Font_metric::get_ascii_char (int) const { - return Box (Interval (0,0),Interval (0,0)); + return Box (Interval (0, 0), Interval (0, 0)); } +Box +Font_metric::get_indexed_char (int k) const +{ + return get_ascii_char (k); +} -void -Font_metric::derived_mark ()const +int +Font_metric::name_to_index (String) const { - + return -1; } - +Offset +Font_metric::get_indexed_wxwy (int) const +{ + return Offset (0, 0); +} + +void +Font_metric::derived_mark () const +{ +} SCM Font_metric::mark_smob (SCM s) { - Font_metric * m = (Font_metric*) SCM_CELL_WORD_1 (s); - - m->derived_mark(); + Font_metric *m = (Font_metric*) SCM_CELL_WORD_1 (s); + m->derived_mark (); return m->description_; } @@ -124,7 +113,9 @@ int Font_metric::print_smob (SCM s, SCM port, scm_print_state *) { Font_metric *m = unsmob_metrics (s); - scm_puts ("#description_, port); scm_puts (">", port); return 1; @@ -136,54 +127,80 @@ IMPLEMENT_SMOBS (Font_metric); IMPLEMENT_DEFAULT_EQUAL_P (Font_metric); IMPLEMENT_TYPE_P (Font_metric, "ly:font-metric?"); -Molecule -Font_metric::find_by_name (String) const + +SCM +Font_metric::font_file_name () const { - Molecule 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 Molecule for the glyph named @var{name} in -@var{font}. The font must be available as an AFM file.") +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"); + String s ("unknown"); + return s; +} + +#include "afm.hh" - return fm->find_by_name (ly_scm2string (name)).smobbed_copy (); + +int +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); +} -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.") +Stencil +Font_metric::get_ascii_char_stencil (int code) 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"); + SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (), + scm_int2num (code)); + Box b = get_ascii_char (code); + return Stencil (b, at); +} - b = fm->text_dimension (ly_scm2string (text)); - - return gh_cons (ly_interval2scm (b[X_AXIS]), ly_interval2scm(b[Y_AXIS])); +Stencil +Font_metric::get_indexed_char_stencil (int code) const +{ + 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); } +Offset +Font_metric::attachment_point (String) const +{ + 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 ())); -Molecule -Font_metric::get_char_molecule (int code) const + Box b = text_dimension (str); + return Stencil (b, lst); +} + +Box +Font_metric::text_dimension (String) const { - Molecule m ; - SCM at = scm_list_n (ly_symbol2scm ("char"), gh_int2scm (code), - SCM_UNDEFINED); - at = fontify_atom (this, at); - Box b = get_char (code); - return Molecule (b, at); + return Box (Interval (0,0), Interval (0,0)); } +