summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHan-Wen Nienhuys <hanwen@xs4all.nl>2007-01-06 17:36:41 +0100
committerHan-Wen Nienhuys <hanwen@xs4all.nl>2007-01-06 17:36:41 +0100
commitbf55449ed8708a5260b165f4c4da6f3dd49e69a5 (patch)
treed3f3aa6142bf017ed142608159fafcaf07e755e7
parentd756b22da61b4438edc84fd1a9cca8b460c9ae66 (diff)
Update syntax: addquote -> addQuote
-rw-r--r--input/regression/quote-cue-during.ly4
-rw-r--r--input/regression/quote-cyclic.ly6
-rw-r--r--input/regression/quote-during.ly4
-rw-r--r--input/regression/quote-grace.ly4
-rw-r--r--input/regression/quote-tie.ly6
-rw-r--r--input/regression/quote-transposition.ly6
-rw-r--r--input/regression/quote-tuplet.ly4
-rw-r--r--input/regression/quote.ly4
-rw-r--r--ly/music-functions-init.ly2
-rw-r--r--python/convertrules.py6
10 files changed, 25 insertions, 21 deletions
diff --git a/input/regression/quote-cue-during.ly b/input/regression/quote-cue-during.ly
index 42045c5f73..347838151f 100644
--- a/input/regression/quote-cue-during.ly
+++ b/input/regression/quote-cue-during.ly
@@ -11,14 +11,14 @@ last note."
}
-\version "2.10.0"
+\version "2.11.10"
\layout {
ragged-right = ##t
}
quoteMe = \relative c' { fis4 r16 a8.-> b4(-\ff~ b16 c8. b) }
-\addquote quoteMe \quoteMe
+\addQuote quoteMe \quoteMe
original = \relative c'' {
c8 d
diff --git a/input/regression/quote-cyclic.ly b/input/regression/quote-cyclic.ly
index 26332e3ebe..9cc47d370a 100644
--- a/input/regression/quote-cyclic.ly
+++ b/input/regression/quote-cyclic.ly
@@ -6,13 +6,13 @@ example, there are notes with each full-bar rest."
}
-\version "2.10.0"
+\version "2.11.10"
A = \relative c' { c4 d e f | \cueDuring #"qB" #1 { R1 } | }
B = \relative c' { \cueDuring #"qA" #1 { R1 } | f4 e d c | }
-\addquote "qA" \A
-\addquote "qB" \B
+\addQuote "qA" \A
+\addQuote "qB" \B
\layout { ragged-right = ##t }
diff --git a/input/regression/quote-during.ly b/input/regression/quote-during.ly
index 4b2549ba00..d17d80d4c5 100644
--- a/input/regression/quote-during.ly
+++ b/input/regression/quote-during.ly
@@ -8,7 +8,7 @@ quoted. In this example, a 16th rests is not quoted, since
@code{rest-event} is not in @code{quotedEventTypes}."
}
-\version "2.10.0"
+\version "2.11.10"
\layout {
ragged-right = ##t
}
@@ -16,7 +16,7 @@ quoted. In this example, a 16th rests is not quoted, since
quoteMe = \relative c' { fis4 r16 a8.-> b4-\ff c }
-\addquote quoteMe \quoteMe
+\addQuote quoteMe \quoteMe
original = \relative c'' { c8 d s2 es8 gis8 }
<<
diff --git a/input/regression/quote-grace.ly b/input/regression/quote-grace.ly
index 718134d611..e612aeac3c 100644
--- a/input/regression/quote-grace.ly
+++ b/input/regression/quote-grace.ly
@@ -7,13 +7,13 @@
}
\paper { ragged-right= ##t }
-\version "2.10.0"
+\version "2.11.10"
quoted = \relative c'' {
R1
\grace g16 f4 \grace a16 bes4 \grace b16 c4 c4
}
-\addquote quoted \quoted
+\addQuote quoted \quoted
<<
diff --git a/input/regression/quote-tie.ly b/input/regression/quote-tie.ly
index e9584de114..50cb66e275 100644
--- a/input/regression/quote-tie.ly
+++ b/input/regression/quote-tie.ly
@@ -1,4 +1,4 @@
-\version "2.10.0"
+\version "2.11.10"
\header {
@@ -15,12 +15,12 @@ to the 2nd note. "
cueI = \relative c'' {
a1 ~ | a | a |
}
-\addquote "cueI" { \cueI }
+\addQuote "cueI" { \cueI }
cueII = \relative c' {
R1 | e | a |
}
-\addquote "cueII" { \cueII }
+\addQuote "cueII" { \cueII }
\new Staff {
\cueDuring "cueI" #UP { R1 } |
diff --git a/input/regression/quote-transposition.ly b/input/regression/quote-transposition.ly
index ef700dd871..ceecc579d4 100644
--- a/input/regression/quote-transposition.ly
+++ b/input/regression/quote-transposition.ly
@@ -10,12 +10,12 @@ quoted ones) will transposed as well. "
}
-\version "2.10.0"
+\version "2.11.10"
\layout { ragged-right = ##t }
-\addquote clarinet {
+\addQuote clarinet {
\transposition bes
d'16 d'16 d'8
d'16 d'16 d'8
@@ -23,7 +23,7 @@ quoted ones) will transposed as well. "
d'16 d'16 d'8
}
-\addquote sax {
+\addQuote sax {
\transposition es'
a8 a a a a a a a
}
diff --git a/input/regression/quote-tuplet.ly b/input/regression/quote-tuplet.ly
index 0579d4fde6..a96249540f 100644
--- a/input/regression/quote-tuplet.ly
+++ b/input/regression/quote-tuplet.ly
@@ -1,5 +1,5 @@
-\version "2.10.0"
+\version "2.11.10"
\header {
@@ -12,7 +12,7 @@ foo = \relative {
\times 2/3 { c4 c c } \times 2/3 { c4 c c }
}
-\addquote "foo" { \foo }
+\addQuote "foo" { \foo }
\paper {
ragged-right = ##t
diff --git a/input/regression/quote.ly b/input/regression/quote.ly
index 4d61ee608b..1f29585f3c 100644
--- a/input/regression/quote.ly
+++ b/input/regression/quote.ly
@@ -7,7 +7,7 @@ things are quoted. In this example, a 16th rests is not quoted, since
@code{rest-event} is not in @code{quotedEventTypes}."
}
-\version "2.10.0"
+\version "2.11.10"
\layout {
ragged-right = ##t
}
@@ -15,7 +15,7 @@ things are quoted. In this example, a 16th rests is not quoted, since
quoteMe = \relative c' { fis4 r16 a8.-> b4-\ff c }
-\addquote quoteMe \quoteMe
+\addQuote quoteMe \quoteMe
original = \relative c'' { c8 d s2 es8 gis8 }
<<
diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 725ba480a5..2f4876b044 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -14,7 +14,7 @@
acciaccatura =
#(def-grace-function startAcciaccaturaMusic stopAcciaccaturaMusic)
-addquote =
+addQuote =
#(define-music-function (parser location name music) (string? ly:music?)
(_i "Add a piece of music to be quoted ")
(add-quotable parser name music)
diff --git a/python/convertrules.py b/python/convertrules.py
index 2a54213bda..cd08dab83e 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2934,6 +2934,10 @@ def conv (str):
r"\override \2Beam #'breakable", str)
str = re.sub (r'(\\set\s+)?allowBeamBreak',
r"\override Beam #'breakable", str)
+ str = re.sub (r'addquote' , 'addQuote', str)
return str
-conversions.append (((2, 11, 10), conv, """allowBeamBreak -> Beam #'breakable = ##t"""))
+conversions.append (((2, 11, 10), conv, """allowBeamBreak -> Beam #'breakable = ##t
+addquote -> addQuote
+
+"""))