release: 1.1.64

[lilypond.git] / ly / params.ly

diff --git a/ly/params.ly b/ly/params.ly
index 8762d5bb878e7e60394f7eaafd75490be499c30f..033f1c9a3ff1733f39a18773ee7cb4172739d5d4 100644 (file)
--- a/ly/params.ly
+++ b/ly/params.ly
@@ -12,6 +12,7 @@ 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 + \staffline - \beam_thickness) / 2.0;
 interbeam4 = (3.0 * \interline - \beam_thickness) / 3.0;
@@ -27,12 +28,32 @@ stem_length1 = 5.;
 stem_length2 = 4.;
 stem_length3 = 3.;
 
+%
+arithmetic_basicspace = 2.;
+arithmetic_multiplier = 0.9 * \quartwidth ;
+
+
+
+% 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 = 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.
@@ -42,6 +63,12 @@ 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
@@ -66,23 +93,39 @@ beam_steep_slope = 0.2 / 1.0;
 
 % OSU: suggested gap = ss / 5;
 slur_x_gap = \interline / 5.0;
+slur_y_gap = 0.25 * \interline;
+slur_y_free = 0.75 * \interline;
 slur_x_minimum = 3.0 * \interline;
 
 % slope damping: keep dy/dx < slur_slope_damping
-slur_slope_damping = 0.6;
+slur_slope_damping = 0.3;
+slur_interstaff_slope_damping = 0.6;
+% height damping: keep h/dx < slur_height_damping
+slur_height_damping = 0.4;
+slur_interstaff_height_damping = 0.5;
+% snap to stem if slur ends closer to stem than
+slur_snap_to_stem = 1.75 * \interline;
+slur_interstaff_snap_to_stem = 2.5 * \interline;
+% maximum dy change allowed by snapping
+slur_snap_max_slope_change = 0.5;
+slur_interstaff_snap_max_slope_change = 0.5;
+
 
-% dy_slur := dy_music * factor
-slur_slope_follow_music_factor = 0.8;
 
 tie_x_minimum = \slur_x_minimum;
+% OSU: tie gap == slur gap
 tie_x_gap = \slur_x_gap;
-tie_slope_damping = 0.8;
+tie_y_gap = 0.25 * \interline;
+% length of a tie that's a staffspace high
+tie_staffspace_length = 4.0 * \interline;
 
 % ugh: rename to bow (in bezier.cc and fonts.doc too...)
 % slur_thickness = 1.8 * \staffline;
 slur_thickness = 1.4 * \staffline;
 slur_height_limit = \staffheight;
 
+
+
 % slur_ratio = 0.3;
 % try bit flatter slurs
 slur_ratio = 0.25;
@@ -95,7 +138,6 @@ slur_rc_factor = 2.4;
 notewidth = (\quartwidth + \wholewidth) / 2.0;
 
 % ugh
-barsize = \staffheight;
 rulethickness = \staffline;
 
 gourlay_energybound = 100000.;
@@ -123,8 +165,10 @@ barthick_thick = 6.0* \staffline;
 barthick_thin = 1.6*\staffline;
 barthick_score = 1.6*\staffline;
 
+tuplet_spanner_gap = 2.0 * \interline;
 tuplet_thick = 1.0*\staffline;
 volta_thick = 1.6*\staffline;
+volta_spanner_height = 2.0 *\interline;
 
 % relative thickness of thin lines  1.6 : 1 : 0.8
 stemthickness = 0.8*\staffline;
@@ -133,12 +177,17 @@ rulethickness = \staffline;
 
 extender_height = 0.8*\staffline;
 
+hyphen_thickness = 0.05*\font_normal;
+hyphen_height = 0.2*\font_normal;
+hyphen_minimum_length = 0.25*\font_normal;
+
 % Multi-measure rests
 mmrest_x_minimum = 2.0*\staffheight;
 
 
 % chop off this much when next to pp / ff sign.
 crescendo_shorten = 4.0 * \interline;
+crescendo_thickness   = \staffline;
 
 % in internote.
 restcollision_minimum_dist = 3.0;
@@ -147,8 +196,20 @@ restcollision_minimum_beamdist = 1.5;
 % deprecated!
 postBreakPadding = 0.0;
 
+% optical correction amount.
 stemSpacingCorrection = 0.5*\interline;
 
+
+% relative strength of space following  tprefatory matter, and inline clefs.
+non_musical_space_strength = 8.0; 
+
+
+%If columns do not have spacing information set, set it to this much
+loose_column_distance = 2.0 * \interline;
+
+% if stem is on middle line, choose this direction.
+stem_default_neutral_direction = 1.0;
+
 \include "engraver.ly";