X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-interface.cc;h=7e8f1bd964982762c941a2ecba9f1a5913a3c2bb;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=c50b4cb316be326c8f4f10eeb7fe345e9b0d5e18;hpb=75f8a001fe30f30fa2d32a961218d0f1cdbeeb7e;p=lilypond.git diff --git a/lily/font-interface.cc b/lily/font-interface.cc index c50b4cb316..7e8f1bd964 100644 --- a/lily/font-interface.cc +++ b/lily/font-interface.cc @@ -1,244 +1,75 @@ -/* - font-interface.cc -- implement Font_interface - - source file of the GNU LilyPond music typesetter - - (c) 2000--2001 Han-Wen Nienhuys - - */ - -#include "all-font-metrics.hh" -#include "font-metric.hh" -#include "font-interface.hh" -#include "grob.hh" -#include "paper-def.hh" -#include "warn.hh" - - /* - TODO revise font handling. - - -* relative sizes should relate to staff-space, eg. font-staff-space -= 1.2 ^ relative-size - -* If a relative size is given, lily should magnify the closest -design size font to match that. (ie. fonts should have variable -scaling) + This file is part of LilyPond, the GNU music typesetter. -(this requires that fonts are stored as (filename , designsize)) + Copyright (C) 2000--2014 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - - */ + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -SCM -Font_interface::font_alist_chain (Grob *me) -{ - SCM defaults = ly_cdr (scm_assoc (ly_symbol2scm ("font-defaults"), - me->paper_l ()->style_sheet_)); + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ - SCM ch = scm_list_n (me->mutable_property_alist_, - me->immutable_property_alist_, - defaults, - SCM_UNDEFINED); +#include "font-interface.hh" - return ch; -} +#include "all-font-metrics.hh" +#include "output-def.hh" +#include "warn.hh" +#include "grob.hh" -/* - todo: split up this func, reuse in text_item? - */ +/* todo: split up this func, reuse in text_item? */ Font_metric * -Font_interface::get_default_font (Grob*me) +Font_interface::get_default_font (Grob *me) { - Font_metric * fm = unsmob_metrics (me->get_grob_property ("font")); - if (fm) - return fm; - - fm = get_font (me, font_alist_chain (me)); - me->set_grob_property ("font", fm->self_scm ()); - return fm; -} - - -SCM -ly_font_interface_get_default_font (SCM grob) -{ - Grob * gr = unsmob_grob (grob); - - if (!gr) + Font_metric *fm = Font_metric::unsmob (me->get_property ("font")); + if (!fm) { - warning ("ly_font_interface_get_default_font (): invalid argument"); - return SCM_UNDEFINED; - } + SCM chain = music_font_alist_chain (me); - return Font_interface::get_default_font (gr)->self_scm (); -} - -Font_metric * -Font_interface::get_font (Grob *me, SCM chain) -{ - - SCM ss = me->paper_l ()->style_sheet_; - - SCM proc = ly_cdr (scm_assoc (ly_symbol2scm ("properties-to-font"), - ss)); - - SCM fonts = ly_cdr (scm_assoc (ly_symbol2scm ("fonts"), ss)); - - assert (gh_procedure_p (proc)); - SCM font_name = gh_call2 (proc, fonts, chain); + fm = select_font (me->layout (), chain); + me->set_property ("font", fm->self_scm ()); + } - Font_metric *fm = me->paper_l ()->find_font (font_name, 1.0); return fm; } SCM -Font_interface::add_style (Grob* me, SCM style, SCM chain) -{ - assert (gh_symbol_p (style)); - - SCM sheet = me->paper_l ()->style_sheet_; - - SCM style_alist = ly_cdr (scm_assoc (ly_symbol2scm ("style-alist"), sheet)); - SCM entry = scm_assoc (style, style_alist); - if (gh_pair_p (entry)) - { - chain = gh_cons (ly_cdr (entry), chain); - } - return chain; -} - -/* -SCM routines: - -Interpreting music... -MIDI output to wtk1-fugue2.midi... -Track ... - -real 0m31.862s -user 0m29.110s -sys 0m0.260s - -real 0m26.964s -user 0m24.850s -sys 0m0.280s - - -so a 14% speedup. - -*/ - -static SCM name_sym, shape_sym, family_sym, series_sym, rel_sz_sym, design_sz_sym, wild_sym; - - -static void -init_syms () -{ - name_sym = scm_permanent_object (ly_symbol2scm ("font-name")); - shape_sym = scm_permanent_object (ly_symbol2scm ("font-shape")); - family_sym = scm_permanent_object (ly_symbol2scm ("font-family")); - series_sym = scm_permanent_object (ly_symbol2scm ("font-series")); - rel_sz_sym = scm_permanent_object (ly_symbol2scm ("font-relative-size")); - design_sz_sym = scm_permanent_object (ly_symbol2scm ("font-design-size")); - wild_sym = scm_permanent_object (ly_symbol2scm ("*")); - - scm_c_define_gsubr ("ly-get-default-font", 1 , 0, 0, - (Scheme_function_unknown) ly_font_interface_get_default_font); -} - - -bool -Font_interface::wild_compare (SCM field_val, SCM val) +Font_interface::music_font_alist_chain (Grob *g) { - return (val == SCM_BOOL_F || field_val == wild_sym || field_val == val); + SCM defaults + = g->layout ()->lookup_variable (ly_symbol2scm ("font-defaults")); + if (defaults == SCM_UNDEFINED) + defaults = SCM_EOL; + return g->get_property_alist_chain (defaults); } -ADD_SCM_INIT_FUNC (Font_interface_syms,init_syms); - - -MAKE_SCHEME_CALLBACK (Font_interface,properties_to_font_name,2); SCM -Font_interface::properties_to_font_name (SCM fonts, SCM alist_chain) +Font_interface::text_font_alist_chain (Grob *g) { - SCM name = ly_assoc_chain (name_sym, alist_chain); - - SCM shape = SCM_BOOL_F; - SCM family = SCM_BOOL_F; - SCM series = SCM_BOOL_F; - - - SCM point_sz = ly_assoc_chain (design_sz_sym, alist_chain); - SCM rel_sz = SCM_BOOL_F; - - if (!gh_pair_p (name)) - { - shape = ly_assoc_chain (shape_sym, alist_chain); - family = ly_assoc_chain (family_sym, alist_chain); - series = ly_assoc_chain (series_sym, alist_chain); - - if (gh_pair_p (shape)) - shape = ly_cdr (shape); - if (gh_pair_p (family)) - family = ly_cdr (family); - if (gh_pair_p (series)) - series = ly_cdr (series); - } - else - name = ly_cdr (name); - - - if (gh_pair_p (point_sz)) - point_sz = ly_cdr (point_sz); - else - { - rel_sz = ly_assoc_chain (rel_sz_sym, alist_chain); - if (gh_pair_p (rel_sz)) - rel_sz = ly_cdr (rel_sz); - } - - for (SCM s = fonts ; gh_pair_p (s); s = ly_cdr (s)) - { - SCM qlist = gh_caar (s); - - if (name != SCM_BOOL_F) - { - if (!wild_compare (scm_list_ref (qlist, gh_int2scm (4)), name)) - continue; - } - else - { - if (!wild_compare (scm_list_ref (qlist, gh_int2scm (1)), series)) - continue; - if (!wild_compare (scm_list_ref (qlist, gh_int2scm (2)), shape)) - continue; - if (!wild_compare (scm_list_ref (qlist, gh_int2scm (3)), family)) - continue; - } - - if (point_sz != SCM_BOOL_F) - { - // This if statement will always be true since name must - // be SCM_BOOL_F here, right? /MB - if (!wild_compare (scm_list_ref (qlist, gh_int2scm (4)), name)) - continue; - } - else - { - if (!wild_compare (ly_car (qlist), rel_sz)) - continue; - } - - - SCM qname = gh_cdar (s); - return qname; - } - - warning (_ ("couldn't find any font satisfying ")); - scm_write (scm_list_n (name, point_sz, shape, series , family, rel_sz, SCM_UNDEFINED), scm_current_error_port ()); - scm_flush (scm_current_error_port ()); - - return ly_str02scm ("cmr10"); - + SCM defaults + = g->layout ()->lookup_variable (ly_symbol2scm ("text-font-defaults")); + if (defaults == SCM_UNDEFINED) + defaults = SCM_EOL; + return g->get_property_alist_chain (defaults); } + +ADD_INTERFACE (Font_interface, + "Any symbol that is typeset through fixed sets of glyphs," + " (i.e., fonts).", + + /* properties */ + "font " + "font-encoding " + "font-family " + "font-name " + "font-series " + "font-shape " + "font-size " + );