Minor fixes.

[lilypond.git] / ly / titling-init.ly

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index f4c1ee24d4356a8329401fef2bb5537e62ff8727..64f1855a0499d713df10d016b92952dd7abaf042 100644 (file)
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,53 +1,53 @@
 \version "2.4.0"
 
 slashSeparator = \markup {
-    \hcenter
-    \vcenter \combine
-      \beam #2.0 #0.5 #0.48
-      \raise #0.7 \beam #2.0 #0.5 #0.48
-  }
-
+  \hcenter
+  \vcenter \combine
+  \beam #2.0 #0.5 #0.48
+  \raise #0.7 \beam #2.0 #0.5 #0.48
+}
 
 tagline = \markup {
   \with-url
-  #"http://lilypond.org/pdflink/"
+
+  %% todo: lilypond.org/music-engraving
+  #"http://lilypond.org/web/"
   \line {
-    "Engraved by LilyPond"
+    "Music engraving by LilyPond"
     #(ly:export (lilypond-version))
     "-"
     "www.lilypond.org"
   }
 }
-bookTitleMarkup = \markup {
 
+bookTitleMarkup = \markup {
+  \override #'(baseline-skip . 3)
   \column {
     \fill-line { \fromproperty #'header:dedication }
-    \fill-line {
-      \huge \bigger \bigger \bigger \bold \fromproperty #'header:title
-    }
-    \fill-line {
-      \override #'(baseline-skip . 3)
-      \column {
-       \fill-line {
-         \huge \bigger \bigger
-         \bold \fromproperty #'header:subtitle
-       }
-       \fill-line {
-         \huge \bigger
-         \bold \fromproperty #'header:subsubtitle
-       }
+    \column {
+      \override #'(baseline-skip . 3.5)
+      \huge \bigger \bold
+      \fill-line {
+       \bigger \fromproperty #'header:title
       }
-    }
-    \fill-line {
-      \fromproperty #'header:poet
-      \fromproperty #'header:instrument 
-      \column {
-       \fromproperty #'header:composer
-       \fromproperty #'header:arranger
+      \fill-line {
+       \large \smaller \bold
+       \bigger  \fromproperty #'header:subtitle
+      }
+      \fill-line {
+       \smaller \bold
+       \fromproperty #'header:subsubtitle
+      }
+      \fill-line {
+       \fromproperty #'header:poet
+       { \large \bold \fromproperty #'header:instrument }
+       \column {
+         \fromproperty #'header:composer
+         \fromproperty #'header:arranger
+       }
       }
     }
   }
-
 }
 
 scoreTitleMarkup = \markup {
@@ -59,31 +59,33 @@ scoreTitleMarkup = \markup {
 
 #(define (first-page layout props arg)
   (if (= (chain-assoc-get 'page:page-number props -1) 1)
-    (interpret-markup layout props arg)
-    empty-stencil))
+   (interpret-markup layout props arg)
+   empty-stencil))
 
 #(define (last-page layout props arg)
   (if (chain-assoc-get 'page:last? props #f)
-    (interpret-markup layout props arg)
-    empty-stencil))
+   (interpret-markup layout props arg)
+   empty-stencil))
 
 #(define (not-first-page layout props arg)
   (if (not (= (chain-assoc-get 'page:page-number props -1) 1))
-    (interpret-markup layout props arg)
-    empty-stencil))
+   (interpret-markup layout props arg)
+   empty-stencil))
 
 #(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)))
-    (interpret-markup layout props arg)
-    empty-stencil))
+           (chain-assoc-get 'page:last? props -1)))
+   (interpret-markup layout props arg)
+   empty-stencil))
 
 oddHeaderMarkup = \markup
-\on-the-fly #not-single-page
+ % \on-the-fly #not-single-page
 \fill-line {
-  ""
+  %% force the header to take some space, otherwise the
+  %% page layout becomes a complete mess. 
+  " "
   \on-the-fly #not-first-page \fromproperty #'header:instrument
-  \fromproperty #'page:page-number-string
+  \on-the-fly #not-first-page \fromproperty #'page:page-number-string
 }
 
 evenHeaderMarkup = \markup