Merge branch 'stable/2.16' into staging

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

diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index d08c665f570767712e02f2dad6a836d0a8e82fea..07ee79176b16ae316671d52980d1737a493c8f66 100644 (file)
--- a/ly/paper-defaults-init.ly
+++ b/ly/paper-defaults-init.ly
@@ -1,6 +1,6 @@
 %%%% This file is part of LilyPond, the GNU music typesetter.
 %%%%
-%%%% Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+%%%% Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %%%%                          Jan Nieuwenhuizen <janneke@gnu.org>
 %%%%                          Neil Puttock <n.puttock@gmail.com>
 %%%%
@@ -17,7 +17,7 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.14.0"
+\version "2.16.0"
 
 \paper {
   #(set-paper-dimension-variables (current-module))
@@ -97,9 +97,9 @@
   %%
   %% Page breaking
   %%
-  blank-after-score-page-force = 2
-  blank-last-page-force = 0
-  blank-page-force = 5
+  blank-after-score-page-penalty = 2
+  blank-last-page-penalty = 0
+  blank-page-penalty = 5
   page-breaking = #ly:optimal-breaking
 
 
@@ -148,6 +148,9 @@
   #(define text-font-defaults
      `((font-encoding . latin1)
        (baseline-skip . 3)
+       (replacement-alist . ,default-string-replacement-alist)
        (word-space . 0.6)))
 
+  \include "text-replacements.ly"
+
 }