X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-interface.cc;h=abd31a2c696ad2d91a9f392d6b923d52cf30e5b8;hb=65db8f83e41fd25444cfc021797199426f76b0ea;hp=3bf81c4643e31715e6fac27e1652bc2a2ac71f4a;hpb=b38543766c067e06f65df471b30893dd4a486248;p=lilypond.git diff --git a/lily/text-interface.cc b/lily/text-interface.cc index 3bf81c4643..abd31a2c69 100644 --- a/lily/text-interface.cc +++ b/lily/text-interface.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2009 Han-Wen Nienhuys + Copyright (C) 1998--2010 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -75,10 +75,8 @@ Text_interface::interpret_string (SCM layout_smob, SCM_BOOL_F); SCM music_encodings = ly_lily_module_constant ("all-music-font-encodings"); - if (scm_memq (encoding, music_encodings) != SCM_BOOL_F) - return fm->word_stencil (str, true).smobbed_copy (); - else - return fm->word_stencil (str, false).smobbed_copy (); + bool is_music = (scm_memq (encoding, music_encodings) != SCM_BOOL_F); + return fm->text_stencil (layout, str, is_music).smobbed_copy (); } MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Text_interface, interpret_markup, 3, 0,