From: Trevor Daniels <t.daniels@treda.co.uk>
Date: Thu, 18 Apr 2013 13:40:12 +0000 (+0100)
Subject: Doc: Change \on-the-fly #procedure to \on-the-fly \procedure (3098)
X-Git-Tag: release/2.17.17-1~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=09f7d25964ec1ae3ad1f4a862a2b46444f56c50f;p=lilypond.git

Doc: Change \on-the-fly #procedure to \on-the-fly \procedure (3098)

  This avoids problems when \on-the-fly is used within #{ .. #}
---

diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely
index 2debffd336..09d4e89879 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
 
diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index c35b97aa75..546efac4fa 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