X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fparams.ly;h=3cf95651a8dbef1977e1a90a65222a93036e7e8f;hb=3b764dbab9c6ba03a1a5c2caa0c3046e96a6f596;hp=8be7f2a9b26ef95ff1be0a64df4cbe30231f9ce2;hpb=f3467e6b78be6d8497cf4d0a43ffd01656a33300;p=lilypond.git diff --git a/ly/params.ly b/ly/params.ly index 8be7f2a9b2..3cf95651a8 100644 --- 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 @@ -65,23 +87,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.5; +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; @@ -94,13 +132,8 @@ slur_rc_factor = 2.4; notewidth = (\quartwidth + \wholewidth) / 2.0; % ugh -barsize = \staffheight; rulethickness = \staffline; -% stem should be thinner? -stemthickness = \staffline; - - gourlay_energybound = 100000.; %{ The following bounds the number of measures @@ -109,16 +142,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! %} @@ -126,13 +157,52 @@ 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_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; +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; +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 = 40.0; + + +%If columns do not have spacing information set, set it to this much +loose_column_distance = 2.0 * \interline; + \include "engraver.ly"; +