* scm/page.scm: Rename annotate{headers,systems,page}->

	annotate-*

	* input/regression/page-spacing.ly,
	input/regression/page-layout-manual-position.ly: idem

diff --git a/ChangeLog b/ChangeLog
index 8cea113520e49391dac00695c43f5bd228fed184..9574c5a817f13be075e8855ca0643194b3a8fabd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-09  Mats Bengtsson  <mabe@drongo.s3.kth.se>
+
+       * scm/page.scm: Rename annotate{headers,systems,page}->
+       annotate-*
+
+       * input/regression/page-spacing.ly,
+       input/regression/page-layout-manual-position.ly: idem
+
+
 2006-06-09  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * scripts/lilypond-book.py (find_toplevel_snippets): don't use

diff --git a/input/regression/page-layout-manual-position.ly b/input/regression/page-layout-manual-position.ly
index 1508f6fe5b8960b32cf7c61925e323b3c20cea11..8da7f73701891065f0398d826ad0e401713c8ea9 100644 (file)
--- a/input/regression/page-layout-manual-position.ly
+++ b/input/regression/page-layout-manual-position.ly
@@ -17,8 +17,8 @@ systems may be placed absolutely on the printable area of the page."
   headerMarkup = "header"
   indent =0.0
   annotate-spacing = ##f
-  annotatepage = ##t
-  annotateheaders = ##t
+  annotate-page = ##t
+  annotate-headers = ##t
 }
 
 \book {

diff --git a/input/regression/page-spacing.ly b/input/regression/page-spacing.ly
index 4081ba6d8cfa6d855753fa446cae8c67946c88d9..0fa638031c5834eefefa32a612b139ee2d23421c 100644 (file)
--- a/input/regression/page-spacing.ly
+++ b/input/regression/page-spacing.ly
@@ -8,7 +8,7 @@ For technical reasons, @code{overrideProperty} has to be used for
 setting properties on individual object. @code{\override} may still be
 used for global overrides.
 
-By setting @code{annotatespacing}, we can see the effect of each property.
+By setting @code{annotate-spacing}, we can see the effect of each property.
 "
 
 }

diff --git a/scm/page.scm b/scm/page.scm
index 23ee840792dac46a10f25ecbaffdba355f0f4e5b..a572e441021806a743ea49b8261db1cb6827b6cc 100644 (file)
--- a/scm/page.scm
+++ b/scm/page.scm
@@ -162,7 +162,7 @@
          
          ;; add arrow markers 
          (if (or (annotate? layout)
-                 (ly:output-def-lookup layout 'annotateheaders #f)) 
+                 (ly:output-def-lookup layout 'annotate-headers #f)) 
              (set! head-stencil
                    (ly:stencil-add
                     (ly:stencil-translate-axis
@@ -315,7 +315,7 @@ create offsets.
        )
 
     (if (or (annotate? layout)
-           (ly:output-def-lookup layout 'annotatesystems #f))
+           (ly:output-def-lookup layout 'annotate-systems #f))
 
        (begin
          (for-each (lambda (sys next-sys)
@@ -366,7 +366,7 @@ create offsets.
 
     ;; annotation.
     (if (or (annotate? layout)
-           (ly:output-def-lookup layout 'annotatepage #f))
+           (ly:output-def-lookup layout 'annotate-page #f))
        (set! page-stencil (annotate-page layout page-stencil)))
 
     page-stencil))