Revert "Clean up declarations-init.ly, paper-defaults-init.ly."

This reverts commit 407df9e0f629e1224ccac29c7ea503513e704a55.
The commit caused some unexpected `make doc' errors.

2 files changed, 27 insertions, 26 deletions

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index b500cbf09f..403bb0d01d 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -99,27 +99,27 @@ repeatTie = #(make-music 'RepeatTieEvent)
 \include "paper-defaults-init.ly"
 
 \layout {
-  unit = #(ly:output-def-lookup $defaultpaper 'unit)
-  mm = #(ly:output-def-lookup $defaultpaper 'mm)
+    mm = #(ly:output-def-lookup $defaultpaper 'mm)
+    unit = #(ly:output-def-lookup $defaultpaper 'unit)
 
-  cm = #(* 10 mm)
-  in = #(* 254/10 mm)
-  pt = #(* 100/7227 in)
+    in = #(* 25.4 mm)
+    pt = #(/  in 72.27)
+    cm = #(* 10 mm)
 
-  \include "engraver-init.ly"
+    \include "engraver-init.ly"
 
-  #(set-paper-dimension-variables (current-module))
+    #(set-paper-dimension-variables (current-module))
 }
 
 #(set-default-paper-size (ly:get-option 'paper-size))
 
 partCombineListener = \layout {
-  \context {
-    \Score
-    skipTypesetting = ##t
-    ignoreBarChecks = ##t
-    \alias "Timing"
-  }
+    \context {
+	\Score
+	skipTypesetting = ##t
+	ignoreBarChecks = ##t
+	\alias "Timing"
+    }
 }
 
 \include "dynamic-scripts-init.ly"
diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index d0869eaf50..e18e12019d 100644
--- a/ly/paper-defaults-init.ly
+++ b/ly/paper-defaults-init.ly
@@ -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
@@ -98,9 +98,9 @@
   %%
   %% Page breaking
   %%
-  blank-after-score-page-force = #2
-  blank-last-page-force = #0
-  blank-page-force = #5
+  blank-after-score-page-force = 2
+  blank-last-page-force = 0
+  blank-page-force = 5
   page-breaking = #ly:optimal-breaking
 
 
@@ -115,8 +115,8 @@
   %%
   %% 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 +133,13 @@
   %%
   %% 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)
+       (word-space . 0.6)))
 
 }