ly:clone-parser -> ly:parser-clone, ly:parser-lexer.

diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index 8bc3d5e9943b05735d6d72d1de1322010ebde5ad..83c3826dbdf7bf625f4becc951695b18e19a2d01 100644 (file)
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -163,7 +163,15 @@ LY_DEFINE (ly_parse_string, "ly:parse-string",
   return SCM_UNSPECIFIED;
 }
 
-LY_DEFINE (ly_clone_parser, "ly:clone-parser",
+LY_DEFINE (ly_parser_lexer, "ly:parser-lexer",
+          1, 0, 0, (SCM parser_smob),
+          "Return the lexer for PARSER_SMOB.")
+{
+  Lily_parser *parser = unsmob_lily_parser (parser_smob);
+  return parser->lexer_->self_scm ();
+}
+
+LY_DEFINE (ly_parser_clone, "ly:parser-clone",
           1, 0, 0, (SCM parser_smob),
           "Return a clone of PARSER_SMOB.")
 {

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index f5342b052d53f84f7d6e5adf4dbf53157f0d53ab..077c965bd545137645fd35ce7c6c771816f6bae3 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -551,7 +551,7 @@ includePageLayoutFile =
         (if (access? tweak-filename R_OK)
             (begin
               (ly:message "Including tweak file ~a" tweak-filename)
-               (set! page-layout-parser (ly:clone-parser parser))
+               (set! page-layout-parser (ly:parser-clone parser))
               (ly:parser-parse-string page-layout-parser
                                        (format #f "\\include \"~a\""
                                                tweak-filename))))))

diff --git a/python/convertrules.py b/python/convertrules.py
index 2ed3b2863664fa71b9b22f7918c268c798f83a2d..a2ac08534b12706c02d643d7ad5c7b1b83d6b6ff 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2878,3 +2878,10 @@ def conv (str):
 
 conversions.append (((2, 10, 0), conv, """bump version for release"""))
 
+
+def conv (str):
+    return re.sub ('ly:clone-parser',
+                   'ly:parser-clone', str)
+
+conversions.append (((2, 11, 2), conv, """ly:clone-parser -> ly:parser-clone"""))
+

diff --git a/scm/parser-ly-from-scheme.scm b/scm/parser-ly-from-scheme.scm
index 9d2b3b5d47e000468ec82308eb3c598a6221316f..86f3f89a27e8652ac7708a357db855d0daa67008 100644 (file)
--- a/scm/parser-ly-from-scheme.scm
+++ b/scm/parser-ly-from-scheme.scm
@@ -78,7 +78,7 @@ character."
                              ;; other caracters
                              (else
                               (display c out))))))))
-      `(let ((parser-clone (ly:clone-parser parser)))
+      `(let ((parser-clone (ly:parser-clone parser)))
          ,@(map (lambda (binding)
                   `(ly:parser-define! parser-clone ',(car binding) ,(cdr binding)))
                 (reverse bindings))