summaryrefslogtreecommitdiff
path: root/lily/separation-item.cc
diff options
context:
space:
mode:
authorJoe Neeman <joeneeman@gmail.com>2007-06-29 15:56:37 +0300
committerJoe Neeman <joeneeman@gmail.com>2007-06-29 15:56:37 +0300
commit62f3c5d4ddb492bc771f2d25b971cd3c9f38676d (patch)
treec1a1fda466458a0514967e6a71ab697cb33e4ab4 /lily/separation-item.cc
parentc373de38a49dea998a0733658a48a0e62912fa11 (diff)
use PaperColumns instead of SeparationItems
Diffstat (limited to 'lily/separation-item.cc')
-rw-r--r--lily/separation-item.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 8704a55b45..a692fc0b9b 100644
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -8,6 +8,7 @@
#include "separation-item.hh"
+#include "axis-group-interface.hh"
#include "lookup.hh"
#include "stencil.hh"
#include "skyline.hh"
@@ -106,20 +107,21 @@ Separation_item::boxes (Grob *me, Grob *left)
{
Item *il = dynamic_cast<Item *> (elts[i]);
if (pc != il->get_column ())
- {
- continue;
- }
+ continue;
+ if (Axis_group_interface::has_interface (il))
+ continue;
Interval y (il->pure_height (ycommon, 0, very_large));
Interval x (il->extent (pc, X_AXIS));
Interval extra = robust_scm2interval (elts[i]->get_property ("extra-spacing-width"),
- Interval (0, 0));
+ Interval (-0.1, 0.1));
x[LEFT] += extra[LEFT];
x[RIGHT] += extra[RIGHT];
if (to_boolean (elts[i]->get_property ("infinite-spacing-height")))
y = Interval (-infinity_f, infinity_f);
+ if (!x.is_empty () && !y.is_empty ())
out.push_back (Box (x, y));
}