X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=144a944a6121768ca2a02524d10167271e39ccea;hb=6b93aa32e32d736202d803c68f5156cc253a5f7c;hp=2c006ad09798684bcc4e78ed34fdfae8e3fe214a;hpb=e99a6533b0a5cfdf1d8ec5b00ed4010459285deb;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 2c006ad097..144a944a61 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -3,244 +3,161 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ + #include + +#include "virtual-font-metric.hh" +#include "all-font-metrics.hh" #include "string.hh" -#include "assoc.hh" #include "misc.hh" #include "paper-def.hh" -#include "debug.hh" -#include "lookup.hh" -#include "ps-lookup.hh" -#include "tex-lookup.hh" -#include "dimension.hh" -#include "assoc-iter.hh" -#include "score-engraver.hh" -#include "p-score.hh" -#include "identifier.hh" +#include "warn.hh" +#include "scaled-font-metric.hh" #include "main.hh" -#include "scope.hh" -#include "assoc.hh" -#include "assoc-iter.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_p_assoc_p_ = new Assoc; } - Paper_def::~Paper_def () { - for (Assoc_iter ai(*lookup_p_assoc_p_); ai.ok (); ai++) - { - delete ai.val (); - } - - delete lookup_p_assoc_p_; } -Paper_def::Paper_def (Paper_def const&s) - : Music_output_def (s) +Paper_def::Paper_def (Paper_def const&src) + : Music_output_def (src) { - lookup_p_assoc_p_ = new Assoc; - for (Assoc_iter ai(*s.lookup_p_assoc_p_); ai.ok (); ai++) - { - Lookup * l = ps_output_global_b ? new Ps_lookup (*ai.val ()) - : new Tex_lookup (*ai.val ()); - l->paper_l_ = this; - set_lookup (ai.key(), l); - } } Real -Paper_def::get_var (String s) const +Paper_def::get_realvar (SCM s) const { - if (!scope_p_->elem_b (s)) - error (_f ("unknown paper variable: `%s\'", s)); - Real * p = scope_p_->elem (s)->access_Real (false); - if (!p) - { - error (_ ("not a real variable")); - return 0.0; - } - - return *p; + 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 { - if (!shape_int_a_.size ()) - if (n) - return Interval (0, linewidth_f ()); - else - return Interval (get_var ("indent"), linewidth_f ()); - - if (n >= shape_int_a_.size ()) - n = shape_int_a_.size () -1; + Real lw = get_realvar (ly_symbol2scm ("linewidth")); + Real ind = n? 0.0:get_realvar (ly_symbol2scm ("indent")); - return shape_int_a_[n]; + return Interval (ind, lw); } -Real -Paper_def::beam_thickness_f () const -{ - return get_var ("beam_thickness"); -} -Real -Paper_def::linewidth_f () const -{ - return get_var ("linewidth"); -} - -Real -Paper_def::duration_to_dist (Moment d,Real k) const -{ - return arithmetic_spacing (d,k); -} -/** - Get the measure wide constant for arithmetic. - - @see - John S. Gourlay. ``Spacing a Line of Music,'' Technical Report - OSU-CISRC-10/87-TR35, Department of Computer and Information Science, - The Ohio State University, 1987. - - */ -Real -Paper_def::arithmetic_constant (Moment d) const -{ - return get_var ("arithmetic_basicspace") - log_2 (Moment (1,8) ") : outname)); + progress_indication("\n"); -Real -Paper_def::geometric_spacing (Moment d) const -{ - Real dur_f = (d) ?pow (get_var ("geometric"), log_2 (d)) : 0; - return get_var ("basicspace") + get_var ("unitspace") * dur_f; + 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; } -void -Paper_def::set_lookup (int i, Lookup*l) -{ - if (lookup_p_assoc_p_->elem_b (i)) - { - delete lookup_p_assoc_p_->elem (i); - } - l ->paper_l_ = this; - (*lookup_p_assoc_p_)[i] = l; -} -Real -Paper_def::interline_f () const +/* + Todo: use symbols and hashtable idx? +*/ +Font_metric * +Paper_def::find_font (SCM fn, Real m) { - return get_var ("interline"); -} + SCM key = gh_cons (fn, gh_double2scm (m)); + SCM met = scm_assoc (key, scaled_fonts_); -Real -Paper_def::rule_thickness () const -{ - return get_var ("rulethickness"); -} + if (gh_pair_p (met)) + return unsmob_metrics (ly_cdr (met)); -Real -Paper_def::staffline_f () const -{ - return get_var ("rulethickness"); -} + /* + 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 + { + SCM scale_var = ly_module_lookup (scope_, ly_symbol2scm ("outputscale")); -Real -Paper_def::staffheight_f () const -{ - return get_var ("staffheight"); -} + m /= gh_scm2double (scm_variable_ref (scale_var)); -Real -Paper_def::interbeam_f (int multiplicity_i) const -{ - if (multiplicity_i <= 3) - return get_var ("interbeam"); - else - return get_var ("interbeam4"); -} + 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); + } -Real -Paper_def::internote_f () const -{ - return get_var ("interline") /2.0 ; + return f; } -Real -Paper_def::note_width () const -{ - return get_var ("notewidth"); -} -void -Paper_def::print () const +/* + Return alist to translate internally used fonts back to real-world + coordinates. */ +SCM +Paper_def::font_descriptions ()const { -#ifndef NPRINT - Music_output_def::print (); - DOUT << "Paper {"; - - for (Assoc_iter ai(*lookup_p_assoc_p_); ai.ok (); ai++) + SCM l = SCM_EOL; + for (SCM s = scaled_fonts_; gh_pair_p (s); s = ly_cdr (s)) { - DOUT << "Lookup: " << ai.key () ; - ai.val ()->print (); - } + SCM desc = ly_caar (s); + if (!gh_string_p (gh_car (desc))) + continue ; - DOUT << "}\n"; -#endif -} + SCM mdesc = unsmob_metrics (ly_cdar (s))->description_; -Lookup const * -Paper_def::lookup_l (int i) const -{ - return (*lookup_p_assoc_p_)[i]; + l = gh_cons (gh_cons (mdesc, desc), l); + } + return l; } -IMPLEMENT_IS_TYPE_B1 (Paper_def, Music_output_def); - -String -Paper_def::ps_output_settings_str () const +Paper_def* +unsmob_paper (SCM x) { - String s ("\n "); - for (Assoc_iter i (*scope_p_); i.ok (); i++) - s += String ("/mudelapaper") + i.key () - + "{" + i.val ()->str () + "} bind def\n"; - s += *scope_p_->elem ("texsetting")->access_String (); - return s; + return dynamic_cast (unsmob_music_output_def (x)); } + -String -Paper_def::tex_output_settings_str () const +LY_DEFINE (ly_paper_def_p, "ly:paper-def?", + 1, 0,0, (SCM def), + "Is @var{def} a paper definition?") { - String s ("\n "); - for (Assoc_iter i (*scope_p_); i.ok (); i++) - s += String ("\\def\\mudelapaper") + i.key () - + "{" + i.val ()->str () + "}\n"; - s += *scope_p_->elem ("texsetting")->access_String (); - return s; -} + Paper_def *op = dynamic_cast (unsmob_music_output_def (def)); -int Paper_def::default_count_i_ = 0; - -int -Paper_def::get_next_default_count () const -{ - return default_count_i_ ++; + bool pap = op; + return gh_bool2scm (pap); } - - -