X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-select.cc;h=a5957ba715dab54ce231423ab6a356c88187cc94;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=654ad04111f428c21bc3274ea007de13e9568a7a;hpb=37ec023ff30dca4f6850331fbd526940f8570939;p=lilypond.git diff --git a/lily/font-select.cc b/lily/font-select.cc index 654ad04111..a5957ba715 100644 --- a/lily/font-select.cc +++ b/lily/font-select.cc @@ -1,182 +1,146 @@ -/* - font-select.cc -- implement property -> font_metric routines. +/* + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2003--2015 Han-Wen Nienhuys - (c) 2003--2004 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. -#include + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ -#include "paper-def.hh" +#include "dimensions.hh" +#include "all-font-metrics.hh" +#include "output-def.hh" #include "font-interface.hh" #include "warn.hh" +#include "pango-font.hh" +#include "main.hh" -LY_DEFINE (ly_paper_get_font, "ly:paper-get-font", 2, 0, 0, - (SCM paper, SCM chain), - - "Return a font metric satisfying the font-qualifiers " - "in the alist chain @var{chain}.\n" - "(An alist chain is a list of alists, containing grob properties).\n") -{ - Paper_def *pap = unsmob_paper (paper); - SCM_ASSERT_TYPE (pap, paper, SCM_ARG1, __FUNCTION__, "paper definition"); - - Font_metric *fm = select_font (pap, chain); - return fm->self_scm (); -} - -LY_DEFINE (ly_paper_get_number, "ly:paper-get-number", 2, 0, 0, - (SCM paper, SCM name), - "Return the paper variable @var{name}.") -{ - Paper_def *pap = unsmob_paper (paper); - SCM_ASSERT_TYPE (pap, paper, SCM_ARG1, __FUNCTION__, "paper definition"); - return gh_double2scm (pap->get_realvar (name)); -} - -bool -wild_compare (SCM field_val, SCM val) -{ - return (val == SCM_BOOL_F || field_val == ly_symbol2scm ("*") || field_val == val); -} -Font_metric* -get_font_by_design_size (Paper_def* paper, Real requested, - SCM font_vector) +Font_metric * +get_font_by_design_size (Output_def *layout, Real requested, + SCM font_vector) { - int n = SCM_VECTOR_LENGTH (font_vector); + int n = scm_c_vector_length (font_vector); Real size = 1e6; Real last_size = -1e6; int i = 0; - + + SCM pango_description_string = SCM_EOL; + SCM last_pango_description_string = SCM_EOL; for (; i < n; i++) { - size = gh_scm2double (gh_car (SCM_VECTOR_REF (font_vector, i))); + SCM entry = scm_c_vector_ref (font_vector, i); + + if (scm_promise_p (entry) == SCM_BOOL_T) + { + Font_metric *fm = Font_metric::unsmob (scm_force (entry)); + size = fm->design_size (); + } +#if HAVE_PANGO_FT2 + else if (scm_is_pair (entry) + && scm_is_number (scm_car (entry)) + && scm_is_string (scm_cdr (entry))) + { + size = scm_to_double (scm_car (entry)); + pango_description_string + = scm_cdr (entry); + } +#endif + if (size > requested) - break ; - last_size = size; + break; + last_size = size; + last_pango_description_string = pango_description_string; } if (i == n) - { - i = n-1; - } + i = n - 1; else if (i > 0) { if ((requested / last_size) < (size / requested)) - { - i -- ; - size = last_size; - } + { + i--; + size = last_size; + pango_description_string = last_pango_description_string; + } } - - return paper->find_font (gh_cdr (SCM_VECTOR_REF (font_vector, i)), - requested / size); -} + Font_metric *fm = 0; + if (scm_is_string (pango_description_string)) + { +#if HAVE_PANGO_FT2 + return find_pango_font (layout, + pango_description_string, + requested / size); +#else + error ("Trying to retrieve pango font without HAVE_PANGO_FT2."); +#endif + } + else + fm = Font_metric::unsmob (scm_force (scm_c_vector_ref (font_vector, i))); -Font_metric* -get_font_by_mag_step (Paper_def* paper, Real requested_step, - SCM font_vector, Real default_size) -{ - return get_font_by_design_size (paper, - default_size * pow (2.0, requested_step / 6.0), - font_vector); + return find_scaled_font (layout, fm, requested / size); } +Font_metric * +get_font_by_mag_step (Output_def *layout, Real requested_step, + SCM font_vector, Real default_size) +{ + return get_font_by_design_size (layout, default_size + * pow (2.0, requested_step / 6.0), + font_vector); +} - -/* - We can probably get more efficiency points if we preprocess FONTS - to make lookup easier. - */ SCM properties_to_font_size_family (SCM fonts, SCM alist_chain) { - SCM shape = SCM_BOOL_F; - SCM family = SCM_BOOL_F; - SCM series = SCM_BOOL_F; - - shape = ly_assoc_chain (ly_symbol2scm ("font-shape"), alist_chain); - family = ly_assoc_chain (ly_symbol2scm ("font-family"), alist_chain); - series = ly_assoc_chain (ly_symbol2scm ("font-series"), 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); - - - for (SCM s = fonts ; gh_pair_p (s); s = ly_cdr (s)) - { - SCM qlist = ly_caar (s); - - if (!wild_compare (SCM_VECTOR_REF (qlist, 0), series)) - continue; - if (!wild_compare (SCM_VECTOR_REF (qlist, 1), shape)) - continue; - if (!wild_compare (SCM_VECTOR_REF (qlist, 2), family)) - continue; - - SCM qname = ly_cdar (s); - return qname; - } - - warning (_f ("cannot find font for: (%s %s %s)", - ly_symbol2string (series).to_str0 (), - ly_symbol2string (shape).to_str0 (), - ly_symbol2string (family).to_str0 ())); - - scm_write (scm_list_n (shape, series , family, - SCM_UNDEFINED), scm_current_error_port ()); - scm_flush (scm_current_error_port ()); - - return scm_makfrom0str ("cmr10"); + return scm_call_2 (ly_lily_module_constant ("lookup-font"), fonts, + alist_chain); } - Font_metric * -select_font (Paper_def *paper, SCM chain) +select_encoded_font (Output_def *layout, SCM chain) { - SCM name = ly_assoc_chain (ly_symbol2scm ("font-name"), chain); - - if (!gh_pair_p (name) || !gh_string_p (gh_cdr (name))) + SCM name = ly_chain_assoc_get (ly_symbol2scm ("font-name"), chain, SCM_BOOL_F); + + if (!scm_is_string (name)) { - SCM fonts = paper->lookup_variable (ly_symbol2scm ("fonts")); + SCM fonts = layout->lookup_variable (ly_symbol2scm ("fonts")); name = properties_to_font_size_family (fonts, chain); } + +#if HAVE_PANGO_FT2 + if (scm_is_string (name)) + return select_pango_font (layout, chain); else - name = gh_cdr (name); +#endif + if (scm_is_true (scm_instance_p (name))) + { + SCM base_size = scm_slot_ref (name, ly_symbol2scm ("default-size")); + SCM vec = scm_slot_ref (name, ly_symbol2scm ("size-vector")); + Real req = robust_scm2double (ly_chain_assoc_get (ly_symbol2scm ("font-size"), chain, SCM_BOOL_F), + 0.0); - if (gh_string_p (name)) - { - SCM mag = ly_assoc_chain (ly_symbol2scm ("font-magnification"), chain); - - Real rmag = gh_pair_p (mag) ? robust_scm2double (gh_cdr (mag), 1.0) : 1; - - return paper->find_font (name, rmag); - } - else if (gh_pair_p (name)) // (DEFAULT . FONT-VEC) pair - { - SCM vec = gh_cdr (name); - SCM base_size = gh_car (name); - - SCM font_size = ly_assoc_chain (ly_symbol2scm ("font-size"), chain); - Real req = 0.0; - if (gh_pair_p (font_size)) - req = gh_scm2double (ly_cdr (font_size)); - - return get_font_by_mag_step (paper, req, - vec, gh_scm2double (base_size)); - } + return get_font_by_mag_step (layout, req, vec, + scm_to_double (base_size)); + } assert (0); - return 0; } - +Font_metric * +select_font (Output_def *layout, SCM chain) +{ + return select_encoded_font (layout, chain); +}