release: 0.1.22

[lilypond.git] / lily / atom.cc

diff --git a/lily/atom.cc b/lily/atom.cc
index ac3c246a03e8724e950ac918b32564a09cb64224..870c6bece91c6b8fdc9da8884c84366b7dc40083 100644 (file)
--- a/lily/atom.cc
+++ b/lily/atom.cc
@@ -5,7 +5,7 @@
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
-#include "symbol.hh"
+#include "atom.hh"
 #include "tex.hh"
 #include "interval.hh"
 #include "dimen.hh"
@@ -17,36 +17,79 @@ void
 Atom::print() const
 {
 #ifndef NPRINT
-    DOUT << "texstring: " <<sym_.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();
+
+  DOUT << "\noffset: " << off_.str ();
 #endif
 }
 
 Box
 Atom::extent() const
 {
-    Box b (sym_.dim);
-    b.translate (off_);
-    return b;
+  Box b (dim_);
+  b.translate (off_);
+  return b;
+}
+
+
+Atom::Atom()
+  : dim_ (Interval (0,0),Interval (0,0))
+{
+  tex_ = "\\unknown";
 }
 
-Atom::Atom (Symbol s)
+Atom::Atom (String s, Box b)
+  :  dim_ (b)
 {
-    sym_=s;
+  tex_ = s;
 }
 
 
+String
+Atom::str() const 
+{
+  return "Atom (\'"+tex_+"\', (" + dim_.x().str () + ", " 
+    + dim_.y ().str () + "))";
+}
+
 String
 Atom::TeX_string() const
 {
-    /* infinity checks. */
-    assert (abs (off_.x()) < 100 CM);
-    assert (abs (off_.y()) < 100 CM);
-    
-    // whugh.. Hard coded...
-    String s ("\\placebox{%}{%}{%}");
-    Array<String> a;
-    a.push (print_dimen (off_.y()));
-    a.push (print_dimen (off_.x()));
-    a.push (sym_.tex);
-    return substitute_args (s, a);
+  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;
+}
+
+void
+Atom::translate_axis (Real r, Axis a)
+{
+  off_[a] += r; 
+}
+
+void
+Atom::translate (Offset o)
+{
+  off_ += o;
 }