(Font selection):

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

diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly
index 9b61589f21b668d6ff659449588bbd6d37a77391..925f1c3ffa2cad8c85386b98e2b7232ac2ac9df8 100644 (file)
--- a/ly/paper-defaults.ly
+++ b/ly/paper-defaults.ly
@@ -25,10 +25,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 book-title (marked-up-title 'bookTitleMarkup))
+    #(define-public score-title (marked-up-title 'scoreTitleMarkup))
+    #(define-public force-eps-font-include #f)
+    
     %%
     %% ugh. hard coded?
     %%
@@ -50,7 +50,6 @@
     beforetitlespace = 10 \mm
     betweentitlespace = 2 \mm
 
-
     raggedbottom = ##f
 
     %%
@@ -58,7 +57,7 @@
     %%
     raggedlastbottom= ##t
 
-    %% ugh.  Should use /etc/papersize and set explicitely for
+    %% ugh.  Should use /etc/papersize and set explicitly for
     %% documentation.
     papersizename = "a4"
 
@@ -67,17 +66,22 @@
 
     %% use lmodern in latin1 (cork) flavour if EC is not available.
     #(define text-font-defaults
-      `((font-encoding
-        . ,(if (and (not (ly:kpathsea-find-file "ecrm10.pfa"))
-                (ly:kpathsea-find-file "cork-lm.enc")) 'cork-lm 'Extended-TeX-Font-Encoding---Latin))
-       (baseline-skip . 2)
+      `((font-encoding .
+        ,(cond
+          (tex-backend? 'Extended-TeX-Font-Encoding---Latin)
+          (else 'latin1)))
+       ;; add to taste here.
+       
+       (baseline-skip . 3)
        (word-space . 0.6)))
 
     #(define page-breaking ly:optimal-page-breaks)
     #(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"
 }