Reviewers: ,
Message:
I'll add the change to EM 2.1 as part of Patch Set 2 shortly
Description:
Doc: Change \on-the-fly #procedure to \on-the-fly \procedure (3098)
This avoids problems when \on-the-fly is used within #{ .. #}
Please review this at https://codereview.appspot.com/8853044/
Affected files:
M Documentation/notation/input.itely
M ly/titling-init.ly
Index: Documentation/notation/input.itely
diff --git a/Documentation/notation/input.itely
b/Documentation/notation/input.itely
index
2debffd3364d722d3066f6613314378d25949344..09d4e898794c915e0b5e1d035d7a32d1189f07c2
100644
--- a/Documentation/notation/input.itely
+++ b/Documentation/notation/input.itely
@@ -952,7 +952,7 @@ The default settings for @code{scoreTitleMarkup} as
defined in
@example
scoreTitleMarkup = \markup @{ \column @{
- \on-the-fly #print-all-headers @{ \bookTitleMarkup \hspace #1 @}
+ \on-the-fly \print-all-headers @{ \bookTitleMarkup \hspace #1 @}
\fill-line @{
\fromproperty #'header:piece
\fromproperty #'header:opus
@@ -1112,7 +1112,7 @@ markup conditionally to header and footer text
defined within the
@example
@code{variable} = @code{\markup} @{
...
- @code{\on-the-fly} #@var{procedure} @var{markup}
+ @code{\on-the-fly} \@var{procedure} @var{markup}
...
@}
@end example
@@ -1160,7 +1160,7 @@ same layout by defining it as @code{\oddFooterMarkup}:
evenHeaderMarkup = \markup \null
oddFooterMarkup = \markup {
\fill-line {
- \on-the-fly #print-page-number-check-first
+ \on-the-fly \print-page-number-check-first
\fromproperty #'page:page-number-string
}
}
@@ -1176,8 +1176,8 @@ Several @code{\on-the-fly} conditions can be combined
with an
@q{and} operation, for example,
@example
- @code{\on-the-fly #first-page}
- @code{\on-the-fly #last-page}
+ @code{\on-the-fly \first-page}
+ @code{\on-the-fly \last-page}
@code{@{ \markup ... \fromproperty #'header: ... @}}
@end example
Index: ly/titling-init.ly
diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index
c35b97aa750c61a00a6d35ead1195e4e966d567c..546efac4fac66106297b1cc99432ca9a0e44430f
100644
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -59,7 +59,7 @@ bookTitleMarkup = \markup {
}
scoreTitleMarkup = \markup { \column {
- \on-the-fly #print-all-headers { \bookTitleMarkup \hspace #1 }
+ \on-the-fly \print-all-headers { \bookTitleMarkup \hspace #1 }
\fill-line {
\fromproperty #'header:piece
\fromproperty #'header:opus
_______________________________________________
lilypond-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/lilypond-devel
