X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=init%2Fparams.ly;h=650f51783bdb24ddad558f903cc1e8711963af13;hb=5308c12a34d4a873a4d289dcb15b4e9610c123a4;hp=f6313c648bcf06ad754a89e693c00d5d808cf9d7;hpb=95de6911a5cd1f90dfcd72ec798f089f6522f50f;p=lilypond.git

diff --git a/init/params.ly b/init/params.ly
index f6313c648b..650f51783b 100644
--- a/init/params.ly
+++ b/init/params.ly
@@ -1,42 +1,97 @@
 % params.ly
 % generic paper parameters
 
-interline = staffheight / 4.0;
-internote = interline / 2.0;
-staffline = interline / 10.0;
+paperfile = \papersize + ".ly";
+% paperfile = "a4.ly";
+\include \paperfile;
+\include "paper.ly";
 
-beam_thickness = 0.48 * (interline - staffline);
-interbeam = (2.0 * interline - beam_thickness) / 2.0;
-interbeam4 = (3.0 * interline - beam_thickness) / 3.0;
+interline = \staffheight / 4.0;
+
+
+% thickness of stafflines
+staffline = \interline / 10.0;
+
+beam_thickness = 0.52 * (\interline - \staffline);
+interbeam = (2.0 * \interline - \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;
+
+% 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;
+
+% 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_shorten1 = \forced_stem_shorten0;
+forced_stem_shorten2 = \forced_stem_shorten1;
+forced_stem_shorten3 = \forced_stem_shorten2;
+
+% there are several ways to calculate the direction of a beam
+% 
+% * MAJORITY : number count of up or down notes
+% * MEAN     : mean centre distance of all notes
+% * MEDIAN   : mean centre distance weighted per note
+%
+% enum Dir_algorithm { DOWN=-1, UP=1, MAJORITY=2, MEAN, MEDIAN };
+%
+DOWN = -1.0;
+UP = 1.0;
+MAJORITY = 2.0;
+MEAN = 3.0;
+MEDIAN = 4.0;
+% [Ross]: majority
+beam_dir_algorithm = \MAJORITY;
+
+% catch suspect beam slopes, set slope to zero if
+% outer stem is lengthened more than
+beam_lengthened = 0.2 * \interline;
+% and slope is running away steeper than
+beam_steep_slope = 0.2 / 1.0;
 
 % OSU: suggested gap = ss / 5;
-slur_x_gap = interline / 5.0;
-slur_x_minimum = 2.0 * interline;
-tie_x_minimum = slur_x_minimum;
-tie_x_gap = slur_x_gap;
+slur_x_gap = \interline / 5.0;
+slur_x_minimum = 2.0 * \interline;
+slur_slope_damping = 0.5;
+tie_x_minimum = \slur_x_minimum;
+tie_x_gap = \slur_x_gap;
+tie_slope_damping = 0.3;
 
 % ugh: rename to bow (in bezier.cc and fonts.doc too...)
-slur_thickness = 1.8 * staffline;
-slur_height_limit = staffheight;
-slur_ratio = 1.0 / 3.0;
+% slur_thickness = 1.8 * \staffline;
+slur_thickness = 1.4 * \staffline;
+slur_height_limit = \staffheight;
+
+% mmm, try bit flatter slurs
+% slur_ratio = 1.0 / 3.0;
+slur_ratio = 0.3;
 slur_clip_ratio = 1.2;
-slur_clip_height = 3.0 * staffheight;
+slur_clip_height = 3.0 * \staffheight;
 slur_clip_angle = 100.0;
 slur_rc_factor = 2.4;
 
 % ugh
-notewidth = (quartwidth + wholewidth) / 2.0;
+notewidth = (\quartwidth + \wholewidth) / 2.0;
 
 % ugh
-barsize = staffheight;
-rulethickness = staffline;
-
-% mmm
-indent = linewidth / 14.0;
+barsize = \staffheight;
+rulethickness = \staffline;
+stemthickness = \staffline;
 
-% uhm
-unitspace = 22.\pt;
-geometric = 0.;
 
 gourlay_energybound = 100000.;
 %{