X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=d0aa8fa88eb24cdb963073e8440094e245d317bb;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=5813786e62c080c0851c41bc2aea143d707db043;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 5813786e62..d0aa8fa88e 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -3,164 +3,111 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 2004--2008 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 "scaled-font-metric.hh" -#include "main.hh" -#include "scope.hh" -#include "file-results.hh" // urg? header_global_p -#include "paper-outputter.hh" - -Paper_def::Paper_def () -{ -} - -Paper_def::~Paper_def () -{ -} - -Paper_def::Paper_def (Paper_def const&src) - : Music_output_def (src) -{ -} - 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"))); } SCM -Paper_def::get_scmvar (String s) const +get_font_table (Output_def *def) { - return scope_p_->scm_elem (ly_symbol2scm (s.ch_C ())); -} - -Real -Paper_def::get_realvar (SCM s) const -{ - SCM val ; - if (!scope_p_->try_retrieve (s, &val)) + SCM font_table = def->lookup_variable (ly_symbol2scm ("scaled-fonts")); + if (scm_hash_table_p (font_table) != SCM_BOOL_T) { - programming_error ("unknown paper variable: " + ly_symbol2string (s)); - return 0.0; + font_table = scm_c_make_hash_table (11); + def->set_variable (ly_symbol2scm ("scaled-fonts"), font_table); } + return font_table; +} - Real sc = 1.0; - SCM ssc; - if (scope_p_->try_retrieve (ly_symbol2scm ("outputscale"), &ssc)) - { - sc = gh_scm2double (ssc); - } - if (gh_number_p (val)) - { - return gh_scm2double (val) / sc; - } - else +SCM +get_pango_font_table (Output_def *def) +{ + SCM font_table = def->lookup_variable (ly_symbol2scm ("pango-fonts")); + if (scm_hash_table_p (font_table) != SCM_BOOL_T) { - programming_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"); - - return Interval (ind, lw); -} + 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::score_count_i_ = 0; + SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag); -int -Paper_def::get_next_score_count () const -{ - return score_count_i_ ++; + 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); } -void -Paper_def::reset_score_count () +Font_metric * +find_pango_font (Output_def *layout, SCM descr, Real factor) { - score_count_i_ = 0; -} - + if (layout->parent_) + return find_pango_font (layout->parent_, descr, factor); -Paper_outputter* -Paper_def::paper_outputter_p () -{ - String outname = outname_str (); - progress_indication (_f ("paper output to `%s'...", - outname == "-" ? String ("") : outname)); - - target_str_global_array.push (outname); - Paper_outputter * po = new Paper_outputter (outname); - Path p = split_path (outname); - p.ext = ""; - po->basename_ = p.str (); - return po; -} + 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)); -/* - todo: use symbols and hashtable idx? -*/ -Font_metric * -Paper_def::find_font (SCM fn, Real m) -{ - SCM key = gh_cons (fn, gh_double2scm (m)); - SCM met = scm_assoc (key, scaled_fonts_); + pango_font_description_set_size (description, + gint (factor * + pango_font_description_get_size (description))); - if (gh_pair_p (met)) - return unsmob_metrics (ly_cdr (met)); - - SCM ssc; - if (scope_p_->try_retrieve (ly_symbol2scm ("outputscale"), &ssc)) - { - m /= gh_scm2double (ssc); - } - Font_metric* f = all_fonts_global_p->find_font (ly_scm2string (fn)); - SCM val = Scaled_font_metric::make_scaled_font_metric (f, m); - scaled_fonts_ = scm_acons (key, val, scaled_fonts_); + Font_metric *fm = all_fonts_global->find_pango_font (description, + output_scale (layout)); - scm_gc_unprotect_object (val); + pango_font_description_free (description); + + sizes = scm_acons (size_key, fm->self_scm (), sizes); + scm_hash_set_x (table, descr, sizes); - return dynamic_cast (unsmob_metrics (val)); + return fm; } - -/* - Return alist to translate internally used fonts back to real-world - coordinates. */ -SCM -Paper_def::font_descriptions ()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) { + SCM proc = ly_lily_module_constant ("scale-layout"); + SCM new_pap = scm_call_2 (proc, o->self_scm (), scm_double2num (amount)); - - SCM l = SCM_EOL; - for (SCM s = scaled_fonts_; gh_pair_p (s); s = ly_cdr (s)) - { - SCM desc = ly_caar (s); - SCM mdesc = unsmob_metrics (ly_cdar (s))->description_; - - l = gh_cons (gh_cons (mdesc, desc), l); - } - return l; + o = unsmob_output_def (new_pap); + o->protect (); + return o; } +