Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

* 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond:
  Small corrections to NR 1.8.1 "Writing Text"
  Misc proofreading and policy.
  Compile fix.
  Standardize introduciton of snippets.
  Remove old @cindex entries for markup commands.
  GDP: NR 2 Reorganisation: Ancient headings
  Fix comments from Neil, thanks!
  add \balloonLength{On,Off} similar to \textLengthOff

diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely
index 34dbffc849565a5f05a6f4591798756517256607..cc8de79d4b9cd495a819a1fad46eba5d6b71936c 100644 (file)
--- a/Documentation/user/ancient.itely
+++ b/Documentation/user/ancient.itely
@@ -17,6 +17,25 @@
 @cindex Petrucci
 @cindex mensural
 
+@menu
+* Introduction to ancient notation::
+* Alternative note signs::
+* Additional note signs::
+* Pre-defined contexts::
+* Transcribing ancient music::
+* Editorial markings::
+@end menu
+
+@node Introduction to ancient notation
+@subsection Introduction to ancient notation
+
+@menu
+* Ancient notation supported::
+@end menu
+
+@node Ancient notation supported
+@subsubsection Ancient notation supported
+
 Support for ancient notation includes features for mensural notation
 and Gregorian Chant notation.  There is also limited support for
 figured bass notation, see @ref{Figured bass}.
@@ -88,23 +107,16 @@ up during the baroque period.
 
 @c Here are all subtopics at a glance:
 
-@menu
-* Alternative note signs for ancient music::
-* Additional note signs for ancient music::
-* Pre-defined contexts::
-* Musica ficta accidentals::
-@end menu
-
-@node Alternative note signs for ancient music
-@subsection Alternative note signs for ancient music
+@node Alternative note signs
+@subsection Alternative note signs
 
 @menu
-* Ancient note heads::          
-* Ancient accidentals::         
-* Ancient rests::               
-* Ancient clefs::               
-* Ancient flags::               
-* Ancient time signatures::     
+* Ancient note heads::
+* Ancient accidentals::
+* Ancient rests::
+* Ancient clefs::
+* Ancient flags::
+* Ancient time signatures::
 @end menu
 
 @node Ancient note heads
@@ -157,7 +169,7 @@ engravers work.
 
 Use the @code{glyph-name-alist} property of grob
 @internalsref{Accidental} and @internalsref{KeySignature} to select
-ancient accidentals. 
+ancient accidentals.
 
 @lilypond[quote,ragged-right,staffsize=26]
 \score {
@@ -645,16 +657,16 @@ The @code{old6/8alt} symbol (an alternate symbol for 6/8) is not
 addressable with @code{\time}.  Use a @code{\markup} instead
 
 
-@node Additional note signs for ancient music
-@subsection Additional note signs for ancient music
+@node Additional note signs
+@subsection Additional note signs
 
 @menu
-* Ancient articulations::       
-* Custodes::                    
-* Divisiones::                  
-* Ligatures::                   
-* White mensural ligatures::    
-* Gregorian square neumes ligatures::  
+* Ancient articulations::
+* Custodes::
+* Divisiones::
+* Ligatures::
+* White mensural ligatures::
+* Gregorian square neumes ligatures::
 @end menu
 
 
@@ -877,8 +889,8 @@ function
 with the same effect and is believed to be stable.
 
 @menu
-* White mensural ligatures::    
-* Gregorian square neumes ligatures::  
+* White mensural ligatures::
+* Gregorian square neumes ligatures::
 @end menu
 
 @node White mensural ligatures
@@ -1927,8 +1939,8 @@ with head prefixes in arbitrary order.
 @subsection Pre-defined contexts
 
 @menu
-* Gregorian Chant contexts::    
-* Mensural contexts::           
+* Gregorian Chant contexts::
+* Mensural contexts::
 @end menu
 
 
@@ -1999,8 +2011,60 @@ demonstrates
 }
 @end lilypond
 
-@node Musica ficta accidentals
-@subsection Musica ficta accidentals
+@node Transcribing ancient music
+@subsection Transcribing ancient music
+
+@menu
+* Ancient and modern from one source::
+* Incipits::
+* Mensurstriche layout::
+* Transcribing Gregorian chant::
+@end menu
+
+
+@node Ancient and modern from one source
+@subsubsection Ancient and modern from one source
+
+@c TODO Add text
+@c Here among others the snippets about reducing note length
+TBC
+
+
+@node Incipits
+@subsubsection Incipits
+
+@c TODO Add text
+@c clefs, mensuration signs etc from lsr and -user
+TBC
+
+
+@node Mensurstriche layout
+@subsubsection Mensurstriche layout
+
+@c TODO Add text
+@c from lsr and -user
+TBC
+
+
+@node Transcribing Gregorian chant
+@subsubsection Transcribing Gregorian chant
+
+@c TODO Add text
+@c extract from 1.6.1.1
+TBC
+
+
+@node Editorial markings
+@subsection Editorial markings
+
+@menu
+* Annotational accidentals::
+* Baroque rhythmic notation::
+@end menu
+
+
+@node Annotational accidentals
+@subsubsection Annotational accidentals
 
 In European music from before about 1600, singers were often
 expected to chromatically alter notes at their own initiative.
@@ -2038,3 +2102,9 @@ Internals Reference: @internalsref{Accidental_engraver} engraver and
 the @internalsref{AccidentalSuggestion} object.
 
 
+@node Baroque rhythmic notation
+@subsubsection Baroque rhythmic notation
+
+@c TODO Add text
+@c try Till Rettig
+TBC
\ No newline at end of file

diff --git a/Documentation/user/editorial.itely b/Documentation/user/editorial.itely
index b019606cbda18b0186cd0857fc9432529870d2b0..e234e8b303d070b05ee279b574bd6b95cfe39ae0 100644 (file)
--- a/Documentation/user/editorial.itely
+++ b/Documentation/user/editorial.itely
@@ -46,7 +46,7 @@ inside the staff.
 The font size of notation elements may be altered.  It does not
 change the size of variable symbols, such as beams or slurs.
 
-@warning{For @strong{text} font sizes, see
+@warning{For font sizes of text, see
 @ref{Common markup commands}.}
 
 @lilypond[quote,fragment,relative=2,verbatim,ragged-right]
@@ -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
@@ -287,13 +299,10 @@ Exact RGB colors can be specified using the Scheme function
   \with-color #(x11-color 'navy) "Clarinet"
 }
   
-% black
 \override Stem #'color = #(rgb-color 0 0 0)
 gis8 a
-% white
 \override Stem #'color = #(rgb-color 1 1 1)
 gis8 a
-% dark blue
 \override Stem #'color = #(rgb-color 0 0 0.5) 
 gis4 a
 @end lilypond
@@ -330,12 +339,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 +365,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 +444,36 @@ 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
+Balloon text normally influences note spacing, but this can be
+altered:
+
+@lilypond[quote,verbatim,fragment,ragged-right,relative=2]
+\new Voice \with { \consists "Balloon_engraver" }
+{
+  \balloonLengthOff
+  \balloonGrobText #'Stem #'(3 . 4) \markup { "I'm a Stem" }
+  a8 
+  \balloonGrobText #'Rest #'(-4 . -4) \markup { "I'm a rest" }
+  r
+  \balloonLengthOn
+  <c, g'-\balloonText #'(-2 . -2) \markup { "I'm a note head" } c>2. 
+}
+@end lilypond
+
+
+@predefined
+
+@funindex ballonLengthOn
+@funindex ballonLengthOff
+@code{\balloonLengthOn}, @code{\balloonLengthOff}
 
 @seealso
 
@@ -453,20 +492,23 @@ Internals Reference:
 Vertical lines can be drawn between staves synchronized with the
 notes.
 
+The @code{Grid_point_engraver} must be used to create the end
+points of the lines, while the @code{Grid_line_span_engraver} must
+be used to actually draw the lines.  By default this centers grid
+lines horizontally below and to the left side of each note head.
+Grid lines extend from the middle lines of each staff.  The
+@code{gridInterval} must specify the duration between the grid
+lines.
+
 @lilypond[quote,verbatim,ragged-right]
 \layout {
   \context {
     \Staff
-    % set up grids
     \consists "Grid_point_engraver" 
-    % set the grid interval to one quarter note
     gridInterval = #(ly:make-moment 1 4)
   }
   \context {
     \Score
-    % by default this centers grid lines horizontally below
-    % and to the left side of the note head, the grid lines
-    % extending from the middle lines of each staff
     \consists "Grid_line_span_engraver"
   }
 }
@@ -520,7 +562,7 @@ pieces.  Simple horizontal brackets are supported.
 @lilypond[quote,verbatim,ragged-right]
 \layout {
   \context {
-    \Staff
+    \Voice
     \consists "Horizontal_bracket_engraver"
   }
 }
@@ -535,7 +577,7 @@ Analysis brackets may be nested.
 @lilypond[quote,verbatim,ragged-right]
 \layout {
   \context {
-    \Staff
+    \Voice
     \consists "Horizontal_bracket_engraver"
   }
 }

diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely
index 807370f24a045586840095a6e8f26549fbb5fb1d..57d80672477ce07954afb382be36299fb707ca72 100644 (file)
--- a/Documentation/user/expressive.itely
+++ b/Documentation/user/expressive.itely
@@ -147,7 +147,8 @@ a4^\prall^\markup { \sharp }
 Music Glossary: @rglos{tenuto}, @rglos{accent}, @rglos{staccato},
 @rglos{portato}.
 
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@lsrdir{Expressive,Expressive-marks}
 
 Internals Reference: @internalsref{Script},
 @internalsref{TextScript}.
@@ -360,7 +361,8 @@ Music Glossary: @rglos{crescendo}, @rglos{decrescendo}.
 
 Learning Manual: @rlearning{Articulation and dynamics}.
 
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@lsrdir{Expressive,Expressive-marks}
 
 Internals Reference: @internalsref{DynamicText},
 @internalsref{Hairpin}.  Vertical positioning of these symbols is
@@ -405,7 +407,8 @@ boxf = \markup{ \bracket { \dynamic f } }
 
 @seealso
 
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@lsrdir{Expressive,Expressive-marks}
 
 
 @node Curves
@@ -476,7 +479,8 @@ can be achieved in LilyPond by setting @code{doubleSlurs},
 
 Music Glossary: @rglos{slur}
 
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@lsrdir{Expressive,Expressive-marks}
 
 Internals Reference: @internalsref{Slur}.
 
@@ -520,7 +524,8 @@ You cannot have simultaneous phrasing slurs.
 
 @seealso
 
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@lsrdir{Expressive,Expressive-marks}
 
 Internals Reference: @internalsref{PhrasingSlur}
 
@@ -555,7 +560,8 @@ d4
 
 @seealso
 
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@lsrdir{Expressive,Expressive-marks}
 @c @lsr{expressive,breathing-sign.ly}.
 
 Internals Reference: @internalsref{BreathingSign}
@@ -601,7 +607,8 @@ c4-\bendAfter #-3
 @c TODO: add falls and doits to glossary.
 @c Music Glossary: @rglos{falls}, @rglos{doits}.
 
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@lsrdir{Expressive,Expressive-marks}
 
 
 @node Lines
@@ -647,7 +654,8 @@ I = \once \override NoteColumn #'ignore-collision = ##t
 
 Music Glossary: @rglos{glissando}
 
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@lsrdir{Expressive,Expressive-marks}
 
 @c FIXME: I need to figure out what's up with these.  -gp
 @c @lsr{expressive,glissando.ly},
@@ -784,7 +792,8 @@ Music Glossary: @rglos{arpeggio}
 
 Notation Reference: @ref{Ties}, for writing out arpeggios.
 
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@lsrdir{Expressive,Expressive-marks}
 
 Internals Reference: @internalsref{Arpeggio},
 @internalsref{PianoStaff}.
@@ -851,6 +860,7 @@ printed as a stemless note head in parentheses.
 
 Music Glossary: @rglos{trill}
 
-Snippets: @lsrdir{Expressive,Expressive-marks}
+Snippets:
+@lsrdir{Expressive,Expressive-marks}
 
 Internals Reference: @internalsref{TrillSpanner}

diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely
index 78ca74506284b746f9883834ee77c806d0d10259..e1ad2ca5ca050d626bcbade3ef0ccffa51c0054e 100644 (file)
--- a/Documentation/user/pitches.itely
+++ b/Documentation/user/pitches.itely
@@ -166,15 +166,14 @@ large intervals:
 If the preceding item is a chord, the first note of the chord is
 used as the reference point for the octave placement of a
 following note or chord.  Inside chords, the next note is always
-relative to the preceding one.
+relative to the preceding one.  Examine the next example
+carefully, paying attention to the @code{c} notes.
 
 @lilypond[verbatim,quote,ragged-right]
 \relative c' {
   c
   <c e g>
-  % the C is now an octave higher
   <c' e g'>
-  % the C returns to the original pitch
   <c, e, g''>
 }
 @end lilypond
@@ -341,7 +340,7 @@ Learning Manual:
 
 Notation Reference:
 @ref{Automatic accidentals},
-@ref{Musica ficta accidentals},
+@ref{Annotational accidentals},
 @ref{Note names in other languages}.
 
 Snippets:
@@ -967,7 +966,9 @@ concert pitch.
 Here are a few notes for violin and B-flat clarinet where the
 parts have been entered using the notes and key as they appear in
 each part of the conductor's score.  The two instruments are
-playing in unison.
+playing in unison.  Adding the @code{\transposition c'} to the
+violin part is not strictly necessary, but it is a useful
+reminder.
 
 @lilypond[verbatim,quote,ragged-right]
 \new GrandStaff <<
@@ -975,7 +976,6 @@ playing in unison.
     \relative c'' {
       \set Staff.instrumentName = "Vln"
       \set Staff.midiInstrument = "violin"
-      % strictly speaking not necessary, but a good reminder
       \transposition c'
 
       \key c \major
@@ -988,7 +988,6 @@ playing in unison.
       \set Staff.midiInstrument = "clarinet"
       \transposition bes
 
-      % not concert pitch
       \key d \major
       a4( d8) r d r d4
     }
@@ -1099,12 +1098,10 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      %%% change the next line as desired:
       #(set-accidental-style 'default)
       \musicA
     }
     \context Staff = "down" {
-      %%% change the next line as desired:
       #(set-accidental-style 'default)
       \musicB
     }
@@ -1115,6 +1112,7 @@ musicB = {
 Note that the last lines of this example can be replaced by the
 following, as long as the same accidental style should be used in
 both staves.
+
 @example
 \new PianoStaff @{
   <<

diff --git a/Documentation/user/repeats.itely b/Documentation/user/repeats.itely
index fea9b93c961e95c74413c8158afd5a77155ffe99..911ceb53931cc9d8ecdb7bf1337f4c2fd23a6a61 100644 (file)
--- a/Documentation/user/repeats.itely
+++ b/Documentation/user/repeats.itely
@@ -184,7 +184,8 @@ Music Glossary: @rglos{repeat}, @rglos{volta}.
 
 Notation Reference: @ref{Bar lines}, @ref{Modifying context plug-ins}.
 
-Snippets: @lsrdir{Repeats,Repeats}.
+Snippets:
+@lsrdir{Repeats,Repeats}
 
 Internals Reference: @internalsref{VoltaBracket},
 @internalsref{RepeatedMusic}, @internalsref{VoltaRepeatedMusic},
@@ -260,7 +261,8 @@ c4 c4
 
 Notation Reference: @ref{Bar lines}, @ref{Formatting text}.
 
-Snippets: @lsrdir{Repeats,Repeats}
+Snippets:
+@lsrdir{Repeats,Repeats}
 
 Internals Reference: @internalsref{VoltaBracket},
 @internalsref{RepeatedMusic}, @internalsref{VoltaRepeatedMusic}.
@@ -304,7 +306,8 @@ c1
 
 @seealso
 
-Snippets: @lsrdir{Repeats,Repeats}.
+Snippets:
+@lsrdir{Repeats,Repeats}
 
 Internals Reference: @internalsref{RepeatedMusic},
 @internalsref{UnfoldedRepeatedMusic}.
@@ -366,7 +369,8 @@ R1
 
 @seealso
 
-Snippets: @lsrdir{Repeats,Repeats}
+Snippets:
+@lsrdir{Repeats,Repeats}
 
 Internals Reference: @internalsref{RepeatSlash},
 @internalsref{PercentRepeat}, @internalsref{DoublePercentRepeat},
@@ -438,7 +442,8 @@ Notation Reference: @ref{Tremolo repeats}.
 Internals Reference: @internalsref{Beam},
 @internalsref{StemTremolo}.
 
-Snippets: @lsrdir{Repeats,Repeats}
+Snippets:
+@lsrdir{Repeats,Repeats}
 
 Elsewhere: @internalsref{StemTremolo}.
 

diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely
index 2ee531339524625ddbed21f50f601ae748748b54..199f90c8625e35bff40ec803ea426ff981ee69cf 100644 (file)
--- a/Documentation/user/rhythms.itely
+++ b/Documentation/user/rhythms.itely
@@ -143,7 +143,8 @@ Notation Reference:
 @ref{Ancient notation},
 @ref{Proportional notation}.
 
-Snippets: @lsrdir{Rhythms,Rhythms}.
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 Internals Reference:
 @internalsref{Dots},
@@ -247,7 +248,8 @@ Notation Reference:
 @ref{Objects connected to the input},
 @ref{Polymetric notation}.
 
-Snippets: @lsrdir{Rhythms,Rhythms}.
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 Internals Reference:
 @internalsref{TupletBracket},
@@ -342,7 +344,8 @@ Notation Reference:
 @ref{Skips},
 @ref{Polymetric notation}.
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 
 @node Ties
@@ -472,7 +475,8 @@ Music Glossary:
 
 Notation Reference: @ref{Automatic note splitting}.
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 Internals Reference:
 @internalsref{LaissezVibrerTie},
@@ -560,7 +564,8 @@ a4\rest d4\rest
 
 Notation Reference: @ref{Full measure rests}
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 Internals Reference: @internalsref{Rest}
 
@@ -632,7 +637,8 @@ empty page:
 
 @seealso
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 Internals Reference: @internalsref{SkipMusic}
 
@@ -805,7 +811,8 @@ Notation Reference:
 @ref{Formatting text},
 @ref{Text scripts}.
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 Internals Reference:
 @internalsref{MultiMeasureRest},
@@ -1032,7 +1039,8 @@ Music Glossary: @rglos{anacrusis}
 
 Notation Reference: @ref{Grace notes}
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 Internal Reference: @internalsref{Timing_translator}
 
@@ -1105,7 +1113,8 @@ Music Glossary: @rglos{cadenza}
 
 Notation Reference: @ref{Controlling visibility of objects}
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 @knownissues
 
@@ -1304,7 +1313,8 @@ Learning Manual:
 @rlearning{Engravers explained},
 @rlearning{Adding and removing engravers}.
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 Internals Reference:
 @internalsref{Note_heads_engraver},
@@ -1451,7 +1461,8 @@ f8 f''8 f8 f''8
 
 Notation Reference: @ref{Manual beams}, @ref{Setting automatic beam behavior}.
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 Internals Reference: @internalsref{Beam}.
 
@@ -1650,7 +1661,8 @@ automatic beam is still accepting notes, it is not typeset.
 
 @seealso
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 
 @node Manual beams
@@ -1761,7 +1773,8 @@ music snippets, and when numbers in the fraction are small.
 
 @seealso
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 
 
@@ -1917,7 +1930,8 @@ Notation Reference: @ref{Line breaking}, @ref{Repeats},
 @c FIXME: node name changed, but is subject to further changes.
 @c @ref{System start delimiters}.
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 Internals Reference: @internalsref{BarLine} (created at
 @internalsref{Staff} level), @internalsref{SpanBar} (across
@@ -2059,7 +2073,8 @@ Bar numbers can be removed entirely by removing the
 
 @seealso
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 Internals Reference: @internalsref{BarNumber}.
 
@@ -2156,7 +2171,8 @@ when it is processed.
 
 @seealso
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 
 @node Rehearsal marks
@@ -2262,7 +2278,8 @@ For common tweaks to the positioning of rehearsal marks, see
 
 @seealso
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 This manual: @ref{The Feta font}, @ref{Formatting text}.
 
@@ -2450,7 +2467,8 @@ Music Glossary:
 @rglos{acciaccatura},
 @rglos{appoggiatura}
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 Internals Reference: @internalsref{GraceMusic}.
 
@@ -2520,7 +2538,8 @@ cadenza = \relative c' {
 
 @seealso
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 
 @node Time administration
@@ -2599,7 +2618,8 @@ notes.
 
 This manual: @ref{Bar numbers}, @ref{Unmetered music}
 
-Snippets: @lsrdir{Rhythms,Rhythms}
+Snippets:
+@lsrdir{Rhythms,Rhythms}
 
 Internals Reference: @internalsref{Timing_translator},
 @internalsref{Score}

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index 39793910eca612236604f52a3607a36224d88b64..27ddc14e982d49e1823e57808392a93ecf44412f 100644 (file)
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -52,7 +52,8 @@ Music Glossary: @rglos{chord}.
 
 Notation Reference: @ref{Modern chords}.
 
-Snippets: @lsrdir{Simultaneous,Simultaneous-notes}.
+Snippets:
+@lsrdir{Simultaneous,Simultaneous-notes}
 
 @knownissues
 
@@ -82,7 +83,8 @@ clusters.
 
 @seealso
 
-Snippets: @lsrdir{Simultaneous,Simultaneous-notes}.
+Snippets:
+@lsrdir{Simultaneous,Simultaneous-notes}
 
 Internals Reference: @internalsref{ClusterSpanner},
 @internalsref{ClusterSpannerBeacon},
@@ -250,7 +252,8 @@ override typesetting decisions.
 
 @seealso
 
-Snippets: @lsrdir{Simultaneous,Simultaneous-notes}.
+Snippets:
+@lsrdir{Simultaneous,Simultaneous-notes}
 
 Internals Reference: the objects responsible for resolving
 collisions are @internalsref{NoteCollision} and
@@ -353,7 +356,8 @@ has no effect on the pitches of @var{musicexpr1} and
 
 Music Glossary: @rglos{a due}.
 
-Snippets: @lsrdir{Simultaneous,Simultaneous-notes}.
+Snippets:
+@lsrdir{Simultaneous,Simultaneous-notes}
 
 Internals Reference: @internalsref{PartCombineMusic}, @internalsref{Voice}.
 
@@ -444,5 +448,6 @@ music = {
 
 @seealso
 
-Snippets: @lsrdir{Simultaneous,Simultaneous-notes}
+Snippets:
+@lsrdir{Simultaneous,Simultaneous-notes}
 

diff --git a/Documentation/user/staff.itely b/Documentation/user/staff.itely
index e75c6ad1c019e904303dcd08c4366d56724b2d99..297eea6f5506e73340dcdd1d02cad6c85c11d5ae 100644 (file)
--- a/Documentation/user/staff.itely
+++ b/Documentation/user/staff.itely
@@ -124,7 +124,8 @@ Notation Reference: @ref{Percussion staves},
 @ref{Guitar tablatures}, @ref{Gregorian Chant contexts},
 @ref{Mensural contexts}.
 
-Snippets: @lsrdir{Staff,Staff-notation}.
+Snippets:
+@lsrdir{Staff,Staff-notation}
 
 Internals Reference: @internalsref{Staff}, @internalsref{DrumStaff},
 @internalsref{GregorianTranscriptionStaff}, @internalsref{RhythmicStaff},
@@ -258,7 +259,8 @@ piano music and @code{ChoirStaff} for all kind of vocal ensemble music.
 Music Glossary: @rglos{brace}, 
 @rglos{bracket}, @rglos{grand staff}.
 
-Snippets: @lsrdir{Staff,Staff-notation}
+Snippets:
+@lsrdir{Staff,Staff-notation}
 
 Internals Reference: @internalsref{Staff}, @internalsref{ChoirStaff},
 @internalsref{GrandStaff}, @internalsref{PianoStaff}, 
@@ -382,7 +384,8 @@ source code, for instructions how to set them see @ref{Instrument names}.
 
 @seealso
 
-Snippets: @lsrdir{Staff,Staff-notation}
+Snippets:
+@lsrdir{Staff,Staff-notation}
 
 Internals Reference: @internalsref{InnerChoirStaffGroup}, 
 @internalsref{InnerStaffGroup}, @internalsref{SystemStartBar}, 
@@ -636,7 +639,8 @@ with the @code{\skip} command.
 
 Music Glossary: @rglos{ossia}, @rglos{staff}, @rglos{Frenched staff}.
 
-Snippets: @lsrdir{Staff,Staff-notation}.
+Snippets:
+@lsrdir{Staff,Staff-notation}
 
 Internals Reference: @internalsref{StaffSymbol}.
 
@@ -753,7 +757,8 @@ of which it is written.
 
 Notation Reference: @ref{Staff symbol}.
 
-Snippets: @lsrdir{Staff,Staff-notation}
+Snippets:
+@lsrdir{Staff,Staff-notation}
 
 Internals Reference: @internalsref{ChordNames},
 @internalsref{FiguredBass}, @internalsref{Lyrics},
@@ -819,7 +824,8 @@ Music Glossary: @rglos{metronome}, @rglos{metronomic indication},
 
 Notation Reference: @ref{Formatting text}.
 
-Snippets: @lsrdir{Staff,Staff-notation}.
+Snippets:
+@lsrdir{Staff,Staff-notation}
 
 Internals Reference: @internalsref{MetronomeMark}, @ref{MIDI
 output}.
@@ -938,7 +944,8 @@ c1 c c c \break
 
 Notation Reference: @ref{Modifying context plug-ins}.
 
-Snippets: @lsrdir{Staff,Staff-notation}
+Snippets:
+@lsrdir{Staff,Staff-notation}
 
 Internals Reference: @internalsref{InstrumentName},
 @internalsref{PianoStaff}, @internalsref{Staff}.
@@ -1060,7 +1067,8 @@ written entirely in lower-case letters: @code{\addquote}.
 
 Notation Reference: @ref{Instrument transpositions}.
 
-Snippets: @lsrdir{Staff,Staff-notation}
+Snippets:
+@lsrdir{Staff,Staff-notation}
 
 Internals Reference: @internalsref{QuoteMusic}, @internalsref{Voice}.
 
@@ -1173,7 +1181,8 @@ cbsn = \relative c, {
 
 @seealso
 
-Snippets: @lsrdir{Staff,Staff-notation}.
+Snippets:
+@lsrdir{Staff,Staff-notation}
 
 Internals Reference: @internalsref{Voice}.
 

diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely
index cb9ba67a734bee8ea2c24e3267ba04947f3c16f8..8fef6bef56add10b697969fac9c7223164b22bb1 100644 (file)
--- a/Documentation/user/text.itely
+++ b/Documentation/user/text.itely
@@ -97,7 +97,8 @@ d8^"pizz." e f g \textLengthOn a4_"scherzando" f
 Notation Reference: @ref{Formatting text},
 @ref{Controlling direction and placement}.
 
-Snippets: @lsrdir{Text,Text}
+Snippets:
+@lsrdir{Text,Text}
 
 Internals Reference: @internalsref{TextScript}.
 
@@ -121,9 +122,8 @@ default; to enable it, use
 Some performance indications, e.g., @i{rallentando} or
 @i{accelerando}, are written as text and are extended over many
 measures with dotted lines.
-
 Such objects, called @q{spanners}, may be created
-from one note to another by using the following syntax:
+from one note to another using the following syntax:
 
 @lilypond[verbatim,quote,ragged-right,fragment,relative=2]
 \override TextSpanner #'bound-details #'left #'text = "rit." 
@@ -133,9 +133,9 @@ e,\stopTextSpan
 
 @noindent
 The string to be printed is set through
-object properties. By default it is printed in italic characters,
+object properties.  By default it is printed in italic characters,
 but different formatting can be obtained using
-@code{\markup} blocks:
+@code{\markup} blocks, as described in @ref{Formatting text}.
 
 @lilypond[quote,ragged-right,fragment,relative=2,verbatim]
 \override TextSpanner #'bound-details #'left #'text =
@@ -145,7 +145,7 @@ e,\stopTextSpan
 @end lilypond
 
 The line style, as well as the text string, can be defined as an
-object property. This syntax is described in @ref{Line styles}.
+object property.  This syntax is described in @ref{Line styles}.
 
 @predefined
 
@@ -160,7 +160,8 @@ object property. This syntax is described in @ref{Line styles}.
 
 Notation Reference: @ref{Line styles}.
 
-Snippets: @lsrdir{Text,Text}
+Snippets:
+@lsrdir{Text,Text}
 
 Internals Reference: @internalsref{TextSpanner}.
 
@@ -178,7 +179,7 @@ Various text elements can be added to a score using
 the syntax described in @ref{Rehearsal marks}:
 
 @lilypond[verbatim,quote,ragged-right,fragment,relative=2]
-c4\mark "dolce" c c c
+c4\mark "Allegro" c c c
 @end lilypond
 
 This syntax makes possible to put any text on a bar line;
@@ -193,14 +194,14 @@ c1
 @end lilypond
 
 @noindent
-Such objects are only typeset above the top staff of the score; they
-can be placed above the bar line or between notes, depending on whether
-you specify it at the end or the middle of a bar. When specified at the
-beginning of a score or at a line break, the mark will be printed at
+Such objects are only typeset above the top staff of the score; depending on
+whether they are specified at the end or the middle of a bar, they 
+can be placed above the bar line or between notes.  When specified at the
+beginning of a score or at a line break, marks will be printed at
 the beginning of the line (the next line, in case of a line break).
 
 @lilypond[fragment,quote,ragged-right,verbatim,relative=2]
-\mark "dolce" c1
+\mark "Allegro" c1
 c\mark "assai" \break
 c c
 @end lilypond
@@ -222,7 +223,8 @@ c c
 Notation Reference: @ref{Rehearsal marks},
 @ref{Formatting text}, @ref{The Feta font}.
 
-Snippets: @lsrdir{Text,Text}
+Snippets:
+@lsrdir{Text,Text}
 
 Internals Reference: @internalsref{RehearsalMark}.
 
@@ -279,6 +281,13 @@ text documents or books -- and therefore to
 use LilyPond as a word processor.  This syntax is described in
 @ref{Multi-page markup}.
 
+@predefined
+
+@funindex \markup
+@code{\markup},
+@funindex \markuplines
+@code{\markuplines}
+
 @ignore
 @snippets
 
@@ -287,22 +296,16 @@ TODO: add convenient snippets in input/new -vv
 
 @seealso
 
-Notation Reference: @code{Formatting text},
-@code{File structure}, 
+Notation Reference: @ref{Formatting text},
+@ref{File structure}, 
 @ref{Multiple scores in a book},
 @ref{Multi-page markup}.
 
-Snippets: @lsrdir{Text,Text}.
+Snippets:
+@lsrdir{Text,Text}
 
 Internals Reference: @internalsref{TextScript}.
 
-@predefined
-
-@funindex \markup
-@code{\markup},
-@funindex \markuplines
-@code{\markuplines}
-
 
 @node Formatting text
 @subsection Formatting text
@@ -328,7 +331,7 @@ using the @code{\markup} mode specific syntax.
 @cindex typeset text
 
 A @code{\markup} block is used to typeset text with an extensible syntax,
-called @q{markup mode}.
+called @qq{markup mode}.
 Specific commands can be entered in this mode, using the
 backslash @code{\} character.
 @c TODO: move the following sentence (and add an example?) -vv
@@ -496,7 +499,8 @@ I'm putting them in bulk, prior to working on this section. -vv
 
 This manual: @ref{Text markup commands}.
 
-Snippets: @lsrdir{Text,Text}
+Snippets:
+@lsrdir{Text,Text}
 
 Internals Reference: @internalsref{TextScript}.
 
@@ -706,7 +710,8 @@ block.  In such a case, the @code{\score} must contain a @code{\layout} block.
 
 @seealso
 
-Snippets: @lsrdir{Text,Text}
+Snippets:
+@lsrdir{Text,Text}
 
 @node Multi-page markup
 @subsubsection Multi-page markup
@@ -739,7 +744,8 @@ lists.  The built-in markup list commands are described in
 This manual: @ref{Text markup list commands}, @ref{New
 markup list command definition}.
 
-Snippets: @lsrdir{Text,Text}
+Snippets:
+@lsrdir{Text,Text}
 
 @predefined
 
@@ -873,6 +879,7 @@ property.  The resulting size is taken relative to the
 
 @seealso
 
-Snippets: @lsrdir{Text,Text}
+Snippets:
+@lsrdir{Text,Text}
 
 

diff --git a/Documentation/user/writing-texinfo.txt b/Documentation/user/writing-texinfo.txt
index c6ca460136b35b7b4b379eee066e3d1b43300d8a..d8d5f6cdacd9893729bf33128f6c37be4993a6d5 100644 (file)
--- a/Documentation/user/writing-texinfo.txt
+++ b/Documentation/user/writing-texinfo.txt
@@ -105,6 +105,9 @@ commands.
 
 * Use two spaces after a period.
 
+* In examples of syntax, use @var{musicexpr} for a music
+  expression.
+
 * Variables or numbers which consist of a single character
   (probably followed by a punctuation mark) should be tied
   properly, either to the previous or the next word.  Example:

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