From: John Mandereau <john.mandereau@gmail.com>
Date: Wed, 13 Aug 2008 16:37:07 +0000 (+0200)
Subject: Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.56-1~2^2~14
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=87cf46e19dec8334e569daa58f457757296688a1;p=lilypond.git

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

* 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond:
  GDP LM 3.3.4 Explaining \context
  Updates to chords.itely, fretted-strings.itely
  Compile fix.
  Update from Kurt.
  Update fretted-strings.itely
  staff-symbol-referencer.cc: Junk redundant functions.
  Robustify Staff_symbol_referencer::on_line ().
  Update fretted-strings.itely
  Change type predicate for 'layer to integer.
  Replacing "User Manual" with "Notation Ref" in SL

Conflicts:

	Documentation/user/fundamental.itely
---

87cf46e19dec8334e569daa58f457757296688a1
diff --cc Documentation/user/fundamental.itely
index 39c726d8d0,ecd591cfc8..7c57879ede
--- a/Documentation/user/fundamental.itely
+++ b/Documentation/user/fundamental.itely
@@@ -1999,13 -1962,43 +1996,47 @@@ value of the font size.  If it is late
  this new default value may be restored with the
  @code{\unset fontSize} command.
  
+ @unnumberedsubsubsec Setting context properties with @code{\context}
+ 
+ The values of context properties may be set in @emph{all} contexts
+ of a particular type, such as all @code{Staff} contexts, with a single
+ command.  The context type is identified by using its
+ type name, like @code{Staff}, prefixed by a back-slash: @code{\Staff}.
+ The statement which sets the property value is the same as that in a 
+ @code{\with} block, introduced above.  It is placed in a
+ @code{\context} block within a @code{\layout} block.  Each
+ @code{\context} block will affect all contexts of the type specified
+ throughout the @code{\score} or @code{\book} block in which the
+ @code{\layout} block appears.  Here is a example to show the format:
+ 
+ @lilypond[verbatim,quote]
+ \score {
+   \new Staff {
+     \relative c'' {
+       cis4 e d ces
+     }
+   }
+   \layout {
+     \context {
+       \Staff
+       extraNatural = ##t
+     }
+   }
+ }
+ @end lilypond
+ 
+ @noindent
+ Context properties set in this way may be overridden for particular
+ instances of contexts by statements in a @code{\with} block, and by
+ @code{\set} commands embedded in music statements.
+ 
 -More information about changing context properties can be found in
 -the Notation Reference -- see
 -@ruser{Changing context default settings}.
 +@seealso
 +
 +Notation Reference: @ruser{Changing context default settings},
 +@ruser{The set command}.
 +
 +Internals Reference: @rinternals{Contexts},
 +@rinternals{Tunable context properties}.
  
  
  @node Adding and removing engravers
@@@ -2142,16 -2135,6 +2173,17 @@@ staff in a four-staff score, we could w
  }
  @end lilypond
  
 +@noindent
 +The values of context properties may also be set
 +for all contexts of a particular type by including the
 +@code{\set} command in a @code{\context} block in the
 +same way.
 +
 +@seealso
 +
- Notation Reference: @ruser{Modifying context plug-ins}.
++Notation Reference: @ruser{Modifying context plug-ins},
++@ruser{Changing context default settings}.
 +
  
  @node Extending the templates
  @section Extending the templates