Doc: more removal of \new Score from LM

Tracker issue 1033

diff --git a/Documentation/learning/tweaks.itely b/Documentation/learning/tweaks.itely
index 2d3d46e7a3d4216ab965d1105c24b88195782db5..4e69da10188acf9745ca62cbb92a171e0c66a798 100644 (file)
--- a/Documentation/learning/tweaks.itely
+++ b/Documentation/learning/tweaks.itely
@@ -3184,7 +3184,7 @@ different voices together?  This is where we need to turn again to
 the Notation Reference for help.  A search for @qq{merge} in the
 Notation Reference index quickly leads us to the commands for merging
 differently headed and differently dotted notes in
-@ruser{Collision resolution}.  In our example we need to merge both 
+@ruser{Collision resolution}.  In our example we need to merge both
 types of note for the duration of the polyphonic section in bar 3,
 so using the information we find in the Notation Reference we add
 
@@ -4114,16 +4114,20 @@ compress that line of the score just enough to fit within the
 margins.
 
 To be effective under all circumstances these checks must be enabled
-by placing the overrides in a Score @code{\with} block, rather than
-in-line in music, as follows:
+by placing the overrides using @code{\context} within a @code{\layout}
+block, rather than in-line in music, as follows:
 
 @example
-\new Score \with @{
-  % Makes sure text scripts and lyrics are within the paper margins
-  \override PaperColumn #'keep-inside-line = ##t
-  \override NonMusicalPaperColumn #'keep-inside-line = ##t
-@} @{
-   ..
+\score @{
+  @{ @dots{}notes@dots{} @}
+  \layout @{
+    \context @{
+      \Score
+      % Makes sure text scripts and lyrics are within the paper margins
+      \override PaperColumn #'keep-inside-line = ##t
+      \override NonMusicalPaperColumn #'keep-inside-line = ##t
+    @}
+  @}
 @}
 @end example
 

diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely
index 4171c5b1e8692334a852c5c350283eb6111f2e89..f28b3b29062e68c0ad92a8aa6f137b27a5298080 100644 (file)
--- a/Documentation/notation/changing-defaults.itely
+++ b/Documentation/notation/changing-defaults.itely
@@ -131,8 +131,7 @@ across staves.
 
 A Score context is instantiated implicitly when a
 @code{\score @{@dots{}@}} or @code{\layout @{@dots{}@}} block is
-processed, or explicitly when a @code{\new Score} command is
-executed.
+processed.
 
 @node Top-level contexts - staff containers
 @unnumberedsubsubsec Top-level contexts - staff containers
@@ -272,7 +271,6 @@ context.
 @node Creating contexts
 @subsection Creating contexts
 
-@c TODO \new Score and \score
 @c TODO more complete descriptions rather than learning style
 
 For scores with only one voice and one staff, contexts are

diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely
index 08d4bf82ba80cb8c714eb6a68c87aea6f1d9c64b..c152fab0dd7d8ae6c08da3dc0c31d76440161440 100644 (file)
--- a/Documentation/notation/input.itely
+++ b/Documentation/notation/input.itely
@@ -1806,15 +1806,11 @@ from the MIDI output, insert the following lines in the
 @end example
 
 MIDI output is created only when a @code{\midi} block is included
-within a score block defined with a @code{\score} command.  If it
-is placed within an explicitly instantiated score context (i.e.
-within a @code{\new Score} block) the file will fail.  To solve
-this, enclose the @code{\new Score} and the @code{\midi} commands
-in a @code{\score} block.
+within a score block defined with a @code{\score} command.
 
 @example
 \score @{
-  \new Score @{ @dots{}notes@dots{} @}
+  @{ @dots{}notes@dots{} @}
   \midi @{ @}
 @}
 @end example