* lily/stencil.cc (translate): remove absolute dimension.

[lilypond.git] / ly / paper-defaults.ly

diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly
index 9b61589f21b668d6ff659449588bbd6d37a77391..55a95d8333cb8c0d28eb2d6d3035af4adcd53c11 100644 (file)
--- a/ly/paper-defaults.ly
+++ b/ly/paper-defaults.ly
@@ -26,8 +26,10 @@
     outputscale = #1.7573
     
     #(define-public score-title default-score-title)
-    #(define-public user-title default-user-title)
-    #(define-public book-title default-book-title)
+%    #(define-public user-title default-user-title)
+%    #(define-public book-title default-book-title)
+    #(define-public book-title (marked-up-title 'bookTitleMarkup))
+    #(define-public score-title (marked-up-title 'scoreTitleMarkup))
 
     %%
     %% ugh. hard coded?
@@ -77,7 +79,9 @@
     #(define page-music-height default-page-music-height )
     #(define page-make-stencil default-page-make-stencil )
 
-    #(define make-header plain-header)
-    #(define make-footer plain-footer)
+    #(define make-header (marked-up-headfoot 'oddHeaderMarkup 'evenHeaderMarkup))
+    #(define make-footer (marked-up-headfoot 'oddFooterMarkup 'evenFooterMarkup))
     #(set-paper-dimension-variables (current-module))
+
+    \include "titling-init.ly"
 }