X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Fpaper-def.cc;h=83b3491da85bc80493f9072ac8ac176429054b4a;hb=24ac85edabed266d1de42c12971f4e81b4475d7d;hp=99e371a9999f306c8ef8ffdfbb9e6fca100cd50e;hpb=bdde3680c8709b0d84e9291642ae4474a3a31668;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 99e371a999..83b3491da8 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -1,153 +1,113 @@ -/* +/* paper-def.cc -- implement Paper_def source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 2004 Han-Wen Nienhuys */ - -#include - -#include "virtual-font-metric.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 "dimensions.hh" #include "ly-module.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 () -{ -} - -Paper_def::Paper_def (Paper_def const&src) - : Music_output_def (src) -{ -} +#include "output-def.hh" +#include "modified-font-metric.hh" +#include "pango-font.hh" Real -Paper_def::get_realvar (SCM s) const -{ - SCM val = lookup_variable (s); - SCM scale = lookup_variable (ly_symbol2scm ("outputscale")); - - Real sc = gh_scm2double (scale); - return gh_scm2double (val) / sc; -} - -/* - 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 +output_scale (Output_def *od) { - Real lw = get_realvar (ly_symbol2scm ("linewidth")); - Real ind = n? 0.0:get_realvar (ly_symbol2scm ("indent")); - - return Interval (ind, lw); + return scm_to_double (od->lookup_variable (ly_symbol2scm ("outputscale"))); } - - -Paper_outputter* -Paper_def::get_paper_outputter (String outname) const +SCM +get_font_table (Output_def *def) { - progress_indication (_f ("paper output to `%s'...", - outname == "-" ? String ("") : outname)); - progress_indication("\n"); - - 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; + 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; } + -/* - Todo: use symbols and hashtable idx? -*/ +/* TODO: should add nesting for Output_def here too. */ Font_metric * -Paper_def::find_font (SCM fn, Real m) +find_scaled_font (Output_def *mod, Font_metric *f, Real m, + SCM font_encoding, SCM input_encoding) { - 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)) + if (mod->parent_) + return find_scaled_font (mod->parent_, f, m, font_encoding, input_encoding); + + 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_BOOL_F); + if (sizes != SCM_BOOL_F) { - f = new Virtual_font_metric (fn, m, this); // TODO: GC protection. - - scaled_fonts_ = scm_acons (key, f->self_scm (), scaled_fonts_); - scm_gc_unprotect_object (f->self_scm ()); + SCM met = scm_assoc (scm_make_real (lookup_mag), sizes); + if (scm_is_pair (met)) + return unsmob_metrics (scm_cdr (met)); } else - { - SCM scale_var = ly_module_lookup (scope_, ly_symbol2scm ("outputscale")); - - m /= gh_scm2double (scm_variable_ref (scale_var)); + sizes = SCM_EOL; + + SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag, + font_encoding, + input_encoding); + + sizes = scm_acons (scm_make_real (lookup_mag), val, sizes); + scm_gc_unprotect_object (val); + scm_hashq_set_x (font_table, f->self_scm (), sizes); + return unsmob_metrics (val); +} - 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_); - scm_gc_unprotect_object (val); - - f = unsmob_metrics (val); - } +/* 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_gc_protect_object (new_pap); - return f; + return unsmob_output_def (new_pap); } - -/* - Return alist to translate internally used fonts back to real-world - coordinates. */ -SCM -Paper_def::font_descriptions ()const +LY_DEFINE (ly_paper_fonts, "ly:paper-fonts", + 1, 0, 0, + (SCM bp), + "Return fonts scaled up BP") { - SCM l = SCM_EOL; - for (SCM s = scaled_fonts_; gh_pair_p (s); s = ly_cdr (s)) - { - SCM desc = ly_caar (s); - if (!gh_string_p (gh_car (desc))) - continue ; + Output_def *b = unsmob_output_def (bp); - SCM mdesc = unsmob_metrics (ly_cdar (s))->description_; + SCM font_table = b->lookup_variable (ly_symbol2scm ("scaled-fonts")); + + SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "paper"); - l = gh_cons (gh_cons (mdesc, desc), l); + SCM ell = SCM_EOL; + if (scm_hash_table_p (font_table) == SCM_BOOL_T) + { + SCM func = ly_lily_module_constant ("hash-table->alist"); + + for (SCM s = scm_call_1 (func, font_table); scm_is_pair (s); + s = scm_cdr (s)) + { + SCM entry = scm_car (s); + for (SCM t = scm_cdr (entry); scm_is_pair (t); t = scm_cdr (t)) + { + Font_metric *fm = unsmob_metrics (scm_cdar (t)); + + if (dynamic_cast (fm) + || dynamic_cast (fm)) + ell = scm_cons (fm->self_scm (), ell); + } + } } - return l; + return ell; } - -Paper_def* -unsmob_paper (SCM x) -{ - return dynamic_cast (unsmob_music_output_def (x)); -} -