X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fpaper-defaults-init.ly;h=ef7419312271c1de3f975c10be5d375c6889ab56;hb=e7aa6c445f463844dbaa52d38ea4aac2882b5601;hp=d0869eaf509aa3d26bcb5f7501fe89052fdece2a;hpb=407df9e0f629e1224ccac29c7ea503513e704a55;p=lilypond.git

diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index d0869eaf50..ef74193122 100644
--- 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+%%%% Copyright (C) 2004--2014 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.12.0"
+\version "2.16.0"
 
 \paper {
   #(set-paper-dimension-variables (current-module))
@@ -28,10 +28,10 @@
   %%% the dimension-variables variable.  See paper.scm.
 
   unit = #(ly:unit)
-  mm = #1
+  mm = 1.0
+  in = 25.4
+  pt = #(/ in 72.27)
   cm = #(* 10 mm)
-  in = #(* 254/10 mm)
-  pt = #(* 100/7227 in)
 
   % 20pt staff, 5 pt = 1.75 mm
   output-scale = #1.7573
@@ -56,19 +56,18 @@
   ragged-bottom = ##f
   ragged-last-bottom = ##t  % best for shorter scores
 
-
   %%
   %% Flexible vertical spacing
   %%
   %% Note: these are not scaled; they are in staff-spaces.
-  system-system-spacing = #'((space . 12) (minimum-distance . 8) (padding . 1) (stretchability . 60))
-  score-system-spacing = #'((space . 14) (minimum-distance . 8) (padding . 1) (stretchability . 120))
-  markup-system-spacing = #'((space . 5) (padding . 0.5) (stretchability . 30))
-  score-markup-spacing = #'((space . 12) (padding . 0.5) (stretchability . 60))
-  markup-markup-spacing = #'((space . 1) (padding . 0.5))
-  top-system-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0))
-  top-markup-spacing = #'((space . 0) (padding . 1) (minimum-distance . 0))
-  last-bottom-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0) (stretchability . 30))
+  system-system-spacing = #'((basic-distance . 12) (minimum-distance . 8) (padding . 1) (stretchability . 60))
+  score-system-spacing = #'((basic-distance . 14) (minimum-distance . 8) (padding . 1) (stretchability . 120))
+  markup-system-spacing = #'((basic-distance . 5) (padding . 0.5) (stretchability . 30))
+  score-markup-spacing = #'((basic-distance . 12) (padding . 0.5) (stretchability . 60))
+  markup-markup-spacing = #'((basic-distance . 1) (padding . 0.5))
+  top-system-spacing = #'((basic-distance . 1) (minimum-distance . 0) (padding . 1))
+  top-markup-spacing = #'((basic-distance . 0) (minimum-distance . 0) (padding . 1))
+  last-bottom-spacing = #'((basic-distance . 1) (minimum-distance . 0) (padding . 1) (stretchability . 30))
 
 
   %%
@@ -98,12 +97,22 @@
   %%
   %% 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
 
 
+  %%
+  %% Footnotes
+  %%
+  footnote-separator-markup = \markup \fill-line { \override #'(span-factor . 1/2) \draw-hline }
+  footnote-padding = 0.5\mm
+  footnote-footer-padding = 0.5\mm
+  footnote-number-raise = 0.5\mm
+  footnote-numbering-function = #numbered-footnotes
+  reset-footnotes-on-new-page = ##t
+
   %%
   %% Page numbering
   %%
@@ -111,12 +120,11 @@
   print-first-page-number = ##f
   print-page-number = ##t
 
-
   %%
   %% Headers, footers, and titles
   %%
-  make-header = #(marked-up-headfoot 'oddHeaderMarkup 'evenHeaderMarkup)
-  make-footer = #(marked-up-headfoot 'oddFooterMarkup 'evenFooterMarkup)
+  #(define make-header (marked-up-headfoot 'oddHeaderMarkup 'evenHeaderMarkup))
+  #(define make-footer (marked-up-headfoot 'oddFooterMarkup 'evenFooterMarkup))
 
   #(define-public book-title (marked-up-title 'bookTitleMarkup))
   #(define-public score-title (marked-up-title 'scoreTitleMarkup))
@@ -133,12 +141,16 @@
   %%
   %% Fonts
   %%
-  font-defaults = #'((font-family . feta)
-                     (font-encoding . fetaMusic))
+  #(define font-defaults
+    '((font-family . feta) (font-encoding . fetaMusic)))
 
   % `latin1' is a dummy value for Pango fonts
-  text-font-defaults = #'((font-encoding . latin1)
-                          (baseline-skip . 3)
-                          (word-space . 0.6))
+  #(define text-font-defaults
+     `((font-encoding . latin1)
+       (baseline-skip . 3)
+       (replacement-alist . ,default-string-replacement-alist)
+       (word-space . 0.6)))
+
+  \include "text-replacements.ly"
 
 }