patch::: 1.3.96.jcn4

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index feca94f8845ef460a56e1ffec8d37189e196ef10..7d242ed48e915406151a1b177de34baad9adb353 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -3,45 +3,138 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+ (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-#include "debug.hh"
-#include "molecule.hh"
+#include "text-item.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
 #include "staff-symbol-referencer.hh"
+#include "staff-symbol-referencer.hh"
+#include "main.hh"
+#include "all-font-metrics.hh"
+#include "afm.hh"
+
+/*
+  text: string | (markup sentence)
+  markup: markup-symbol | (markup-symbol . parameter)
+  sentence: text | sentence text
+  
+
+  Properties:
+
+  * Font:
+  ---* Type:
+  ------* Series: medium, bold
+  ------* Shape: upright, italic, slanted
+  ------* Family: roman, music, orator, typewriter
+
+  ---* Size:
+  ------* size: ...,-2,-1,0,1,2,... (style-sheet -> cmrXX, fetaXX)
+  ------* points: 11,13,16,20,23,26 (for feta)
+  ------* magnification: UNSIGNED
 
-struct Text_item
+  * Typesetting:
+  ---* kern: INT (staff-space)
+  ---* align: horizontal/vertical / lines / rows
+ */
+Molecule
+Text_item::text2molecule (Score_element *me, SCM text, SCM properties) 
 {
-  DECLARE_SCHEME_CALLBACK( brew_molecule, (SCM));
-};
+  if (gh_string_p (text))
+    return string2molecule (me, text, properties);
+  else if (gh_list_p (text))
+    {
+      if (!gh_pair_p (gh_car (text)) && gh_string_p (gh_car (text)))
+       return string2molecule (me, gh_car (text), properties);
+      else
+       return markup_sentence2molecule (me, text, properties);
+    }
+  return Molecule ();
+}
 
+Molecule
+Text_item::string2molecule (Score_element *me, SCM text, SCM properties)
+{
+  SCM f = me->get_elt_property ("get-font-name");
+  SCM style = me->get_elt_property ("style-sheet");
+  SCM font_name = gh_call2 (f, style, properties);
+  String font_str = "roman";
+  if (gh_string_p (font_name))
+    font_str = ly_scm2string (font_name);
+    
+  SCM magnification = me->get_elt_property ("font-magnification");
 
-MAKE_SCHEME_CALLBACK(Text_item,brew_molecule,1);
+  Font_metric* metric_l = 0;
+  if (gh_number_p (magnification))
+    metric_l = all_fonts_global_p->find_scaled (font_str,
+                                               gh_scm2int (magnification));
+  else
+    metric_l = all_fonts_global_p->find_font (font_str);
 
-SCM 
-Text_item::brew_molecule (SCM sm) 
+  SCM list = gh_list (ly_symbol2scm ("text"), text, SCM_UNDEFINED);
+  list = fontify_atom (metric_l, list);
+
+  return Molecule (metric_l->text_dimension (ly_scm2string (text)), list);
+}
+
+Molecule
+Text_item::markup_sentence2molecule (Score_element *me, SCM markup_sentence,
+                                    SCM properties)
 {
-  Score_element * s = unsmob_element (sm);
+  SCM markup = gh_car (markup_sentence);
+  SCM sentence = gh_cdr (markup_sentence);
+  SCM f = me->get_elt_property ("markup-to-properties");
   
-  SCM style = s->get_elt_property ("style");
-  String st = gh_string_p (style) ?  ly_scm2string (style) : "";
-  SCM txt = s-> get_elt_property ("text");
-  String t = gh_string_p (txt) ? ly_scm2string (txt) : "";
+  SCM p = gh_cons (gh_call1 (f, markup), properties);
 
-  Molecule mol =  s->paper_l ()->lookup_l(0)->text (st, t, s->paper_l ());
+  Axis align = X_AXIS;
+  SCM a = scm_assoc (ly_symbol2scm ("align"), p);
+  if (gh_pair_p (a) && gh_number_p (gh_cdr (a)))
+    align = (Axis)gh_scm2int (gh_cdr (a));
 
-  SCM space =  s->get_elt_property ("word-space");
+  Molecule mol;
+  while (gh_pair_p (sentence))
+    {
+      Molecule m = text2molecule (me, gh_car (sentence), p);
+      if (!m.empty_b ())
+       mol.add_at_edge (align, align == X_AXIS ? RIGHT : DOWN, m, 0);
+      sentence = gh_cdr (sentence);
+    }
+  return mol;
+}
+
+MAKE_SCHEME_CALLBACK (Text_item, brew_molecule, 1);
+SCM 
+Text_item::brew_molecule (SCM smob) 
+{
+  Score_element *me = unsmob_element (smob);
+  
+  SCM text = me->get_elt_property ("scm-text");
+  Molecule mol;
+  if (text == SCM_EOL)
+    {
+      SCM style = me->get_elt_property ("style");
+      String st = gh_string_p (style) ?  ly_scm2string (style) : "";
+      SCM text = me->get_elt_property ("text");
+      String t = gh_string_p (text) ? ly_scm2string (text) : "";
+      
+      mol = me->paper_l ()->lookup_l (0)->text (st, t, me->paper_l ());
+    }
+  else
+    mol = text2molecule (me, text,
+                        gh_append2 (me->immutable_property_alist_,
+                                    me->mutable_property_alist_));
+
+  SCM space = me->get_elt_property ("word-space");
   if (gh_number_p (space))
     {
       Molecule m;
       m.set_empty (false);
-      mol.add_at_edge (X_AXIS, RIGHT, m, gh_scm2double (space)*
-                      Staff_symbol_referencer::staff_space (s));
+      mol.add_at_edge (X_AXIS, RIGHT, m, gh_scm2double (space)
+                      * Staff_symbol_referencer::staff_space (me));
     }
   return mol.create_scheme (); 
 }
 
-