X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fparams.ly;h=5e89fd3f35b4e9de43e11c47362951e632b86768;hb=7181c77e5d46a271f5f76e99bee7f844611e23e4;hp=46e240e9865f0aa9f2b0be60a90a3ed527220db8;hpb=c52973e438ce3490d688860bb71849a7b3c26fef;p=lilypond.git

diff --git a/ly/params.ly b/ly/params.ly
index 46e240e986..5e89fd3f35 100644
--- a/ly/params.ly
+++ b/ly/params.ly
@@ -7,9 +7,11 @@ TODO:
 
 * cleanup
 * use elt properties, iso. paper variables.
+
 %}
 
 
+papersizename = \papersize ;
 
 paperfile = \papersize + ".ly";
 % paperfile = "a4.ly";
@@ -19,18 +21,6 @@ paperfile = \papersize + ".ly";
 staffspace = \staffheight / 4.0;
 stafflinethickness = \staffspace / 10.0;
 
-% deprecated
-interline = \staffspace;
-
-
-% urg, need grace_ versions of these too?
-beam_thickness = 0.52 * (\staffspace - \stafflinethickness);
-
-
-
-interbeam = (2.0 * \staffspace + \stafflinethickness - \beam_thickness) / 2.0;
-interbeam4 = (3.0 * \staffspace - \beam_thickness) / 3.0;
-
 %{
 The space taken by a note is determined by the formula 
 
@@ -72,53 +62,12 @@ If you want to space your music wider, use something like:
 
 %}
 % We use 0.9*\quartwidth, because 1.0 seems to wide.
+% quartwidth == 1.32 * staffspace
 % We don't adjust arithmetic_basicspace accordingly (why not?)
-arithmetic_multiplier = 0.9 * \quartwidth ;
+arithmetic_multiplier = 0.9 * 1.32 * \staffspace ;
 arithmetic_basicspace = 2.0;
 
 
-% 
-% UGH; junk these!
-%
-
-% catch suspect beam slopes, set slope to zero if
-% outer stem is lengthened more than
-beam_lengthened = 0.2 * \staffspace;
-% and slope is running away steeper than
-beam_steep_slope = 0.2 / 1.0;
-
-
-
-%{
-  Slur parameters.
-  
-  See Documentation/programmer/fonts.doc
-%}
-% Height-limit (h_inf) = factor * staff_space
-slur_height_limit_factor = 2.0;
-slur_ratio = 1.0 / 3.0;
-
-slur_thickness = 1.2 * \stafflinethickness;
-
-slur_force_blowfit = 0.5;
-slur_beautiful = 0.5;
-
-
-%{
-Horizontal space between centre of notehead and slur.
-%}
-% OSU: suggested gap = ss / 5;
-slur_x_gap = \staffspace / 5.0;
-slur_y_gap = 0.25 * \staffspace;
-slur_y_free = 0.75 * \staffspace;
-slur_x_minimum = 1.5 * \staffspace;
-
-
-% The constants that define the valid areas for the middle control points
-% Used in de_uglyfy.  Bit empirical.
-bezier_control1 = 1.5;
-bezier_control2 = 0.8;
-bezier_control3 = -2.0;
 
 % URG: the magic constants for area asymmetry
 bezier_pct_c0 = -0.2;
@@ -128,69 +77,9 @@ bezier_pct_in_max = 1.2;
 bezier_area_steps = 1.0;
 
 
-%{
-  Tie parameters
-%}
-
-tie_height_limit_factor = \slur_height_limit_factor;
-tie_ratio = \slur_ratio;
-tie_thickness = \slur_thickness;
-
-tie_x_minimum = \staffspace + \slur_x_minimum;
-% OSU: tie gap == slur gap
-tie_x_gap = \slur_x_gap;
-tie_y_gap = 0.25 * \staffspace;
-% length of a tie that's a staffspace high
-tie_staffspace_length = 4.0 * \staffspace;
-
-tie_staffline_clearance = 2.0 *\tie_thickness;
-
-
-
-
-% ugh
-notewidth = (\quartwidth + \wholewidth) / 2.0;
-
-gourlay_energybound = 100000.;
-%{
-Maximum number of measures per line to try when using Gourlay
-method. 
-%}
-gourlay_maxmeasures = 10.;
-
-% vertical space between lines.
+% vertical space between lines of text.
 line_kern = \staffspace;
 
-volta_thick = 1.6*\stafflinethickness;
-volta_spanner_height = 2.0 *\staffspace;
-
-% relative thickness of thin lines  1.6 : 1 : 0.8
-stemthickness = 0.8*\stafflinethickness;
-rulethickness = \stafflinethickness;
-
-
-extender_height = 0.8*\stafflinethickness;
-
-
-% Multi-measure rests
-multi_measure_rest_x_minimum = 2.5*\staffheight;
-multi_measure_rest_padding = 2.0 *\staffspace;
-multi_measure_rest_expand_limit = 10.0;
-
-% chop off this much when next to pp / ff sign.
-crescendo_shorten = 4.0 * \staffspace;
-crescendo_thickness   = \stafflinethickness;
-crescendo_height = 0.666 * \staffspace;
-crescendo_dash_thickness = 1.2*\stafflinethickness;
-crescendo_dash = 4.0*\staffspace;
-
-% in internote.
-restcollision_minimum_dist = 3.0;
-restcollision_minimum_beamdist = 1.5;
-
-
-% unit for note collision resolving
-collision_note_width = \notewidth;	%ugh.
 
 % optical correction amount.
 stemSpacingCorrection = 0.5*\staffspace;
@@ -230,14 +119,22 @@ will cause scores to be set looser
 
 compression_energy_factor = 0.6;
 
-% if stem is on middle line, choose this direction.
-stem_default_neutral_direction = 1.0;
-
-% in staffspace
-articulation_script_padding_default = 1.0;
-
+\translator { \NoteNamesContext }
+\translator { \ScoreContext }
+\translator { \ChoirStaffContext}
+\translator { \GraceContext}
+\translator { \RhythmicStaffContext}
+\translator { \StaffContext }
+\translator { \VoiceContext}
+\translator { \StaffGroupContext }
+\translator { \ChordNameContext }
+\translator { \ChordNameVoiceContext}
+\translator { \GrandStaffContext}
+\translator { \LyricsContext }
+\translator { \ThreadContext}
+\translator { \PianoStaffContext}
+\translator { \LyricsVoiceContext }
 
-\include "engraver.ly";