release: 1.3.19

[lilypond.git] / lily / atom.cc

diff --git a/lily/atom.cc b/lily/atom.cc
index 76b59197d39219634b934a0f5761588a76705558..eccf3b984351df7181b9ef13405cff5127a504e7 100644 (file)
--- a/lily/atom.cc
+++ b/lily/atom.cc
@@ -3,10 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #include "atom.hh"
 #include "interval.hh"
 #include "string.hh"
@@ -15,108 +14,25 @@
 #include "dimensions.hh"
 #include "lookup.hh"
 #include "main.hh"
+#include "global-ctor.hh"
+#include "font-metric.hh"
 
-inline bool
-Atom::check_infinity_b ()const
+Atom::Atom(SCM s)
 {
-  bool ridiculous = false;
-#ifndef NDEBUG
-  
-  /* infinity checks. */
-  for (int a = X_AXIS; a < NO_AXES; a++)
-    {
-      Axis ax = (Axis)a;
-      if (abs (off_[ax]) >= 100 CM)
-       {
-         warning (_f ("ridiculous dimension: %s, %s", axis_name_str (ax),
-                  global_lookup_l->print_dimen (off_[ax])));
-         
-         if (experimental_features_global_b)
-           assert (false);
-
-         ( (Atom*)this)->off_[ax] = 0.0;
-         ridiculous = true;
-       }
-    }
-#endif
-  return ridiculous;
+  func_ = s;
 }
 
-
 void
-Atom::print () const
+Atom::fontify (Font_metric * met)
 {
-#ifndef NPRINT
-  DOUT << "string: " << str_ << '\n';
-
-  DOUT << "dim:";
-  for (Axis i=X_AXIS; i < NO_AXES; incr (i))
-    DOUT << axis_name_str (i) << " = " << dim_[i].str ();
-
-  DOUT << "\noffset: " << off_.str ();
-#endif
-}
-
-Box
-Atom::extent () const
-{
-  Box b (dim_);
-  b.translate (off_);
-  return b;
-}
+  SCM desc = ly_quote_scm (met->description ());
+  SCM font_switch = gh_list (ly_symbol2scm ("select-font"),
+                            desc,
+                            SCM_UNDEFINED);
 
+  SCM f =func_;
+  func_ = gh_list (ly_symbol2scm ("string-append"),
+                  font_switch , f,
+                  SCM_UNDEFINED);
 
-Atom::Atom ()
-  : dim_ (Interval (0,0),Interval (0,0))
-{
-  /*
-    urg
-    We should probably make Atom an abstract base class to
-    derive Ps_atom and Tex_atom from.
-    But Atom is used as a simple type *everywhere*,
-    and we don't have virtual contructors.
-   */
-  str_ = global_lookup_l->unknown_str ();
-}
-
-Atom::Atom (String s, Box b)
-  :  dim_ (b)
-{
-  str_ = s;
-}
-
-
-String
-Atom::str () const
-{
-  return String ("Atom (\'") + str_ + "\', (" + dim_.x ().str () + ", "
-    + dim_.y ().str () + "))";
-}
-
-Offset
-Atom::offset () const
-{
-  return off_;
-}
-
-
-
-void
-Atom::translate_axis (Real r, Axis a)
-{
-  off_[a] += r;
-  check_infinity_b ();
-}
-
-void
-Atom::translate (Offset o)
-{
-  off_ += o;
-  check_infinity_b ();
-}
-
-bool
-Atom::empty() const
-{
-  return (dim_.y().length() == 0);
 }