release: 1.1.52

[lilypond.git] / ly / params.ly

diff --git a/ly/params.ly b/ly/params.ly
index f98ac790802d1a8fa872817db0e2e8d97b758b9c..c3bbd2edadf24eda57558cd79b8403c7e01b0b45 100644 (file)
--- a/ly/params.ly
+++ b/ly/params.ly
@@ -12,35 +12,57 @@ interline = \staffheight / 4.0;
 % thickness of stafflines
 staffline = \interline / 10.0;
 
+% urg, need grace_ versions of these too?
 beam_thickness = 0.52 * (\interline - \staffline);
-interbeam = (2.0 * \interline - \beam_thickness) / 2.0;
+interbeam = (2.0 * \interline + \staffline - \beam_thickness) / 2.0;
 interbeam4 = (3.0 * \interline - \beam_thickness) / 3.0;
 
 % stems and beams
 %
 % poor man's array size
 stem_max = 3.0;
-%
-stem_length0 = 3.5*\interline;
-stem_length1 = 2.5 * \interline;
-stem_length2 = 2.0 * \interline;
-stem_length3 = 1.5 * \interline;
+
+% stem stuff measured in staff positions.
+stem_length0 = 7.;
+stem_length1 = 5.;
+stem_length2 = 4.;
+stem_length3 = 3.;
+
+% urg.
+% if only these ugly arrays were scm,
+% we could override them in the Grace context
+grace_factor = 0.8;
+grace_stem_length0 = \stem_length0 * \grace_factor;
+grace_stem_length1 = \stem_length1 * \grace_factor;
+grace_stem_length2 = \stem_length2 * \grace_factor;
+grace_stem_length3 = \stem_length3 * \grace_factor;
 
 % only used for beams
-minimum_stem_length0 = 0.0; % not used
-minimum_stem_length1 = 1.5 * \interline;
-minimum_stem_length2 = 1.25 * \interline;
-minimum_stem_length3 = 1.0 * \interline;
+minimum_stem_length0 = 0.0 ; % not used
+minimum_stem_length1 = 3. ;
+minimum_stem_length2 = 2.5;
+minimum_stem_length3 = 2.0;
+
+grace_minimum_stem_length0 = 0.0 ; % not used
+grace_minimum_stem_length1 = \minimum_stem_length1 * \grace_factor;
+grace_minimum_stem_length2 = \minimum_stem_length2 * \grace_factor;
+grace_minimum_stem_length3 = \minimum_stem_length3 * \grace_factor;
 
 % stems in unnatural (forced) direction should be shortened,
 % according to [Roush & Gourlay].  Their suggestion to knock off
 % a whole staffspace seems a bit drastical: we'll do half.
 %
-forced_stem_shorten0 = 0.5 * \interline;
+forced_stem_shorten0 = 1.0;
 forced_stem_shorten1 = \forced_stem_shorten0;
 forced_stem_shorten2 = \forced_stem_shorten1;
 forced_stem_shorten3 = \forced_stem_shorten2;
 
+% don't shorten grace stems, always up
+grace_forced_stem_shorten0 = 0.;
+grace_forced_stem_shorten1 = \grace_forced_stem_shorten0;
+grace_forced_stem_shorten2 = \grace_forced_stem_shorten1;
+grace_forced_stem_shorten3 = \grace_forced_stem_shorten2;
+
 % there are several ways to calculate the direction of a beam
 % 
 % * MAJORITY : number count of up or down notes
@@ -70,6 +92,9 @@ slur_x_minimum = 3.0 * \interline;
 % slope damping: keep dy/dx < slur_slope_damping
 slur_slope_damping = 0.6;
 
+% dy_slur := dy_music * factor
+slur_slope_follow_music_factor = 0.8;
+
 tie_x_minimum = \slur_x_minimum;
 tie_x_gap = \slur_x_gap;
 tie_slope_damping = 0.8;
@@ -94,10 +119,6 @@ notewidth = (\quartwidth + \wholewidth) / 2.0;
 barsize = \staffheight;
 rulethickness = \staffline;
 
-% stem should be thinner?
-stemthickness = \staffline;
-
-
 gourlay_energybound = 100000.;
 %{
 The following bounds the number of measures
@@ -106,16 +127,14 @@ on a line.  Decreasing it greatly reduces computation time
 gourlay_maxmeasures = 10.;
 castingalgorithm = \Gourlay;
 
-%{
-Ross. page 151
+%{ Ross. page 151 lists these values, but we think that thick lines
+and kernings are too thick.
 
 bar_kern = 0.5 * \interline;
 bar_thinkern = 0.75 * \interline;
 barthick_thick = 0.5* \interline;
+barthick_score = 0.13333* \interline;
 barthick_thin = 0.1*\interline;
-Can't be, these are ugly!  Changed to old (TeX) values.
-
-% barline should be thicker!
 
 %}
 
@@ -123,11 +142,35 @@ bar_kern = 3.0 * \staffline;
 bar_thinkern = 3.0 * \staffline;
 barthick_thick = 6.0* \staffline;
 barthick_thin = 1.6*\staffline;
+barthick_score = 1.6*\staffline;
 
 tuplet_thick = 1.0*\staffline;
 volta_thick = 1.6*\staffline;
 
+% relative thickness of thin lines  1.6 : 1 : 0.8
+stemthickness = 0.8*\staffline;
+rulethickness = \staffline;
+
+
+extender_height = 0.8*\staffline;
+
+% Multi-measure rests
+mmrest_x_minimum = 2.0*\staffheight;
+
+
+% chop off this much when next to pp / ff sign.
+crescendo_shorten = 4.0 * \interline;
+
+% in internote.
+restcollision_minimum_dist = 3.0;
+restcollision_minimum_beamdist = 1.5;
+
+% deprecated!
+postBreakPadding = 0.0;
+
+stemSpacingCorrection = 0.5*\interline;
 
 \include "engraver.ly";
 
 
+