X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=144a944a6121768ca2a02524d10167271e39ccea;hb=6b93aa32e32d736202d803c68f5156cc253a5f7c;hp=9eec211a700da15a12e230bed3975add054b282e;hpb=bc1e5cfa4aef13a1b9bd2d251dd9cb25dbaf9d03;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 9eec211a70..144a944a61 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -3,27 +3,35 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--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 "debug.hh" -#include "lookup.hh" +#include "warn.hh" +#include "scaled-font-metric.hh" #include "main.hh" -#include "scope.hh" -#include "file-results.hh" // urg? header_global_p -#include "paper-stream.hh" +#include "scm-hash.hh" +#include "input-file-results.hh" // urg? header_global +#include "paper-outputter.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 () { - lookup_alist_ = SCM_EOL; } - Paper_def::~Paper_def () { } @@ -31,46 +39,16 @@ Paper_def::~Paper_def () Paper_def::Paper_def (Paper_def const&src) : Music_output_def (src) { - SCM n = SCM_EOL; - for (SCM s = src.lookup_alist_; gh_pair_p(s); s = gh_cdr (s)) - { - n = scm_acons (gh_caar(s), gh_cdar (s), n); - } - - lookup_alist_ = n; -} - - -Real -Paper_def::get_var (String s) const -{ - return get_realvar (ly_symbol2scm (s.ch_C())); -} - -SCM -Paper_def::get_scmvar (String s) const -{ - return scope_p_->scm_elem (ly_symbol2scm (s.ch_C())); } Real Paper_def::get_realvar (SCM s) const { - if (!scope_p_->elem_b (s)) - { - programming_error ("unknown paper variable: " + ly_symbol2string (s)); - return 0.0; - } - SCM val = scope_p_->scm_elem (s); - if (gh_number_p (val)) - { - return gh_scm2double (val); - } - else - { - non_fatal_error (_("not a real variable")); - return 0.0; - } + SCM val = lookup_variable (s); + SCM scale = lookup_variable (ly_symbol2scm ("outputscale")); + + Real sc = gh_scm2double (scale); + return gh_scm2double (val) / sc; } /* @@ -80,92 +58,106 @@ Paper_def::get_realvar (SCM s) const Interval Paper_def::line_dimensions_int (int n) const { - Real lw = get_var ("linewidth"); - Real ind = n? 0.0:get_var ("indent"); + Real lw = get_realvar (ly_symbol2scm ("linewidth")); + Real ind = n? 0.0:get_realvar (ly_symbol2scm ("indent")); return Interval (ind, lw); } -void -Paper_def::set_lookup (int i, Lookup*l) + + + +Paper_outputter* +Paper_def::get_paper_outputter (String outname) const { - lookup_alist_ = scm_assq_set_x(lookup_alist_, gh_int2scm (i), l->self_scm_); + 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; } /* - junkme. - */ -Real -Paper_def::interbeam_f (int multiplicity_i) const + Todo: use symbols and hashtable idx? +*/ +Font_metric * +Paper_def::find_font (SCM fn, Real m) { - if (multiplicity_i <= 3) - return get_var ("interbeam"); + 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); // TODO: GC protection. + + scaled_fonts_ = scm_acons (key, f->self_scm (), scaled_fonts_); + scm_gc_unprotect_object (f->self_scm ()); + } else - return get_var ("interbeam4"); -} + { + SCM scale_var = ly_module_lookup (scope_, ly_symbol2scm ("outputscale")); + m /= gh_scm2double (scm_variable_ref (scale_var)); -void -Paper_def::print () const -{ -#ifndef NPRINT - Music_output_def::print (); - if (flower_dstream) - gh_display (lookup_alist_); -#endif -} + 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); + } -Lookup const * -Paper_def::lookup_l (int i) const -{ - SCM l = scm_assq (gh_int2scm(i), lookup_alist_); - return l == SCM_BOOL_F ? 0 : unsmob_lookup (gh_cdr (l)); + return f; } -int Paper_def::default_count_i_ = 0; -int -Paper_def::get_next_default_count () const +/* + Return alist to translate internally used fonts back to real-world + coordinates. */ +SCM +Paper_def::font_descriptions ()const { - return default_count_i_ ++; -} + 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 ; -void -Paper_def::reset_default_count() -{ - default_count_i_ = 0; -} + SCM mdesc = unsmob_metrics (ly_cdar (s))->description_; + l = gh_cons (gh_cons (mdesc, desc), l); + } + return l; +} -Paper_stream* -Paper_def::paper_stream_p () const +Paper_def* +unsmob_paper (SCM x) { - 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); + return dynamic_cast (unsmob_music_output_def (x)); } + - -String -Paper_def::base_output_str () const +LY_DEFINE (ly_paper_def_p, "ly:paper-def?", + 1, 0,0, (SCM def), + "Is @var{def} a paper definition?") { - String str = get_default_output (); + Paper_def *op = dynamic_cast (unsmob_music_output_def (def)); - if (str.empty_b ()) - { - str = default_outname_base_global; - int def = get_next_default_count (); - if (def) - str += "-" + to_str (def); - } - return str; + bool pap = op; + return gh_bool2scm (pap); } - -