(interpret_markup): cache make-simple-markup

diff --git a/ChangeLog b/ChangeLog
index 252b59fa96b4b336e0639aeb477fa6f6f580c97f..d67647e93a9bfbe015001575e39c82e6d6bd9422 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-03  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/text-item.cc (interpret_markup): cache make-simple-markup
+
 2004-03-03  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * input/test/title-markup.ly (spaceTest): Add.

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 7984a9b606b0640d8e18a612b4a055ec942649ad..8d4c5b6d3b6a5c36914759a5ef860a506b3e8194 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -18,7 +18,7 @@ Version 2.1.13
 
 @itemize @bullet
 
-@item Property functions can now be used as arguments of @code{set!},
+@item Property functions may be used as an argument to @code{set!},
 for example
 
 @example

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 5e64c895b521753e820d104eb0f08b92e2d54531..2fe344130750340af8529ca03ea905946250a9ea 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -61,7 +61,7 @@ void
 Paper_outputter::output_metadata (SCM scopes, Paper_def *paper)
 {
   SCM fields = SCM_EOL;
-  for (int i = dump_header_fieldnames_global.size (); i--;)
+  for (int i = dump_header_fieldnames_global.size (); i--; )
     fields = gh_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()),
                                     fields);
   

diff --git a/lily/text-item.cc b/lily/text-item.cc
index bfb24f1b53350142bd04ffdea68e112b5ecfa0a6..29273cf6620f9a699b4cc8b4dcf5db86faeabcda 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -25,7 +25,9 @@ Text_item::interpret_markup (SCM paper, SCM props, SCM markup)
       if (str.index_any (" \t\n\r") != -1)
        {
          /* Multi word string to line markup.  */
-         SCM proc = scm_c_eval_string ("make-simple-markup");
+         static SCM proc;
+         if (!proc)
+           proc = scm_c_eval_string ("make-simple-markup");
          return interpret_markup (paper, props, scm_call_1 (proc, markup));
        }