(Page layout): add

betweensystempadding

diff --git a/ChangeLog b/ChangeLog
index ed29928e0dfb0e99a7cd98fe11b8aaee2be240c8..83b8310c148f7d418761681af7f4d26dd0fca649 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-09-05  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * Documentation/user/changing-defaults.itely (Page layout): add
+       betweensystempadding
+
        * scm/page-layout.scm (ly:optimal-page-breaks): typo.
 
        * input/regression/quote-cyclic.ly (Module): new file.

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 133d2f6f59646bbad3b995985c98f6198c5ccfd6..794a86b1de94e233060218aee8c5b22dd74a467d 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -7,10 +7,17 @@
 @unnumbered New features in 2.3 since 2.2
 
 @itemize @bullet
+@item  LilyPond will try to keep
+staves at the same distances across a page, but it will stretch
+distances to prevent collisions. This results in a more orderly
+appearance of the page.
 
 @item Key signature cancellations are now printed before the bar line,
 and their appearance has been improved.
 
+@item Different voices that all use  @code{\quote} can now refer to
+each other.
+
 
 @item The automatic staff changer, which is invoked with
 @code{\autochange}, now creates the @code{up} and @code{down} staff

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index bd25872d9de4edd012b64535cd7a09bd15fc3c01..9bfd2fe7d997506a4f06e1a0f0b9d57e581be32e 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -2227,6 +2227,12 @@ The default layout responds to the following settings in the
   This dimensions determines the distance between systems. It is the
 ideal distance between the center of the bottom staff of one system, and
 the center of the top staff of the next system.
+
+@item betweensystempadding
+This dimension is the minimum amount of white space that will always
+be present between the bottom most symbol of one system, and the
+topmost of the next system.
+
 @end table
 
 @example

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 04cb3b13a0045b3429ad1ae44678101a42500fc7..9a5a30a995c97e895fe559115c253987d6bc8a82 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -901,14 +901,11 @@ Accidentals and key signatures often confuse new users, because
 unaltered notes get natural signs depending on the key signature. For
 more information,   see  @ref{More about pitches}.
 
-@refbugs
-
-The ordering of a key cancellation is wrong when it is combined with
-repeat bar lines. The cancellation is also printed after a line break.
 
 @seealso
 
-Program reference: @internalsref{KeyChangeEvent}, and @internalsref{KeySignature}.
+Program reference: @internalsref{KeyChangeEvent},
+@internalsref{KeyCancellation} and @internalsref{KeySignature}.
 
 @cindex @code{keySignature}
 

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 9a7ff0129ca51c357256fdeeff7ba5d47f60f94f..a0475b3e44d3b6b1862af9bbf353110acac795c1 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -35,7 +35,7 @@ inline bool ly_c_symbol_p (SCM x) { return SCM_SYMBOLP (x); }
 inline bool ly_c_boolean_p (SCM x) { return SCM_BOOLP (x); }
 #define scm_is_bool(x) ly_c_boolean_p(x)
 inline bool ly_c_eq_p (SCM x, SCM y) { return SCM_EQ_P (x, y); }
-#define scm_is_eq(x,y)  (SCM_EQ_P (x, y));
+#define scm_is_eq(x,y)  (SCM_EQ_P((x), (y)))
 
 inline double ly_scm2double (SCM x) { return scm_num2dbl (x, "ly_scm2double"); }
 #define scm_to_double(x) (ly_scm2double(x))