X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-interface.cc;h=7bb4ceadc07c53ded50199d088572280975b1308;hb=b0c79ceb092e54f20a2d745144db266b2fa3c828;hp=12e2e36e3e169c1a728ef3edc37cac7290ce13b0;hpb=37ca1f80bf5401accd17056938f4f7b2c147ddb2;p=lilypond.git diff --git a/lily/text-interface.cc b/lily/text-interface.cc index 12e2e36e3e..7bb4ceadc0 100644 --- a/lily/text-interface.cc +++ b/lily/text-interface.cc @@ -1,23 +1,34 @@ /* - text-interface.cc -- implement Text_interface + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1998--2007 Han-Wen Nienhuys + Copyright (C) 1998--2011 Han-Wen Nienhuys Jan Nieuwenhuizen + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "text-interface.hh" - -#include "main.hh" #include "config.hh" -#include "pango-font.hh" -#include "warn.hh" -#include "grob.hh" #include "font-interface.hh" -#include "output-def.hh" +#include "grob.hh" +#include "main.hh" +#include "misc.hh" #include "modified-font-metric.hh" +#include "output-def.hh" +#include "pango-font.hh" +#include "warn.hh" static void replace_whitespace (string *str) @@ -27,24 +38,13 @@ replace_whitespace (string *str) while (i < n) { - vsize char_len = 1; char cur = (*str)[i]; - - // U+10000 - U+10FFFF - if ((cur & 0x11110000) == 0x11110000) - char_len = 4; - // U+0800 - U+FFFF - else if ((cur & 0x11100000) == 0x11100000) - char_len = 3; - // U+0080 - U+07FF - else if ((cur & 0x11000000) == 0x11000000) - char_len = 2; - else if (cur & 0x10000000) - programming_error ("invalid utf-8 string"); - else - // avoid the locale-dependent isspace - if (cur == '\n' || cur == '\t' || cur == '\v') - (*str)[i] = ' '; + + // avoid the locale-dependent isspace + if (cur == '\n' || cur == '\t' || cur == '\v') + (*str)[i] = ' '; + + vsize char_len = utf8_char_len (cur); i += char_len; } @@ -53,8 +53,8 @@ replace_whitespace (string *str) MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 3); SCM Text_interface::interpret_string (SCM layout_smob, - SCM props, - SCM markup) + SCM props, + SCM markup) { LY_ASSERT_SMOB (Output_def, layout_smob, 1); LY_ASSERT_TYPE (scm_is_string, markup, 3); @@ -64,18 +64,30 @@ Text_interface::interpret_string (SCM layout_smob, Font_metric *fm = select_encoded_font (layout, props); replace_whitespace (&str); - return fm->word_stencil (str).smobbed_copy (); + + /* + We want to filter strings with a music font that pass through + the text interface. Here the font encoding is checked to see + if it matches one of the music font encodings. --pmccarty + */ + SCM encoding = ly_chain_assoc_get (ly_symbol2scm ("font-encoding"), + props, + SCM_BOOL_F); + SCM music_encodings = ly_lily_module_constant ("all-music-font-encodings"); + + 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, - "Convert a text markup into a stencil." -" Takes three arguments, @var{layout}, @var{props}, and @var{markup}.\n" -"\n" -"@var{layout} is a @code{\\layout} block; it may be obtained from a grob with" -" @code{ly:grob-layout}. @var{props} is a alist chain, ie. a list of alists." -" This is typically obtained with" -" @code{(ly:grob-alist-chain (ly:layout-lookup layout 'text-font-defaults))}." -" @var{markup} is the markup text to be processed."); + "Convert a text markup into a stencil." + " Takes three arguments, @var{layout}, @var{props}, and @var{markup}.\n" + "\n" + "@var{layout} is a @code{\\layout} block; it may be obtained from a grob with" + " @code{ly:grob-layout}. @var{props} is an alist chain, i.e. a list of" + " alists. This is typically obtained with" + " @code{(ly:grob-alist-chain grob (ly:output-def-lookup layout 'text-font-defaults))}." + " @var{markup} is the markup text to be processed."); SCM Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup) { @@ -86,7 +98,7 @@ Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup) SCM func = scm_car (markup); SCM args = scm_cdr (markup); if (!is_markup (markup)) - programming_error ("markup head has no markup signature"); + programming_error ("markup head has no markup signature"); return scm_apply_2 (func, layout_smob, props, args); } @@ -122,10 +134,10 @@ bool Text_interface::is_markup (SCM x) { return (scm_is_string (x) - || (scm_is_pair (x) - && SCM_BOOL_F - != scm_object_property (scm_car (x), - ly_symbol2scm ("markup-signature")))); + || (scm_is_pair (x) + && SCM_BOOL_F + != scm_object_property (scm_car (x), + ly_symbol2scm ("markup-signature")))); } bool @@ -135,20 +147,19 @@ Text_interface::is_markup_list (SCM x) return scm_is_true (scm_call_1 (music_list_p, x)); } - ADD_INTERFACE (Text_interface, - "A Scheme markup text, see @ruser{Formatting text} and" - " @ruser{New markup command definition}.\n" - "\n" - "There are two important commands:" - " @code{ly:text-interface::print}, which is a" - " grob callback, and" - " @code{ly:text-interface::interpret-markup}.", - - /* properties */ - "baseline-skip " - "text " - "word-space " - "text-direction " - ); + "A Scheme markup text, see @ruser{Formatting text} and" + " @rextend{New markup command definition}.\n" + "\n" + "There are two important commands:" + " @code{ly:text-interface::print}, which is a" + " grob callback, and" + " @code{ly:text-interface::interpret-markup}.", + + /* properties */ + "baseline-skip " + "text " + "word-space " + "text-direction " + );