X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=84ef5f298db1ace1ebcf96c41220aa6a2bf949a8;hb=f0968255554403de5d86b7e6efff5e644cba7f7a;hp=001e801175d98e8db6835a8aef979525f2de45b5;hpb=44db43814df6d3d9d11d5f84a2b894ff386024aa;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 001e801175..84ef5f298d 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -1,194 +1,101 @@ -/* +/* paper-def.cc -- implement Paper_def source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 2004 Han-Wen Nienhuys */ -#include - -#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-stream.hh" - -Paper_def::Paper_def () -{ - style_sheet_ = SCM_EOL; - scaled_fonts_ = SCM_EOL; -} - -Paper_def::~Paper_def () -{ -} - -Paper_def::Paper_def (Paper_def const&src) - : Music_output_def (src) -{ - scaled_fonts_ = SCM_EOL; - style_sheet_ = src.style_sheet_; -} - +#include "dimensions.hh" +#include "ly-module.hh" +#include "output-def.hh" +#include "modified-font-metric.hh" 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 ("outputscale"))); } -SCM -Paper_def::get_scmvar (String s) 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) { - return scope_p_->scm_elem (ly_symbol2scm (s.ch_C())); -} + if (mod->parent_) + return find_scaled_font (mod->parent_, f, m, font_encoding, input_encoding); + + Real lookup_mag = m / output_scale (mod); -Real -Paper_def::get_realvar (SCM s) const -{ - SCM val ; - if (!scope_p_->try_retrieve (s, &val)) - { - programming_error ("unknown paper variable: " + ly_symbol2string (s)); - return 0.0; - } - Real sc = 1.0; - SCM ssc; - if (scope_p_->try_retrieve (ly_symbol2scm ("outputscale"), &ssc)) + SCM font_table = mod->lookup_variable (ly_symbol2scm ("scaled-fonts")); + if (scm_hash_table_p (font_table) != SCM_BOOL_T) { - sc = gh_scm2double (ssc); + font_table = scm_c_make_hash_table (11); + mod->set_variable (ly_symbol2scm ("scaled-fonts"), font_table); } - if (gh_number_p (val)) + + SCM sizes = scm_hashq_ref (font_table, f->self_scm (), SCM_BOOL_F); + if (sizes != SCM_BOOL_F) { - return gh_scm2double (val) / sc; + SCM met = scm_assoc (scm_make_real (lookup_mag), sizes); + if (scm_is_pair (met)) + return unsmob_metrics (scm_cdr (met)); } else - { - programming_error ("not a real variable"); - return 0.0; - } -} - -/* - 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 -{ - Real lw = get_var ("linewidth"); - Real ind = n? 0.0:get_var ("indent"); - - return Interval (ind, lw); -} - - - -int Paper_def::default_count_i_ = 0; - -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 (); - - if (outname != "-") - outname += String (".") + output_global_ch; - progress_indication (_f ("paper output to %s...", - outname == "-" ? String ("") : outname)); - - target_str_global_array.push (outname); - return new Paper_stream (outname); + 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); } - -/* URGURGUGUUGH - - not const. - - Wat een puinhoop is dit. */ -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 (); - - if (str.empty_b ()) - { - str = default_outname_base_global; - int def = get_next_default_count (); - if (def) - str += "-" + to_str (def); - } - - /* Must store value, as this function can be called only once */ - Paper_def *urg = (Paper_def*)this; - urg->current_output_base_ = str; + 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); - return str; + return unsmob_output_def (new_pap); } -/* - todo: use symbols and hashtable idx? -*/ -Font_metric * -Paper_def::find_font (SCM fn, Real m) +LY_DEFINE (ly_paper_fonts, "ly:paper-fonts", + 1, 0, 0, + (SCM bp), + "Return fonts scaled up BP") { - SCM key = gh_cons (fn, gh_double2scm (m)); - SCM met = scm_assoc (key, scaled_fonts_); + Output_def *b = unsmob_output_def (bp); - if (gh_pair_p (met)) - return unsmob_metrics (gh_cdr (met)); - - SCM ssc; - if (scope_p_->try_retrieve (ly_symbol2scm ("outputscale"), &ssc)) - { - m /= gh_scm2double (ssc); - } + SCM font_table = b->lookup_variable (ly_symbol2scm ("scaled-fonts")); - 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_ ); - - scm_unprotect_object (val); + SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "paper"); - return dynamic_cast (unsmob_metrics (val)); -} - - -/* - Return alist to translate internally used fonts back to real-world - coordinates. */ -SCM -Paper_def::font_descriptions ()const -{ - - - SCM l = SCM_EOL; - for (SCM s = scaled_fonts_; gh_pair_p (s); s = gh_cdr(s)) + SCM ell = SCM_EOL; + if (scm_hash_table_p (font_table) == SCM_BOOL_T) { - SCM desc = gh_caar (s); - SCM mdesc = unsmob_metrics (gh_cdar (s))->description_; - - l = gh_cons (gh_cons (mdesc, desc), l); + SCM func = ly_scheme_function ("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)) + ell = scm_cons (fm->self_scm (), ell); + } + } } - return l; + return ell; }