X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=3f402cc13ddaec48815425fd27516cf93dd1aad0;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=9eec211a700da15a12e230bed3975add054b282e;hpb=bc1e5cfa4aef13a1b9bd2d251dd9cb25dbaf9d03;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 9eec211a70..3f402cc13d 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -3,169 +3,104 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 2004--2006 Han-Wen Nienhuys */ -#include +#include "dimensions.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 "debug.hh" -#include "lookup.hh" -#include "main.hh" -#include "scope.hh" -#include "file-results.hh" // urg? header_global_p -#include "paper-stream.hh" - -Paper_def::Paper_def () -{ - lookup_alist_ = SCM_EOL; -} - - -Paper_def::~Paper_def () +Real +output_scale (Output_def *od) { + return scm_to_double (od->lookup_variable (ly_symbol2scm ("outputscale"))); } -Paper_def::Paper_def (Paper_def const&src) - : Music_output_def (src) +SCM +get_font_table (Output_def *def) { - SCM n = SCM_EOL; - for (SCM s = src.lookup_alist_; gh_pair_p(s); s = gh_cdr (s)) + SCM font_table = def->lookup_variable (ly_symbol2scm ("scaled-fonts")); + if (scm_hash_table_p (font_table) != SCM_BOOL_T) { - n = scm_acons (gh_caar(s), gh_cdar (s), n); + font_table = scm_c_make_hash_table (11); + def->set_variable (ly_symbol2scm ("scaled-fonts"), font_table); } - - lookup_alist_ = n; -} - - -Real -Paper_def::get_var (String s) const -{ - return get_realvar (ly_symbol2scm (s.ch_C())); + return font_table; } SCM -Paper_def::get_scmvar (String s) const +get_pango_font_table (Output_def *def) { - return scope_p_->scm_elem (ly_symbol2scm (s.ch_C())); -} - -Real -Paper_def::get_realvar (SCM s) const -{ - if (!scope_p_->elem_b (s)) - { - programming_error ("unknown paper variable: " + ly_symbol2string (s)); - return 0.0; - } - SCM val = scope_p_->scm_elem (s); - if (gh_number_p (val)) + SCM font_table = def->lookup_variable (ly_symbol2scm ("pango-fonts")); + if (scm_hash_table_p (font_table) != SCM_BOOL_T) { - return gh_scm2double (val); - } - else - { - non_fatal_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"); + if (mod->parent_) + return find_scaled_font (mod->parent_, f, m); - return Interval (ind, lw); -} + Real lookup_mag = m / output_scale (mod); -void -Paper_def::set_lookup (int i, Lookup*l) -{ - lookup_alist_ = scm_assq_set_x(lookup_alist_, gh_int2scm (i), l->self_scm_); -} + 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)); + SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag); -/* - junkme. - */ -Real -Paper_def::interbeam_f (int multiplicity_i) const -{ - if (multiplicity_i <= 3) - return get_var ("interbeam"); - else - return get_var ("interbeam4"); -} - - -void -Paper_def::print () const -{ -#ifndef NPRINT - Music_output_def::print (); - if (flower_dstream) - gh_display (lookup_alist_); -#endif -} - -Lookup const * -Paper_def::lookup_l (int i) const -{ - SCM l = scm_assq (gh_int2scm(i), lookup_alist_); - return l == SCM_BOOL_F ? 0 : unsmob_lookup (gh_cdr (l)); -} - -int Paper_def::default_count_i_ = 0; - -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_stream* -Paper_def::paper_stream_p () const +Font_metric * +find_pango_font (Output_def *layout, SCM descr, Real factor) { - String outname = base_output_str (); - - if (outname != "-") - outname += String (".") + output_global_ch; - progress_indication (_f ("paper output to %s...", - outname == "-" ? String ("") : outname)); - - target_str_global_array.push (outname); - return new Paper_stream (outname); + 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)); + + 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)); + + sizes = scm_acons (size_key, fm->self_scm (), sizes); + scm_hash_set_x (table, descr, sizes); + + return fm; } - -String -Paper_def::base_output_str () 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 str = get_default_output (); + SCM proc = ly_lily_module_constant ("scale-layout"); + SCM new_pap = scm_call_2 (proc, o->self_scm (), scm_double2num (amount)); - 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; } -