X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator.cc;h=52274adc429f8b6952ca0027389829c9b9908f30;hb=2976557ee7f774f7c7bb670caebef0c51af0b91f;hp=7e1518bdc10cc267ad44c1a1a402f160dff59a56;hpb=358d6e99ada8019268ade9ba9080b2d0d88eeb7a;p=lilypond.git diff --git a/lily/translator.cc b/lily/translator.cc index 7e1518bdc1..52274adc42 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #include "translator.hh" @@ -199,7 +199,7 @@ Translator::static_translator_description (const char *grobs, parse_symbol_list (grobs), static_properties); static_properties = scm_acons (ly_symbol2scm ("description"), - scm_makfrom0str (desc), static_properties); + scm_from_locale_string (desc), static_properties); SCM list = SCM_EOL; for (; listener_list; listener_list = listener_list->next_) @@ -318,10 +318,11 @@ internal_event_assignment (Stream_event **old_ev, Stream_event *new_ev, const ch new_ev->self_scm ()))) { /* extract event class from function name */ - const char *prefix = "listen_"; string ev_class = function; + /* This assertion fails if EVENT_ASSIGNMENT was called outside a translator listener. Don't do that. */ + const char *prefix = "listen_"; assert (0 == ev_class.find (prefix)); /* "listen_foo_bar" -> "foo-bar" */ @@ -340,7 +341,7 @@ internal_event_assignment (Stream_event **old_ev, Stream_event *new_ev, const ch } ADD_TRANSLATOR (Translator, - "Base class. Unused", + "Base class. Not instantiated.", "", "", "");