X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=70017df10c41ca2a20d7eeed092d5715e2a843bc;hb=8951d0826ecca6b6abdf774ec5f761d13a738ca8;hp=11f63489e8913c59b32bab6fa37b6a94a0c8cb8c;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 11f63489e8..70017df10c 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -1,88 +1,58 @@ -/* - 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 - Mats Bengtsson (the ugly TeX parsing in text_dimension) - */ + (c) 1999--2006 Han-Wen Nienhuys + + Mats Bengtsson (the ugly TeX parsing in text_dimension) +*/ + +#include "font-metric.hh" -#include -#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 "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 (); i++) - { - - switch (text[i]) - { - case '\\': - // accent marks use width of base letter - if (i +1 < text.length_i ()) - { - 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_i ()) && !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; } +Stencil +Font_metric::find_by_name (string s) const +{ + 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.c_str ())); + b = get_indexed_char (idx); + } -Font_metric::~Font_metric () -{ + Stencil q (b, expr); + return q; } Font_metric::Font_metric () { description_ = SCM_EOL; - + self_scm_ = SCM_EOL; smobify_self (); } @@ -90,23 +60,50 @@ Font_metric::Font_metric (Font_metric const &) { } -int +Font_metric::~Font_metric () +{ +} + +size_t Font_metric::count () const { return 0; } -Box -Font_metric::get_char (int)const +Box +Font_metric::get_ascii_char (size_t) const { - return Box (Interval (0,0),Interval (0,0)); + return Box (Interval (0, 0), Interval (0, 0)); } +Box +Font_metric::get_indexed_char (size_t k) const +{ + return get_ascii_char (k); +} + +size_t +Font_metric::name_to_index (string) const +{ + return (size_t)-1; +} + +Offset +Font_metric::get_indexed_wxwy (size_t) 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); + Font_metric *m = (Font_metric *) SCM_CELL_WORD_1 (s); + m->derived_mark (); return m->description_; } @@ -114,45 +111,88 @@ int Font_metric::print_smob (SCM s, SCM port, scm_print_state *) { Font_metric *m = unsmob_metrics (s); - scm_puts ("#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, "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_); } +string +Font_metric::font_name () const +{ + string s ("unknown"); + return s; +} -SCM -ly_find_glyph_by_name (SCM font, SCM name) +size_t +Font_metric::index_to_ascii (size_t i) const { - if (!unsmob_metrics (font) || !gh_string_p (name)) - { - warning ("ly-find-glyph-by-name: invalid argument."); - Molecule m; - return m.smobbed_copy (); - } + return i; +} + +size_t +Font_metric::index_to_charcode (size_t i) const +{ + return index_to_ascii (i); +} - return unsmob_metrics (font)->find_by_name (ly_scm2string (name)).smobbed_copy (); +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); +} + +Stencil +Font_metric::get_indexed_char_stencil (size_t code) const +{ + 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); } +Offset +Font_metric::attachment_point (string) const +{ + return Offset (0, 0); +} -static void -font_metric_init () +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.c_str ())); + + Box b = text_dimension (str); + return Stencil (b, lst); +} + +Box +Font_metric::text_dimension (string) const { - scm_c_define_gsubr ("ly-find-glyph-by-name", 2 , 0, 0, - (Scheme_function_unknown) ly_find_glyph_by_name); + return Box (Interval (0, 0), Interval (0, 0)); } -ADD_SCM_INIT_FUNC (font_metric_init, font_metric_init);