X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=f997c9905d086f322650bcad6864c51a0c3859ee;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=64dfe31de245c54e0c3daa880275d4dd83038612;hpb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 64dfe31de2..f997c9905d 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -1,208 +1,124 @@ /* - paper-def.cc -- implement Paper_def + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2004--2015 Han-Wen Nienhuys - (c) 1997--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 "virtual-font-metric.hh" +#include "dimensions.hh" +#include "libc-extension.hh" +#include "output-def.hh" +#include "modified-font-metric.hh" +#include "pango-font.hh" #include "all-font-metrics.hh" -#include "string.hh" -#include "misc.hh" -#include "paper-def.hh" -#include "warn.hh" -#include "scaled-font-metric.hh" -#include "main.hh" -#include "scm-hash.hh" -#include "input-file-results.hh" // urg? header_global -#include "paper-outputter.hh" -#include "ly-module.hh" - -/* - This is an almost empty thing. The only substantial thing this class - handles is scaling up and down to real-world dimensions (internally - dimensions are against global staff-space.) - */ -Paper_def::Paper_def () -{ - scaled_fonts_ = SCM_EOL; - /* - don't remove above statement, scm_make_hash_table may trigger GC. - */ - scaled_fonts_ = scm_c_make_hash_table (11); -} - -Paper_def::~Paper_def () -{ -} - -Paper_def::Paper_def (Paper_def const&src) - : Music_output_def (src) +Real +output_scale (Output_def *od) { - scaled_fonts_ = SCM_EOL; - /* - don't remove above statement, scm_make_hash_table may trigger GC. - */ - scaled_fonts_ = scm_c_make_hash_table (11); + return scm_to_double (od->lookup_variable (ly_symbol2scm ("output-scale"))); } -void -Paper_def::derived_mark () +SCM +get_font_table (Output_def *def) { - scm_gc_mark (scaled_fonts_); + SCM font_table = def->lookup_variable (ly_symbol2scm ("scaled-fonts")); + if (scm_hash_table_p (font_table) != SCM_BOOL_T) + { + font_table = scm_c_make_hash_table (11); + def->set_variable (ly_symbol2scm ("scaled-fonts"), font_table); + } + return font_table; } -Real -Paper_def::get_dimension (SCM s) const +SCM +get_pango_font_table (Output_def *def) { - SCM val = lookup_variable (s); - SCM scale = lookup_variable (ly_symbol2scm ("outputscale")); - - Real sc = ly_scm2double (scale); - return ly_scm2double (val) / sc; + SCM font_table = def->lookup_variable (ly_symbol2scm ("pango-fonts")); + if (scm_hash_table_p (font_table) != SCM_BOOL_T) + { + font_table = scm_c_make_hash_table (11); + def->set_variable (ly_symbol2scm ("pango-fonts"), font_table); + } + return font_table; } -/* - FIXME. This is broken until we have a generic way of - putting lists inside the \paper block. - */ -Interval -Paper_def::line_dimensions_int (int n) const +/* TODO: should add nesting for Output_def here too. */ +Font_metric * +find_scaled_font (Output_def *mod, Font_metric *f, Real m) { - Real lw = get_dimension (ly_symbol2scm ("linewidth")); - Real ind = n? 0.0:get_dimension (ly_symbol2scm ("indent")); - - return Interval (ind, lw); -} + if (mod->parent_) + return find_scaled_font (mod->parent_, f, m); + Real lookup_mag = m / output_scale (mod); + SCM font_table = get_font_table (mod); + SCM sizes = scm_hashq_ref (font_table, f->self_scm (), SCM_EOL); + SCM handle = scm_assoc (scm_from_double (lookup_mag), sizes); + if (scm_is_pair (handle)) + return Font_metric::unsmob (scm_cdr (handle)); + SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag); -Paper_outputter* -Paper_def::get_paper_outputter (String outname) const -{ - progress_indication (_f ("paper output to `%s'...", - outname == "-" ? String ("") : outname)); - progress_indication("\n"); - - global_input_file->target_strings_.push (outname); - Paper_outputter * po = new Paper_outputter (outname); - Path p = split_path (outname); - p.ext = ""; - po->basename_ = p.to_string (); - return po; + sizes = scm_acons (scm_from_double (lookup_mag), val, sizes); + Font_metric::unsmob (val)->unprotect (); + scm_hashq_set_x (font_table, f->self_scm (), sizes); + return Font_metric::unsmob (val); } - - Font_metric * -Paper_def::find_scaled_font (Font_metric *f, Real m) +find_pango_font (Output_def *layout, SCM descr, Real factor) { - SCM sizes = scm_hashq_ref (scaled_fonts_, f->self_scm (), SCM_BOOL_F); - if (sizes != SCM_BOOL_F) - { - SCM met = scm_assoc (scm_make_real (m), sizes); - if (ly_pair_p (met)) - return unsmob_metrics (ly_cdr (met)); - } - else - { - sizes = SCM_EOL; - } - - - /* - Hmm. We're chaining font - metrics. Should consider wether to merge - virtual-font and scaled_font. - */ - SCM val = SCM_EOL; - if (Virtual_font_metric * vf = dynamic_cast (f)) - { - /* - For fontify_atom (), the magnification and name must be known - at the same time. That's impossible for - - Scaled (Virtual_font (Font1,Font2)) - - so we replace by - - Virtual_font (Scaled (Font1), Scaled (Font2)) - - */ - SCM l = SCM_EOL; - SCM *t = &l; - for (SCM s = vf->get_font_list (); ly_pair_p (s); s = ly_cdr (s)) - { - Font_metric*scaled - = find_scaled_font (unsmob_metrics (ly_car (s)), m); - *t = scm_cons (scaled->self_scm (), SCM_EOL); - t = SCM_CDRLOC(*t); - } - - vf = new Virtual_font_metric (l); - val = vf->self_scm (); - } - else - { - SCM scale_var = ly_module_lookup (scope_, ly_symbol2scm ("outputscale")); - SCM coding_var = ly_module_lookup (scope_, ly_symbol2scm ("inputcoding")); + if (layout->parent_) + return find_pango_font (layout->parent_, descr, factor); - m /= ly_scm2double (scm_variable_ref (scale_var)); - val = Modified_font_metric::make_scaled_font_metric (scm_variable_ref (coding_var), - f, m); - } + SCM table = get_pango_font_table (layout); + SCM sizes = scm_hash_ref (table, descr, SCM_EOL); + SCM size_key = scm_from_double (factor); + SCM handle = scm_assoc (size_key, sizes); + if (scm_is_pair (handle)) + return Font_metric::unsmob (scm_cdr (handle)); - sizes = scm_acons (scm_make_real (m), val, sizes); - scm_gc_unprotect_object (val); - - scm_hashq_set_x (scaled_fonts_, f->self_scm (), sizes); - - return unsmob_metrics (val); -} + PangoFontDescription *description + = pango_font_description_from_string (scm_i_string_chars (descr)); + pango_font_description_set_size + (description, + gint (my_round (factor * pango_font_description_get_size (description)))); + Font_metric *fm = all_fonts_global->find_pango_font (description, + output_scale (layout)); -/* - Return alist to translate internally used fonts back to real-world - coordinates. */ -SCM -Paper_def::font_descriptions () const -{ - SCM func = ly_scheme_function ("hash-table->alist"); + pango_font_description_free (description); - SCM l = SCM_EOL; - for (SCM s = scm_call_1 (func, scaled_fonts_); ly_pair_p (s); s = ly_cdr (s)) - { - SCM entry = ly_car (s); - for (SCM t = ly_cdr (entry); ly_pair_p (t); t = ly_cdr (t)) - { - Font_metric *fm= unsmob_metrics (ly_cdar (t)); - - if (dynamic_cast (fm)) - l = scm_cons (fm->self_scm (), l); - } - } - return l; -} + sizes = scm_acons (size_key, fm->self_scm (), sizes); + scm_hash_set_x (table, descr, sizes); -Paper_def* -unsmob_paper (SCM x) -{ - return dynamic_cast (unsmob_music_output_def (x)); + return fm; } - -LY_DEFINE (ly_paper_def_p, "ly:paper-def?", - 1, 0,0, (SCM def), - "Is @var{def} a paper definition?") +/* TODO: this is a nasty interface. During formatting, + the Output_def should be scaled to the output_scale_ + specified in the toplevel Output_def. */ +Output_def * +scale_output_def (Output_def *o, Real amount) { - Paper_def *op = dynamic_cast (unsmob_music_output_def (def)); + SCM proc = ly_lily_module_constant ("scale-layout"); + SCM new_pap = scm_call_2 (proc, o->self_scm (), scm_from_double (amount)); - bool pap = op; - return ly_bool2scm (pap); + o = Output_def::unsmob (new_pap); + o->protect (); + return o; } +