CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/04 20:56:07
Modified files:
Documentation/topdocs: NEWS.tely
Documentation/user: global.itely
input/regression: page-spacing.ly
python : convertrules.py
scripts : lilypond-book.py
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.94&tr2=1.95&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/global.itely.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/page-spacing.ly.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/python/convertrules.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/lilypond-book.py.diff?tr1=1.275&tr2=1.276&r1=text&r2=text
Patches:
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.94
lilypond/Documentation/topdocs/NEWS.tely:1.95
--- lilypond/Documentation/topdocs/NEWS.tely:1.94 Mon Oct 3 12:10:52 2005
+++ lilypond/Documentation/topdocs/NEWS.tely Tue Oct 4 20:56:07 2005
@@ -54,9 +54,7 @@
\relative c'' <<
\new PianoStaff <<
\new Voice {
- \set PianoStaff.instrument = #"piano"
- \set PianoStaff.instr = #"pn"
- c1_"normal"
+ c1
\overrideProperty
#"Score.NonMusicalPaperColumn"
Index: lilypond/Documentation/user/global.itely
diff -u lilypond/Documentation/user/global.itely:1.39
lilypond/Documentation/user/global.itely:1.40
--- lilypond/Documentation/user/global.itely:1.39 Mon Oct 3 12:10:52 2005
+++ lilypond/Documentation/user/global.itely Tue Oct 4 20:56:07 2005
@@ -576,7 +576,10 @@
{ c4 }
@end lilypond
-
[EMAIL PROTECTED]
+All units dimensions are measured in staff spaces. The pairs
+(@var{a},@var{b}) are intervals, where @var{a} is the lower edge and
[EMAIL PROTECTED] the upper edge of the interval.
@seealso
@@ -585,7 +588,8 @@
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},
[EMAIL PROTECTED]/regression/,alignment-vertical-spacing.ly}.
@refbugs
@@ -673,6 +677,9 @@
The distance for @code{fixed-alignment-extra-space} may also be
negative.
[EMAIL PROTECTED]
+
+Example files: @inputfileref{input/regression/,alignment-vertical-spacing.ly}.
@node Horizontal spacing
@subsection Horizontal Spacing
Index: lilypond/input/regression/page-spacing.ly
diff -u lilypond/input/regression/page-spacing.ly:1.3
lilypond/input/regression/page-spacing.ly:1.4
--- lilypond/input/regression/page-spacing.ly:1.3 Sun Oct 2 01:16:08 2005
+++ lilypond/input/regression/page-spacing.ly Tue Oct 4 20:56:07 2005
@@ -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 @@
}
-\version "2.7.10"
+\version "2.7.12"
#(set-global-staff-size 11)
@@ -24,13 +24,13 @@
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 @@
\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
Index: lilypond/python/convertrules.py
diff -u lilypond/python/convertrules.py:1.17
lilypond/python/convertrules.py:1.18
--- lilypond/python/convertrules.py:1.17 Mon Oct 3 11:30:40 2005
+++ lilypond/python/convertrules.py Tue Oct 4 20:56:07 2005
@@ -2249,8 +2249,8 @@
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 @@
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):
Index: lilypond/scripts/lilypond-book.py
diff -u lilypond/scripts/lilypond-book.py:1.275
lilypond/scripts/lilypond-book.py:1.276
--- lilypond/scripts/lilypond-book.py:1.275 Tue Oct 4 12:33:28 2005
+++ lilypond/scripts/lilypond-book.py Tue Oct 4 20:56:07 2005
@@ -561,9 +561,13 @@
%(preamble_string)s
-%% ********************************
+
+
+
+
+%% ****************************************************************
%% Start cut-&-pastable-section
-%% ********************************
+%% ****************************************************************
\paper {
#(define dump-extents #t)
@@ -579,16 +583,32 @@
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 = {
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
