Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index 67839f9c6c5695869bc39438f08184b901e03416..4bd187cbbe7cf6795d2882f5db6cafe0932dfd4e 100644 (file)
--- a/ly/paper-defaults-init.ly
+++ b/ly/paper-defaults-init.ly
@@ -1,22 +1,18 @@
-\version "2.11.11"
+\version "2.12.0"
 #(use-modules (scm layout-page-layout))
 \paper {
 
-    %%%% WARNING
-
-    %%% if you  add any new dimensions, don't forget to update
-    %%% the dimension-variables variable. see paper.scm
+    %%% WARNING
+    %%%
+    %%% If you add any new dimensions, don't forget to update
+    %%% the dimension-variables variable.  See paper.scm.
     
     unit = #(ly:unit)
     mm = 1.0
     in = 25.4
-    pt = #(/  in 72.27)
+    pt = #(/ in 72.27)
     cm = #(* 10 mm)
 
-    %% This is weird; `everyone' uses LATIN1?  How does I select TeX
-    %% input encoding in EMACS? -- jcn
-    %%%%input-encoding = #"TeX"
-    input-encoding = #"latin1"
     print-page-number = ##t
 
     %%
@@ -92,19 +88,15 @@
     #(define font-defaults
       '((font-encoding . fetaMusic)))
 
-    %% use lmodern in latin1 (cork) flavour if EC is not available.
+    %%
+    %% the font encoding `latin1' is a dummy value for Pango fonts
+    %%
     #(define text-font-defaults
-      `((font-encoding .
-        ,(cond
-          (tex-backend? 'Extended-TeX-Font-Encoding---Latin)
-          (else 'latin1)))
-       ;; add to taste here.
-       
+      `((font-encoding . latin1)
        (baseline-skip . 3)
        (word-space . 0.6)))
 
     #(define page-breaking ly:optimal-breaking)
-    #(define page-breaking-wrapper page-breaking-wrapper)
     #(define page-post-process post-process-pages)
 
     #(define write-page-layout (ly:get-option 'dump-tweaks))