* Documentation/user/refman.itely (Ottava brackets): more doco for

ottava.

* scm/define-grobs.scm (all-grob-descriptions): set
text-repeat-if-broken for ottava spanner

diff --git a/ChangeLog b/ChangeLog
index 72eadf0cc4fb9240aa08c260bd88398915bd19ef..eade867096abeb839614b36b510100e5404dcac3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-01-13  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * Documentation/user/refman.itely (Ottava brackets): more doco for
+       ottava.
+
        * lily/side-position-interface.cc (out_of_staff): also do
        out_of_staff() correctly for d == DOWN.
 

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index e1641e0c4a6bd5bd90c4f58d302f9818a895c9b7..d3cd476a219246107afa0f6004d19940d6e74a76 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -7,15 +7,27 @@
 
 @chapter New features in 2.1 since 2.0
 
+@ignore
 Unreleased:
 
 @itemize
 @end itemize
 
-Version 2.1.7
+Version 2.1.9
+@end ignore
 
 @itemize @bullet
 
+@item There is a new mechanism for putting lyrics to melodies.
+With this mechanism, @code{LyricVoice}s can be put melodies
+individually, allowing for different melismatic sections in every
+@code{LyricVoice}. See @file{input/regression/lyric-combine-new.ly}.
+
+@item Formatting of ottava brackets has been improved.
+
+@item Bar lines may now be dotted.
+
+
 @item The documentation now has links to a wiki, where everyone can
 add personal comments to the manual.
 

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 1d67d864f36e1ad8864ebc029126a2ad62840310..f83ad9fc75aad55c0be28bdb4839ae73e045c495 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -972,12 +972,23 @@ the staff. They are created by invoking the function
   a b }
 @end lilypond
 
-Internally the @code{set-octavation} function sets the properties
+The @code{set-octavation} function also takes -1 (for 8va bassa) and 2
+(for 15ma) as arguments.  Internally the function sets the properties
 @code{ottavation} (eg. to @code{"8va"}) and
-@code{centralCPosition}. The function also takes arguments -1 (for 8va
-bassa) and 2 (for 15ma).
+@code{centralCPosition}. For overriding the text of the bracket, set
+@code{ottavation} after invoking @code{set-octavation}, i.e.,
 
-@internalsref{OttavaSpanner}.
+@example
+  #(set-octavation 1)
+  \property Staff.ottavation = #"8"
+@end example
+
+@seealso
+
+Internals: @internalsref{OttavaSpanner}.
+
+Examples: @inputfileref{input/regression,ottava.ly},
+@inputfileref{input/regression,ottava-broken.ly}.
 
 @refbugs
 

diff --git a/VERSION b/VERSION
index 63cc2c5fb2238b5f04c03b5912e2bfadd466335f..b4ab3276327819b26c940f8c6a31adc900dfaf51 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=1
-PATCH_LEVEL=8
-MY_PATCH_LEVEL=hwn1
+PATCH_LEVEL=9
+MY_PATCH_LEVEL=
 

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 5999f0474990c4deeab9fcfacc55bc4d16166d0e..31fabdd98877666134f38d49b632a706f43b4515 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1088,7 +1088,7 @@
        (width-correct . 0.0)
        (style . dashed-line)
        (dash-fraction . 0.3)
-       (edge-height . (0 . 1.5))
+       (edge-height . (0 . 1.2))
        (direction . 1)
        (meta . ((interfaces . (text-spanner-interface side-position-interface font-interface spanner-interface))))             
        ))