X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=0f6efc6b75ca457b821c2c718e379531d2c02aab;hb=926115ff42def8bc1ce767029e4f03c8072994ba;hp=388235ab7d9f858042832daa4d0319ffd2aa6572;hpb=13d8b383afd5bceb11747f5a3ee79ee9d4eca0aa;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 388235ab7d..0f6efc6b75 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -1,89 +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 "book-paper-def.hh" -#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 "paper-outputter.hh" -#include "ly-module.hh" +#include "lily-imports.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 () +Real +output_scale (Output_def *od) { - bookpaper_ = 0; + return scm_to_double (od->lookup_variable (ly_symbol2scm ("output-scale"))); } -Paper_def::Paper_def (Paper_def const&src) - : Music_output_def (src) +SCM +get_font_table (Output_def *def) { - /* Do not remove this statement, scm_make_hash_table may trigger GC. */ - bookpaper_ = 0; + SCM font_table = def->lookup_variable (ly_symbol2scm ("scaled-fonts")); + if (!to_boolean (scm_hash_table_p (font_table))) + { + font_table = scm_c_make_hash_table (11); + def->set_variable (ly_symbol2scm ("scaled-fonts"), font_table); + } + return font_table; } -Paper_def::~Paper_def () +SCM +get_pango_font_table (Output_def *def) { + SCM font_table = def->lookup_variable (ly_symbol2scm ("pango-fonts")); + if (!to_boolean (scm_hash_table_p (font_table))) + { + font_table = scm_c_make_hash_table (11); + def->set_variable (ly_symbol2scm ("pango-fonts"), font_table); + } + return font_table; } -Real -Paper_def::get_dimension (SCM s) const +/* TODO: should add nesting for Output_def here too. */ +Font_metric * +find_scaled_font (Output_def *mod, Font_metric *f, Real m) { - SCM val = lookup_variable (s); - return ly_scm2double (val); -} + if (mod->parent_) + return find_scaled_font (mod->parent_, f, m); -/* 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 -{ - Real lw = get_dimension (ly_symbol2scm ("linewidth")); - Real ind = n? 0.0:get_dimension (ly_symbol2scm ("indent")); + Real lookup_mag = m / output_scale (mod); - return Interval (ind, lw); -} + 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 unsmob (scm_cdr (handle)); -Paper_outputter* -Paper_def::get_paper_outputter (String outname) const -{ - progress_indication (_f ("paper output to `%s'...", - outname == "-" ? String ("") : outname)); - return new Paper_outputter (outname); + SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag); + sizes = scm_acons (scm_from_double (lookup_mag), val, sizes); + unsmob (val)->unprotect (); + scm_hashq_set_x (font_table, f->self_scm (), sizes); + return unsmob (val); } -Paper_def* -unsmob_paper (SCM x) +Font_metric * +find_pango_font (Output_def *layout, SCM descr, Real factor) { - return dynamic_cast (unsmob_music_output_def (x)); + if (layout->parent_) + return find_pango_font (layout->parent_, descr, factor); + + 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 unsmob (scm_cdr (handle)); + + 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)); + + pango_font_description_free (description); + + sizes = scm_acons (size_key, fm->self_scm (), sizes); + scm_hash_set_x (table, descr, sizes); + + 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 new_pap = Lily::scale_layout (o->self_scm (), scm_from_double (amount)); - bool pap = op; - return ly_bool2scm (pap); + o = unsmob (new_pap); + o->protect (); + return o; } +