X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=144a944a6121768ca2a02524d10167271e39ccea;hb=6b93aa32e32d736202d803c68f5156cc253a5f7c;hp=4cd2101032181b4a57994f42f9fbd36b22d04986;hpb=a1d72ee4c631e40978415d31666337beaebceabc;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 4cd2101032..144a944a61 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -3,297 +3,161 @@ 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 "p-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; } - 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) -{ - 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 -{ - 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; } -Real -Paper_def::get_var (String s) const +Paper_def::Paper_def (Paper_def const&src) + : Music_output_def (src) { - return get_realvar (ly_symbol (s)); } Real Paper_def::get_realvar (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; - - return shape_int_a_[n]; -} - -Real -Paper_def::beam_thickness_f () const -{ - return get_realvar (beam_thickness_scm_sym); -} + Real lw = get_realvar (ly_symbol2scm ("linewidth")); + Real ind = n? 0.0:get_realvar (ly_symbol2scm ("indent")); -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); + return Interval (ind, lw); } -/** - 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 -{ - return get_var ("arithmetic_basicspace") - log_2 (Moment (1,8) ") : outname)); + progress_indication("\n"); -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; + 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::rule_thickness () const +/* + Todo: use symbols and hashtable idx? +*/ +Font_metric * +Paper_def::find_font (SCM fn, Real m) { - return get_realvar (rulethickness_scm_sym); -} + SCM key = gh_cons (fn, gh_double2scm (m)); + SCM met = scm_assoc (key, scaled_fonts_); -Real -Paper_def::staffline_f () const -{ - return get_realvar (rulethickness_scm_sym); - } + if (gh_pair_p (met)) + return unsmob_metrics (ly_cdr (met)); -Real -Paper_def::staffheight_f () const -{ - return get_realvar (staffheight_scm_sym); + /* + 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 ()); } - -Real -Paper_def::interbeam_f (int multiplicity_i) const -{ - if (multiplicity_i <= 3) - return get_realvar (interbeam_scm_sym); else - return get_realvar (interbeam4_scm_sym); -} - -Real -Paper_def::note_width () const -{ - return get_realvar (notewidth_scm_sym); -} - -void -Paper_def::print () const -{ -#ifndef NPRINT - Music_output_def::print (); - DOUT << "Paper {"; - - for (Hash_table_iter ai(*lookup_p_tab_p_); ai.ok (); ai++) { - DOUT << "Lookup: " << ai.key () << " = " << ai.val ()->font_name_ << '\n'; - } + SCM scale_var = ly_module_lookup (scope_, ly_symbol2scm ("outputscale")); - DOUT << "}\n"; -#endif -} - -Lookup const * -Paper_def::lookup_l (int i) const -{ - return (*lookup_p_tab_p_)[i]; -} + m /= gh_scm2double (scm_variable_ref (scale_var)); + 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); + } - -int Paper_def::default_count_i_ = 0; - -int -Paper_def::get_next_default_count () const -{ - return default_count_i_ ++; + return f; } -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 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 ; - 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 mdesc = unsmob_metrics (ly_cdar (s))->description_; - return p; + 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; - *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); } -