X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=ffcc2409d1d8383208786275ca098549d5ce5216;hb=5547ff00446ba0ac2bdbd1fe3205c2fb8411bb2f;hp=e6294c37406b608a7766ea6249504db07cdb42e1;hpb=106e5978fe2fa568bbc6649bc8fcf1134307373a;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index e6294c3740..ffcc2409d1 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -3,232 +3,205 @@ 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 "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; + 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 () { - 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=new Lookup (*ai.val ()); - l->paper_l_ = this; - set_lookup (ai.key(), l); - } - - + scaled_fonts_ = SCM_EOL; + /* + don't remove above statement, scm_make_hash_table may trigger GC. + */ + scaled_fonts_ = scm_c_make_hash_table (11); } -Real -Paper_def::get_var (String s) const +void +Paper_def::derived_mark () { - 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; -} - -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; - - return shape_int_a_[n]; + scm_gc_mark (scaled_fonts_); } Real -Paper_def::beam_thickness_f () const +Paper_def::get_dimension (SCM s) const { - return get_var ("beam_thickness"); + SCM val = lookup_variable (s); + SCM scale = lookup_variable (ly_symbol2scm ("outputscale")); + + Real sc = gh_scm2double (scale); + return gh_scm2double (val) / sc; } -Real -Paper_def::linewidth_f () const +/* + 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 { - return get_var ("linewidth"); -} + Real lw = get_dimension (ly_symbol2scm ("linewidth")); + Real ind = n? 0.0:get_dimension (ly_symbol2scm ("indent")); -Real -Paper_def::duration_to_dist (Moment d,Real k) const -{ - return arithmetic_spacing (d,k); + return Interval (ind, lw); } -/** - 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 +Paper_outputter* +Paper_def::get_paper_outputter (String outname) const { - return get_var ("arithmetic_basicspace") - log_2 (Moment (1,8) ") : outname)); + progress_indication("\n"); -Real -Paper_def::arithmetic_spacing (Moment d ,Real k) const -{ - return (log_2 (d) + k)* get_var ("arithmetic_multiplier"); + 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; } -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; -} -void -Paper_def::set_lookup (int i, Lookup*l) + +Font_metric * +Paper_def::find_scaled_font (Font_metric *f, Real m) { - if (lookup_p_assoc_p_->elem_b (i)) + SCM sizes = scm_hashq_ref (scaled_fonts_, f->self_scm (), SCM_BOOL_F); + if (sizes != SCM_BOOL_F) { - delete lookup_p_assoc_p_->elem (i); + SCM met = scm_assoc (gh_double2scm (m), sizes); + if (gh_pair_p (met)) + return unsmob_metrics (ly_cdr (met)); } - l ->paper_l_ = this; - (*lookup_p_assoc_p_)[i] = l; -} + else + { + sizes = SCM_EOL; + } + -Real -Paper_def::interline_f () const -{ - return get_var ("interline"); -} + /* + Hmm. We're chaining font - metrics. Should consider wether 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)) + { + Font_metric*scaled + = find_scaled_font (unsmob_metrics (gh_car (s)), m); + *t = scm_cons (scaled->self_scm (), SCM_EOL); + t = SCM_CDRLOC(*t); + } + + vf = new Virtual_font_metric (l); + val = vf->self_scm (); + } + else + { + SCM scale_var = ly_module_lookup (scope_, ly_symbol2scm ("outputscale")); -Real -Paper_def::rule_thickness () const -{ - return get_var ("rulethickness"); -} + m /= gh_scm2double (scm_variable_ref (scale_var)); -Real -Paper_def::staffline_f () const -{ - return get_var ("rulethickness"); -} + val = Scaled_font_metric::make_scaled_font_metric (f, m); + } -Real -Paper_def::staffheight_f () const -{ - return get_var ("staffheight"); -} + sizes = scm_acons (gh_double2scm (m), val, sizes); + scm_gc_unprotect_object (val); -Real -Paper_def::interbeam_f (int multiplicity_i) const -{ - if (multiplicity_i <= 3) - return get_var ("interbeam"); - else - return get_var ("interbeam4"); + scm_hashq_set_x (scaled_fonts_, f->self_scm (), sizes); + + return unsmob_metrics (val); } -Real -Paper_def::internote_f () const -{ - return get_var ("interline") /2.0 ; -} -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 {"; + SCM func = ly_scheme_function ("hash-table->alist"); - for (Assoc_iter ai(*lookup_p_assoc_p_); ai.ok (); ai++) + SCM l = SCM_EOL; + for (SCM s = scm_call_1 (func, scaled_fonts_); gh_pair_p (s); s = ly_cdr (s)) { - DOUT << "Lookup: " << ai.key () ; - ai.val ()->print (); + 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)); + + if (dynamic_cast (fm)) + l = gh_cons (fm->self_scm (), l); + } } - - DOUT << "}\n"; -#endif + return l; } -Lookup const * -Paper_def::lookup_l (int i) const +Paper_def* +unsmob_paper (SCM x) { - return (*lookup_p_assoc_p_)[i]; + return dynamic_cast (unsmob_music_output_def (x)); } + -IMPLEMENT_IS_TYPE_B1 (Paper_def, Music_output_def); - -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); } - - -