From 3899f883830d1335677574573a355310223a8712 Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Fri, 18 Jul 2008 20:17:52 +0100 Subject: [PATCH] More Scheme vector quoting. --- Documentation/de/user/fretted-strings.itely | 2 +- Documentation/es/user/fretted-strings.itely | 2 +- Documentation/es/user/tweaks.itely | 2 +- Documentation/fr/user/fretted-strings.itely | 4 ++-- Documentation/fr/user/pitches.itely | 2 +- Documentation/fr/user/rhythms.itely | 2 +- Documentation/user/rhythms.itely | 6 +++--- Documentation/user/tweaks.itely | 2 +- input/cary-layout.ly | 16 ++++++++-------- input/regression/collision-head-solfa-fa.ly | 2 +- input/regression/easy-notation.ly | 10 ++-------- input/regression/note-head-solfa.ly | 12 +++++------- 12 files changed, 27 insertions(+), 35 deletions(-) diff --git a/Documentation/de/user/fretted-strings.itely b/Documentation/de/user/fretted-strings.itely index 8d9ddbe..c6ec8b9 100644 --- a/Documentation/de/user/fretted-strings.itely +++ b/Documentation/de/user/fretted-strings.itely @@ -298,7 +298,7 @@ Argument eingesetzt wird, wie im nächsten Beispiel: #(define RH rightHandFinger) { \set strokeFingerOrientations = #'(right) - \override StrokeFinger #'digit-names = ##("x" "y" "z" "!" "@") + \override StrokeFinger #'digit-names = #'#("x" "y" "z" "!" "@") 4 4 } diff --git a/Documentation/es/user/fretted-strings.itely b/Documentation/es/user/fretted-strings.itely index ab317dd..058d033 100644 --- a/Documentation/es/user/fretted-strings.itely +++ b/Documentation/es/user/fretted-strings.itely @@ -321,7 +321,7 @@ siguiente: #(define RH rightHandFinger) { \set strokeFingerOrientations = #'(right) - \override StrokeFinger #'digit-names = ##("x" "y" "z" "!" "@") + \override StrokeFinger #'digit-names = #'#("x" "y" "z" "!" "@") 4 4 4 diff --git a/Documentation/es/user/tweaks.itely b/Documentation/es/user/tweaks.itely index 3c84016..4c2c3cf 100644 --- a/Documentation/es/user/tweaks.itely +++ b/Documentation/es/user/tweaks.itely @@ -1002,7 +1002,7 @@ de la instrucción @code{\override}. @lilypond[quote,fragment,ragged-right,verbatim,relative=2] { \time 12/16 - \override Staff.BarLine #'break-visibility = ##(#f #f #f) + \override Staff.BarLine #'break-visibility = #'#(#f #f #f) c4 b8 c d16 c d8 | g, a16 b8 c d4 e16 | e8 diff --git a/Documentation/fr/user/fretted-strings.itely b/Documentation/fr/user/fretted-strings.itely index 19d50f6..6b3678f 100644 --- a/Documentation/fr/user/fretted-strings.itely +++ b/Documentation/fr/user/fretted-strings.itely @@ -291,7 +291,7 @@ chaîne de caractères comme argument de @code{\rightHandFinger}. #(define RH rightHandFinger) { \set strokeFingerOrientations = #'(right) - \override StrokeFinger #'digit-names = ##("x" "y" "z" "!" "@") + \override StrokeFinger #'digit-names = #'#("x" "y" "z" "!" "@") 4 4 } @@ -360,7 +360,7 @@ chaîne de caractères comme argument de @code{\rightHandFinger}. #(define RH rightHandFinger) { \set strokeFingerOrientations = #'(right) - \override StrokeFinger #'digit-names = ##("x" "y" "z" "!" "@") + \override StrokeFinger #'digit-names = #'#("x" "y" "z" "!" "@") 4 4 } diff --git a/Documentation/fr/user/pitches.itely b/Documentation/fr/user/pitches.itely index c0cbdc8..da8265d 100644 --- a/Documentation/fr/user/pitches.itely +++ b/Documentation/fr/user/pitches.itely @@ -869,7 +869,7 @@ de symboles. Le n-ième élément indique le style à utiliser pour le n-ième degré de la gamme. Toutes les combinaisons sont possibles : @lilypond[verbatim,relative=1,fragment] - \set shapeNoteStyles = ##(cross triangle fa #f mensural xcircle diamond) + \set shapeNoteStyles = #'#(cross triangle fa #f mensural xcircle diamond) c8 d4. e8 a2 g1 @end lilypond diff --git a/Documentation/fr/user/rhythms.itely b/Documentation/fr/user/rhythms.itely index 6585ea8..9b8984e 100644 --- a/Documentation/fr/user/rhythms.itely +++ b/Documentation/fr/user/rhythms.itely @@ -1259,7 +1259,7 @@ Vous pouvez imprimer un numéro de mesure à intervalles réguliers plutôt qu'en tête de chaque ligne. C'est ce qu'illustre l'exemple suivant. @lilypond[verbatim,ragged-right,quote,fragment,relative] -\override Score.BarNumber #'break-visibility = ##(#f #t #t) +\override Score.BarNumber #'break-visibility = #'#(#f #t #t) \set Score.currentBarNumber = #11 \bar "" % Permit first bar number to be printed % Print a bar number every second measure diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely index c644863..ee87ba5 100644 --- a/Documentation/user/rhythms.itely +++ b/Documentation/user/rhythms.itely @@ -2033,7 +2033,7 @@ line visible}, @code{beginning of line visible}. In the following example bar numbers are printed at all possible places: @lilypond[verbatim,ragged-right,quote,fragment,relative] -\override Score.BarNumber #'break-visibility = ##(#t #t #t) +\override Score.BarNumber #'break-visibility = #'#(#t #t #t) \set Score.currentBarNumber = #11 \bar "" % Permit first bar number to be printed c1 c c c @@ -2049,7 +2049,7 @@ and here the bar numbers are printed every two measures except at the end of the line: @lilypond[verbatim,ragged-right,quote,fragment,relative] -\override Score.BarNumber #'break-visibility = ##(#f #t #t) +\override Score.BarNumber #'break-visibility = #'#(#f #t #t) \set Score.currentBarNumber = #11 \bar "" % Permit first bar number to be printed % Print a bar number every second measure @@ -2097,7 +2097,7 @@ bar line: @lilypond[verbatim,ragged-right,quote,fragment,relative] \set Score.currentBarNumber = #111 -\override Score.BarNumber #'break-visibility = ##(#t #t #t) +\override Score.BarNumber #'break-visibility = #'#(#t #t #t) % Increase the size of the bar number by 2 \override Score.BarNumber #'font-size = #2 % Print a bar number every second measure diff --git a/Documentation/user/tweaks.itely b/Documentation/user/tweaks.itely index 596cdc1..346c9aa 100644 --- a/Documentation/user/tweaks.itely +++ b/Documentation/user/tweaks.itely @@ -990,7 +990,7 @@ the @code{\override} command. @lilypond[quote,fragment,ragged-right,verbatim,relative=2] { \time 12/16 - \override Staff.BarLine #'break-visibility = ##(#f #f #f) + \override Staff.BarLine #'break-visibility = #'#(#f #f #f) c4 b8 c d16 c d8 | g, a16 b8 c d4 e16 | e8 diff --git a/input/cary-layout.ly b/input/cary-layout.ly index c0ec727..3bfde1d 100644 --- a/input/cary-layout.ly +++ b/input/cary-layout.ly @@ -76,28 +76,28 @@ fraction = #(define-music-function (parser location music) (ly:music?) #{ \tweak #'text #tuplet-number::calc-fraction-text $music #}) triangle = #(define-music-function (parser location music) (ly:music?) - #{ \once \set shapeNoteStyles = ##(do do do do do do do) $music #}) + #{ \once \set shapeNoteStyles = #'#(do do do do do do do) $music #}) semicircle = #(define-music-function (parser location music) (ly:music?) - #{ \once \set shapeNoteStyles = ##(re re re re re re re) $music #}) + #{ \once \set shapeNoteStyles = #'#(re re re re re re re) $music #}) blackdiamond = #(define-music-function (parser location music) (ly:music?) - #{ \once \set shapeNoteStyles = ##(mi mi mi mi mi mi mi) $music #}) + #{ \once \set shapeNoteStyles = #'#(mi mi mi mi mi mi mi) $music #}) tiltedtriangle = #(define-music-function (parser location music) (ly:music?) - #{ \once \set shapeNoteStyles = ##(fa fa fa fa fa fa fa) $music #}) + #{ \once \set shapeNoteStyles = #'#(fa fa fa fa fa fa fa) $music #}) square = #(define-music-function (parser location music) (ly:music?) - #{ \once \set shapeNoteStyles = ##(la la la la la la la) $music #}) + #{ \once \set shapeNoteStyles = #'#(la la la la la la la) $music #}) wedge = #(define-music-function (parser location music) (ly:music?) - #{ \once \set shapeNoteStyles = ##(ti ti ti ti ti ti ti) $music #}) + #{ \once \set shapeNoteStyles = #'#(ti ti ti ti ti ti ti) $music #}) harmonic = #(define-music-function (parser location music) (ly:music?) - #{ \once \set shapeNoteStyles = ##(harmonic harmonic harmonic harmonic harmonic harmonic harmonic) $music #}) + #{ \once \set shapeNoteStyles = #'#(harmonic harmonic harmonic harmonic harmonic harmonic harmonic) $music #}) cross = #(define-music-function (parser location music) (ly:music?) - #{ \once \set shapeNoteStyles = ##(cross cross cross cross cross cross cross) $music #}) + #{ \once \set shapeNoteStyles = #'#(cross cross cross cross cross cross cross) $music #}) white = #(define-music-function (parser location music) (ly:music?) #{ \once \override NoteHead #'duration-log = #1 $music #}) diff --git a/input/regression/collision-head-solfa-fa.ly b/input/regression/collision-head-solfa-fa.ly index 5abfd39..143ea7e 100644 --- a/input/regression/collision-head-solfa-fa.ly +++ b/input/regression/collision-head-solfa-fa.ly @@ -8,7 +8,7 @@ << \key c \major - \set Staff.shapeNoteStyles = ##(do re mi fa #f la ti) + \set Staff.shapeNoteStyles = #'#(do re mi fa #f la ti) { f'4 } \\ diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly index 1649789..381589b 100644 --- a/input/regression/easy-notation.ly +++ b/input/regression/easy-notation.ly @@ -5,18 +5,12 @@ You also get ledger lines, of course." } - -\layout { - ragged-right = ##t -} - \relative { \easyHeadsOn f1 e f2 e f4 e - \override NoteHead #'note-names = ##("U" "V" "W" "X" "Y" "Z" "z") - c2 d4 e + \override NoteHead #'note-names = #'#("U" "V" "W" "X" "Y" "Z" "z") + c2 d4 e } - diff --git a/input/regression/note-head-solfa.ly b/input/regression/note-head-solfa.ly index 56e4790..dcde23c 100644 --- a/input/regression/note-head-solfa.ly +++ b/input/regression/note-head-solfa.ly @@ -1,4 +1,3 @@ - \header { texidoc = "With @code{shapeNoteStyles}, the style of the note head @@ -10,15 +9,14 @@ to the @code{tonic} property." fragment = { \key c \major - \set shapeNoteStyles = ##(do re mi fa #f la ti) + \set shapeNoteStyles = #'#(do re mi fa #f la ti) c1 d e f g a b c d e f g a b c c,,2 d e f g a b c d e f g a b c c,,4 d e f g a b c d e f g a b c } - -\transpose c d - \relative { - \fragment +\transpose c d { + \relative c' { + \fragment + } } - -- 1.5.4.3