X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-select.cc;h=5045a8276ebf4c460ec10e7c4e714c1b5cc17d2b;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=f04da901b3d63d2d2db02a4cbe3a60b82541b6b7;hpb=5856b3f565bfa6ef87d53b9fa9db7ec961ecf452;p=lilypond.git diff --git a/lily/font-select.cc b/lily/font-select.cc index f04da901b3..5045a8276e 100644 --- a/lily/font-select.cc +++ b/lily/font-select.cc @@ -1,77 +1,66 @@ -/* - font-select.cc -- implement property -> font_metric routines. - - source file of the GNU LilyPond music typesetter +/* + This file is part of LilyPond, the GNU music typesetter. - (c) 2003--2004 Han-Wen Nienhuys + Copyright (C) 2003--2015 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. -#include + 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. + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ +#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" +#include "lily-imports.hh" -LY_DEFINE (ly_paper_get_font, "ly:paper-get-font", 2, 0, 0, - (SCM paper_smob, 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") -{ - Output_def *paper = unsmob_output_def (paper_smob); - SCM_ASSERT_TYPE (paper, paper_smob, SCM_ARG1, - __FUNCTION__, "paper definition"); - - Font_metric *fm = select_font (paper, chain); - return fm->self_scm (); -} - -LY_DEFINE (ly_paper_get_number, "ly:paper-get-number", 2, 0, 0, - (SCM paper_smob, SCM name), - "Return the paper variable @var{name}.") -{ - Output_def *paper = unsmob_output_def (paper_smob); - SCM_ASSERT_TYPE (paper, paper_smob, SCM_ARG1, - __FUNCTION__, "paper definition"); - return scm_make_real (paper->get_dimension (name)); -} - -bool -wild_compare (SCM field_val, SCM val) -{ - return (val == SCM_BOOL_F - || field_val == ly_symbol2scm ("*") - || field_val == val); -} - -/* - TODO: this triggers a great number of font-loads (feta11 upto - parmesan23). We could make a Delayed_load_font_metric for which the - design size is specced in advance. - */ Font_metric * -get_font_by_design_size (Output_def *paper, Real requested, - SCM font_vector, SCM input_encoding) +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++) { - SCM entry = SCM_VECTOR_REF (font_vector, i); - Font_metric *fm = unsmob_metrics (scm_force (entry)); - size = fm->design_size (); - + SCM entry = scm_c_vector_ref (font_vector, i); + + if (to_boolean (scm_promise_p (entry))) + { + Font_metric *fm = 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) @@ -79,77 +68,79 @@ get_font_by_design_size (Output_def *paper, Real requested, 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; + } } - Font_metric *fm = unsmob_metrics (scm_force (SCM_VECTOR_REF (font_vector, - i))); - return find_scaled_font (paper, fm, requested / size, input_encoding); + 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 = unsmob (scm_force (scm_c_vector_ref (font_vector, i))); + return find_scaled_font (layout, fm, requested / size); } -Font_metric* -get_font_by_mag_step (Output_def *paper, Real requested_step, - SCM font_vector, Real default_size, - SCM input_encoding) +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 (paper, default_size - * pow (2.0, requested_step / 6.0), - font_vector, input_encoding); + return get_font_by_design_size (layout, default_size + * pow (2.0, requested_step / 6.0), + font_vector); } SCM properties_to_font_size_family (SCM fonts, SCM alist_chain) { - return scm_call_2 (ly_scheme_function ("lookup-font"), fonts, alist_chain); + return Lily::lookup_font (fonts, alist_chain); } Font_metric * -select_encoded_font (Output_def *paper, SCM chain, SCM input_encoding) +select_encoded_font (Output_def *layout, SCM chain) { - SCM name = ly_assoc_chain (ly_symbol2scm ("font-name"), chain); - - if (!ly_c_pair_p (name) || !ly_c_string_p (ly_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 = ly_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")); - if (ly_c_string_p (name)) - { - SCM mag = ly_assoc_chain (ly_symbol2scm ("font-magnification"), chain); - Real rmag = (ly_c_pair_p (mag) - ? robust_scm2double (ly_cdr (mag), 1.0) - : 1); - Font_metric *fm = all_fonts_global->find_font (ly_scm2string (name)); - - return find_scaled_font (paper, fm, rmag, input_encoding); - } - else if (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")); - - SCM font_size = ly_assoc_chain (ly_symbol2scm ("font-size"), chain); - Real req = 0; - if (ly_c_pair_p (font_size)) - req = ly_scm2double (ly_cdr (font_size)); - - return get_font_by_mag_step (paper, req, vec, ly_scm2double (base_size), - input_encoding); - } + Real req = robust_scm2double (ly_chain_assoc_get (ly_symbol2scm ("font-size"), chain, SCM_BOOL_F), + 0.0); + + return get_font_by_mag_step (layout, req, vec, + scm_to_double (base_size)); + } assert (0); return 0; } Font_metric * -select_font (Output_def *paper, SCM chain) +select_font (Output_def *layout, SCM chain) { - return select_encoded_font (paper, chain, SCM_EOL); + return select_encoded_font (layout, chain); }