CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Graham Percival <[EMAIL PROTECTED]> 05/06/23 17:17:16
Modified files:
. : ChangeLog
ly : titling-init.ly
Log message:
Vincent's patch for titles.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3816&tr2=1.3817&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/titling-init.ly.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3816 lilypond/ChangeLog:1.3817
--- lilypond/ChangeLog:1.3816 Thu Jun 23 16:53:43 2005
+++ lilypond/ChangeLog Thu Jun 23 17:17:16 2005
@@ -3,6 +3,9 @@
* Documentation/user/lilypond-book.itely,
Documentation/user/examples.itely: add \RequirePackage{graphics}.
+ * ly/titling.ly: checks printfirstpagenumber, adds meter, and
+ fixes baseline-skip. Thanks Vincent!
+
2005-06-23 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* buildscripts/gen-emmentaler-scripts.py (notice): add GPL notice
Index: lilypond/ly/titling-init.ly
diff -u lilypond/ly/titling-init.ly:1.17 lilypond/ly/titling-init.ly:1.18
--- lilypond/ly/titling-init.ly:1.17 Wed Jun 1 22:49:19 2005
+++ lilypond/ly/titling-init.ly Thu Jun 23 17:17:16 2005
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.5.31"
slashSeparator = \markup {
\hcenter
@@ -26,27 +26,28 @@
\override #'(baseline-skip . 3)
\column {
\fill-line { \fromproperty #'header:dedication }
+ \override #'(baseline-skip . 3.5)
\column {
- \override #'(baseline-skip . 3.5)
\huge \bigger \bold
\fill-line {
- \bigger \fromproperty #'header:title
+ \bigger \fromproperty #'header:title
}
\fill-line {
- \large \smaller \bold
- \bigger \fromproperty #'header:subtitle
+ \large \smaller \bold
+ \bigger \fromproperty #'header:subtitle
}
\fill-line {
- \smaller \bold
- \fromproperty #'header:subsubtitle
+ \smaller \bold
+ \fromproperty #'header:subsubtitle
}
\fill-line {
- \fromproperty #'header:poet
- { \large \bold \fromproperty #'header:instrument }
- \column {
- \fromproperty #'header:composer
- \fromproperty #'header:arranger
- }
+ \fromproperty #'header:poet
+ { \large \bold \fromproperty #'header:instrument }
+ \fromproperty #'header:composer
+ }
+ \fill-line {
+ \fromproperty #'header:meter
+ \fromproperty #'header:arranger
}
}
}
@@ -80,6 +81,11 @@
(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)
+ (interpret-markup layout props arg)
+ (not-first-page layout props arg)))
+
oddHeaderMarkup = \markup
% \on-the-fly #not-single-page
\fill-line {
@@ -87,7 +93,7 @@
%% page layout becomes a complete mess.
" "
\on-the-fly #not-first-page \fromproperty #'header:instrument
- \on-the-fly #not-first-page \fromproperty #'page:page-number-string
+ \on-the-fly #check-print-first-page-number \fromproperty
#'page:page-number-string
}
evenHeaderMarkup = \markup
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
