From 10307205898fbe594a219666d7a9252c095289cb Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 26 Oct 2005 09:18:03 +0000
Subject: [PATCH] move fixed dimensions from paper.scm

---
 ChangeLog                        |  4 ++++
 Documentation/user/lilypond.tely |  2 +-
 lily/axis-group-engraver.cc      | 14 +-------------
 ly/paper-defaults.ly             | 14 +++++++++++++-
 scm/paper.scm                    | 10 ++--------
 5 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 43c7d32c3b..8bf927ddc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* ly/paper-defaults.ly: move fixed dimensions from paper.scm 
+
 2005-10-25  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* HACKING: Update.
diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index e7d66c7430..1b69793dbb 100644
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -246,7 +246,7 @@ Copyright 1999--2005 by the authors
 @top GNU LilyPond --- The music typesetter
 @c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
 
-This is the user manual for GNU LilyPond 2.6.x series.
+This is the user manual for GNU LilyPond 2.7.x series.
 @ifhtml
 (See the bottom of this page for the exact version number).
 @end ifhtml
diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 2796f05ca4..c52eeb9053 100644
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -82,19 +82,7 @@ Axis_group_engraver::process_acknowledged ()
 	      staffline_ = 0;
 	      break;
 	    }
-#if 0 
-	  else if (elts_[i]->is_empty (Y_AXIS))
-	    {
-	      /*
-		We have to do _something_, otherwise staff objects will
-		end up with System as parent.
-
-	      */
-	      elts_[i]->set_parent (staffline_, Y_AXIS);
-	    }
-	  else
-#endif
-	    add_element (elts_[i]);
+	  add_element (elts_[i]);
 	}
     }
   elts_.clear ();
diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly
index a87599f61a..e35adf1a0a 100644
--- a/ly/paper-defaults.ly
+++ b/ly/paper-defaults.ly
@@ -99,4 +99,16 @@
     #(set-paper-dimension-variables (current-module))
 
     \include "titling-init.ly"
-}
+
+
+    topmargin = 5 \mm
+    bottommargin = 6 \mm
+    headsep = 4 \mm
+    footsep = 4 \mm
+    rightmargin = 10 \mm
+
+    leftmargin = ##f
+    firstpagenumber = #1
+    printfirstpagenumber =##f)
+
+  }
diff --git a/scm/paper.scm b/scm/paper.scm
index f86aeb0161..e42369462a 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -94,14 +94,8 @@
     (module-define! m 'indent (/ w 14))
 
     ;; page layout - what to do with (printer specific!) margin settings?
-    (module-define! m 'topmargin (* 5 mm))
-    (module-define! m 'bottommargin (* 6 mm))
-    (module-define! m 'headsep (* 4 mm))
-    (module-define! m 'footsep (* 4 mm))
-    (module-define! m 'leftmargin #f)
-    (module-define! m 'firstpagenumber 1)
-    (module-define! m 'printfirstpagenumber #f)
-    (module-define! m 'rightmargin (* 10 mm))))
+
+    ))
 
 (define (internal-set-paper-size module name landscape?)
   (define (swap x)
-- 
2.39.2