X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-interface.cc;h=3bf81c4643e31715e6fac27e1652bc2a2ac71f4a;hb=24bdff1e3d1639f8e6ebfc9611f38ea2c13be262;hp=5524d5a0b1259c3fcda61ab166d075faa177c76b;hpb=ed32442d90825777d09672a871940674b308a2da;p=lilypond.git diff --git a/lily/text-interface.cc b/lily/text-interface.cc index 5524d5a0b1..3bf81c4643 100644 --- a/lily/text-interface.cc +++ b/lily/text-interface.cc @@ -1,24 +1,54 @@ /* - text-item.cc -- implement Text_interface + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1998--2005 Han-Wen Nienhuys + Copyright (C) 1998--2009 Han-Wen Nienhuys Jan Nieuwenhuizen -*/ -#include "text-item.hh" + 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. -#include + 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) +{ + vsize i = 0; + vsize n = str->size (); + + while (i < n) + { + char cur = (*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; + } +} MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 3); SCM @@ -26,20 +56,40 @@ Text_interface::interpret_string (SCM layout_smob, SCM props, SCM markup) { + LY_ASSERT_SMOB (Output_def, layout_smob, 1); + LY_ASSERT_TYPE (scm_is_string, markup, 3); + + string str = ly_scm2string (markup); Output_def *layout = unsmob_output_def (layout_smob); + Font_metric *fm = select_encoded_font (layout, props); - SCM_ASSERT_TYPE (layout, layout_smob, SCM_ARG1, - __FUNCTION__, "Layout definition"); - SCM_ASSERT_TYPE (scm_is_string (markup), markup, SCM_ARG3, - __FUNCTION__, "string"); + replace_whitespace (&str); - String str = ly_scm2string (markup); + /* + 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"); - Font_metric *fm = select_encoded_font (layout, props); - return fm->text_stencil (str).smobbed_copy (); + 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 (); } -MAKE_SCHEME_CALLBACK (Text_interface, interpret_markup, 3); +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 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) { @@ -49,16 +99,18 @@ Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup) { SCM func = scm_car (markup); SCM args = scm_cdr (markup); - if (!markup_p (markup)) - programming_error ("Markup head has no markup signature."); + if (!is_markup (markup)) + programming_error ("markup head has no markup signature"); return scm_apply_2 (func, layout_smob, props, args); } else { - programming_error ("Is not a markup: "); + programming_error ("Object is not a markup. "); + scm_puts ("This object should be a markup: ", scm_current_error_port ()); scm_display (markup, scm_current_error_port ()); - assert (false); + scm_puts ("\n", scm_current_error_port ()); + Box b; b[X_AXIS].set_empty (); b[Y_AXIS].set_empty (); @@ -76,12 +128,12 @@ Text_interface::print (SCM grob) SCM t = me->get_property ("text"); SCM chain = Font_interface::text_font_alist_chain (me); - return interpret_markup (me->get_layout ()->self_scm (), chain, t); + return interpret_markup (me->layout ()->self_scm (), chain, t); } /* Ugh. Duplicated from Scheme. */ bool -Text_interface::markup_p (SCM x) +Text_interface::is_markup (SCM x) { return (scm_is_string (x) || (scm_is_pair (x) @@ -90,7 +142,27 @@ Text_interface::markup_p (SCM x) ly_symbol2scm ("markup-signature")))); } -ADD_INTERFACE (Text_interface, "text-interface", - "A scheme markup text, see @usermanref{Text markup}.", - "text baseline-skip word-space"); +bool +Text_interface::is_markup_list (SCM x) +{ + SCM music_list_p = ly_lily_module_constant ("markup-list?"); + return scm_is_true (scm_call_1 (music_list_p, x)); +} + + +ADD_INTERFACE (Text_interface, + "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 " + );