Info from NEWS to docs.

diff --git a/ChangeLog b/ChangeLog
index fff84253ca304587fb3dd4a941e9b0d6842bd3cf..b9bb367ce28e4b06616d0163013a01046cd2f7ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
        * Documentation/user/ *-notation.itely: misc minor editing,
        shifting doc sections around.
 
+       * Documentation/user/ *-notation-itely, global.itely,
+       changing-defaults.itely: added new stuff from NEWS.
+
 2006-02-20  Heikki Junes  <hjunes@cc.hut.fi>
 
        * po/fi.po: update.

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index 2d1e2bfdaa64ba4e42c8393743bc44b2d1052640..d2b758c6212c4dcaf240bcf6b4cd49d3ff7081f1 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -187,6 +187,25 @@ c1 c c c4 c c c
 \mark "D.S. al Fine "
 @end lilypond
 
+Text marks may be aligned with notation objects other than
+bar lines,
+
+@lilypond[fragment,quote,ragged-right,verbatim,relative=2]
+\relative {
+  c1
+  \key cis \major
+  \clef alto
+  \set Score.rehearsalMarkAlignSymbol = #'key-signature
+  \mark "on-key"
+  cis
+ \key ces \major
+  \set Score.rehearsalMarkAlignSymbol = #'clef
+  \clef treble
+  \mark "on clef"
+  ces
+}
+@end lilypond
+
 
 @seealso
 
@@ -1519,8 +1538,8 @@ LilyPond is limited.
 @menu
 * Polymetric notation::         
 * Time administration::         
+* Proportional notation::       
 * Clusters::                    
-* Special fermatas::            
 * Special noteheads::           
 * Feathered beams::             
 * Improvisation::               
@@ -1721,6 +1740,21 @@ c4 c1
 @end lilypond
 
 
+@node Proportional notation
+@subsection Proportional notation
+@cindex Proportional notation
+
+Notes can be spaced proportional to their time-difference by
+assigning a duration to @code{proportionalNotationDuration}
+
+@lilypond[quote,ragged-right,verbatim,relative=2,fragment]
+<<
+  \set Score.proportionalNotationDuration = #(ly:make-moment 1 16)
+  \new Staff { c8[ c c c c c]  c4 c2 r2 }
+  \new Staff { c2  \times 2/3 { c8 c c } c4 c1 }
+>>
+@end lilypond
+
 
 @node Clusters
 @subsection Clusters
@@ -1759,16 +1793,19 @@ Music expressions like @code{<< @{ g8 e8 @} a4 >>} are not printed
 accurately.  Use @code{<g a>8 <e a>8} instead.
 
 
+@ignore
 
-@node Special fermatas
-@subsection Special fermatas
+This is covered in articulation; does it really need its
+own doc section?  -gp
+@n ode Special fermatas
+@s ubsection Special fermatas
 
-@cindex fermatas, special
+@c index fermatas, special
 
 In contemporary music notation, special fermata symbols denote breaks
 of differing lengths.  The following fermatas are supported
 
-@lilypond[quote,ragged-right]
+@li lypond[quote,ragged-right]
 <<
   \oldaddlyrics {
     b'2
@@ -1801,6 +1838,8 @@ of differing lengths.  The following fermatas are supported
 See @ref{Articulations} for general instructions how to apply scripts
 such as fermatas to notes.
 
+@end lilypond
+
 
 @node Special noteheads
 @subsection Special noteheads

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index 5b60197da90922867e516c34759c287b971c833e..76eeb5c451f7f1347a4d31beb890226447843bb1 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -144,6 +144,16 @@ ceses4 ces cis c
 ceses4 ces cis c
 @end lilypond
 
+@cindex Musica ficta
+
+Suggested accidentals (used in notating musica ficta) may
+be written with @code{suggestAccidentals}
+
+@lilypond[fragment,quote,ragged-right,verbatim,relative=2]
+\set suggestAccidentals = ##t
+ais4 bis
+@end lilypond
+
 
 @seealso
 
@@ -167,8 +177,8 @@ after the pitch.  A cautionary accidental
 question mark `@code{?}' after the pitch.  These extra accidentals
 can be used to produce natural signs, too.
 
-@lilypond[quote,ragged-right,fragment,verbatim]
-cis' cis' cis'! cis'? c c? c! c
+@lilypond[quote,ragged-right,fragment,verbatim,relative=1]
+cis cis cis! cis? c c? c! c
 @end lilypond
 
 
@@ -540,6 +550,7 @@ website for more information.
 * Barnumber check::             
 * Skipping corrected music::    
 * Automatic note splitting::    
+* Writing music in parallel::   
 @end menu
 
 
@@ -897,6 +908,26 @@ Examples: @inputfileref{input/@/regression,completion@/-heads@/.ly}.
 Program reference: @internalsref{Completion_heads_engraver}.
 
 
+@node Writing music in parallel
+@subsection Writing music in parallel
+@cindex Writing music in parallel
+@cindex Interleaved music
+
+Music for multiple parts can be interleaved
+
+@lilypond[quote,fragment,verbatim,relative=1]
+\parallelMusic #'(voiceA voiceB) {
+  r8     g'16[ c''] e''[ g' c'' e''] r8     g'16[ c''] e''[ g' c'' e''] |
+  c'2                                c'2                                |
+  r8     a'16[ d''] f''[ a' d'' f''] r8     a'16[ d''] f''[ a' d'' f''] |
+  c'2                                c'2                                |
+}
+\new StaffGroup <<
+  \new Staff \new Voice \voiceA
+  \new Staff \new Voice \voiceB
+>>
+@end lilypond
+
 
 @node Staff notation
 @section Staff notation

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index be62081aa053fdc42f420dc4d35c8f4482572cbf..6571d8772316ddc7963ecdb1b9edd836ca2350ba 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -553,7 +553,12 @@ affects settings that were made in the same context.  In other words, the
 \revert Staff.Stem #'thickness
 @end example
 
+Some tweakable options are called ``subproperties'' and reside inside
+properties.  To tweak those, use
 
+@example
+\override Stem #'details #'beamed-lengths = #'(4 4 3) 
+@end example
 
 
 @seealso
@@ -946,6 +951,14 @@ context will not be noticed.
 
 @end itemize
 
+Some tweakable options are called ``subproperties'' and reside inside
+properties.  To tweak those, use
+
+@example
+\override Stem #'details #'beamed-lengths = #'(4 4 3) 
+@end example
+
+
 More specific overrides are also possible.  The next section
 discusses in depth how to figure out these statements for yourself.
 

diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index 59480aabc2d16dc45499e077a8e39d4e18b719a7..3b7465d30ed65183553866978585e3f47d25ade8 100644 (file)
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -760,6 +760,33 @@ exaggerated corrections:
 }
 @end lilypond
 
+Proportional notation is supported; see @ref{Proportional notation}.
+
+@c  check this before release  --gp
+Symbol sizes (such as accidentals) may be disregarded for determining
+horizontal spacing,
+
+@lilypond[quote,ragged-right,relative=2,fragment]
+<<
+  \time 2/4
+  \new Staff { c16[ c c c c c c c] c[ c c c c c c c] }
+  \new Staff {
+          c16[ cisis ces cis c cisis ces cis]
+    \override Score.SpacingSpanner #'uniform-stretching = ##t 
+          c16[ cisis ces cis c cisis ces cis]
+  }
+>>
+@end lilypond
+
+
+When @code{strict-note-spacing} is set, notes are spaced without
+regard for clefs, bar lines, and grace notes,
+
+@lilypond[quote,ragged-right,relative=2,fragment]
+\override Score.SpacingSpanner #'strict-note-spacing = ##t 
+\new Staff { c8[ c \clef alto c \grace { c16[ c] } c8 c c]  c32[ c32] }
+@end lilypond
+
 
 @seealso
 
@@ -866,6 +893,12 @@ This makes the following 28 measures (assuming 4/4 time) be broken every
 
 Internals: @internalsref{BreakEvent}.
 
+A linebreaking configuration can now be saved as a @code{.ly} file
+automatically.  This allows vertical alignments to be stretched to
+fit pages in a second formatting run.  This is fairly new and
+complicated; see @inputfileref{input/regression/,page-layout-twopass.ly}
+for details.
+
 
 @node Page breaking
 @subsection Page breaking