* Documentation/topdocs/NEWS.tely (Top): doc string argument change.

* lily/parser.yy (Generic_prefix_music_scm): allow strings as
function arguments too

* Documentation/topdocs/NEWS.tely (Top): document new feature.

* Documentation/topdocs/NEWS.tely (Top): strip out-www.

diff --git a/ChangeLog b/ChangeLog
index 6694bbfdc4fedd898a14c3df3866bd661e1b2768..ec8f1258627f9129799595de7a2b4197b03d55c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-12-14  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * Documentation/topdocs/NEWS.tely (Top): doc string argument change.
+
+       * lily/parser.yy (Generic_prefix_music_scm): allow strings as
+       function arguments too
+
+       * lily/main.cc (set_relocation): new function.
+
        * scripts/musicxml2ly.py (convert): add \version
 
        * lily/tie.cc: remove get_default_attachments()

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 0984cfc89c94b3f6cd9a55a9f2909b9e709694e7..53a3d55120d49ddcf012b20df7ec627b0eea504a 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -45,10 +45,12 @@ This document is also available in @uref{NEWS.pdf,PDF}.
 
 
 @itemize @bullet
+@item String arguments for music functions may be specified without
+@code{#} marks. This allows syntactical constructs (like \clef and
+\bar) to be expressed in generic music functions.
 
 @item Ties in chords are also formatted using a scoring based
-formatting. This reduces the number of collisions for ties in
-chords, 
+formatting. This reduces the number of collisions for ties in chords,
 
 @lilypond[raggedright,fragment,relative=2]
   <b  d f g> ~  <b  d f g> 

diff --git a/lily/parser.yy b/lily/parser.yy
index 4b250d09663de35f5a561878152c5e274fd4d8ed..0c3810cb67d64181b43f9dabb13dc857dc084c26 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -414,6 +414,7 @@ If we give names, Bison complains.
 %type <scm> step_number
 %type <scm> step_numbers 
 %type <scm> string
+%type <scm> function_scm_argument
 
 %type <score> score_block
 %type <score> score_body
@@ -983,32 +984,38 @@ Grouped_music_list:
        | Sequential_music              { $$ = $1; }
        ;
 
+
+function_scm_argument:
+       embedded_scm  
+       | simple_string
+       ;
+
 Generic_prefix_music_scm:
        MUSIC_FUNCTION {
                $$ = scm_list_2 ($1, make_input (@$));
        }
-       | MUSIC_FUNCTION_SCM embedded_scm {
+       | MUSIC_FUNCTION_SCM function_scm_argument {
                $$ = scm_list_3 ($1, make_input (@$), $2);
        }
        | MUSIC_FUNCTION_MARKUP full_markup {
                $$ = scm_list_3 ($1, make_input (@$), $2);
        }
 
-       | MUSIC_FUNCTION_SCM_MUSIC embedded_scm Music {
+       | MUSIC_FUNCTION_SCM_MUSIC function_scm_argument Music {
                $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ());
                $3->unprotect ();
        }
-       | MUSIC_FUNCTION_SCM_SCM embedded_scm embedded_scm {
+       | MUSIC_FUNCTION_SCM_SCM function_scm_argument function_scm_argument {
                $$ = scm_list_4 ($1, make_input (@$), $2, $3);
        }
-       | MUSIC_FUNCTION_SCM_SCM_SCM embedded_scm embedded_scm embedded_scm {
+       | MUSIC_FUNCTION_SCM_SCM_SCM function_scm_argument function_scm_argument function_scm_argument {
                $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4);
        }
        | MUSIC_FUNCTION_MUSIC Music {
                $$ = scm_list_3 ($1, make_input (@$), $2->self_scm ());
                $2->unprotect ();
        }
-       | MUSIC_FUNCTION_SCM_SCM_MUSIC embedded_scm embedded_scm Music {
+       | MUSIC_FUNCTION_SCM_SCM_MUSIC function_scm_argument function_scm_argument Music {
                $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4->self_scm ());
        }
        | MUSIC_FUNCTION_MARKUP_MUSIC full_markup Music {
@@ -1023,7 +1030,7 @@ Generic_prefix_music_scm:
                $2->unprotect ();
                $3->unprotect ();
        }
-       | MUSIC_FUNCTION_SCM_MUSIC_MUSIC embedded_scm Music Music {
+       | MUSIC_FUNCTION_SCM_MUSIC_MUSIC function_scm_argument Music Music {
                $$ = scm_list_5 ($1, make_input (@$), $2, $3->self_scm (), $4->self_scm ());
                $4->unprotect ();
                $3->unprotect ();
@@ -1543,11 +1550,11 @@ music_function_chord_body:
                $$ = scm_list_3 ($1, make_input (@$),
                                        $2->self_scm ());
        }
-       | MUSIC_FUNCTION_SCM_MUSIC embedded_scm chord_body_element {
+       | MUSIC_FUNCTION_SCM_MUSIC function_scm_argument chord_body_element {
                $$ = scm_list_4 ($1, make_input (@$),
                                        $2, $3->self_scm ());
        }
-       | MUSIC_FUNCTION_SCM_SCM_MUSIC embedded_scm embedded_scm
+       | MUSIC_FUNCTION_SCM_SCM_MUSIC function_scm_argument function_scm_argument
                chord_body_element {
 
                $$ = scm_list_5 ($1, make_input (@$),
@@ -1718,10 +1725,10 @@ music_function_event:
        MUSIC_FUNCTION_MUSIC post_event {
                $$ = scm_list_3 ($1, make_input (@$), $2->self_scm ());
        }
-       | MUSIC_FUNCTION_SCM_MUSIC embedded_scm post_event {
+       | MUSIC_FUNCTION_SCM_MUSIC function_scm_argument post_event {
                $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ());
        }
-       | MUSIC_FUNCTION_SCM_SCM_MUSIC embedded_scm embedded_scm post_event {
+       | MUSIC_FUNCTION_SCM_SCM_MUSIC function_scm_argument function_scm_argument post_event {
                $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4->self_scm ());
        }
        ;