X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeat-acknowledge-engraver.cc;h=3e3025556f88b31d9784a8c112db9a6bc1aca204;hb=ba824abf873d98c5afa9f8236beb85929cec0c03;hp=b41f8b3fe3dfa217bd24ef871eb403e79fd6abab;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc index b41f8b3fe3..3e3025556f 100644 --- a/lily/repeat-acknowledge-engraver.cc +++ b/lily/repeat-acknowledge-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2005 Han-Wen Nienhuys + (c) 2000--2007 Han-Wen Nienhuys */ #include "engraver.hh" @@ -66,7 +66,7 @@ Repeat_acknowledge_engraver::process_music () SCM cs = get_property ("repeatCommands"); - String s = ""; + string s = ""; bool start = false; bool end = false; bool volta_found = false; @@ -102,7 +102,7 @@ Repeat_acknowledge_engraver::process_music () if (!scm_is_string (wb) || ly_is_equal (db, wb)) { if (s != "" || (volta_found && !scm_is_string (wb))) - context ()->set_property ("whichBar", scm_makfrom0str (s.to_str0 ())); + context ()->set_property ("whichBar", ly_string2scm (s)); } } @@ -110,6 +110,5 @@ ADD_TRANSLATOR (Repeat_acknowledge_engraver, /* doc */ "Acknowledge repeated music, and convert the contents of " "repeatCommands ainto an appropriate setting for whichBar.", /* create */ "", - /* accept */ "", /* read */ "repeatCommands whichBar", /* write */ "");