X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=d40e1abc389eeaec9445742d351ff6f8dddb99cb;hb=a286e94740cef413b1460cda2ce9848ad089ca90;hp=ffcc2409d1d8383208786275ca098549d5ce5216;hpb=5547ff00446ba0ac2bdbd1fe3205c2fb8411bb2f;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index ffcc2409d1..d40e1abc38 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -1,207 +1,132 @@ -/* +/* 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 () -{ - scaled_fonts_ = SCM_EOL; - /* - don't remove above statement, scm_make_hash_table may trigger GC. - */ - scaled_fonts_ = scm_c_make_hash_table (11); -} - -Paper_def::~Paper_def () -{ -} - -Paper_def::Paper_def (Paper_def const&src) - : Music_output_def (src) -{ - scaled_fonts_ = SCM_EOL; - /* - don't remove above statement, scm_make_hash_table may trigger GC. - */ - scaled_fonts_ = scm_c_make_hash_table (11); -} - -void -Paper_def::derived_mark () -{ - scm_gc_mark (scaled_fonts_); -} +#include "output-def.hh" +#include "modified-font-metric.hh" +#include "virtual-font-metric.hh" Real -Paper_def::get_dimension (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_dimension (ly_symbol2scm ("linewidth")); - Real ind = n? 0.0:get_dimension (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 +/* TODO: should add nesting for Output_def here too. */ +Font_metric * +find_scaled_font (Output_def *mod, Font_metric *f, Real m, + SCM font_encoding, SCM input_encoding) { - 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; -} - + if (mod->parent_) + return find_scaled_font (mod->parent_, f, m, font_encoding, input_encoding); + + Real lookup_mag = m; + if (!dynamic_cast (f)) + lookup_mag /= output_scale (mod); + SCM font_table = mod->lookup_variable (ly_symbol2scm ("scaled-fonts")); + if (scm_hash_table_p (font_table) != SCM_BOOL_T) + { + font_table = scm_c_make_hash_table (11); + mod->set_variable (ly_symbol2scm ("scaled-fonts"), font_table); + } -Font_metric * -Paper_def::find_scaled_font (Font_metric *f, Real m) -{ - SCM sizes = scm_hashq_ref (scaled_fonts_, f->self_scm (), SCM_BOOL_F); + + SCM sizes = scm_hashq_ref (font_table, f->self_scm (), SCM_BOOL_F); if (sizes != SCM_BOOL_F) { - SCM met = scm_assoc (gh_double2scm (m), sizes); - if (gh_pair_p (met)) - return unsmob_metrics (ly_cdr (met)); + SCM met = scm_assoc (scm_make_real (lookup_mag), sizes); + if (scm_is_pair (met)) + return unsmob_metrics (scm_cdr (met)); } else - { - sizes = SCM_EOL; - } + sizes = SCM_EOL; - - /* - Hmm. We're chaining font - metrics. Should consider wether to merge - virtual-font and scaled_font. - */ + /* Hmm. We're chaining font - metrics. Should consider whether to + merge virtual-font and scaled_font. */ SCM val = SCM_EOL; if (Virtual_font_metric * vf = dynamic_cast (f)) { - /* - For fontify_atom (), the magnification and name must be known - at the same time. That's impossible for - - Scaled (Virtual_font (Font1,Font2)) - - so we replace by - - Virtual_font (Scaled (Font1), Scaled (Font2)) - - */ - SCM l = SCM_EOL; - SCM *t = &l; - for (SCM s = vf->get_font_list (); gh_pair_p (s); s = gh_cdr (s)) + /* For fontify_atom (), the magnification and name must be known + at the same time. That's impossible for + + Scaled (Virtual_font (Font1,Font2)) + + so we replace by + + Virtual_font (Scaled (Font1), Scaled (Font2)) */ + SCM lst = SCM_EOL; + SCM *t = &lst; + for (SCM s = vf->get_font_list (); scm_is_pair (s); s = scm_cdr (s)) { - Font_metric*scaled - = find_scaled_font (unsmob_metrics (gh_car (s)), m); + Font_metric *scaled + = find_scaled_font (mod, unsmob_metrics (scm_car (s)), m, + font_encoding, input_encoding); *t = scm_cons (scaled->self_scm (), SCM_EOL); - t = SCM_CDRLOC(*t); + t = SCM_CDRLOC (*t); } - vf = new Virtual_font_metric (l); + vf = new Virtual_font_metric (lst); val = vf->self_scm (); } else - { - SCM scale_var = ly_module_lookup (scope_, ly_symbol2scm ("outputscale")); - - m /= gh_scm2double (scm_variable_ref (scale_var)); + val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag, + font_encoding, + input_encoding); - val = Scaled_font_metric::make_scaled_font_metric (f, m); - } - - sizes = scm_acons (gh_double2scm (m), val, sizes); + sizes = scm_acons (scm_make_real (lookup_mag), val, sizes); scm_gc_unprotect_object (val); - - scm_hashq_set_x (scaled_fonts_, f->self_scm (), sizes); - + scm_hashq_set_x (font_table, f->self_scm (), sizes); return unsmob_metrics (val); } - - -/* - 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 func = ly_scheme_function ("hash-table->alist"); - - SCM l = SCM_EOL; - for (SCM s = scm_call_1 (func, scaled_fonts_); gh_pair_p (s); s = ly_cdr (s)) - { - SCM entry = gh_car (s); - for (SCM t = gh_cdr (entry); gh_pair_p (t); t = gh_cdr (t)) - { - Font_metric *fm= unsmob_metrics (gh_cdar (t)); + SCM proc = ly_scheme_function ("scale-layout"); + SCM new_pap = scm_call_2 (proc, o->self_scm (), scm_double2num (amount)); + scm_gc_protect_object (new_pap); - if (dynamic_cast (fm)) - l = gh_cons (fm->self_scm (), l); - } - } - return l; + return unsmob_output_def (new_pap); } -Paper_def* -unsmob_paper (SCM x) +LY_DEFINE (ly_paper_fonts, "ly:paper-fonts", + 1, 0, 0, + (SCM bp), + "Return fonts scaled up BP") { - return dynamic_cast (unsmob_music_output_def (x)); -} + Output_def *b = unsmob_output_def (bp); + + SCM font_table = b->lookup_variable (ly_symbol2scm ("scaled-fonts")); + SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "paper"); -LY_DEFINE (ly_paper_def_p, "ly:paper-def?", - 1, 0,0, (SCM def), - "Is @var{def} a paper definition?") -{ - Paper_def *op = dynamic_cast (unsmob_music_output_def (def)); + SCM ell = SCM_EOL; + if (scm_hash_table_p (font_table) == SCM_BOOL_T) + { + SCM func = ly_scheme_function ("hash-table->alist"); - bool pap = op; - return gh_bool2scm (pap); + 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)) + ell = scm_cons (fm->self_scm (), ell); + } + } + } + return ell; }