Fix mistake in overwriting regression test

2 files changed, 56 insertions, 29 deletions

diff --git a/input/regression/note-names-context.ly b/input/regression/note-names-context.ly
new file mode 100644
index 0000000000..c49b663e22
--- /dev/null
+++ b/input/regression/note-names-context.ly
@@ -0,0 +1,37 @@
+\version "2.13.57"
+
+\header {
+
+  texidoc = "
+    NoteNames context should be close to the related notes,
+    and should not collide with the tempo markings.
+  "
+}
+
+\paper {
+  system-system-spacing
+    #'basic-distance = #10 % increase this value for more space
+}
+
+notes = \relative c {
+  c'4 c c c
+}
+
+mylyrics = \lyricmode {
+  \tempo "Allegro"
+  ly -- ric ly -- ric
+}
+
+\score {
+  <<
+    \new Voice = "voice" {
+      \repeat unfold 13 \notes
+    }
+    \context NoteNames  {
+      \repeat unfold 13 \notes
+    }
+    \new Lyrics \lyricsto "voice" {
+      \repeat unfold 13 \mylyrics
+    }
+  >>
+}
diff --git a/input/regression/note-names.ly b/input/regression/note-names.ly
index 615b37a3c8..2c756679a3 100644
--- a/input/regression/note-names.ly
+++ b/input/regression/note-names.ly
@@ -1,37 +1,27 @@
-\version "2.13.56"
+\version "2.13.38"
 
 \header {
-
-  texidoc = "
-    NoteNames context should be close to the related notes,
-    and should not collide with the tempo markings.
-  "
+  texidoc = "Various languages are supported for note names input.
+Selecting another language within a music expression is possible,
+and doesn't break point-and-click abilities.
+"
 }
 
-\paper {
-  system-system-spacing
-    #'basic-distance = #10 % increase this value for more space
-}
 
-notes = \relative c {
-  c'4 c c c
-}
+%% Old syntax.
+\include "english.ly"
 
-mylyrics = \lyricmode {
-  \tempo "Allegro"
-  ly -- ric ly -- ric
-}
+\relative c'' {
+  g4 bf d c
+
+  %% Manual override of the pitchnames variable
+  %% and the parser note names:
+  #(begin
+    (set! pitchnames (ly:assoc-get 'nederlands language-pitch-names))
+    (ly:parser-set-note-names parser pitchnames))
+  bes4 a g fis
 
-\score {
-  <<
-    \new Voice = "voice" {
-      \repeat unfold 13 \notes
-    }
-    \context NoteNames  {
-      \repeat unfold 13 \notes
-    }
-    \new Lyrics \lyricsto "voice" {
-      \repeat unfold 13 \mylyrics
-    }
-  >>
+  %% The \language command acts in the same way:
+  \language "italiano"
+  sol4 fa mib re
 }