X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=d0aa8fa88eb24cdb963073e8440094e245d317bb;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=b3568b2dd0571a6086438407ebd90274ac955729;hpb=e8936ee66fdd3e7ebe30556590e8dc913908a533;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index b3568b2dd0..d0aa8fa88e 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -3,153 +3,111 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2003 Han-Wen Nienhuys + (c) 2004--2008 Han-Wen Nienhuys */ - -#include - -#include "virtual-font-metric.hh" +#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 "warn.hh" -#include "scaled-font-metric.hh" -#include "main.hh" -#include "scm-hash.hh" -#include "input-file-results.hh" // urg? header_global -#include "paper-outputter.hh" -#include "ly-modules.hh" - -/* - This is an almost empty thing. The only substantial thing this class - handles, is scaling up and down to real-world dimensions (internally - dimensions are against global staff-space.) - - */ -Paper_def::Paper_def () -{ -} - -Paper_def::~Paper_def () +Real +output_scale (Output_def *od) { + return scm_to_double (od->lookup_variable (ly_symbol2scm ("output-scale"))); } -Paper_def::Paper_def (Paper_def const&src) - : Music_output_def (src) +SCM +get_font_table (Output_def *def) { + SCM font_table = def->lookup_variable (ly_symbol2scm ("scaled-fonts")); + if (scm_hash_table_p (font_table) != SCM_BOOL_T) + { + font_table = scm_c_make_hash_table (11); + def->set_variable (ly_symbol2scm ("scaled-fonts"), font_table); + } + return font_table; } - - -Real -Paper_def::get_realvar (SCM s) const +SCM +get_pango_font_table (Output_def *def) { - SCM val = lookup_variable (s); - SCM scale = lookup_variable (ly_symbol2scm ("outputscale")); - - Real sc = gh_scm2double (scale); - return gh_scm2double (val) / sc; + SCM font_table = def->lookup_variable (ly_symbol2scm ("pango-fonts")); + if (scm_hash_table_p (font_table) != SCM_BOOL_T) + { + 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_realvar (ly_symbol2scm ("linewidth")); - Real ind = n? 0.0:get_realvar (ly_symbol2scm ("indent")); + if (mod->parent_) + return find_scaled_font (mod->parent_, f, m); - return Interval (ind, lw); -} + 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_ = 0; + SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag); -int -Paper_def::get_next_score_count () const -{ - return score_count_ ++; + 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_ = 0; -} + 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)); -Paper_outputter* -Paper_def::get_paper_outputter () -{ - String outname = outname_string (); - progress_indication (_f ("paper output to `%s'...", - outname == "-" ? String ("") : outname)); - - global_input_file->target_strings_.push (outname); - Paper_outputter * po = new Paper_outputter (outname); - Path p = split_path (outname); - p.ext = ""; - po->basename_ = p.to_string (); - return po; -} + PangoFontDescription *description + = pango_font_description_from_string (scm_i_string_chars (descr)); + pango_font_description_set_size (description, + gint (factor * + pango_font_description_get_size (description))); -/* - 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_); - - if (gh_pair_p (met)) - return unsmob_metrics (ly_cdr (met)); - - /* - Hmm. We're chaining font - metrics. Should consider wether to merge - virtual-font and scaled_font. - */ - Font_metric* f=0; - if (gh_list_p (fn)) - { - f = new Virtual_font_metric (fn, m, this); - } - else - { - SCM scale_var = ly_module_lookup (scope_, ly_symbol2scm ("outputscale")); + + Font_metric *fm = all_fonts_global->find_pango_font (description, + output_scale (layout)); - m /= gh_scm2double (scm_variable_ref (scale_var)); + pango_font_description_free (description); + + sizes = scm_acons (size_key, fm->self_scm (), sizes); + scm_hash_set_x (table, descr, sizes); - f = all_fonts_global->find_font (ly_scm2string (fn)); - SCM val = Scaled_font_metric::make_scaled_font_metric (f, m); - scaled_fonts_ = scm_acons (key, val, scaled_fonts_); - f = unsmob_metrics (val); - scm_gc_unprotect_object (val); - } - - return f; + 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 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_; + SCM proc = ly_lily_module_constant ("scale-layout"); + SCM new_pap = scm_call_2 (proc, o->self_scm (), scm_double2num (amount)); - l = gh_cons (gh_cons (mdesc, desc), l); - } - return l; + o = unsmob_output_def (new_pap); + o->protect (); + return o; } +