X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fpaper-def.cc;h=8a170642616e038022beb00be6cd7ad7488918f1;hb=e52025a21dc38183fb6da296a71f0e34d4f6ce8e;hp=c5a9146f811d1240a9c1d6ed563334f7a499804d;hpb=3a0e9efb7f067e5b334ba0596b95e15d96d7cc49;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index c5a9146f81..8a17064261 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -3,266 +3,104 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 2004--2006 Han-Wen Nienhuys */ -#include -#include "string.hh" -#include "misc.hh" -#include "paper-def.hh" -#include "debug.hh" -#include "lookup.hh" -#include "score-engraver.hh" -#include "paper-score.hh" -#include "identifier.hh" -#include "main.hh" -#include "scope.hh" -#include "dictionary-iter.hh" -#include "file-results.hh" // urg? header_global_p -#include "paper-outputter.hh" -#include "paper-stream.hh" - - -Paper_def::Paper_def () -{ - lookup_p_tab_p_ = new Hash_table; - lookup_p_tab_p_->hash_func_ = int_hash; -} - - -Paper_def::~Paper_def () -{ - for (Hash_table_iter ai(*lookup_p_tab_p_); ai.ok (); ai++) - { - delete ai.val (); - } - - delete lookup_p_tab_p_; -} - -Paper_def::Paper_def (Paper_def const&s) - : Music_output_def (s) -{ - shape_int_a_ = s.shape_int_a_; - lookup_p_tab_p_ = new Hash_table; - lookup_p_tab_p_->hash_func_ = int_hash; - - for (Hash_table_iter ai(*s.lookup_p_tab_p_); ai.ok (); ai++) - { - Lookup * l = new Lookup (*ai.val ()); - set_lookup (ai.key(), l); - } -} - -SCM -Paper_def::get_scm_var (SCM s) const -{ - if (!scope_p_->elem_b (s)) - return SCM_BOOL_F; - - Identifier * id = scope_p_->elem (s); - - SCM z; - SCM_NEWCELL (z); - SCM_SETCAR(z, s); - - SCM val; - - if (dynamic_cast (id)) - { - Real r = *id->access_content_Real (false); - val = gh_double2scm (r); - } - else - { - return SCM_BOOL_F; - } - - SCM_SETCDR(z,val); - return z; -} +#include "dimensions.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 -{ - return get_realvar (ly_symbol (s)); -} - -Real -Paper_def::get_realvar (SCM s) const -{ - if (!scope_p_->elem_b (s)) - error (_f ("unknown paper variable: `%s'", symbol_to_string (s))); - Real * p = scope_p_->elem (s)->access_content_Real (false); - if (!p) - { - error (_("not a real variable")); - return 0.0; - } - - return *p; -} - -Interval -Paper_def::line_dimensions_int (int n) const +output_scale (Output_def *od) { - if (!shape_int_a_.size ()) - { - Real lw = get_realvar (linewidth_scm_sym); - Real ind = n? 0.0:get_var ("indent"); - - return Interval (ind, lw); - } - - 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::length_mom_to_dist (Moment d,Real k) const -{ - return arithmetic_spacing (d,k); -} - - -/** - Get the measure wide constant for arithmetic spacing. - - @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) elem_b (i)) + SCM font_table = def->lookup_variable (ly_symbol2scm ("scaled-fonts")); + if (scm_hash_table_p (font_table) != SCM_BOOL_T) { - delete lookup_p_tab_p_->elem (i); + font_table = scm_c_make_hash_table (11); + def->set_variable (ly_symbol2scm ("scaled-fonts"), font_table); } - (*lookup_p_tab_p_)[i] = l; + return font_table; } - -Real -Paper_def::interbeam_f (int multiplicity_i) const -{ - if (multiplicity_i <= 3) - return get_realvar (interbeam_scm_sym); - else - return get_realvar (interbeam4_scm_sym); -} - - -void -Paper_def::print () const +SCM +get_pango_font_table (Output_def *def) { -#ifndef NPRINT - Music_output_def::print (); - DEBUG_OUT << "Paper {"; - - for (Hash_table_iter ai(*lookup_p_tab_p_); ai.ok (); ai++) + SCM font_table = def->lookup_variable (ly_symbol2scm ("pango-fonts")); + if (scm_hash_table_p (font_table) != SCM_BOOL_T) { - DEBUG_OUT << "Lookup: " << ai.key () << " = " << ai.val ()->font_name_ << '\n'; + font_table = scm_c_make_hash_table (11); + def->set_variable (ly_symbol2scm ("pango-fonts"), font_table); } - - DEBUG_OUT << "}\n"; -#endif + return font_table; } -Lookup const * -Paper_def::lookup_l (int i) const +/* TODO: should add nesting for Output_def here too. */ +Font_metric * +find_scaled_font (Output_def *mod, Font_metric *f, Real m) { - return (*lookup_p_tab_p_)[i]; -} + 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::default_count_i_ = 0; + SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag); -int -Paper_def::get_next_default_count () const -{ - return default_count_i_ ++; -} - -void -Paper_def::reset_default_count() -{ - default_count_i_ = 0; + 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); } -Paper_outputter* -Paper_def::paper_outputter_p (Paper_stream* os_p, Scope* header_l, String origin_str) const +Font_metric * +find_pango_font (Output_def *layout, SCM descr, Real factor) { - Paper_outputter* p = new Paper_outputter (os_p); + if (layout->parent_) + return find_pango_font (layout->parent_, descr, factor); - // for now; breaks -fscm output - p->output_comment (_ ("Outputting Score, defined at: ")); - p->output_comment (origin_str); + 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)); - p->output_version(); - if (header_global_p) - p->output_scope (header_global_p, "mudela"); - if (header_l) - p->output_scope (header_l, "mudela"); - if (scope_p_) - p->output_scope (scope_p_, "mudelapaper"); - + PangoFontDescription *description + = pango_font_description_from_string (scm_i_string_chars (descr)); + Font_metric *fm = all_fonts_global->find_pango_font (description, + factor, + output_scale (layout)); - // *p->outstream_l_ << *scope_p_->elem (String (output_global_ch) + "setting")->access_content_String (false); + sizes = scm_acons (size_key, fm->self_scm (), sizes); + scm_hash_set_x (table, descr, sizes); - SCM scm = gh_list (ly_symbol ("experimental-on"), SCM_UNDEFINED); - p->output_scheme (scm); - scm = gh_list (ly_symbol ("header-end"), SCM_UNDEFINED); - p->output_scheme (scm); - - return p; + return fm; } -Paper_stream* -Paper_def::paper_stream_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) { - String outname = base_output_str (); - - if (outname != "-") - outname += String (".") + output_global_ch; - *mlog << _f ("paper output to %s...", - outname == "-" ? String ("") : outname) << endl; - - target_str_global_array.push (outname); - return new Paper_stream (outname); -} - + SCM proc = ly_lily_module_constant ("scale-layout"); + SCM new_pap = scm_call_2 (proc, o->self_scm (), scm_double2num (amount)); -String -Paper_def::base_output_str () const -{ - String str = get_default_output (); - - if (str.empty_b ()) - { - str = default_outname_base_global; - int def = get_next_default_count (); - if (def) - str += "-" + to_str (def); - } - return str; + o = unsmob_output_def (new_pap); + o->protect (); + return o; }