Clarify docs and fix bugs 63, 91, and 96.

diff --git a/ChangeLog b/ChangeLog
index 8ad44b1e3d86a5b75ad2896ce638e9c67919897d..ec662e8fc77710444b94fa3d15a7302eea3091e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-08  Graham Percival  <gpermus@gmail.com>
+
+       * Docuemntation/user/page.itely: clarify two-pass vs. ragged-bottom.
+
+       * ly/property-init.ly: fix sacred harp notehead shapes (bug 96).
+
+       * scm/define-context-properties.scm: clarified docs (bug 91).
+
+       * Documentation/user/basic-notation.itely: document volta brackets
+       not aligning (bug 63).
+
 2006-10-08  John Mandereau  <john.mandereau@free.fr>
 
        * po/fr.po: update translation.

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index 6115449cdf28355df7cf60dc525a12fc04d7ef45..6cbb216eda28f43e87965a18eb5af078aa303621 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -2987,6 +2987,7 @@ give enough alternatives for all of the repeats, the first alternative
 is assumed to be played more than once.
 
 Standard repeats are used like this
+
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 c1
 \repeat volta 2 { c4 d e f }
@@ -2994,6 +2995,7 @@ c1
 @end lilypond
 
 With alternative endings
+
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 c1
 \repeat volta 2 {c4 d e f}
@@ -3073,6 +3075,8 @@ so after a repeat timing information must be reset by hand; for
 example, by setting @code{Score.measurePosition} or entering
 @code{\partial}.  Similarly, slurs or ties are also not repeated.
 
+Volta brackets are not vertically aligned.
+
 
 @node Repeats and MIDI
 @subsection Repeats and MIDI

diff --git a/Documentation/user/page.itely b/Documentation/user/page.itely
index ceaee2adef2bc9e3b9a2ece1644322632dedbe2d..4f0b45175501d206a25a83b816519b3927b7bee7 100644 (file)
--- a/Documentation/user/page.itely
+++ b/Documentation/user/page.itely
@@ -628,10 +628,13 @@ space left on a page, a two-pass technique can be used:
 @enumerate
 @item In the first pass, the amount of vertical space used to increase
 the height of each system is computed and dumped to a file.
-@item In the second pass, the systems are stretched according to the
-data in the page layout file.
+@item In the second pass, spacing inside the systems are
+stretched according to the data in the page layout file.
 @end enumerate
 
+The @code{ragged-bottom} property adds space between systems, while
+the two-pass technique adds space between staffs inside a system.
+
 To allow this behaviour, a @code{tweak-key} variable has to be set in
 each score @code{\layout} block, and the tweaks included in each score
 music, using the @code{\scoreTweak} music function.

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 73c3357d7cec2412962cd8d0aa97b042cd6bef6a..36941a18c994a28c4f88c04379c127cbc449a007 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -61,7 +61,7 @@ setEasyHeads = \sequential {
 aikenHeads = \set shapeNoteStyles = ##(do re mi fa #f la ti)
 
 sacredHarpHeads =
-  \set shapeNoteStyles = ##(#f #f mi #f fa la #f)
+  \set shapeNoteStyles = ##(fa #f la fa #f la mi)
 
 dynamicUp = {
   \override DynamicText  #'direction = #UP