*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 154419cf1a102f8583aee43f7617a5727b1ac3d7..b34c289c8113bfdc3975e2fef0741457cf97f380 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
 
 2006-10-16  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * ly/paper-defaults.ly: set left/right margin.
+
+       * scm/paper.scm (set-paper-dimensions): use left-margin and
+       right-margin for computing linewidth.
+
        * Documentation/topdocs/NEWS.tely (Top): idem.
 
        * input/regression/lyric-tie.ly (texidoc): use vowels for tied

diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly
index 44ec0b961e6a8a0ba8edd5e85727627322ca3632..8b211581cf158319c872c28227db73a772bd5a36 100644 (file)
--- a/ly/paper-defaults.ly
+++ b/ly/paper-defaults.ly
@@ -121,9 +121,10 @@
     bottom-margin = 6 \mm
     head-separation = 4 \mm
     foot-separation = 4 \mm
-    right-margin = 10 \mm
 
-    left-margin = ##f
+    left-margin = 10 \mm
+    right-margin = 10 \mm
+    
     first-page-number = #1
     print-first-page-number =##f
   }

diff --git a/scm/paper.scm b/scm/paper.scm
index c50bcbe6ce94298847354d6cdbb14b3dcc32f443..b729b996e524578740aaac41cea052e2fedceb2c 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -94,7 +94,10 @@
   (let* ((mm (eval 'mm m)))
     (module-define! m 'paper-width w)
     (module-define! m 'paper-height h)
-    (module-define! m 'line-width (- w (* 20 mm)))
+    (module-define! m 'line-width (- w
+                                    (ly:modules-lookup (list m) 'left-margin)
+                                    (ly:modules-lookup (list m) 'right-margin)))
+
     (module-define! m 'indent (/ w 14))
 
     ;; page layout - what to do with (printer specific!) margin settings?