release: 0.1.13

[lilypond.git] / lily / atom.cc

diff --git a/lily/atom.cc b/lily/atom.cc
index fbb6e973f830de43557dba8ec5524399082a4c94..00660aac555a6751a9918ae6299a23c231794a73 100644 (file)
--- a/lily/atom.cc
+++ b/lily/atom.cc
@@ -38,15 +38,25 @@ Atom::Atom (Symbol s)
 String
 Atom::TeX_string() const
 {
+  String tex_str = sym_.tex;
+  Offset off = off_;
+
   /* infinity checks. */
-  assert (abs (off_.x()) < 100 CM);
-  assert (abs (off_.y()) < 100 CM);
-  
+  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{%}{%}{%}");
-  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 s ("\\placebox{");
+  s += print_dimen (off[Y_AXIS])+"}{";
+  s += print_dimen (off[X_AXIS]) + "}{";
+  s += tex_str + "}";
+  return s;
 }