X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Finclude%2Fpaper-def.hh;h=8615d9cf86c957ab430f8d8da40e889f88cff8cd;hb=8002fa018c81f70585c25232247c6dcba7f5cba0;hp=77942e8027992eceb0fcc8571272a4517a48d23a;hpb=7fb17937c5ba5aa779b2a1a8040403ee446c6b7b;p=lilypond.git diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh index 77942e8027..8615d9cf86 100644 --- a/lily/include/paper-def.hh +++ b/lily/include/paper-def.hh @@ -30,20 +30,18 @@ add support for multiple fontsizes - + remove all utility funcs add support for other len->wid conversions. - Input_engraver should be in here. - Interesting variables: /// The distance between lines interline - */ +*/ class Paper_def : public Music_output_def { Hash_table *lookup_p_tab_p_; @@ -54,7 +52,6 @@ protected: public: virtual ~Paper_def (); - Array shape_int_a_; Real get_realvar (SCM symbol) const; @@ -67,26 +64,13 @@ public: void set_lookup (int, Lookup*); Paper_def (Paper_def const&); - /// The distance between beams of multiplicity_i + /** The distance between beams of multiplicity_i + JUNKME + */ Real interbeam_f (int multiplicity_i) const; - /// The thickness of a beam - Real beam_thickness_f () const; - - /// thickness of the standard line - Real rule_thickness () const; - - /// thickness of the staff line - Real staffline_f () const; - Interval line_dimensions_int (int) const; - Real linewidth_f () const; - - /// height of the staff - Real staffheight_f () const; - /// width of a crotchet ball - Real note_width () const; void print () const; Lookup const * lookup_l (int sz) const; // TODO naming @@ -95,9 +79,10 @@ public: influence using the geometric_ and paratime_signatures. */ Real length_mom_to_dist (Moment, Real) const; - Real geometric_spacing (Moment) const; + Real arithmetic_constant (Moment minimal_mom) const; Real arithmetic_spacing (Moment mom,Real constant) const; + virtual int get_next_default_count () const; static void reset_default_count();