X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=e9a56ae0e190f269ce0c0ed690c933e0c46defd8;hb=8f2b7704b353e11bb85128498200e7f8d09d040d;hp=233e2075d21c1f973c2a9e5f810794320ca47e98;hpb=1ac137fdab1f1be8a5621599664008107b5a9a6a;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 233e2075d2..e9a56ae0e1 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -3,202 +3,111 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 2004--2007 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 "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); - } -} - 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"))); } -Real -Paper_def::get_realvar (SCM s) const +SCM +get_font_table (Output_def *def) { - if (!scope_p_->elem_b (s)) - error (_f ("unknown paper variable: `%s'", ly_symbol2string (s))); - Real * p = scope_p_->elem (s)->access_content_Real (false); - if (!p) + SCM font_table = def->lookup_variable (ly_symbol2scm ("scaled-fonts")); + if (scm_hash_table_p (font_table) != SCM_BOOL_T) { - error (_("not a real variable")); - return 0.0; + font_table = scm_c_make_hash_table (11); + def->set_variable (ly_symbol2scm ("scaled-fonts"), font_table); } - - return *p; + return font_table; } - -Interval -Paper_def::line_dimensions_int (int n) const +SCM +get_pango_font_table (Output_def *def) { - SCM s = default_properties_ [ly_symbol2scm ("margin-shape")]; - if (!gh_pair_p (s)) - { - Real lw = get_var ("linewidth"); - Real ind = n? 0.0:get_var ("indent"); - - return Interval (ind, lw); - } - - - SCM last = SCM_EOL; - while (gh_pair_p (s) && n --) - { - last = s; - s = gh_cdr (s); - } - - if (s == SCM_EOL) + SCM font_table = def->lookup_variable (ly_symbol2scm ("pango-fonts")); + if (scm_hash_table_p (font_table) != SCM_BOOL_T) { - s = last; + font_table = scm_c_make_hash_table (11); + def->set_variable (ly_symbol2scm ("pango-fonts"), font_table); } - - SCM pair = gh_car (s); - - return Interval (gh_scm2double (gh_car (pair)), - gh_scm2double (gh_cdr (pair))); + return font_table; } -void -Paper_def::set_lookup (int i, Lookup*l) +/* TODO: should add nesting for Output_def here too. */ +Font_metric * +find_scaled_font (Output_def *mod, Font_metric *f, Real m) { - if (lookup_p_tab_p_->elem_b (i)) - { - delete lookup_p_tab_p_->elem (i); - } - (*lookup_p_tab_p_)[i] = l; -} + if (mod->parent_) + return find_scaled_font (mod->parent_, f, m); + Real lookup_mag = m / output_scale (mod); -/* - junkme. - */ -Real -Paper_def::interbeam_f (int multiplicity_i) const -{ - if (multiplicity_i <= 3) - return get_var ("interbeam"); - else - return get_var ("interbeam4"); -} + 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); -void -Paper_def::print () const -{ -#ifndef NPRINT - Music_output_def::print (); - DEBUG_OUT << "Paper {"; - for (Hash_table_iter ai(*lookup_p_tab_p_); ai.ok (); ai++) - { - DEBUG_OUT << "Lookup: " << ai.key () << " = " << ai.val ()->font_name_ << '\n'; - } - DEBUG_OUT << "}\n"; -#endif + 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); } -Lookup const * -Paper_def::lookup_l (int i) const +Font_metric * +find_pango_font (Output_def *layout, SCM descr, Real factor) { - return (*lookup_p_tab_p_)[i]; -} + 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)); -int Paper_def::default_count_i_ = 0; + pango_font_description_set_size (description, + gint (factor * + pango_font_description_get_size (description))); -int -Paper_def::get_next_default_count () const -{ - return default_count_i_ ++; -} - -void -Paper_def::reset_default_count() -{ - default_count_i_ = 0; -} - - -Paper_stream* -Paper_def::paper_stream_p () const -{ - String outname = base_output_str (); + + Font_metric *fm = all_fonts_global->find_pango_font (description, + output_scale (layout)); - if (outname != "-") - outname += String (".") + output_global_ch; - progress_indication (_f ("paper output to %s...", - outname == "-" ? String ("") : outname)); - + pango_font_description_free (description); + + sizes = scm_acons (size_key, fm->self_scm (), sizes); + scm_hash_set_x (table, descr, sizes); - target_str_global_array.push (outname); - return new Paper_stream (outname); + 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; } -