X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=0f6efc6b75ca457b821c2c718e379531d2c02aab;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=4cf44b1f8d9b2f8f9ad505c7c0ebc7be9b4898a7;hpb=48bdd9154a32245a075494b403639181615864e2;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 4cf44b1f8d..0f6efc6b75 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -1,145 +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 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. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#include -#include "string.hh" -#include "assoc.hh" -#include "misc.hh" -#include "paper-def.hh" -#include "debug.hh" -#include "lookup.hh" -#include "dimen.hh" -#include "input-translator.hh" -#include "engraver-group.hh" -#include "assoc-iter.hh" - -void -Paper_def::set_var(String s, Real r) -{ - real_vars_p_->elem(s) = r; -} +#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 "lily-imports.hh" Real -Paper_def::get_var(String s)const +output_scale (Output_def *od) { - if(! real_vars_p_->elt_b(s)) - error ( "unknown paper variable `" + s+"'"); - return real_vars_p_->elem(s); + return scm_to_double (od->lookup_variable (ly_symbol2scm ("output-scale"))); } -Real -Paper_def::linewidth_f() const +SCM +get_font_table (Output_def *def) { - return get_var("linewidth"); + 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; } -Real -Paper_def::duration_to_dist(Moment d) +SCM +get_pango_font_table (Output_def *def) { - Real dur_f = (d) ?pow(get_var("geometric"), log_2(d)) : 0; - return get_var("basicspace") + get_var("unitspace") * dur_f; + 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; } - -Paper_def::Paper_def() +/* TODO: should add nesting for Output_def here too. */ +Font_metric * +find_scaled_font (Output_def *mod, Font_metric *f, Real m) { - itrans_p_ = 0; - lookup_p_ = 0; - real_vars_p_ = new Assoc; - outfile_str_ = "lelie.tex"; -} + if (mod->parent_) + return find_scaled_font (mod->parent_, f, m); -Paper_def::~Paper_def() -{ - delete itrans_p_; - delete real_vars_p_; - delete lookup_p_; -} + Real lookup_mag = m / output_scale (mod); -Paper_def::Paper_def(Paper_def const&s) -{ - itrans_p_ = s.itrans_p_ ? new Input_translator( *s.itrans_p_):0; - lookup_p_ = s.lookup_p_? new Lookup(*s.lookup_p_) : 0; - lookup_p_->paper_l_ = this; - real_vars_p_ = new Assoc (*s.real_vars_p_); - outfile_str_ = s.outfile_str_; -} + 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)); -void -Paper_def::set(Input_translator * itrans_p) -{ - delete itrans_p_; - itrans_p_ = itrans_p; -} + SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag); -void -Paper_def::set(Lookup*l) -{ - assert(l != lookup_p_); - delete lookup_p_; - lookup_p_ = l; - lookup_p_->paper_l_ = this; + 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); } -Real -Paper_def::interline_f() const +Font_metric * +find_pango_font (Output_def *layout, SCM descr, Real factor) { - return get_var("interline"); -} + 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)); -Real -Paper_def::rule_thickness()const -{ - return get_var("rule_thickness"); -} + PangoFontDescription *description + = pango_font_description_from_string (scm_i_string_chars (descr)); -Real -Paper_def::interbeam_f() const -{ - return get_var("interbeam"); -} -Real -Paper_def::internote_f() const -{ - return interline_f() / 2; -} + pango_font_description_set_size + (description, + gint (my_round (factor * pango_font_description_get_size (description)))); -Real -Paper_def::note_width()const -{ - return get_var("notewidth"); -} + Font_metric *fm = all_fonts_global->find_pango_font (description, + output_scale (layout)); -void -Paper_def::print() const -{ -#ifndef NPRINT - mtor << "Paper {"; - mtor << "out: " <print(); - itrans_p_->print(); - for (Assoc_iter i(*real_vars_p_); i.ok(); i++) { - mtor << i.key() << "= " << i.val() << "\n"; - } - mtor << "}\n"; -#endif -} + pango_font_description_free (description); -Lookup const * -Paper_def::lookup_l() -{ - assert( lookup_p_ ); - return lookup_p_; + sizes = scm_acons (size_key, fm->self_scm (), sizes); + scm_hash_set_x (table, descr, sizes); + + return fm; } -Global_translator* -Paper_def::get_global_translator_p() 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) { - return itrans_p_->get_group_engraver_p()->global_l(); + SCM new_pap = Lily::scale_layout (o->self_scm (), scm_from_double (amount)); + + o = unsmob (new_pap); + o->protect (); + return o; } +