From: Han-Wen Nienhuys Date: Tue, 4 Oct 2005 20:56:07 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: release/2.7.12~11 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4fe8ca04feb590cd241a9d98e9bba1e8d6f04a48;p=lilypond.git *** empty log message *** --- diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index c902799d1c..b91fed2ee0 100644 --- 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 fecb28f8dd..064bf68e1e 100644 --- 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 08c102af4c..2ede5f04ef 100644 --- 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 7bd695dd5f..da8f7f53cf 100644 --- 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 1e14b596e0..2dbf727b0b 100644 --- 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 = {