Prefer # over $ in markups

diff --git a/Documentation/de/extending/scheme-tutorial.itely b/Documentation/de/extending/scheme-tutorial.itely
index 0c0d5ca033b76b075b2a3f53c54da34244820216..11a42bd60c9b67f494f52e3f3fcd09a8fb00d777 100644 (file)
--- a/Documentation/de/extending/scheme-tutorial.itely
+++ b/Documentation/de/extending/scheme-tutorial.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.15.18"
+@c \version "2.15.20"
 
 @node Scheme-Übung
 @chapter Scheme-Übung
@@ -1438,7 +1438,7 @@ tempoPadded = #(define-music-function (parser location padding tempotext)
   (number? string?)
 #{
   \once \override Score.MetronomeMark #'padding = $padding
-  \tempo \markup { \bold $tempotext }
+  \tempo \markup { \bold #tempotext }
 #})
 
 \relative c'' {

diff --git a/Documentation/de/notation/changing-defaults.itely b/Documentation/de/notation/changing-defaults.itely
index 3b6c51b3c79ec4ac01c15fac2ac95840309194d6..6a245b0d990d2aed789bdca4a4be647ad55992b4 100644 (file)
--- a/Documentation/de/notation/changing-defaults.itely
+++ b/Documentation/de/notation/changing-defaults.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.15.10"
+@c \version "2.15.20"
 
 @c Translators: Till Paala
 
@@ -4064,7 +4064,7 @@ tempoPadded =
      (number? string?)
    #{
      \once \override Score.MetronomeMark #'padding = $padding
-     \tempo \markup { \bold $tempotext }
+     \tempo \markup { \bold #tempotext }
    #})
 
 \relative c'' {

diff --git a/Documentation/de/notation/spacing.itely b/Documentation/de/notation/spacing.itely
index 4e28e516a77d9a48919031e1cb7f7c50fb2da1c2..6516fbad5b14d877d6bd662c321899b12bb25421 100644 (file)
--- a/Documentation/de/notation/spacing.itely
+++ b/Documentation/de/notation/spacing.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.20"
 
 @c Translators: Till Paala
 
@@ -1885,7 +1885,7 @@ labelContext =
 #(define-music-function
      (parser location context)
      (string?)
-   #{ s1*0^\markup { \typewriter $context } #})
+   #{ s1*0^\markup { \typewriter #context } #})
 
 \layout {
   \context { \Dynamics    \alignToZero }

diff --git a/Documentation/es/extending/scheme-tutorial.itely b/Documentation/es/extending/scheme-tutorial.itely
index f506feac175df97d7e07ce9f161914969cd67002..4808afe132fe42e74d4e52ca10b67368153934ea 100644 (file)
--- a/Documentation/es/extending/scheme-tutorial.itely
+++ b/Documentation/es/extending/scheme-tutorial.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.15.18"
+@c \version "2.15.20"
 
 @node Tutorial de Scheme
 @appendix Tutorial de Scheme
@@ -1442,7 +1442,7 @@ tempoPadded = #(define-music-function (parser location padding tempotext)
   (number? string?)
 #{
   \once \override Score.MetronomeMark #'padding = $padding
-  \tempo \markup { \bold $tempotext }
+  \tempo \markup { \bold #tempotext }
 #})
 
 \relative c'' {

diff --git a/Documentation/es/notation/changing-defaults.itely b/Documentation/es/notation/changing-defaults.itely
index 9660880cfb65b05d6572efb871b9caa387a8d97a..ee8246c4e608955896d283d8faec8112e3fd0ff8 100644 (file)
--- a/Documentation/es/notation/changing-defaults.itely
+++ b/Documentation/es/notation/changing-defaults.itely
@@ -8,7 +8,7 @@ Translation of GIT committish: f0978ed121192fee9bdf2453a325d98693148acf
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.15.10"
+@c \version "2.15.20"
 
 @node Cambiar los valores por omisión
 @chapter Cambiar los valores por omisión
@@ -3928,7 +3928,7 @@ tempoPadded =
      (number? string?)
    #{
      \once \override Score.MetronomeMark #'padding = $padding
-     \tempo \markup { \bold $tempotext }
+     \tempo \markup { \bold #tempotext }
    #})
 
 \relative c'' {

diff --git a/Documentation/es/notation/spacing.itely b/Documentation/es/notation/spacing.itely
index 1856a0ff8656936ff380d20aae535174446b1e99..5c09228a3a3b494e33faedf900bd0d244d2303a4 100644 (file)
--- a/Documentation/es/notation/spacing.itely
+++ b/Documentation/es/notation/spacing.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.20"
 
 @ignore
 GDP TODO list
@@ -1943,7 +1943,7 @@ labelContext =
 #(define-music-function
      (parser location context)
      (string?)
-   #{ s1*0^\markup { \typewriter $context } #})
+   #{ s1*0^\markup { \typewriter #context } #})
 
 \layout {
   \context { \Dynamics    \alignToZero }

diff --git a/Documentation/extending/scheme-tutorial.itely b/Documentation/extending/scheme-tutorial.itely
index 2deeee9e1cc7ea80477deac630bc8733759fc0d7..2039948f62593265ab30ea3d94f36b988a677160 100644 (file)
--- a/Documentation/extending/scheme-tutorial.itely
+++ b/Documentation/extending/scheme-tutorial.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.15.18"
+@c \version "2.15.20"
 
 @node Scheme tutorial
 @chapter Scheme tutorial
@@ -1416,7 +1416,7 @@ tempoPadded = #(define-music-function (parser location padding tempotext)
   (number? string?)
 #{
   \once \override Score.MetronomeMark #'padding = $padding
-  \tempo \markup { \bold $tempotext }
+  \tempo \markup { \bold #tempotext }
 #})
 
 \relative c'' {

diff --git a/Documentation/fr/notation/spacing.itely b/Documentation/fr/notation/spacing.itely
index 8224814ef2799a3f0b156c45959172051c7fc544..ffbb14cc5306ffdff89f93704b00b6febeecb1b0 100644 (file)
--- a/Documentation/fr/notation/spacing.itely
+++ b/Documentation/fr/notation/spacing.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.20"
 
 @c Translators: Frédéric Chiasson, Jean-Charles Malahieude
 
@@ -1949,7 +1949,7 @@ labelContext =
 #(define-music-function
      (parser location context)
      (string?)
-   #{ s1*0^\markup { \typewriter $context } #})
+   #{ s1*0^\markup { \typewriter #context } #})
 
 \layout {
   \context { \Dynamics    \alignToZero }

diff --git a/Documentation/ja/notation/changing-defaults.itely b/Documentation/ja/notation/changing-defaults.itely
index 5f8c656d2de7e191b9f53f94b94931a71049798a..af33ce076bda60f9aad913d30e62777b22b9606c 100644 (file)
--- a/Documentation/ja/notation/changing-defaults.itely
+++ b/Documentation/ja/notation/changing-defaults.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.15.10"
+@c \version "2.15.20"
 
 @c Translators: Yoshiki Sawada
 @c Translation status: post-GDP
@@ -4132,7 +4132,7 @@ tempoPadded =
      (number? string?)
    #{
      \once \override Score.MetronomeMark #'padding = $padding
-     \tempo \markup { \bold $tempotext }
+     \tempo \markup { \bold #tempotext }
    #})
 
 \relative c'' {

diff --git a/Documentation/ja/notation/spacing.itely b/Documentation/ja/notation/spacing.itely
index 3c3c94f776c2ef8b330b70d488b46ffcedaddbff..6d43db56153e078f986f4d5987c170e67df6ea7e 100644 (file)
--- a/Documentation/ja/notation/spacing.itely
+++ b/Documentation/ja/notation/spacing.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.20"
 
 
 @c Translators: Yoshiki Sawada
@@ -1916,7 +1916,7 @@ labelContext =
 #(define-music-function
      (parser location context)
      (string?)
-   #{ s1*0^\markup { \typewriter $context } #})
+   #{ s1*0^\markup { \typewriter #context } #})
 
 \layout {
   \context { \Dynamics    \alignToZero }

diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely
index 34ceecde4a3cdd1819fa80c8ed025a41755386fb..98163ce3e832905ababb6389b77f66ff87637a16 100644 (file)
--- a/Documentation/notation/changing-defaults.itely
+++ b/Documentation/notation/changing-defaults.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.15.10"
+@c \version "2.15.20"
 
 @node Changing defaults
 @chapter Changing defaults
@@ -3843,7 +3843,7 @@ tempoPadded =
      (number? string?)
    #{
      \once \override Score.MetronomeMark #'padding = #padding
-     \tempo \markup { \bold $tempotext }
+     \tempo \markup { \bold #tempotext }
    #})
 
 \relative c'' {

diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely
index 4c7ab5b0083ed7be0931b51e24365de564589ae9..1724a63439f73ccbb7d83cdae0844f784b2a6ffc 100644 (file)
--- a/Documentation/notation/spacing.itely
+++ b/Documentation/notation/spacing.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.20"
 
 @ignore
 GDP TODO list
@@ -1815,7 +1815,7 @@ labelContext =
 #(define-music-function
      (parser location context)
      (string?)
-   #{ s1*0^\markup { \typewriter $context } #})
+   #{ s1*0^\markup { \typewriter #context } #})
 
 \layout {
   \context { \Dynamics    \alignToZero }

diff --git a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
index 3a0bd736a43f1078c9fffc0d36ce92c1ff19a32f..30fca34dd5b98252f157f8dccddf596bf47caba6 100644 (file)
--- a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
+++ b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
@@ -95,7 +95,7 @@ cueWhile =
      \cueDuring $instrument #dir {
        \once \override TextScript #'self-alignment-X = #RIGHT
        \once \override TextScript #'direction = $dir
-       s1*0-\markup { \tiny $name }
+       s1*0-\markup { \tiny #name }
        $music
      }
    #})

diff --git a/Documentation/snippets/bar-chords-notation-for-guitar--with-text-spanner.ly b/Documentation/snippets/bar-chords-notation-for-guitar--with-text-spanner.ly
index bf66f54d28c5ad65cf13e164f7a7014ed30bb23f..e31034da50d69170665e88593fb5a35f81aa8deb 100644 (file)
--- a/Documentation/snippets/bar-chords-notation-for-guitar--with-text-spanner.ly
+++ b/Documentation/snippets/bar-chords-notation-for-guitar--with-text-spanner.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.20"
 
 \header {
   lsrtags = "chords, fretted-strings"
@@ -76,9 +76,9 @@ bbarre= #(define-music-function (barre location str music) (string? ly:music?)
                         \once \override TextSpanner #'to-barline = ##f
                         \once \override TextSpanner #'bound-details =  #'((left (Y . 0) (padding . 0.25) (attach-dir . -2)) (right (Y . 0) (padding . 0.25) (attach-dir . 2)))
                         \once  \override TextSpanner #'bound-details #'right #'text = \markup { \draw-line #'( 0 . -.5) }
-                        \once  \override TextSpanner #'bound-details #'left #'text =  \markup { \pScript $str }
+                        \once  \override TextSpanner #'bound-details #'left #'text =  \markup { \pScript #str }
 %% uncomment this line for make full barred
-                       % \once  \override TextSpanner #'bound-details #'left #'text =  \markup { "B" $str }
+                       % \once  \override TextSpanner #'bound-details #'left #'text =  \markup { "B" #str }
                           #}
     spanned-music))))
 

diff --git a/Documentation/snippets/string-number-extender-lines.ly b/Documentation/snippets/string-number-extender-lines.ly
index 16397b373567b0aa10bc624256674e26475c15b0..5beadf42d5be39512f4b3cbcebc3a40843c8e030 100644 (file)
--- a/Documentation/snippets/string-number-extender-lines.ly
+++ b/Documentation/snippets/string-number-extender-lines.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.20"
 
 \header {
   lsrtags = "editorial-annotations, text, fretted-strings, tweaks-and-overrides"
@@ -23,7 +23,7 @@ stringNumberSpanner =
     \override TextSpanner #'style = #'solid
     \override TextSpanner #'font-size = #-5
     \override TextSpanner #'(bound-details left stencil-align-dir-y) = #CENTER
-    \override TextSpanner #'(bound-details left text) = \markup { \circle \number $StringNumber }
+    \override TextSpanner #'(bound-details left text) = \markup { \circle \number #StringNumber }
   #})
 
 

diff --git a/input/regression/mozart-hrn-3.ly b/input/regression/mozart-hrn-3.ly
index 4324882e35cd3002fd3614ce669f88c7366b2f9a..63e91886d07928fe1c160af8502849993bcdb55f 100644 (file)
--- a/input/regression/mozart-hrn-3.ly
+++ b/input/regression/mozart-hrn-3.ly
@@ -28,7 +28,7 @@
         }
       }
       \fill-line {
-        $(string-append  "It has been typeset and placed in the public "
+        #(string-append  "It has been typeset and placed in the public "
                                     "domain by " maintainer ".")
       }
       \fill-line {
@@ -48,7 +48,7 @@ virtuoso that taught in Geneva.
 "
 }
 
-\version "2.15.18"
+\version "2.15.20"
 
 \include "mozart-hrn3-defs.ily"
 \include "mozart-hrn3-allegro.ily"

diff --git a/input/regression/page-breaks.ly b/input/regression/page-breaks.ly
index 233e1287f1e06713839e6665c984afcb21b2a564..cb42048b4d2f894d2e72997588eec57cdf351887 100644 (file)
--- a/input/regression/page-breaks.ly
+++ b/input/regression/page-breaks.ly
@@ -1,4 +1,4 @@
-\version "2.15.18"
+\version "2.15.20"
 
 \header {
 
@@ -59,7 +59,7 @@
     \column {
       \fill-line {
        " "
-       \line { "Music engraving by LilyPond" $(lilypond-version) }4
+       \line { "Music engraving by LilyPond" #(lilypond-version) }4
        " "
       }
       \with-url

diff --git a/input/regression/span-bar-spacing.ly b/input/regression/span-bar-spacing.ly
index 08d0616d2453ec96dd990e52a621f8dfa1f4a485..dc4b5032df25922647be5e27ef7e956a54581ed0 100644 (file)
--- a/input/regression/span-bar-spacing.ly
+++ b/input/regression/span-bar-spacing.ly
@@ -8,7 +8,7 @@ edge of a bar line.  This spacing should also take place when
 "
 }
 
-\version "2.15.21"
+\version "2.15.20"
 
 upper = \relative c' {
   \key f \minor \time 12/8 

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index 1041e88c7206b06de98f94ce9379cd49501070dd..1e0ba44fd7a85d0b78726a8452b1abe345591d76 100644 (file)
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,4 +1,4 @@
-\version "2.15.18"
+\version "2.15.20"
 
 chordmodifiers = #default-chord-modifier-list
 
@@ -6,20 +6,20 @@ chordmodifiers = #default-chord-modifier-list
 whiteTriangleMarkup = \markup {
   \triangle ##f
   %%  394 capital delta
-  %$(ly:wide-char->utf-8 #x0394)
+  %#(ly:wide-char->utf-8 #x0394)
 
   %% 2206 : delta from the symbol font.
-  %   $(ly:wide-char->utf-8 #x2206)
+  %   #(ly:wide-char->utf-8 #x2206)
   
   %% up pointing triangle
-  % $(ly:wide-char->utf-8 #x25B3)
+  % #(ly:wide-char->utf-8 #x25B3)
 } 
 
 blackTriangleMarkup = \markup {
   \triangle ##t
 
   %% black up pointing triangle
-%  $(ly:wide-char->utf-8 #x25B2)
+%  #(ly:wide-char->utf-8 #x25B2)
 }
 
 ignatzekExceptionMusic = {
@@ -27,7 +27,7 @@ ignatzekExceptionMusic = {
   <c es ges>-\markup { \super "o" } % should be $\circ$ ?
   <c es ges bes>-\markup {
     %%  f8 is o with slash.
-    \normal-size-super $(ly:wide-char->utf-8 #x00f8)
+    \normal-size-super #(ly:wide-char->utf-8 #x00f8)
   }
   <c es ges beses>-\markup { \super  "o7" }
   <c e g b fis'>-\markup { \super "lyd" } % Lydian

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 5c234f34f2df40a1b9e17f55d5d033eeb5862198..f6daacddb399cf6bac89b3bcccbb291bab242f82 100644 (file)
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,4 +1,4 @@
-\version "2.15.18"
+\version "2.15.20"
 
 slashSeparator = \markup {
   \center-align
@@ -15,7 +15,7 @@ tagline = \markup {
 
     %% 2014 = em dash.
 
-    $(format #f "Music engraving by LilyPond ~a~awww.lilypond.org"
+    #(format #f "Music engraving by LilyPond ~a~awww.lilypond.org"
        (lilypond-version)
        (ly:wide-char->utf-8 #x2014)
        )