release: 1.1.0

[lilypond.git] / lily / atom.cc

diff --git a/lily/atom.cc b/lily/atom.cc
index ff2e75626aa6c0e45d4137d238d94ef55509d8d3..2d8f11e78e724b9f78d9ef3b053965d9b3a538db 100644 (file)
--- a/lily/atom.cc
+++ b/lily/atom.cc
@@ -8,12 +8,12 @@
 
 
 #include "atom.hh"
-#include "tex.hh"
 #include "interval.hh"
-#include "dimension.hh"
 #include "string.hh"
 #include "array.hh"
 #include "debug.hh"
+#include "dimensions.hh"
+#include "lookup.hh"
 #include "main.hh"
 
 inline bool
@@ -76,12 +76,14 @@ Atom::Atom ()
     But Atom is used as a simple type *everywhere*,
     and we don't have virtual contructors.
    */
-  str_ = ps_output_global_b ? "unknown" : "\\unknown";
+  lambda_ = 0;
+  str_ = "unknown\n";
 }
 
 Atom::Atom (String s, Box b)
   :  dim_ (b)
 {
+  lambda_ = 0;
   str_ = s;
 }
 
@@ -114,3 +116,9 @@ Atom::translate (Offset o)
   off_ += o;
   check_infinity_b ();
 }
+
+bool
+Atom::empty() const
+{
+  return (dim_.y().length() == 0);
+}