Policy updates.

diff --git a/Documentation/user/editorial.itely b/Documentation/user/editorial.itely
index 939d28293b9b41c0b0e4b9c602618fe64e500ead..23286185c7e0c22ada6da46fafbd53937d262904 100644 (file)
--- a/Documentation/user/editorial.itely
+++ b/Documentation/user/editorial.itely
@@ -49,7 +49,7 @@ change the size of variable symbols, such as beams or slurs.
 @warning{For font sizes of text, see
 @ref{Common markup commands}.}
 
-@lilypond[quote,fragment,relative=2,verbatim,ragged-right]
+@lilypond[verbatim,quote,relative=2]
 \huge
 c4.-> d8---3
 \large
@@ -76,7 +76,7 @@ Six steps is exactly a factor of two.  The Scheme function
 factor.  The @code{font-size} property can also be set directly,
 so that only certain layout objects are affected.
 
-@lilypond[quote,fragment,relative=2,verbatim,ragged-right]
+@lilypond[verbatim,quote,relative=2]
 \set fontSize = #3
 c4.-> d8---3
 \override NoteHead #'font-size = #-4
@@ -134,13 +134,13 @@ Internals Reference:
 Fingering instructions can be entered using
 @var{note}-@var{digit}:
 
-@lilypond[quote,verbatim,ragged-right,fragment,relative=2]
+@lilypond[verbatim,quote,relative=2]
 c4-1 d-2 f-4 e-3
 @end lilypond
 
 Markup texts may be used for finger changes. 
 
-@lilypond[quote,verbatim,ragged-right,fragment,relative=2]
+@lilypond[verbatim,quote,relative=2]
 c4-1 d-2 f-4 c^\markup { \finger "2 - 3" }
 @end lilypond
 
@@ -149,7 +149,7 @@ c4-1 d-2 f-4 c^\markup { \finger "2 - 3" }
 A thumb-script can be added (e.g., in cello music) to indicate
 that a note should be played with the thumb. 
 
-@lilypond[quote,verbatim,ragged-right,fragment,relative=2]
+@lilypond[verbatim,quote,relative=2]
 <a_\thumb a'-3>2 <b_\thumb b'-3>
 @end lilypond
 
@@ -159,7 +159,7 @@ that a note should be played with the thumb.
 Fingerings for chords can also be added to individual notes of the
 chord by adding them after the pitches.
 
-@lilypond[quote,verbatim,ragged-right,fragment,relative=2]
+@lilypond[verbatim,quote,relative=2]
 <c-1 e-2 g-3 b-5>2 <d-1 f-2 a-3 c-5>
 @end lilypond
 
@@ -200,7 +200,7 @@ Internals Reference:
 Hidden (or invisible or transparent) notes can be useful in
 preparing theory or composition exercises.
 
-@lilypond[quote,ragged-right,verbatim,relative=2,fragment]
+@lilypond[verbatim,quote,relative=2]
 c4 d
 \hideNotes
 e4 f
@@ -215,7 +215,7 @@ c
 Notation objects which are attached to invisible notes are still
 visible.
 
-@lilypond[quote,ragged-right,verbatim,relative=2,fragment]
+@lilypond[verbatim,quote,relative=2]
 c4( d)
 \hideNotes
 e4(\p f)--
@@ -251,7 +251,7 @@ Internals Reference:
 Individual objects may be assigned colors.  Valid color names
 are listed in the @ref{List of colors}.
 
-@lilypond[quote,ragged-right,verbatim,fragment,relative=2]
+@lilypond[verbatim,quote,relative=2]
 \override NoteHead #'color = #red
 c4 c
 \override NoteHead #'color = #(x11-color 'LimeGreen)
@@ -272,7 +272,7 @@ possible to access X11 colors by the multi-word form of its name.
 If @code{x11-color} cannot make sense of the parameter then the
 color returned defaults to black. 
 
-@lilypond[quote,ragged-right,verbatim,fragment,relative=2]
+@lilypond[verbatim,quote,relative=2]
 \override Staff.StaffSymbol #'color = #(x11-color 'SlateBlue2)
 \set Staff.instrumentName = \markup {
   \with-color #(x11-color 'navy) "Clarinet"
@@ -293,7 +293,7 @@ b2 cis
 Exact RGB colors can be specified using the Scheme function
 @code{rgb-color}.
 
-@lilypond[quote,ragged-right,verbatim,fragment,relative=2]
+@lilypond[verbatim,quote,relative=2]
 \override Staff.StaffSymbol #'color = #(x11-color 'SlateBlue2)
 \set Staff.instrumentName = \markup {
   \with-color #(x11-color 'navy) "Clarinet"
@@ -342,7 +342,7 @@ Objects may be parenthesized by prefixing @code{\parenthesize} to
 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]
+@lilypond[verbatim,quote,relative=2]
 c2 \parenthesize d
 c2 \parenthesize <c e g>
 c2 <c \parenthesize e g>
@@ -350,7 +350,7 @@ c2 <c \parenthesize e g>
 
 Non-note objects may be parenthesized as well.
 
-@lilypond[quote,relative=2,fragment,verbatim,ragged-right]
+@lilypond[verbatim,quote,relative=2]
 c2-\parenthesize -. d
 c2 \parenthesize r
 @end lilypond
@@ -433,7 +433,7 @@ Elements of notation can be marked and named with the help of a
 square balloon.  The primary purpose of this feature is to explain
 notation.
 
-@lilypond[quote,verbatim,fragment,ragged-right,relative=2]
+@lilypond[verbatim,quote,relative=2]
 \new Voice \with { \consists "Balloon_engraver" }
 {
   \balloonGrobText #'Stem #'(3 . 4) \markup { "I'm a Stem" }
@@ -456,7 +456,7 @@ attach text to an individual note.
 Balloon text normally influences note spacing, but this can be
 altered:
 
-@lilypond[quote,verbatim,fragment,ragged-right,relative=2]
+@lilypond[verbatim,quote,relative=2]
 \new Voice \with { \consists "Balloon_engraver" }
 {
   \balloonLengthOff
@@ -501,7 +501,7 @@ 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]
+@lilypond[verbatim,quote]
 \layout {
   \context {
     \Staff
@@ -560,7 +560,7 @@ Internals Reference:
 Brackets are used in musical analysis to indicate structure in musical
 pieces.  Simple horizontal brackets are supported.
 
-@lilypond[quote,verbatim,ragged-right]
+@lilypond[verbatim,quote]
 \layout {
   \context {
     \Voice
@@ -575,7 +575,7 @@ pieces.  Simple horizontal brackets are supported.
 
 Analysis brackets may be nested.
 
-@lilypond[quote,verbatim,ragged-right]
+@lilypond[verbatim,quote]
 \layout {
   \context {
     \Voice

diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely
index f615cdbe0595fe9517b3e5613f843892ed785e90..e96bdb0288b81f620370289005faa58fa85f55e2 100644 (file)
--- a/Documentation/user/pitches.itely
+++ b/Documentation/user/pitches.itely
@@ -500,7 +500,7 @@ the @code{=}@tie{}symbol.  This example will generate a warning
 octave @code{d''} instead of @code{d'} as indicated by the octave
 correction.
 
-@lilypond[verbatim,quote,fragment]
+@lilypond[verbatim,quote]
 \relative c'' {
   c2 d='4 d
   e2 f
@@ -516,7 +516,7 @@ calculation of relative mode).  If this check fails, a warning is
 printed, but the previous note is not changed.  Future notes are
 relative to the @var{controlpitch}.
 
-@lilypond[verbatim,quote,fragment]
+@lilypond[verbatim,quote]
 \relative c'' {
   c2 d
   \octave c'
@@ -527,7 +527,7 @@ relative to the @var{controlpitch}.
 Compare the two bars below.  The first and third @code{\octave}
 checks fail, but the second one does not fail.
 
-@lilypond[verbatim,quote,fragment]
+@lilypond[verbatim,quote]
 \relative c'' {
   c4 f g f
 

diff --git a/Documentation/user/writing-texinfo.txt b/Documentation/user/writing-texinfo.txt
index 06de38821b366c67d5699aef68281d333f346739..b13108bf95a505efc8a46f1cdb2ccb4f3576ab68 100644 (file)
--- a/Documentation/user/writing-texinfo.txt
+++ b/Documentation/user/writing-texinfo.txt
@@ -53,13 +53,15 @@ commands.
     \override textscript #'padding = #3
     c1^"hi"
 
-* LilyPond input should be produced via
-    @lilypond[verbatim,quote,ragged-right]
-  with `fragment' and `relative=2' optional.
+* Most LilyPond input should be produced with:
+    @lilypond[verbatim,quote,relative=2]
+  or
+    @lilypond[verbatim,quote,relative=1]
 
-  Examples about page layout may alter the quote/ragged-right
-  options.  Omitting `verbatim' is not allowed except for special
-  circumstances.
+  If you want to use \layout{} or define variables, use
+    @lilypond[verbatim,quote]
+
+  In rare cases, other options may be used (or omitted), but ask first.
 
 * Inspirational headwords are produced with
   @lilypondfile[quote,ragged-right,line-width=16\cm,staffsize=16]