*** empty log message ***

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 68129817e2f95118f89571e221099ab541d12c55..6a456ad9bb503ef853e34017ad8ee2b967e93e95 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -727,7 +727,7 @@ details about complicated or unusual notation.
 explains how to fine tune layout.
 
 @item
-@emph{@ref{Output formats}}
+@emph{@ref{Global issues}}
 discusses issues which affect the global output, such as selecting
 paper size or which MIDI instruments to use.
 

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index d2052cb82b548a0a33e6778afe45b5c3b413d3e2..526226daed11c2337a9483124ec5e4740227d75b 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -269,7 +269,7 @@ of this and other documentation.
                                    instruments.
 * Advanced notation::              Less frequently used notation.
 * Changing defaults::              Tuning output.
-* Output formats::                 What LilyPond produces.
+* Global issues::                  What LilyPond produces.
 
 * Interfaces for programmers::
 * LilyPond-book::                  Integrating text and music.

diff --git a/lily/include/slur-score-parameters.hh b/lily/include/slur-score-parameters.hh
index 5ae14071da67ebf38eb3d4cbe3d532268f635f0c..936789b219a168052334541d49fa2d7569d43de9 100644 (file)
--- a/lily/include/slur-score-parameters.hh
+++ b/lily/include/slur-score-parameters.hh
@@ -15,6 +15,7 @@
 struct Slur_score_parameters
 {
   int region_size_;
+
   Real head_encompass_penalty_;
   Real stem_encompass_penalty_;
   Real closeness_factor_;
@@ -28,6 +29,7 @@ struct Slur_score_parameters
   Real accidental_collision_;
   Real free_slur_distance_;
   Real free_head_distance_;
+  Real extra_encompass_collision_distance_;
   Real extra_encompass_free_distance_;
   Real absolute_closeness_measure_;
   Real edge_slope_exponent_;

diff --git a/lily/slur-score-parameters.cc b/lily/slur-score-parameters.cc
index 84a3d1ce7a1768e0dcf2df7af8b26ecb50491a8b..0a1a09f6f20932961e502998a285ad06405ae679 100644 (file)
--- a/lily/slur-score-parameters.cc
+++ b/lily/slur-score-parameters.cc
@@ -57,6 +57,8 @@ Slur_score_parameters::fill (Grob *me)
     = get_detail (details, ly_symbol2scm ("accidental-collision"));
   extra_encompass_free_distance_
     = get_detail (details, ly_symbol2scm ("extra-encompass-free-distance"));
+  extra_encompass_collision_distance_
+    = get_detail (details, ly_symbol2scm ("extra-encompass-collision-distance"));
   head_slur_distance_factor_
     = get_detail (details, ly_symbol2scm ("head-slur-distance-factor"));
   head_slur_distance_max_ratio_

diff --git a/scm/layout-slur.scm b/scm/layout-slur.scm
index 95f717d566f5474e21872d6b6665b67c2e77642d..93ec7435f4c94eaa13f41b167c9e66ab86b051e6 100644 (file)
--- a/scm/layout-slur.scm
+++ b/scm/layout-slur.scm
@@ -20,7 +20,8 @@
     (free-slur-distance . 0.8)
     (extra-object-collision-penalty . 50)
     (accidental-collision . 3)
-    (extra-encompass-free-distance . 0.8)
+    (extra-encompass-free-distance . 0.3)
+    (extra-encompass-collision-distance . 0.8)
     (head-slur-distance-max-ratio . 3)
     (head-slur-distance-factor . 10)
     (absolute-closeness-measure . 0.3)