Merge branch 'master' of git://git.sv.gnu.org/lilypond

diff --git a/Documentation/user/editorial.itely b/Documentation/user/editorial.itely
index b019606cbda18b0186cd0857fc9432529870d2b0..7a96ed3928d5b6e9b20e061935652d2af3ca31a6 100644 (file)
--- a/Documentation/user/editorial.itely
+++ b/Documentation/user/editorial.itely
@@ -212,8 +212,20 @@ b
 c
 @end lilypond
 
+Notation objects which are attached to invisible notes are still
+visible.
+
+@lilypond[quote,ragged-right,verbatim,relative=2,fragment]
+c4( d)
+\hideNotes
+e4(\p f)->
+@end lilypond
+
+
 @predefined
 
+@funindex \hideNotes
+@funindex \unHideNotes
 @code{\hideNotes}, @code{\unHideNotes}
 
 @seealso
@@ -330,12 +342,13 @@ Notes in a chord cannot be colored with @code{\override}; use
 @cindex parentheses
 
 Objects may be parenthesized by prefixing @code{\parenthesize} to
-the music event.  When applied to a chord, it parenthesizes every
-note.
+the music event.  When prefixed to a chord, it parenthesizes every
+note.  Individual notes inside a chord may also be parenthesized.
 
 @lilypond[quote,relative=2,fragment,verbatim,ragged-right]
 c2 \parenthesize d
 c2 \parenthesize <c e g>
+c2 <c \parenthesize e g>
 @end lilypond
 
 Non-note objects may be parenthesized as well.
@@ -355,6 +368,12 @@ Internals Reference:
 @internalsref{ParenthesesItem},
 @internalsref{parentheses-interface}.
 
+@knownissues
+
+Parenthesizing a chord prints parentheses around each individual
+note, instead of a single large parenthesis around the entire
+chord.
+
 
 @node Stems
 @unnumberedsubsubsec Stems
@@ -428,13 +447,19 @@ notation.
 }
 @end lilypond
 
+@cindex balloon
+@cindex notation, explaining
+
 There are two music functions, @code{balloonGrobText} and
 @code{balloonText};  the former is used like @code{\once \override} to 
 attach text to any grob, and the latter is used like @code{\tweak}, 
 typically within chords, to attach text to an individual note.
 
-@cindex balloon
-@cindex notation, explaining
+@predefined
+
+@funindex ballonLengthOn
+@funindex ballonLengthOff
+@code{\balloonLengthOn}, @code{\balloonLengthOff}
 
 @seealso
 
@@ -520,7 +545,7 @@ pieces.  Simple horizontal brackets are supported.
 @lilypond[quote,verbatim,ragged-right]
 \layout {
   \context {
-    \Staff
+    \Voice
     \consists "Horizontal_bracket_engraver"
   }
 }
@@ -535,7 +560,7 @@ Analysis brackets may be nested.
 @lilypond[quote,verbatim,ragged-right]
 \layout {
   \context {
-    \Staff
+    \Voice
     \consists "Horizontal_bracket_engraver"
   }
 }

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 8bbf124826813f855ef911f8f4fd9c6e81a7b9c6..575d5945d78cf21fb0914bf5fe7afa4b0efe3c73 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -183,6 +183,17 @@ textLengthOff = {
   \override TextScript  #'infinite-spacing-height = ##f
 }
 
+balloonLengthOn = {
+  \override BalloonTextItem #'extra-spacing-width = #'(0 . 0)
+  \override BalloonTextItem #'infinite-spacing-height = ##t
+}
+
+balloonLengthOff = {
+  \override BalloonTextItem #'extra-spacing-width = #'(+inf.0 . -inf.0)
+  \override BalloonTextItem #'infinite-spacing-height = ##f
+}
+
+
 showStaffSwitch = \set followVoice = ##t
 hideStaffSwitch = \set followVoice = ##f
 

diff --git a/scm/document-markup.scm b/scm/document-markup.scm
index 8761deb83db17b031f0d65f12f1d7e9ef7395053..29db2bdc532e83b375ab8e4d37cda5a666820bb4 100644 (file)
--- a/scm/document-markup.scm
+++ b/scm/document-markup.scm
@@ -25,8 +25,8 @@
     (string-append
      "\n\n@item @code{\\" c-name "} " signature-str
      
-     "\n@findex " f-name "\n"
-     "\n@cindex @code{" c-name "}\n"
+     "\n@findex \\" f-name "\n"
+;;     "\n@cindex @code{" c-name "}\n"
      
      (if (string? doc-str)
         doc-str