*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index e518fb324482f1304799c56059001defb4119516..db7b10c0c7f1fe5d7d8fa83f77a5aa0389838db1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 
 2004-04-29  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lily/include/page.hh (class Page): Declare left_margin ().
+
        * lily/page.cc: Remove paper var caching.
 
 2004-04-28  Jan Nieuwenhuizen  <janneke@gnu.org>

diff --git a/lily/include/page.hh b/lily/include/page.hh
index c12d32c02caddc85885ab50555b6c6837bba4cb1..c0f929432e32ffbc36ef515cd05abce7468970bd 100644 (file)
--- a/lily/include/page.hh
+++ b/lily/include/page.hh
@@ -41,6 +41,7 @@ public:
 
   /* available area for text.  */
   Real text_height () const;
+  Real left_margin () const;
   SCM to_stencil () const;
 };
 

diff --git a/lily/page.cc b/lily/page.cc
index f296b4bc8b7500333995bf663b8e5db4c8ccaab8..85b7b7d875fbd59aef233a0b29e78d48427fa9ac 100644 (file)
--- a/lily/page.cc
+++ b/lily/page.cc
@@ -107,6 +107,7 @@ Page::to_stencil () const
   return scm_call_1 (proc, self_scm ());
 }
 
+//urg
 Real
 Page::left_margin () const
 {
@@ -122,7 +123,7 @@ LY_DEFINE (ly_page_header_lines_footer_stencil, "ly:page-header-lines-footer-ste
   SCM_ASSERT_TYPE (p, page, SCM_ARG1, __FUNCTION__, "page");
   
   Stencil stencil;
-  Offset o (p->paper_->get_dimension (ly_symbol2scm ("left-margin")),
+  Offset o (p->left_margin (),
            p->paper_->get_dimension (ly_symbol2scm ("top-margin")));
 
   Real vfill = (p->line_count_ > 1