Issue 3991: \magnifyMusic: surrender to issues 3987 and 3990.

Until issues 3987 and 3990 are fixed, automatic scaling
of horizontal spacing with \magnifyMusic is broken.  This
patch turns the feature off, and adds a note in the docs.

diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index b58b35a4eff28f239054fd378c2ca0737ae410bf..5dc59995355446fa4778b59d45ad1feadb5c8fd3 100644 (file)
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -74,6 +74,7 @@ while automatically scaling stems, beams, and horizontal spacing.
   \new Voice \relative {
     \voiceTwo
     \magnifyMusic 0.63 {
+      \override Score.SpacingSpanner.spacing-increment = #(* 1.2 0.63)
       r32 c'' a c a c a c r c a c a c a c
       r c a c a c a c a c a c a c a c
     }

diff --git a/Documentation/notation/editorial.itely b/Documentation/notation/editorial.itely
index 34822b3da70912c770cad3c12cf66cfc99052d8b..ef4854e694865c98c4e0cc27ab3531a2bc0acc4e 100644 (file)
--- a/Documentation/notation/editorial.itely
+++ b/Documentation/notation/editorial.itely
@@ -86,6 +86,7 @@ command:
   \new Voice \relative {
     \voiceTwo
     \magnifyMusic 0.63 {
+      \override Score.SpacingSpanner.spacing-increment = #(* 1.2 0.63)
       r32 c'' a c a c a c r c a c a c a c
       r c a c a c a c a c a c a c a c
     }
@@ -93,6 +94,9 @@ command:
 >>
 @end lilypond
 
+The @code{\override} in the example above is a bug workaround.
+See the @qq{Known issues and warnings} at the end of this section.
+
 If a normal sized note head is merged with a smaller one, the size
 of the smaller note may need to be reset (with
 @w{@samp{\once@tie{}\normalsize}}) so that the stems and
@@ -106,6 +110,7 @@ accidentals align properly:
   \new Voice \relative {
     \voiceOne
     \magnifyMusic 0.63 {
+      \override Score.SpacingSpanner.spacing-increment = #(* 1.2 0.63)
       \once \normalsize cis'32( cis' gis b a fis \once \normalsize d d'
       \once \normalsize cis, cis' gis b a gis \once \normalsize fis fis'
       \once \normalsize fis, fis' ais, cis b gis \once \normalsize eis eis'
@@ -289,6 +294,28 @@ Snippets:
 Internals Reference:
 @rinternals{font-interface}.
 
+@c The two issues mentioned below:
+@c http://code.google.com/p/lilypond/issues/detail?id=3987
+@c http://code.google.com/p/lilypond/issues/detail?id=3990
+@knownissues
+There are currently two bugs that are preventing proper horizontal
+spacing when using @code{\magnifyMusic}.  There is only one
+available workaround, and it is not guaranteed to work in every
+case.  In the example below, replace the @var{mag} variable with
+your own value.  You may also try removing one or both of the
+@code{\newSpacingSection} commands, and/or the @code{\override}
+and @code{\revert} commands:
+
+@example
+\magnifyMusic @var{mag} @{
+  \newSpacingSection
+  \override Score.SpacingSpanner.spacing-increment = #(* 1.2 @var{mag})
+  @var{[music]}
+  \newSpacingSection
+  \revert Score.SpacingSpanner.spacing-increment
+@}
+@end example
+
 
 @node Fingering instructions
 @unnumberedsubsubsec Fingering instructions

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index c2b83ef35a5cea2e388c1dd16be77e5c4eec7858..78a6b236c4c7861ed53b5af45b83a81cda3a8582 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -660,8 +660,9 @@ slurs, ties, and horizontal spacing are adjusted automatically.")
    ;; these props ARE allowed to shrink below default size
    (define shrinkable-props
      '(
+       ;; TODO: uncomment spacing-increment here once Issue 3987 is fixed
        ;; override at the 'Score level
-       SpacingSpanner.spacing-increment
+       ;SpacingSpanner.spacing-increment
 
        ;; Beam.beam-thickness is dealt with separately below
 
@@ -716,7 +717,8 @@ slurs, ties, and horizontal spacing are adjusted automatically.")
        ))
    #{
      \context Voice {
-       \newSpacingSection
+       %% TODO: uncomment \newSpacingSection once Issue 3990 is fixed
+       %\newSpacingSection
        #(scale-fontSize mag)
        #(scale-props unshrinkable-props mag #f)
        #(scale-props shrinkable-props   mag #t)
@@ -724,7 +726,8 @@ slurs, ties, and horizontal spacing are adjusted automatically.")
 
        #music
 
-       \newSpacingSection
+       %% TODO: uncomment \newSpacingSection once Issue 3990 is fixed
+       %\newSpacingSection
        %% reverse engineer the former fontSize value instead of using \unset
        #(revert-fontSize mag)
        #(revert-props (append unshrinkable-props