*** empty log message ***

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index c902799d1c97d26ab36e05cbd5678a5fc8bdfae0..b91fed2ee0b48e3477a79f392bdccf1d992f2b2b 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -54,9 +54,7 @@ systems.
 \relative c'' <<
   \new PianoStaff <<
     \new Voice  {
-      \set PianoStaff.instrument = #"piano"
-      \set PianoStaff.instr = #"pn"
-      c1_"normal"
+      c1
       
       \overrideProperty
       #"Score.NonMusicalPaperColumn"

diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index fecb28f8dd0835e0e9fbda92b31e79ce3ce32d53..064bf68e1ed937e0e6b473892aa0d71c998a96ca 100644 (file)
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -576,7 +576,10 @@ for page spacing,
 { c4 }
 @end lilypond
 
-
+@noindent
+All units dimensions are measured in staff spaces. The pairs
+(@var{a},@var{b}) are intervals, where @var{a} is the lower edge and
+@var{b} the upper edge of the interval.
 
 @seealso
 
@@ -585,7 +588,8 @@ Internals: Vertical alignment of staves is handled by the
 specifying  the vertical extent are described in connection with 
 the @internalsref{Axis_group_engraver}.
 
-Example files: @inputfileref{input/regression/,page-spacing.ly}.
+Example files: @inputfileref{input/regression/,page-spacing.ly},
+@inputfileref{input/regression/,alignment-vertical-spacing.ly}.
 
 
 @refbugs
@@ -673,6 +677,9 @@ alignment.  For example,
 The distance for @code{fixed-alignment-extra-space} may also be
 negative.
 
+@seealso
+
+Example files: @inputfileref{input/regression/,alignment-vertical-spacing.ly}.
 
 @node Horizontal spacing
 @subsection Horizontal Spacing

diff --git a/input/regression/page-spacing.ly b/input/regression/page-spacing.ly
index 08c102af4cba65bdd3ccafc2385ec22c2a769d0f..2ede5f04ef4919ab18e31ada4e8d299db6faba35 100644 (file)
--- a/input/regression/page-spacing.ly
+++ b/input/regression/page-spacing.ly
@@ -4,7 +4,7 @@
   texidoc = "By setting properties in NonMusicalPaperColumn, vertical
 spacing of page layout can be adjusted.
 
-For technical reasons, @code{outputProperty} has to be used for
+For technical reasons, @code{overrideProperty} has to be used for
 setting properties on individual object. @code{\override} may still be
 used for global overrides.
 
@@ -13,7 +13,7 @@ By setting @code{annotatespacing}, we can see the effect of each property.
 
 }
 
-\version "2.7.10"
+\version "2.7.12"
 
 #(set-global-staff-size 11)
 
@@ -24,13 +24,13 @@ By setting @code{annotatespacing}, we can see the effect of each property.
        c1_"followed by default spacing"\break
        c\break
 
-       \outputProperty
+       \overrideProperty
        #"Score.NonMusicalPaperColumn"
        #'line-break-system-details
        #'((Y-extent . (-30 . 10)))
        c_"Big bounding box (property Y-extent)"\break
 
-       \outputProperty
+       \overrideProperty
        #"Score.NonMusicalPaperColumn"
        #'line-break-system-details
        #'((refpoint-Y-extent . (-37 . -10)))
@@ -43,19 +43,19 @@ By setting @code{annotatespacing}, we can see the effect of each property.
        
        \break
        
-       \outputProperty
+       \overrideProperty
        #"Score.NonMusicalPaperColumn"
        #'line-break-system-details
        #'((next-padding . 10))
 
        c_"Followed by padding, ie unstretchable space. (property next-padding)" \break
-       \outputProperty
+       \overrideProperty
        #"Score.NonMusicalPaperColumn"
        #'line-break-system-details
        #'((next-space . 20))
        c_"Followed by stretchable space (property next-space)"\break
        c\break
-       \outputProperty
+       \overrideProperty
        #"Score.NonMusicalPaperColumn" #'line-break-system-details
        #'((bottom-space . 25.0)) 
        c_"25 staff space to the bottom of the page. (property bottom-space)"\break

diff --git a/python/convertrules.py b/python/convertrules.py
index 7bd695dd5f6cf407cecc700d7fbb6432ddda5e9d..da8f7f53cff759a301d604645b12d7efe1513601 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2249,8 +2249,8 @@ def conv (str):
        return str
 
 conversions.append (((2, 3, 16), conv,
-                    '''\foo -> \foomode (for chords, notes, etc.)
-fold \new FooContext \foomode into \foo.'''))
+                    '''\\foo -> \\foomode (for chords, notes, etc.)
+fold \\new FooContext \\foomode into \\foo.'''))
 
 def conv (str):
        str = re.sub (r'(slur|stem|phrasingSlur|tie|dynamic|dots|tuplet|arpeggio|)Both', r'\1Neutral', str)
@@ -2259,8 +2259,8 @@ def conv (str):
        return str
 
 conversions.append (((2, 3, 17), conv,
-                    '''\foo -> \foomode (for chords, notes, etc.)
-fold \new FooContext \foomode into \foo.'''))
+                    '''\\foo -> \\foomode (for chords, notes, etc.)
+fold \\new FooContext \\foomode into \\foo.'''))
 
 
 def conv (str):

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 1e14b596e02561d9e805bae396078ed29f4fa5b7..2dbf727b0b86b627266a3712f05195775eb33762 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -561,9 +561,13 @@ PREAMBLE_LY = r'''%%%% Generated by %(program_name)s
 %(preamble_string)s
 
 
-%% ********************************
+
+
+
+
+%% ****************************************************************
 %% Start cut-&-pastable-section 
-%% ********************************
+%% ****************************************************************
 
 \paper {
   #(define dump-extents #t)
@@ -579,16 +583,32 @@ PREAMBLE_LY = r'''%%%% Generated by %(program_name)s
 FRAGMENT_LY = r'''
 %(notes_string)s
 {
+
+
+%% ****************************************************************
 %% ly snippet contents follows:
+%% ****************************************************************
 %(code)s
+
+
+%% ****************************************************************
 %% end ly snippet
+%% ****************************************************************
 }
 '''
 
 FULL_LY = '''
+
+
+%% ****************************************************************
 %% ly snippet:
+%% ****************************************************************
 %(code)s
+
+
+%% ****************************************************************
 %% end ly snippet
+%% ****************************************************************
 '''
 
 texinfo_linewidths = {