* Documentation/user/lilypond.tely: Add dir entries for

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index a63c3784d5000ca9424c1339abb7e7904e5cf079..389129867042648d28140ea7b982a2b07831a9a2 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -8,7 +8,7 @@
  */
 #include <math.h>
 
-#include "debug.hh"
+#include "warn.hh"
 #include "text-item.hh"
 #include "paper-def.hh"
 #include "font-interface.hh"
@@ -17,6 +17,7 @@
 #include "main.hh"
 #include "all-font-metrics.hh"
 #include "afm.hh"
+#include "lookup.hh"
 
 
 /*
@@ -88,7 +89,7 @@ Text_item::lookup_character (Grob *, Font_metric*fm, SCM char_name)
 
 
 Molecule
-Text_item::lookup_text (Grob *me, Font_metric*fm, SCM text)
+Text_item::lookup_text (Grob *, Font_metric*fm, SCM text)
 {
   SCM list = scm_list_n (ly_symbol2scm ("text"), text, SCM_UNDEFINED);
   list = fontify_atom (fm, list);
@@ -96,6 +97,7 @@ Text_item::lookup_text (Grob *me, Font_metric*fm, SCM text)
   return Molecule (fm->text_dimension (ly_scm2string (text)), list);
 }
 
+
 /*
   TODO:
 
@@ -109,7 +111,7 @@ Molecule
 Text_item::markup_text2molecule (Grob *me, SCM markup_text,
                                 SCM alist_chain)
 {
-  SCM sheet = me->paper_l ()->style_sheet_;
+  SCM sheet = me->get_paper ()->style_sheet_;
   SCM f = ly_cdr (scm_assoc (ly_symbol2scm ("markup-to-properties"), sheet));
   
   SCM markup = ly_car (markup_text);
@@ -143,6 +145,7 @@ Text_item::markup_text2molecule (Grob *me, SCM markup_text,
   SCM r = ly_assoc_chain (ly_symbol2scm ("raise"), p);
   if (gh_pair_p (r) && gh_number_p (ly_cdr (r)))
     raise = gh_scm2double (ly_cdr (r)) * staff_space;
+  
 
   Interval extent;
   bool extent_b = false;
@@ -154,73 +157,44 @@ Text_item::markup_text2molecule (Grob *me, SCM markup_text,
       extent_b = true;
     }
 
-  Offset o (0, (axis == Y_AXIS ? - kern[axis] : 0));
+  Offset o (kern[X_AXIS], raise - kern[Y_AXIS]);
+  
+  Molecule mol = Lookup::filledbox (Box (Interval (0,0), Interval (0,0)));
 
-  Molecule mol;
+  SCM cp = ly_deep_copy (p);
+  if (raise)
+    {
+      SCM cr = ly_assoc_chain (ly_symbol2scm ("raise"), cp);
+      scm_set_cdr_x (cr, gh_int2scm (0));
+    }
+  
   while (gh_pair_p (text))
     {
-   
-      Molecule m = text2molecule (me, ly_car (text), p);
-
-      /*
-       TODO: look at padding?
-       
-       Look ahead here for kern and raise.
-
-       (cols "foo" ((raise . 1) "bar"))
-       (cols "foo" ((bold (raise . 1)) "bar"))
-
-       When constructing the molecule for bar, all normal extra
-       properties found, such as bold, are used for the construction
-       of bar's molecule.  But for kern or raise, it seems that we're
-       too late then, translating bar's molecule has no effect (or
-       maybe the effect of translating gets nullified when bar's
-       molecule is `added_to_edge' of the molecule for foo?)
-
-       So, while constructing foo's molecule, we look ahead for the
-       raise of bar.  The HEAD of the description of bar may be a
-       single property, or a list, so we must check that too.
-      */
-       
-      SCM next_p = SCM_EOL;
-      if (gh_pair_p (ly_car (text)))
-       next_p = scm_list_n (gh_call2 (f, sheet, ly_caar (text)), SCM_UNDEFINED);
-      SCM next_k = ly_assoc_chain (ly_symbol2scm ("kern"), next_p);
-      Real next_kern = kern[axis];
-      if (gh_pair_p (next_k) && gh_number_p (ly_cdr (next_k)))
-       next_kern = gh_scm2double (ly_cdr (next_k)) * staff_space;
-
-      SCM next_r = ly_assoc_chain (ly_symbol2scm ("raise"), next_p);
-      Real next_raise = 0;
-      if (gh_pair_p (next_r) && gh_number_p (ly_cdr (next_r)))
-       next_raise = gh_scm2double (ly_cdr (next_r)) * staff_space;
-
-      o[Y_AXIS] = next_raise;
+      Molecule m = text2molecule (me, ly_car (text), cp);
 
       if (!m.empty_b ())
        {
-         m.translate (o);
-         if (mol.empty_b ())
-           mol = m;
-         else
-           {
-             if (axis == Y_AXIS && baseline_skip)
-               next_kern += baseline_skip - m.extent (Y_AXIS)[UP];
-             mol.add_at_edge (axis, axis == X_AXIS ? RIGHT : DOWN, m, next_kern);
-           }
+         m.translate_axis (mol.extent (axis)[axis == X_AXIS ? RIGHT : DOWN]
+                           - (axis == Y_AXIS ? baseline_skip : 0),
+                           axis);
+         mol.add_molecule (m);
        }
       text = ly_cdr (text);
     }
   
+  
+  /* Set extend to markup requested value. */
   if (extent_b)
     {
-      /* we're not setting extents for unknown reasons. */
       Box b = mol.extent_box ();
       SCM expr = mol.get_expr ();
 
       b[axis] = extent;
       mol = Molecule (b, expr);
-    }  
+    }
+  
+  mol.translate (o);
+  
   return mol;
 }