Merge remote-tracking branch 'origin/translation'

[lilypond.git] / input / regression / display-lily-tests.ly

diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly
index 64075f0fde4271a6848aa9e0b65adbb5e0b2b4b8..3b99a96bc2ad07b8a3a3cb73c1a360afc826fe1f 100644 (file)
--- a/input/regression/display-lily-tests.ly
+++ b/input/regression/display-lily-tests.ly
@@ -1,4 +1,4 @@
-\version "2.16.0"
+\version "2.17.25"
 #(use-modules (srfi srfi-13)
               (ice-9 format))
 
@@ -107,11 +107,11 @@ stderr of this run."
 \test ##[ c4 ~ #]                                      % TieEvent
 \test ##[ c\noBeam #]                                  % BeamForbidEvent
 \test ##[ c\1 #]                                       % StringNumberEvent
-\test ##[ { c: c:1 } #]                                        % TremoloEvent
+\test ##[ { c:8 c:1 } #]                               % TremoloEvent
 \test ##[ { c-^ c^^ c_^ } #]                           % ArticulationEvent
 \test ##[ { c-+ c^+ c_+ } #]
 \test ##[ { c-- c^- c_- } #]
-\test ##[ { c-| c^| c_| } #]
+\test ##[ { c-! c^! c_! } #]
 \test ##[ { c-> c^> c_> } #]
 \test ##[ { c-. c^. c_. } #]
 \test ##[ { c-_ c^_ c__ } #]
@@ -159,7 +159,7 @@ stderr of this run."
 \test ##[ \mark \default #]                    % MarkEvent
 \test ##[ \mark "Allegro" #]
 \test ##[ \tempo 4 = 120 #]                    % MetronomeChangeEvent
-\test ##[ \tempo 4 = 108 ~ 116 #]
+\test ##[ \tempo 4 = 108 - 116 #]
 \test ##[ \tempo "Allegro" 4 = 132 #]
 \test ##[ \tempo "Andante" #]
 
@@ -178,14 +178,18 @@ stderr of this run."
 \test ##[ { \change Staff = "up" { c d } } #]          % ContextChange
 
 %% Tuplets
-\test ##[ \times 2/3 { c8 d e } #]                             % TimeScaledMusic
-\test ##[ \times 4/6 { c16 d e f g a } #]
-\test ##[ \times 2/3 { c d e \times 2/5 { f e d2 d4 } c } #]
-%}
+\test ##[ \tuplet 3/2 { c8 d e } #]                            % TimeScaledMusic
+\test ##[ \tuplet 6/4 { c16 d e f g a } #]
+\test ##[ \tuplet 3/2 { c4 d e \tuplet 5/2 { f4 e d2 d4 } c4 } #]
+\test ##[ \tuplet 3/2 2 { c4 d e \tuplet 5/2 2 { f4 e d2 d4 } c4 } #]
+
+%% pure rhythm
+\test ##[ { 4 4 8 \tuplet 3/2 { 8[ 16] } 16 } #]
+
 %% \relative and \tranpose
 \test #"NOT A BUG" ##[ \relative c' { c b } #] % RelativeOctaveMusic
 \test #"NOT A BUG" ##[ \transpose c d { c d } #]       % TransposedMusic
-%}
+
 %% Repeats
 \test ##[ \repeat volta 2 { c d } #]           % VoltaRepeatedMusic
 \test ##[ \repeat unfold 2 { c d } #]                  % UnfoldedRepeatedMusic
@@ -211,13 +215,13 @@ stderr of this run."
 \test ##[ \unset Score . skipBars #]           % PropertyUnset
 \test ##[ \unset autoBeaming #]
 %% Layout properties
-\test ##[ \override Staff . Stem #'thickness = #4.0 #]         % OverrideProperty
-\test ##[ \once \override Beam #'beam-thickness = #0.6 #]
-\test ##[ \revert Staff . Stem #'thickness #]          % RevertProperty
-\test ##[ \revert Beam #'beam-thickness #]
+\test ##[ \override Staff.Stem.thickness = #4.0 #]             % OverrideProperty
+\test ##[ \once \override Beam.beam-thickness = #0.6 #]
+\test ##[ \revert Staff.Stem.thickness #]              % RevertProperty
+\test ##[ \revert Beam.beam-thickness #]
 \test "NOT A BUG" ##[ \oneVoice #]     % resetting a bunch of properties
-\test ##[ \override StaffGrouper #'(staff-staff-spacing basic-distance) = #7 #]    % nested properties
-\test ##[ \revert StaffGrouper #'(staff-staff-spacing basic-distance) #]    % nested properties
+\test ##[ \override StaffGrouper.staff-staff-spacing.basic-distance = #7 #]    % nested properties
+\test ##[ \revert StaffGrouper.staff-staff-spacing.basic-distance #]    % nested properties
 
 %% \applyOutput
 \test ##[ \applyOutput #'Foo #(lambda (arg) (list)) #]
@@ -241,11 +245,11 @@ stderr of this run."
 \test ##[ \ottava #1 #]    % OttavaMusic
 
 %% \tweak
-\test ##[ < \tweak #'duration-log #2 c > #]
-\test ##[ < c \tweak #'transparent ##t e > #]
-\test ##[ < \tweak #'color #'(1.0 0.0 0.0) \tweak #'duration-log #2 c > #]
-\test ##[ c-\tweak #'font-size #3 -> #]
-\test ##[ < \tweak Accidental #'color #'(1.0 0.0 0.0) cis eis g > #]
+\test ##[ < \tweak duration-log #2 c > #]
+\test ##[ < c \tweak transparent ##t e > #]
+\test ##[ < \tweak color #'(1.0 0.0 0.0) \tweak duration-log #2 c > #]
+\test ##[ c-\tweak font-size #3 -> #]
+\test ##[ < \tweak Accidental.color #'(1.0 0.0 0.0) cis eis g > #]
 
 %% end test.