X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=4c6dc86ebeb8d645477920e9e4aa35c4b45cdd5a;hb=a9df85e5e8db75539d1844b5c52063c70be23718;hp=3bf736aeff80bf1cb9cbb31abe900a6f4ae87447;hpb=42e20e7c10237378b290cc9d8bcae7a6fda7b076;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 3bf736aeff..4c6dc86ebe 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -1,177 +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--2012 Han-Wen Nienhuys - (c) 1997--2002 Han-Wen Nienhuys -*/ - -#include - -#include "all-font-metrics.hh" -#include "string.hh" -#include "misc.hh" -#include "paper-def.hh" + 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 "scaled-font-metric.hh" -#include "main.hh" -#include "scm-hash.hh" -#include "file-results.hh" // urg? header_global_p -#include "paper-outputter.hh" + 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. -/* - 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 () -{ -} - -Paper_def::~Paper_def () -{ -} - -Paper_def::Paper_def (Paper_def const&src) - : Music_output_def (src) -{ -} + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ +#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" Real -Paper_def::get_var (String s) const +output_scale (Output_def *od) { - return get_realvar (ly_symbol2scm (s.ch_C ())); + return scm_to_double (od->lookup_variable (ly_symbol2scm ("output-scale"))); } SCM -Paper_def::get_scmvar (String s) const +get_font_table (Output_def *def) { - return variable_tab_->get (ly_symbol2scm (s.ch_C ())); + 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; } - SCM -Paper_def::get_scmvar_scm (SCM sym) const +get_pango_font_table (Output_def *def) { - return gh_double2scm (get_realvar (sym)); -} - -Real -Paper_def::get_realvar (SCM s) const -{ - SCM val ; - if (!variable_tab_->try_retrieve (s, &val)) - { - programming_error ("unknown paper variable: " + ly_symbol2string (s)); - return 0.0; - } - - Real sc = 1.0; - SCM ssc; - if (variable_tab_->try_retrieve (ly_symbol2scm ("outputscale"), &ssc)) + SCM font_table = def->lookup_variable (ly_symbol2scm ("pango-fonts")); + if (scm_hash_table_p (font_table) != SCM_BOOL_T) { - sc = gh_scm2double (ssc); - } - if (gh_number_p (val)) - { - return gh_scm2double (val) / sc; - } - else - { - programming_error ("not a real variable"); - return 0.0; + 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_var ("linewidth"); - Real ind = n? 0.0:get_var ("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 unsmob_metrics (scm_cdr (handle)); -int Paper_def::score_count_i_ = 0; + SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag); -int -Paper_def::get_next_score_count () const -{ - return score_count_i_ ++; + sizes = scm_acons (scm_from_double (lookup_mag), val, sizes); + unsmob_metrics (val)->unprotect (); + scm_hashq_set_x (font_table, f->self_scm (), sizes); + return unsmob_metrics (val); } -void -Paper_def::reset_score_count () +Font_metric * +find_pango_font (Output_def *layout, SCM descr, Real factor) { - score_count_i_ = 0; -} + 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_metrics (scm_cdr (handle)); -Paper_outputter* -Paper_def::paper_outputter_p () -{ - String outname = outname_str (); - progress_indication (_f ("paper output to `%s'...", - outname == "-" ? String ("") : outname)); - - target_str_global_array.push (outname); - Paper_outputter * po = new Paper_outputter (outname); - Path p = split_path (outname); - p.ext = ""; - po->basename_ = p.str (); - return po; -} + 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)))); -/* - todo: use symbols and hashtable idx? -*/ -Font_metric * -Paper_def::find_font (SCM fn, Real m) -{ - SCM key = gh_cons (fn, gh_double2scm (m)); - SCM met = scm_assoc (key, scaled_fonts_); + Font_metric *fm = all_fonts_global->find_pango_font (description, + output_scale (layout)); - if (gh_pair_p (met)) - return unsmob_metrics (ly_cdr (met)); - - SCM ssc; - if (variable_tab_->try_retrieve (ly_symbol2scm ("outputscale"), &ssc)) - { - m /= gh_scm2double (ssc); - } - - Font_metric* f = all_fonts_global_p->find_font (ly_scm2string (fn)); - SCM val = Scaled_font_metric::make_scaled_font_metric (f, m); - scaled_fonts_ = scm_acons (key, val, scaled_fonts_); + pango_font_description_free (description); - scm_gc_unprotect_object (val); + sizes = scm_acons (size_key, fm->self_scm (), sizes); + scm_hash_set_x (table, descr, sizes); - return dynamic_cast (unsmob_metrics (val)); + return fm; } - -/* - Return alist to translate internally used fonts back to real-world - coordinates. */ -SCM -Paper_def::font_descriptions ()const +/* 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) { - SCM l = SCM_EOL; - for (SCM s = scaled_fonts_; gh_pair_p (s); s = ly_cdr (s)) - { - SCM desc = ly_caar (s); - SCM mdesc = unsmob_metrics (ly_cdar (s))->description_; + SCM proc = ly_lily_module_constant ("scale-layout"); + SCM new_pap = scm_call_2 (proc, o->self_scm (), scm_from_double (amount)); - l = gh_cons (gh_cons (mdesc, desc), l); - } - return l; + o = unsmob_output_def (new_pap); + o->protect (); + return o; } +