release: 1.0.1

[lilypond.git] / lily / atom.cc

diff --git a/lily/atom.cc b/lily/atom.cc
index 870c6bece91c6b8fdc9da8884c84366b7dc40083..48b5c737202b1b126d42d32321c13942750ebe57 100644 (file)
--- a/lily/atom.cc
+++ b/lily/atom.cc
@@ -3,25 +3,55 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+
+
 #include "atom.hh"
 #include "tex.hh"
 #include "interval.hh"
-#include "dimen.hh"
+#include "dimension.hh"
 #include "string.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "debug.hh"
+#include "main.hh"
+
+inline bool
+Atom::check_infinity_b ()const
+{
+  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),
+                  print_dimen(off_[ax])));
+         
+         if (experimental_features_global_b)
+           assert (false);
+
+         ((Atom*)this)->off_[ax] = 0.0;
+         ridiculous = true;
+       }
+    }
+#endif
+  return ridiculous;
+}
+
 
 void
 Atom::print() const
 {
 #ifndef NPRINT
-  DOUT << "texstring: " <<tex_<<"\n";    
-  
+  DOUT << "texstring: " << tex_ << '\n';
+
   DOUT << "dim:";
-    for (Axis i=X_AXIS; i < NO_AXES; incr(i))
-      DOUT << axis_name_str(i) << " = " << dim_[i].str();
+  for (Axis i=X_AXIS; i < NO_AXES; incr(i))
+    DOUT << axis_name_str(i) << " = " << dim_[i].str();
 
   DOUT << "\noffset: " << off_.str ();
 #endif
@@ -50,46 +80,30 @@ Atom::Atom (String s, Box b)
 
 
 String
-Atom::str() const 
+Atom::str() const
 {
-  return "Atom (\'"+tex_+"\', (" + dim_.x().str () + ", " 
+  return String ("Atom (\'") + tex_ + "\', (" + dim_.x().str () + ", "
     + dim_.y ().str () + "))";
 }
 
-String
-Atom::TeX_string() const
+Offset
+Atom::offset () const
 {
-  String tex_str = tex_;
-  Offset off = off_;
-
-  /* infinity checks. */
-  for (int a = X_AXIS; a < NO_AXES; a++)
-    {
-      Axis ax = (Axis)a;
-      if (abs (off[ax]) >= 100 CM)
-       {
-         warning ("ridiculous dimension " + axis_name_str (ax)  + ", " 
-                  +print_dimen(off[ax]));
-         off[ax] = 0.0;
-         tex_str += "\errormark"; 
-       }
-    }
-  // whugh.. Hard coded...
-  String s ("\\placebox{");
-  s += print_dimen (off[Y_AXIS])+"}{";
-  s += print_dimen (off[X_AXIS]) + "}{";
-  s += tex_str + "}";
-  return s;
+  return off_;
 }
 
+
+
 void
 Atom::translate_axis (Real r, Axis a)
 {
-  off_[a] += r; 
+  off_[a] += r;
+  check_infinity_b ();
 }
 
 void
 Atom::translate (Offset o)
 {
   off_ += o;
+  check_infinity_b ();
 }