* ly/nederlands.ly (pitchnames): use ly:parser-set-note-names.

This fixes setting notenames with `\include "nederlands.ly" '

* lily/my-lily-parser.cc (LY_DEFINE): ly:parser-set-note-names:
new function.

diff --git a/ChangeLog b/ChangeLog
index 2391b6eee7f265998a3d5796f8f1ba8eb9315ed1..98fa4891f025d16cebb3910a51777c8ca8512bfc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-03  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * ly/nederlands.ly (pitchnames): use ly:parser-set-note-names.
+       This fixes setting notenames with `\include "nederlands.ly" '
+
+       * lily/my-lily-parser.cc (LY_DEFINE): ly:parser-set-note-names:
+       new function.
+
 2004-06-01  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * scm/page-layout.scm: don't do piece, it should be in score-title

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index d1a24e8e79d666c25cfd98e2003da9b00e536d84..e98cd9a5d608d84c024a7f97d943d1c18d26f1f0 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -280,6 +280,8 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
       progress_indication ("\n");
 
       My_lily_parser *parser = new My_lily_parser (&sources);
+
+      // TODO: use $parser 
       scm_module_define (global_lily_module, ly_symbol2scm ("parser"),
                         parser->self_scm ());
       parser->parse_file (init, file_name, out_file);
@@ -452,6 +454,25 @@ LY_DEFINE (ly_parser_print_score, "ly:parser-print-score",
   return SCM_UNDEFINED;
 }
 
+
+LY_DEFINE (ly_parser_set_names, "ly:parser-set-note-names",
+          2, 0, 0,
+          (SCM parser, SCM names),
+          "Replace current note names in @var{parser}. @var{names} is an alist of "
+          "symbols. This only has effect if the current mode is notes.")
+{
+  My_lily_parser *p = unsmob_my_lily_parser (parser);
+  SCM_ASSERT_TYPE(p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser");
+
+  if (p->lexer_->is_note_state ())
+    {
+      p->lexer_->pop_state ();
+      p->lexer_->push_note_state (alist_to_hashq (names));
+    }
+
+  return SCM_UNSPECIFIED;
+}
+
 LY_DEFINE (ly_parser_print_book, "ly:parser-print-book",
           2, 0, 0,
           (SCM parser_smob, SCM book_smob),
@@ -484,3 +505,4 @@ LY_DEFINE (ly_parser_print_book, "ly:parser-print-book",
 
   return SCM_UNDEFINED;
 }
+

diff --git a/ly/catalan.ly b/ly/catalan.ly
index eddc835d7d355a44bf2b8f5c08bee218156ac8e7..f0425045647ae0b63743393c1b4ea71c3509aede 100644 (file)
--- a/ly/catalan.ly
+++ b/ly/catalan.ly
@@ -74,3 +74,5 @@ pitchnamesCatalan = #`(
 pitchnames = \pitchnamesCatalan
 
 \version "2.2.0"
+
+#(ly:parser-set-note-names parser pitchnames)

diff --git a/ly/deutsch.ly b/ly/deutsch.ly
index 0d8918ef4665f3a4cd5c403c47e11e7d7460d4cd..d58a6267b8b9e4ca6b3a565ed6b12f3e67101c6b 100644 (file)
--- a/ly/deutsch.ly
+++ b/ly/deutsch.ly
@@ -50,3 +50,5 @@ pitchnamesDeutsch = #`(
 pitchnames = \pitchnamesDeutsch
 
 \version "2.2.0"
+
+#(ly:parser-set-note-names parser pitchnames)

diff --git a/ly/english.ly b/ly/english.ly
index 2219f03f7503f3d0a3624f5e07216aa11366a24b..5c35e15315111b06c0149c1a39eb500783afa144 100644 (file)
--- a/ly/english.ly
+++ b/ly/english.ly
@@ -89,3 +89,5 @@ pitchnames = \pitchnamesEnglish
 
 \version "2.2.0"
 
+
+#(ly:parser-set-note-names parser pitchnames)

diff --git a/ly/espanol.ly b/ly/espanol.ly
index ae8ce9447faff8a37f077c443918e723332f46bd..6fe014bcb594c2923c701db78799f5ad8cf4dc3a 100644 (file)
--- a/ly/espanol.ly
+++ b/ly/espanol.ly
@@ -59,3 +59,5 @@ pitchnamesEspanol = #`(
 pitchnames = \pitchnamesEspanol
 
 \version "2.2.0"
+
+#(ly:parser-set-note-names parser pitchnames)

diff --git a/ly/italiano.ly b/ly/italiano.ly
index 23d3d05878e4771b47a7e0d66810e0c8d0640d16..d0e07504566a75ee5a4479a4c7af00d182b9574b 100644 (file)
--- a/ly/italiano.ly
+++ b/ly/italiano.ly
@@ -87,3 +87,5 @@ pitchnamesItaliano = #`(
 pitchnames = \pitchnamesItaliano
 
 \version "2.2.0"
+
+#(ly:parser-set-note-names parser pitchnames)

diff --git a/ly/nederlands.ly b/ly/nederlands.ly
index 816c3040fb2da68eccca8666a198add82f7a8c44..f41e204c846943ef239aed4d9c82b2280b6d3704 100644 (file)
--- a/ly/nederlands.ly
+++ b/ly/nederlands.ly
@@ -85,3 +85,4 @@ dutchPitchnames = #`(
 
 
 pitchnames = \dutchPitchnames 
+#(ly:parser-set-note-names parser pitchnames)

diff --git a/ly/norsk.ly b/ly/norsk.ly
index dc51587374a3cf3ba4377c909bb9a85648e4aa78..5c686989883f838a50b7e09ada561e47965f22e2 100644 (file)
--- a/ly/norsk.ly
+++ b/ly/norsk.ly
@@ -106,3 +106,5 @@ pitchnamesNorsk = #`(
 pitchnames =\pitchnamesNorsk
 
 \version "2.2.0"
+
+#(ly:parser-set-note-names parser pitchnames)

diff --git a/ly/portugues.ly b/ly/portugues.ly
index 616459d7f40b4c9681cef50d4fab7a079d9f5ef3..a246f66380ec3afdd8913b018d4d096db9f212fd 100644 (file)
--- a/ly/portugues.ly
+++ b/ly/portugues.ly
@@ -87,3 +87,5 @@ pitchnamesPortuguese = #`(
 pitchnames = \pitchnamesPortuguese
 
 \version "2.2.0"
+
+#(ly:parser-set-note-names parser pitchnames)

diff --git a/ly/suomi.ly b/ly/suomi.ly
index ba828d3bcdf43120d28c703258461ca6343dc2d2..21b0dab45f26340b0d13c15777d2d5d3f852bd8f 100644 (file)
--- a/ly/suomi.ly
+++ b/ly/suomi.ly
@@ -49,3 +49,5 @@ pitchnamesSuomi = #`(
 pitchnames = \pitchnamesSuomi
 
 \version "2.2.0"
+
+#(ly:parser-set-note-names parser pitchnames)

diff --git a/ly/svenska.ly b/ly/svenska.ly
index 2c96ac2b4baf2356fa7c4305844861655ec4ca81..38905bd4ccfa54cffc7480b6bf4250727f801a2b 100644 (file)
--- a/ly/svenska.ly
+++ b/ly/svenska.ly
@@ -43,3 +43,5 @@ pitchnamesSvenska = #`(
 
 pitchnames = \pitchnamesSvenska
 \version "2.2.0"
+
+#(ly:parser-set-note-names parser pitchnames)