summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMats Bengtsson <mats.bengtsson@s3.kth.se>2006-06-09 13:11:48 +0000
committerMats Bengtsson <mats.bengtsson@s3.kth.se>2006-06-09 13:11:48 +0000
commit96e411c64146df6dc1b2aa5c5667bb9b8d7176d2 (patch)
treecfbf5e8eb4633fb2f70441f1aa2be094be0fcade
parent29f204c69f7faa934237105281310fc154fab17a (diff)
* scm/page.scm: Rename annotate{headers,systems,page}->
annotate-* * input/regression/page-spacing.ly, input/regression/page-layout-manual-position.ly: idem
-rw-r--r--ChangeLog9
-rw-r--r--input/regression/page-layout-manual-position.ly4
-rw-r--r--input/regression/page-spacing.ly2
-rw-r--r--scm/page.scm6
4 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 8cea113520..9574c5a817 100644
--- 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 1508f6fe5b..8da7f73701 100644
--- 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 4081ba6d8c..0fa638031c 100644
--- 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 23ee840792..a572e44102 100644
--- 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))