* flower/file-path.cc (find): try to open directly as well, so we

[lilypond.git] / lily / text-item.cc

diff --git a/lily/text-item.cc b/lily/text-item.cc
index f0ec373d60be8dfd026398351edd473723789137..7203d7b8e049d0b0b4a5eb286e57ce652a14250b 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -7,70 +7,66 @@
                  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "text-item.hh"
+
 #include <math.h>
 
+#include "main.hh" 
+#include "config.hh"
+#include "pango-font.hh"
 #include "warn.hh"
 #include "grob.hh"
-#include "text-item.hh"
 #include "font-interface.hh"
-#include "virtual-font-metric.hh"
 #include "output-def.hh"
 #include "modified-font-metric.hh"
 #include "ly-module.hh"
 
+
 MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 4)
 SCM
-Text_interface::interpret_string (SCM paper_smob,
-                            SCM props, SCM input_encoding, SCM markup)
+Text_interface::interpret_string (SCM layout_smob,
+                                 SCM props, SCM input_encoding, SCM markup)
 {
-  Output_def *paper = unsmob_output_def (paper_smob);
+  Output_def *layout = unsmob_output_def (layout_smob);
   
-  SCM_ASSERT_TYPE (paper, paper_smob, SCM_ARG1,
-                  __FUNCTION__, "Paper definition");
+  SCM_ASSERT_TYPE (layout, layout_smob, SCM_ARG1,
+                  __FUNCTION__, "Layout definition");
   SCM_ASSERT_TYPE (scm_is_string (markup), markup, SCM_ARG3,
                   __FUNCTION__, "string");
+
+  String str = ly_scm2string (markup);
+
+#if HAVE_PANGO_FT2
+  if (output_format_global != "tex")
+    {
+      Font_metric *fm = select_pango_font (layout, props);
+      return fm->text_stencil (str).smobbed_copy ();
+    }
+#endif
+  
   SCM_ASSERT_TYPE (input_encoding == SCM_EOL || scm_is_symbol (input_encoding),
                   input_encoding, SCM_ARG2, __FUNCTION__, "symbol");
-  
-  String str = ly_scm2string (markup);
+
   if (!scm_is_symbol (input_encoding))
     {
-      SCM enc = paper->lookup_variable (ly_symbol2scm ("inputencoding"));
+      SCM enc = layout->lookup_variable (ly_symbol2scm ("inputencoding"));
       if (scm_is_string (enc))
        input_encoding = scm_string_to_symbol (enc);
       else if (scm_is_symbol (enc))
        input_encoding = enc;
     }
   
-  Font_metric *fm = select_encoded_font (paper, props, input_encoding);
+  Font_metric *fm = select_encoded_font (layout, props, input_encoding);
 
-  SCM lst = SCM_EOL;      
-  Box b;
-  if (Modified_font_metric* mf = dynamic_cast<Modified_font_metric*> (fm))
-    {
-      lst = scm_list_3 (ly_symbol2scm ("text"),
-                       mf->self_scm (),
-                       markup);
-       
-      b = mf->text_dimension (str);
-    }
-  else
-    {
-      /* ARGH. */
-      programming_error ("Must have Modified_font_metric for text.");
-      scm_display (fm->description_, scm_current_error_port ());
-    }
-      
-  return Stencil (b, lst).smobbed_copy ();
+  return fm->text_stencil (str).smobbed_copy();
 }
 
-
 MAKE_SCHEME_CALLBACK (Text_interface, interpret_markup, 3)
 SCM
-Text_interface::interpret_markup (SCM paper_smob, SCM props, SCM markup)
+Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup)
 {
   if (scm_is_string (markup))
-    return interpret_string (paper_smob, props, SCM_EOL, markup);
+    return interpret_string (layout_smob, props, SCM_EOL, markup);
   else if (scm_is_pair (markup))
     {
       SCM func = scm_car (markup);
@@ -78,9 +74,20 @@ Text_interface::interpret_markup (SCM paper_smob, SCM props, SCM markup)
       if (!markup_p (markup))
        programming_error ("Markup head has no markup signature.");
       
-      return scm_apply_2 (func, paper_smob, props, args);
+      return scm_apply_2 (func, layout_smob, props, args);
+    }
+  else
+    {
+      programming_error ("Is not a markup: ");
+      scm_display (markup, scm_current_error_port());
+      assert (false);
+      Box b;
+      b[X_AXIS].set_empty();
+      b[Y_AXIS].set_empty();
+      
+      Stencil s(b, SCM_EOL);
+      return s.smobbed_copy();
     }
-  return SCM_EOL;
 }
 
 MAKE_SCHEME_CALLBACK (Text_interface,print,1);
@@ -91,7 +98,7 @@ 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_paper ()->self_scm (), chain, t);
+  return interpret_markup (me->get_layout ()->self_scm (), chain, t);
 }
 
 /* Ugh. Duplicated from Scheme.  */