X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=0f6efc6b75ca457b821c2c718e379531d2c02aab;hb=ed3e5abd8003297e02e3f90dc8755e33a6619135;hp=dbb99fd73030778d2904e6599d9fe83d00dcec5f;hpb=95de6911a5cd1f90dfcd72ec798f089f6522f50f;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index dbb99fd730..0f6efc6b75 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -1,215 +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--1998 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. -#include -#include "string.hh" -#include "assoc.hh" -#include "misc.hh" -#include "paper-def.hh" -#include "debug.hh" -#include "lookup.hh" -#include "dimen.hh" -#include "assoc-iter.hh" -#include "score-grav.hh" -#include "p-score.hh" -#include "main.hh" - - -Paper_def::Paper_def () -{ - lookup_p_ = 0; - real_vars_p_ = new Dictionary; -} + 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. -Paper_def::~Paper_def () -{ - delete real_vars_p_; - delete lookup_p_; -} + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ -Paper_def::Paper_def (Paper_def const&s) - : Music_output_def (s) -{ - lookup_p_ = s.lookup_p_? new Lookup (*s.lookup_p_) : 0; - lookup_p_->paper_l_ = this; - real_vars_p_ = new Dictionary (*s.real_vars_p_); -} - -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 -{ - if (! real_vars_p_->elt_b (s)) - error (_ ("unknown paper variable `") + s+"'"); - return real_vars_p_->elem (s); -} - -Interval -Paper_def::line_dimensions_int (int n) const +output_scale (Output_def *od) { - if (!shape_int_a_.size ()) - if (n) - return Interval (0, linewidth_f ()); - else - return Interval (get_var ("indent"), linewidth_f ()); - - if (n >= shape_int_a_.size ()) - n = shape_int_a_.size () -1; - - return shape_int_a_[n]; + return scm_to_double (od->lookup_variable (ly_symbol2scm ("output-scale"))); } -Real -Paper_def::beam_thickness_f () const +SCM +get_font_table (Output_def *def) { - return get_var ("beam_thickness"); + 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::linewidth_f () const +SCM +get_pango_font_table (Output_def *def) { - return get_var ("linewidth"); + 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::duration_to_dist (Moment d,Real k) const +/* TODO: should add nesting for Output_def here too. */ +Font_metric * +find_scaled_font (Output_def *mod, Font_metric *f, Real m) { - if (get_var ("geometric")) - return geometric_spacing (d); - return arithmetic_spacing (d,k); -} - + if (mod->parent_) + return find_scaled_font (mod->parent_, f, m); -/** - Get the measure wide constant for arithmetic. + Real lookup_mag = m / output_scale (mod); - @see - John S. Gourlay. ``Spacing a Line of Music,'' Technical Report - OSU-CISRC-10/87-TR35, Department of Computer and Information Science, - The Ohio State University, 1987. - - */ -Real -Paper_def::arithmetic_constant (Moment d) const -{ - return get_var ("arithmetic_basicspace") - log_2 (Moment (1,8) self_scm (), SCM_EOL); + SCM handle = scm_assoc (scm_from_double (lookup_mag), sizes); + if (scm_is_pair (handle)) + return unsmob (scm_cdr (handle)); -Real -Paper_def::geometric_spacing (Moment d) const -{ - Real dur_f = (d) ?pow (get_var ("geometric"), log_2 (d)) : 0; - return get_var ("basicspace") + get_var ("unitspace") * dur_f; -} + 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); -Real -Paper_def::rule_thickness () const -{ - return get_var ("rulethickness"); -} + 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::staffline_f () const -{ - return get_var ("rulethickness"); -} + PangoFontDescription *description + = pango_font_description_from_string (scm_i_string_chars (descr)); -Real -Paper_def::staffheight_f () const -{ - return get_var ("staffheight"); -} + pango_font_description_set_size + (description, + gint (my_round (factor * pango_font_description_get_size (description)))); -Real -Paper_def::interbeam_f (int multiplicity_i) const -{ - if (multiplicity_i <= 3) - return get_var ("interbeam"); - else - return get_var ("interbeam4"); -} + Font_metric *fm = all_fonts_global->find_pango_font (description, + output_scale (layout)); -Real -Paper_def::internote_f () const -{ - return get_var ("internote"); -} + pango_font_description_free (description); -Real -Paper_def::note_width () const -{ - return get_var ("notewidth"); -} + sizes = scm_acons (size_key, fm->self_scm (), sizes); + scm_hash_set_x (table, descr, sizes); -void -Paper_def::print () const -{ -#ifndef NPRINT - Music_output_def::print (); - DOUT << "Paper {"; - lookup_p_->print (); - for (Assoc_iter i (*real_vars_p_); i.ok (); i++) - { - DOUT << i.key () << "= " << i.val () << "\n"; - } - DOUT << "}\n"; -#endif + return fm; } -Lookup const * -Paper_def::lookup_l () +/* 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) { - assert (lookup_p_); - return lookup_p_; -} - -IMPLEMENT_IS_TYPE_B1 (Paper_def, Music_output_def); + SCM new_pap = Lily::scale_layout (o->self_scm (), scm_from_double (amount)); -String -Paper_def::TeX_output_settings_str () const -{ - String s ("\n "); - for (Assoc_iter i (*real_vars_p_); i.ok (); i++) - s += String ("\\def\\mudelapaper") + i.key () + "{" + i.val () + "}\n"; - s += lookup_p_->texsetting + "% (Tex id)\n"; - return s; + o = unsmob (new_pap); + o->protect (); + return o; } -int Paper_def::default_count_i_ = 0; - -int -Paper_def::get_next_default_count () const -{ - return default_count_i_ ++; -}