X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-select.cc;h=5045a8276ebf4c460ec10e7c4e714c1b5cc17d2b;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=0a8a093ca957658c015aa5d94f20b9c75656c6b2;hpb=7c62e4c7902481a8b6f1cea755fc30228f2c64c7;p=lilypond.git diff --git a/lily/font-select.cc b/lily/font-select.cc index 0a8a093ca9..5045a8276e 100644 --- a/lily/font-select.cc +++ b/lily/font-select.cc @@ -1,12 +1,21 @@ /* - 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 "dimensions.hh" #include "all-font-metrics.hh" @@ -15,41 +24,43 @@ #include "warn.hh" #include "pango-font.hh" #include "main.hh" - +#include "lily-imports.hh" Font_metric * get_font_by_design_size (Output_def *layout, Real requested, - SCM font_vector) + SCM font_vector) { int n = scm_c_vector_length (font_vector); Real size = 1e6; Real last_size = -1e6; int i = 0; - String pango_description_string; + SCM pango_description_string = SCM_EOL; + SCM last_pango_description_string = SCM_EOL; for (; i < n; i++) { SCM entry = scm_c_vector_ref (font_vector, i); - - if (scm_promise_p (entry) == SCM_BOOL_T) - { - Font_metric *fm = unsmob_metrics (scm_force (entry)); - size = fm->design_size (); - } + + 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 - = ly_scm2string (scm_cdr (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; + break; last_size = size; + last_pango_description_string = pango_description_string; } if (i == n) @@ -57,91 +68,71 @@ get_font_by_design_size (Output_def *layout, 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 = 0; - if (pango_description_string != "") + if (scm_is_string (pango_description_string)) { #if HAVE_PANGO_FT2 - PangoFontDescription *description - = pango_font_description_from_string (pango_description_string.to_str0 ()); - return all_fonts_global->find_pango_font (description, - requested / size, - output_scale (layout)); + return find_pango_font (layout, + pango_description_string, + requested / size); #else - error ("Trying to retrieve pango font without HAVE_PANGO_FT2."); + error ("Trying to retrieve pango font without HAVE_PANGO_FT2."); #endif } else - { - fm = unsmob_metrics (scm_force (scm_c_vector_ref (font_vector, i))); - } + 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 *layout, Real requested_step, - SCM font_vector, Real default_size) + SCM font_vector, Real default_size) { return get_font_by_design_size (layout, default_size - * pow (2.0, requested_step / 6.0), - font_vector); + * 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_lily_module_constant ("lookup-font"), fonts, alist_chain); + return Lily::lookup_font (fonts, alist_chain); } Font_metric * select_encoded_font (Output_def *layout, SCM chain) { - SCM name = ly_chain_assoc (ly_symbol2scm ("font-name"), chain); + SCM name = ly_chain_assoc_get (ly_symbol2scm ("font-name"), chain, SCM_BOOL_F); - if (!scm_is_pair (name) || !scm_is_string (scm_cdr (name))) + if (!scm_is_string (name)) { SCM fonts = layout->lookup_variable (ly_symbol2scm ("fonts")); name = properties_to_font_size_family (fonts, chain); } - else - name = scm_cdr (name); #if HAVE_PANGO_FT2 - if (scm_is_string (name) - && is_pango_format_global) - { - return select_pango_font (layout, chain); - } + if (scm_is_string (name)) + return select_pango_font (layout, chain); else #endif - if (scm_is_string (name)) - { - SCM mag = ly_chain_assoc (ly_symbol2scm ("font-magnification"), chain); - Real rmag = (scm_is_pair (mag) - ? robust_scm2double (scm_cdr (mag), 1.0) - : 1); - Font_metric *fm = all_fonts_global->find_font (ly_scm2string (name)); - - return find_scaled_font (layout, fm, rmag); - } - else if (scm_instance_p (name)) + 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")); + 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_chain_assoc (ly_symbol2scm ("font-size"), chain); - Real req = 0; - if (scm_is_pair (font_size)) - req = scm_to_double (scm_cdr (font_size)); + 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)); + return get_font_by_mag_step (layout, req, vec, + scm_to_double (base_size)); } assert (0);