X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=ffcc2409d1d8383208786275ca098549d5ce5216;hb=5547ff00446ba0ac2bdbd1fe3205c2fb8411bb2f;hp=b3ca52a21a2d03d8a1809ced59b86cac2532671e;hpb=339ea28cd7e4f8a1c1ca7c1d4dfe803a3f4c03e6;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index b3ca52a21a..ffcc2409d1 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -3,300 +3,205 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 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 "score-engraver.hh" -#include "paper-score.hh" -#include "identifier.hh" +#include "warn.hh" +#include "scaled-font-metric.hh" #include "main.hh" -#include "scope.hh" -#include "dictionary-iter.hh" -#include "file-results.hh" // urg? header_global_p +#include "scm-hash.hh" +#include "input-file-results.hh" // urg? header_global #include "paper-outputter.hh" -#include "paper-stream.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_tab_p_ = new Hash_table; - lookup_p_tab_p_->hash_func_ = int_hash; + 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 (Hash_table_iter ai(*lookup_p_tab_p_); ai.ok (); ai++) - { - delete ai.val (); - } - - delete lookup_p_tab_p_; -} - -Paper_def::Paper_def (Paper_def const&s) - : Music_output_def (s) -{ - shape_int_a_ = s.shape_int_a_; - lookup_p_tab_p_ = new Hash_table; - lookup_p_tab_p_->hash_func_ = int_hash; - - for (Hash_table_iter ai(*s.lookup_p_tab_p_); ai.ok (); ai++) - { - Lookup * l = new Lookup (*ai.val ()); - set_lookup (ai.key(), l); - } } -SCM -Paper_def::get_scm_var (SCM s) const +Paper_def::Paper_def (Paper_def const&src) + : Music_output_def (src) { - if (!scope_p_->elem_b (s)) - return SCM_BOOL_F; - - Identifier * id = scope_p_->elem (s); - - SCM z; - SCM_NEWCELL (z); - SCM_SETCAR(z, s); - - SCM val; - - if (dynamic_cast (id)) - { - Real r = *id->access_content_Real (false); - val = gh_double2scm (r); - } - else - { - return SCM_BOOL_F; - } - - SCM_SETCDR(z,val); - return z; + 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 () { - return get_realvar (ly_symbol (s)); + scm_gc_mark (scaled_fonts_); } Real -Paper_def::get_realvar (SCM s) const +Paper_def::get_dimension (SCM s) const { - if (!scope_p_->elem_b (s)) - error (_f ("unknown paper variable: `%s\'", symbol_to_string (s))); - Real * p = scope_p_->elem (s)->access_content_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_dimension (ly_symbol2scm ("linewidth")); + Real ind = n? 0.0:get_dimension (ly_symbol2scm ("indent")); - return shape_int_a_[n]; + return Interval (ind, lw); } -Real -Paper_def::beam_thickness_f () const -{ - return get_realvar (beam_thickness_scm_sym); -} -Real -Paper_def::linewidth_f () const -{ - return get_realvar (linewidth_scm_sym); -} -Real -Paper_def::length_mom_to_dist (Moment d,Real k) const -{ - return arithmetic_spacing (d,k); -} - - -/** - Get the measure wide constant for arithmetic spacing. - - @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; } -void -Paper_def::set_lookup (int i, Lookup*l) -{ - if (lookup_p_tab_p_->elem_b (i)) - { - delete lookup_p_tab_p_->elem (i); - } - (*lookup_p_tab_p_)[i] = l; -} -Real -Paper_def::rule_thickness () const -{ - return get_realvar (rulethickness_scm_sym); -} - -Real -Paper_def::staffline_f () const +Font_metric * +Paper_def::find_scaled_font (Font_metric *f, Real m) { - return get_realvar (rulethickness_scm_sym); + SCM sizes = scm_hashq_ref (scaled_fonts_, 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)); } - -Real -Paper_def::staffheight_f () const -{ - return get_realvar (staffheight_scm_sym); + else + { + sizes = SCM_EOL; } + -Real -Paper_def::interbeam_f (int multiplicity_i) const -{ - if (multiplicity_i <= 3) - return get_realvar (interbeam_scm_sym); + /* + 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 - return get_realvar (interbeam4_scm_sym); -} - -Real -Paper_def::note_width () const -{ - return get_realvar (notewidth_scm_sym); -} + { + SCM scale_var = ly_module_lookup (scope_, ly_symbol2scm ("outputscale")); -void -Paper_def::print () const -{ -#ifndef NPRINT - Music_output_def::print (); - DOUT << "Paper {"; + m /= gh_scm2double (scm_variable_ref (scale_var)); - for (Hash_table_iter ai(*lookup_p_tab_p_); ai.ok (); ai++) - { - DOUT << "Lookup: " << ai.key () << " = " << ai.val ()->font_name_ << '\n'; + val = Scaled_font_metric::make_scaled_font_metric (f, m); } - DOUT << "}\n"; -#endif -} + sizes = scm_acons (gh_double2scm (m), val, sizes); + scm_gc_unprotect_object (val); -Lookup const * -Paper_def::lookup_l (int i) const -{ - return (*lookup_p_tab_p_)[i]; + scm_hashq_set_x (scaled_fonts_, f->self_scm (), sizes); + + return unsmob_metrics (val); } -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_outputter* -Paper_def::paper_outputter_p (Paper_stream* os_p, Header* header_l, String origin_str) const +/* + Return alist to translate internally used fonts back to real-world + coordinates. */ +SCM +Paper_def::font_descriptions () const { - Paper_outputter* p = new Paper_outputter (os_p); - - // for now; breaks -fscm output - p->output_comment (_ ("outputting Score, defined at: ")); - p->output_comment (origin_str); - - p->output_version(); - if (header_global_p) - p->output_scope (header_global_p, "mudela"); - if (header_l) - p->output_scope (header_l, "mudela"); - if (scope_p_) - p->output_scope (scope_p_, "mudelapaper"); - - - // *p->outstream_l_ << *scope_p_->elem (String (output_global_ch) + "setting")->access_content_String (false); - - SCM scm = gh_list (ly_symbol ("experimental-on"), SCM_UNDEFINED); - p->output_scheme (scm); - scm = gh_list (ly_symbol ("header-end"), SCM_UNDEFINED); - p->output_scheme (scm); + SCM func = ly_scheme_function ("hash-table->alist"); - return p; + 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)); + + if (dynamic_cast (fm)) + l = gh_cons (fm->self_scm (), 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; - *mlog << _f ("Paper output to %s...", - outname == "-" ? String ("") : outname) << endl; - - 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); } -