CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Graham Percival <[EMAIL PROTECTED]> 05/06/27 19:12:51
Modified files:
. : ChangeLog
Documentation/user: global.itely
ly : titling-init.ly
Log message:
Vincent's patch to implement printpagenumber, added docs for that
feature.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3828&tr2=1.3829&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/global.itely.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/titling-init.ly.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3828 lilypond/ChangeLog:1.3829
--- lilypond/ChangeLog:1.3828 Mon Jun 27 18:11:22 2005
+++ lilypond/ChangeLog Mon Jun 27 19:12:50 2005
@@ -1,3 +1,13 @@
+2005-06-27 Graham Percival <[EMAIL PROTECTED]>
+
+ * ly/titling-init.ly: implements printpagenumber, increases
+ space between dedication and title (to avoid collisions with
+ "g" and "q" in dedication), and nicer logic about copyright
+ and instrument fields being printed on the first page.
+ Thanks Vincent!
+
+ * Documentation/user/global.itely: document printpagenumber.
+
2005-06-27 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* Documentation/topdocs/NEWS.tely: Update to 2.6.
Index: lilypond/Documentation/user/global.itely
diff -u lilypond/Documentation/user/global.itely:1.20
lilypond/Documentation/user/global.itely:1.21
--- lilypond/Documentation/user/global.itely:1.20 Thu Jun 23 23:26:33 2005
+++ lilypond/Documentation/user/global.itely Mon Jun 27 19:12:50 2005
@@ -260,6 +260,9 @@
If set to true, will print the page number in the first page. Default is
false.
[EMAIL PROTECTED] printpagenumber
+If set to false, page numbers will not be printed.
+
@item hsize
The width of the page.
Index: lilypond/ly/titling-init.ly
diff -u lilypond/ly/titling-init.ly:1.18 lilypond/ly/titling-init.ly:1.19
--- lilypond/ly/titling-init.ly:1.18 Thu Jun 23 17:17:16 2005
+++ lilypond/ly/titling-init.ly Mon Jun 27 19:12:50 2005
@@ -1,4 +1,4 @@
-\version "2.5.31"
+\version "2.6.0"
slashSeparator = \markup {
\hcenter
@@ -23,7 +23,7 @@
}
bookTitleMarkup = \markup {
- \override #'(baseline-skip . 3)
+ \override #'(baseline-skip . 3.5)
\column {
\fill-line { \fromproperty #'header:dedication }
\override #'(baseline-skip . 3.5)
@@ -46,8 +46,8 @@
\fromproperty #'header:composer
}
\fill-line {
- \fromproperty #'header:meter
- \fromproperty #'header:arranger
+ \fromproperty #'header:meter
+ \fromproperty #'header:arranger
}
}
}
@@ -61,8 +61,8 @@
}
#(define (first-page layout props arg)
- (if (= (chain-assoc-get 'page:page-number props -1) 1)
- (interpret-markup layout props arg)
+ (if (= (chain-assoc-get 'page:page-number props -1)
+ (ly:output-def-lookup layout 'firstpagenumber)) (interpret-markup
layout props arg)
empty-stencil))
#(define (last-page layout props arg)
@@ -71,42 +71,50 @@
empty-stencil))
#(define (not-first-page layout props arg)
- (if (not (= (chain-assoc-get 'page:page-number props -1) 1))
+ (if (not (= (chain-assoc-get 'page:page-number props -1)
+ (ly:output-def-lookup layout 'firstpagenumber)))
(interpret-markup layout props arg)
empty-stencil))
+%% unused
#(define (not-single-page layout props arg)
- (if (not (and (= (chain-assoc-get 'page:page-number props -1) 1)
- (chain-assoc-get 'page:last? props -1)))
+ (if (not (and (= (chain-assoc-get 'page:page-number props -1)
+ (ly:output-def-lookup layout 'firstpagenumber))
+ (chain-assoc-get 'page:last? props -1)))
(interpret-markup layout props arg)
empty-stencil))
-#(define (check-print-first-page-number layout props arg)
- (if (eq? (ly:output-def-lookup layout 'printfirstpagenumber) #t)
+#(define (print-page-number layout props arg)
+ (if (eq? (ly:output-def-lookup layout 'printpagenumber) #t)
(interpret-markup layout props arg)
- (not-first-page layout props arg)))
+ empty-stencil))
+
+#(define (print-page-number-check-first layout props arg)
+ (if (or (not (= (chain-assoc-get 'page:page-number props -1)
+ (ly:output-def-lookup layout 'firstpagenumber)))
+ (eq? (ly:output-def-lookup layout 'printfirstpagenumber) #t))
+ (print-page-number layout props arg)
+ empty-stencil))
oddHeaderMarkup = \markup
- % \on-the-fly #not-single-page
\fill-line {
%% force the header to take some space, otherwise the
- %% page layout becomes a complete mess.
+ %% page layout becomes a complete mess.
" "
\on-the-fly #not-first-page \fromproperty #'header:instrument
- \on-the-fly #check-print-first-page-number \fromproperty
#'page:page-number-string
+ \on-the-fly #print-page-number-check-first \fromproperty
#'page:page-number-string
}
evenHeaderMarkup = \markup
\fill-line {
- \fromproperty #'page:page-number-string
- \fromproperty #'header:instrument
+ \on-the-fly #print-page-number-check-first \fromproperty
#'page:page-number-string
+ \on-the-fly #not-first-page \fromproperty #'header:instrument
""
}
oddFooterMarkup = \markup {
\column {
\fill-line {
-
%% Copyright header field only on first page.
\on-the-fly #first-page \fromproperty #'header:copyright
}
@@ -117,4 +125,3 @@
}
}
-
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
