/*
- 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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
+
+ 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 <http://www.gnu.org/licenses/>.
*/
#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)
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;
}
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,
"@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 (ly:layout-lookup layout 'text-font-defaults))}."
+" @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)
ADD_INTERFACE (Text_interface,
"A Scheme markup text, see @ruser{Formatting text} and"
- " @ruser{New markup command definition}.\n"
+ " @rextend{New markup command definition}.\n"
"\n"
"There are two important commands:"
" @code{ly:text-interface::print}, which is a"