Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

Implement CIR-F4 bounded box-minus-cylinder rematerialization checkpoint

Yuechen Licd2c20f365d6
diff --git a/Aetheris.Kernel.Firmament.Tests/CirBrepMaterializerTests.cs b/Aetheris.Kernel.Firmament.Tests/CirBrepMaterializerTests.cs
new file mode 100644
index 00000000..edcb3560
--- /dev/null
+++ b/Aetheris.Kernel.Firmament.Tests/CirBrepMaterializerTests.cs
@@ -0,0 +1,61 @@
+using Aetheris.Kernel.Core.Cir;
+using Aetheris.Kernel.Core.Math;
+using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Lowering;
+
+namespace Aetheris.Kernel.Firmament.Tests;
+
+public sealed class CirBrepMaterializerTests
+{
+ [Fact]
+ public void CirMaterializer_BoxMinusCylinder_Succeeds()
+ {
+ var root = new CirSubtractNode(
+ new CirTransformNode(new CirBoxNode(20, 20, 10), Transform3D.CreateTranslation(new Vector3D(0, 0, 5))),
+ new CirTransformNode(new CirCylinderNode(3, 20), Transform3D.CreateTranslation(new Vector3D(0, 0, 5))));
+
+ var result = CirBrepMaterializer.TryMaterialize(root);
+
+ Assert.True(result.IsSuccess);
+ Assert.NotNull(result.Body);
+ Assert.Equal(CirBrepMaterializer.BoxMinusCylinderPattern, result.PatternName);
+ }
+
+ [Fact]
+ public void CirMaterializer_UnsupportedPattern_FailsClearly()
+ {
+ var root = new CirSubtractNode(new CirBoxNode(10, 10, 10), new CirSphereNode(3));
+ var result = CirBrepMaterializer.TryMaterialize(root);
+
+ Assert.False(result.IsSuccess);
+ Assert.Null(result.Body);
+ Assert.Equal("rhs-not-cylinder", result.UnsupportedReason);
+ }
+
+ [Fact]
+ public void CirOnly_BoxMinusCylinder_RematerializesToBRepActive()
+ {
+ var plan = BuildBoxMinusCylinderPlan();
+ var state = new NativeGeometryState(NativeGeometryExecutionMode.CirOnly, NativeGeometryMaterializationAuthority.PendingRematerialization, null, "hole", new NativeGeometryReplayLog([]), [], new NativeGeometryCirMirrorState(CirMirrorStatus.NotAttempted, null, []));
+
+ var remat = NativeGeometryRematerializer.TryRematerialize(plan, state);
+
+ Assert.True(remat.IsSuccess);
+ Assert.Equal(NativeGeometryExecutionMode.BRepActive, remat.Value.ExecutionMode);
+ Assert.NotNull(remat.Value.MaterializedBody);
+ Assert.Contains(remat.Value.TransitionEvents, e => e.FromMode == NativeGeometryExecutionMode.CirOnly && e.ToMode == NativeGeometryExecutionMode.BRepActive);
+ }
+
+ private static FirmamentPrimitiveLoweringPlan BuildBoxMinusCylinderPlan()
+ {
+ var primitives = new[]
+ {
+ new FirmamentLoweredPrimitive(0, "base", FirmamentLoweredPrimitiveKind.Box, new FirmamentLoweredBoxParameters(20,20,10), null)
+ };
+ var booleans = new[]
+ {
+ new FirmamentLoweredBoolean(1, "hole", FirmamentLoweredBooleanKind.Subtract, "from", "base", new FirmamentLoweredToolOp("cylinder", new Dictionary<string,string>{{"op","cylinder"},{"radius","3"},{"height","20"}}, "op cylinder radius=3 height=20"), null)
+ };
+ return new FirmamentPrimitiveLoweringPlan(primitives, booleans, []);
+ }
+}
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentStepExporterTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentStepExporterTests.cs
index 4a82ae5d..cf95c685 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentStepExporterTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentStepExporterTests.cs
@@ -1,4 +1,5 @@
using Aetheris.Kernel.Core.Step242;
+using Aetheris.Kernel.Firmament.Execution;
namespace Aetheris.Kernel.Firmament.Tests;
@@ -225,6 +226,34 @@ public sealed class FirmamentStepExporterTests
Assert.Contains("BREP_WITH_VOIDS", first.Value.StepText, StringComparison.Ordinal);
}
+
+ [Fact]
+ public void CirOnly_BoxMinusCylinder_ExportSucceedsAfterRematerialization()
+ {
+ var compiler = new FirmamentCompiler();
+ var source = FirmamentCorpusHarness.ReadFixtureText("testdata/firmament/examples/boolean_box_cylinder_hole.firmament");
+ var compiled = compiler.Compile(new FirmamentCompileRequest(new FirmamentSourceDocument(source)));
+ Assert.True(compiled.Compilation.IsSuccess);
+
+ var artifact = compiled.Compilation.Value;
+ var execution = artifact.PrimitiveExecutionResult!;
+ var cirOnlyState = execution.NativeGeometryState with
+ {
+ ExecutionMode = NativeGeometryExecutionMode.CirOnly,
+ MaterializationAuthority = NativeGeometryMaterializationAuthority.PendingRematerialization,
+ MaterializedBody = null,
+ CirIntentRootReference = "hole1"
+ };
+
+ var cirOnlyArtifact = artifact with
+ {
+ PrimitiveExecutionResult = execution with { NativeGeometryState = cirOnlyState }
+ };
+
+ var export = FirmamentStepExporter.Export(cirOnlyArtifact);
+ Assert.True(export.IsSuccess);
+ Assert.Contains("PRODUCT_DEFINITION", export.Value.StepText, StringComparison.Ordinal);
+ }
[Fact]
public void Export_CirOnlyState_Fails_Clearly_Without_Materializer()
{
diff --git a/Aetheris.Kernel.Firmament/Execution/CirBrepMaterializer.cs b/Aetheris.Kernel.Firmament/Execution/CirBrepMaterializer.cs
new file mode 100644
index 00000000..3e0c9363
--- /dev/null
+++ b/Aetheris.Kernel.Firmament/Execution/CirBrepMaterializer.cs
@@ -0,0 +1,127 @@
+using Aetheris.Kernel.Core.Brep;
+using Aetheris.Kernel.Core.Brep.Boolean;
+using Aetheris.Kernel.Core.Cir;
+using Aetheris.Kernel.Core.Math;
+using Aetheris.Kernel.Core.Results;
+
+namespace Aetheris.Kernel.Firmament.Execution;
+
+internal static class CirBrepMaterializer
+{
+ internal const string BoxMinusCylinderPattern = "subtract(box,cylinder)";
+
+ internal static CirBrepMaterializationResult TryMaterialize(CirNode root)
+ {
+ ArgumentNullException.ThrowIfNull(root);
+
+ if (root is not CirSubtractNode subtract)
+ {
+ return Unsupported("Root CIR node must be subtract.", "root-not-subtract");
+ }
+
+ if (!TryUnwrapTranslation(subtract.Left, out var boxNode, out var boxTranslation) || boxNode is not CirBoxNode box)
+ {
+ return Unsupported("Subtract lhs must be a translated/untranslated box node.", "lhs-not-box");
+ }
+
+ if (!TryUnwrapTranslation(subtract.Right, out var cylinderNode, out var cylinderTranslation) || cylinderNode is not CirCylinderNode cylinder)
+ {
+ return Unsupported("Subtract rhs must be a translated/untranslated cylinder node.", "rhs-not-cylinder");
+ }
+
+ var boxResult = BrepPrimitives.CreateBox(box.Width, box.Height, box.Depth);
+ if (!boxResult.IsSuccess)
+ {
+ return Failed("Failed to create BRep box primitive.", boxResult.Diagnostics);
+ }
+
+ var cylinderResult = BrepPrimitives.CreateCylinder(cylinder.Radius, cylinder.Height);
+ if (!cylinderResult.IsSuccess)
+ {
+ return Failed("Failed to create BRep cylinder primitive.", cylinderResult.Diagnostics);
+ }
+
+ var placedBox = TranslateBody(boxResult.Value, boxTranslation);
+ var placedCylinder = TranslateBody(cylinderResult.Value, cylinderTranslation);
+ var subtractResult = BrepBoolean.Subtract(placedBox, placedCylinder);
+ if (!subtractResult.IsSuccess)
+ {
+ return Failed("Failed to boolean subtract box/cylinder during CIR rematerialization.", subtractResult.Diagnostics);
+ }
+
+ return new CirBrepMaterializationResult(true, subtractResult.Value, BoxMinusCylinderPattern, null, [], "matched-box-minus-cylinder");
+ }
+
+ private static bool TryUnwrapTranslation(CirNode node, out CirNode unwrapped, out Vector3D translation)
+ {
+ if (node is CirTransformNode transformNode)
+ {
+ if (!TryExtractPureTranslation(transformNode.Transform, out translation))
+ {
+ unwrapped = node;
+ return false;
+ }
+
+ unwrapped = transformNode.Child;
+ return true;
+ }
+
+ translation = Vector3D.Zero;
+ unwrapped = node;
+ return true;
+ }
+
+ private static bool TryExtractPureTranslation(Transform3D transform, out Vector3D translation)
+ {
+ var origin = transform.Apply(Point3D.Origin);
+ var x = transform.Apply(new Point3D(1d, 0d, 0d));
+ var y = transform.Apply(new Point3D(0d, 1d, 0d));
+ var z = transform.Apply(new Point3D(0d, 0d, 1d));
+
+ var eps = 1e-9d;
+ var xDelta = x - origin;
+ var yDelta = y - origin;
+ var zDelta = z - origin;
+ var isIdentityBasis = NearlyEqual(xDelta, new Vector3D(1d, 0d, 0d), eps)
+ && NearlyEqual(yDelta, new Vector3D(0d, 1d, 0d), eps)
+ && NearlyEqual(zDelta, new Vector3D(0d, 0d, 1d), eps);
+
+ if (!isIdentityBasis)
+ {
+ translation = Vector3D.Zero;
+ return false;
+ }
+
+ translation = origin - Point3D.Origin;
+ return true;
+ }
+
+ private static bool NearlyEqual(Vector3D left, Vector3D right, double eps)
+ => double.Abs(left.X - right.X) <= eps
+ && double.Abs(left.Y - right.Y) <= eps
+ && double.Abs(left.Z - right.Z) <= eps;
+
+ private static BrepBody TranslateBody(BrepBody body, Vector3D translation)
+ {
+ if (translation == Vector3D.Zero)
+ {
+ return body;
+ }
+
+ return FirmamentPrimitiveExecutionTranslation.TranslateBody(body, translation);
+ }
+
+ private static CirBrepMaterializationResult Unsupported(string diagnostic, string reason)
+ => new(false, null, BoxMinusCylinderPattern, reason, [], diagnostic);
+
+ private static CirBrepMaterializationResult Failed(string diagnostic, IReadOnlyList<Core.Diagnostics.KernelDiagnostic> diagnostics)
+ => new(false, null, BoxMinusCylinderPattern, "materialize-failed", diagnostics, diagnostic);
+}
+
+internal sealed record CirBrepMaterializationResult(
+ bool IsSuccess,
+ BrepBody? Body,
+ string PatternName,
+ string? UnsupportedReason,
+ IReadOnlyList<Core.Diagnostics.KernelDiagnostic> Diagnostics,
+ string Message);
diff --git a/Aetheris.Kernel.Firmament/Execution/FirmamentPrimitiveExecutionTranslation.cs b/Aetheris.Kernel.Firmament/Execution/FirmamentPrimitiveExecutionTranslation.cs
new file mode 100644
index 00000000..f7fb57fc
--- /dev/null
+++ b/Aetheris.Kernel.Firmament/Execution/FirmamentPrimitiveExecutionTranslation.cs
@@ -0,0 +1,51 @@
+using Aetheris.Kernel.Core.Brep;
+using Aetheris.Kernel.Core.Geometry;
+using Aetheris.Kernel.Core.Geometry.Curves;
+using Aetheris.Kernel.Core.Geometry.Surfaces;
+using Aetheris.Kernel.Core.Math;
+using Aetheris.Kernel.Core.Topology;
+
+namespace Aetheris.Kernel.Firmament.Execution;
+
+internal static class FirmamentPrimitiveExecutionTranslation
+{
+ internal static BrepBody TranslateBody(BrepBody body, Vector3D translation)
+ {
+ if (translation == Vector3D.Zero) return body;
+
+ var translatedGeometry = new BrepGeometryStore();
+ foreach (var curveEntry in body.Geometry.Curves)
+ {
+ translatedGeometry.AddCurve(curveEntry.Key, curveEntry.Value.Kind switch
+ {
+ CurveGeometryKind.Line3 => CurveGeometry.FromLine(new Line3Curve(curveEntry.Value.Line3!.Value.Origin + translation, curveEntry.Value.Line3.Value.Direction)),
+ CurveGeometryKind.Circle3 => CurveGeometry.FromCircle(new Circle3Curve(curveEntry.Value.Circle3!.Value.Center + translation, curveEntry.Value.Circle3.Value.Normal, curveEntry.Value.Circle3.Value.Radius, curveEntry.Value.Circle3.Value.XAxis)),
+ _ => curveEntry.Value
+ });
+ }
+
+ foreach (var surfaceEntry in body.Geometry.Surfaces)
+ {
+ translatedGeometry.AddSurface(surfaceEntry.Key, surfaceEntry.Value.Kind switch
+ {
+ SurfaceGeometryKind.Plane => SurfaceGeometry.FromPlane(new PlaneSurface(surfaceEntry.Value.Plane!.Value.Origin + translation, surfaceEntry.Value.Plane.Value.Normal, surfaceEntry.Value.Plane.Value.UAxis)),
+ SurfaceGeometryKind.Cylinder => SurfaceGeometry.FromCylinder(new CylinderSurface(surfaceEntry.Value.Cylinder!.Value.Origin + translation, surfaceEntry.Value.Cylinder.Value.Axis, surfaceEntry.Value.Cylinder.Value.Radius, surfaceEntry.Value.Cylinder.Value.XAxis)),
+ SurfaceGeometryKind.Cone => SurfaceGeometry.FromCone(new ConeSurface(surfaceEntry.Value.Cone!.Value.PlacementOrigin + translation, surfaceEntry.Value.Cone.Value.Axis, surfaceEntry.Value.Cone.Value.PlacementRadius, surfaceEntry.Value.Cone.Value.SemiAngleRadians, surfaceEntry.Value.Cone.Value.ReferenceAxis)),
+ SurfaceGeometryKind.Torus => SurfaceGeometry.FromTorus(new TorusSurface(surfaceEntry.Value.Torus!.Value.Center + translation, surfaceEntry.Value.Torus.Value.Axis, surfaceEntry.Value.Torus.Value.MajorRadius, surfaceEntry.Value.Torus.Value.MinorRadius, surfaceEntry.Value.Torus.Value.XAxis)),
+ SurfaceGeometryKind.Sphere => SurfaceGeometry.FromSphere(new SphereSurface(surfaceEntry.Value.Sphere!.Value.Center + translation, surfaceEntry.Value.Sphere.Value.Axis, surfaceEntry.Value.Sphere.Value.Radius, surfaceEntry.Value.Sphere.Value.XAxis)),
+ _ => surfaceEntry.Value
+ });
+ }
+
+ var vertexPoints = new Dictionary<VertexId, Point3D>();
+ foreach (var vertex in body.Topology.Vertices)
+ {
+ if (FirmamentPlacementResolver.TryGetVertexPoint(body, vertex.Id, out var point))
+ {
+ vertexPoints[vertex.Id] = point + translation;
+ }
+ }
+
+ return new BrepBody(body.Topology, translatedGeometry, body.Bindings, vertexPoints, body.SafeBooleanComposition?.Translate(translation));
+ }
+}
diff --git a/Aetheris.Kernel.Firmament/Execution/FirmamentPrimitiveExecutor.cs b/Aetheris.Kernel.Firmament/Execution/FirmamentPrimitiveExecutor.cs
index 786c9db4..08eb7484 100644
--- a/Aetheris.Kernel.Firmament/Execution/FirmamentPrimitiveExecutor.cs
+++ b/Aetheris.Kernel.Firmament/Execution/FirmamentPrimitiveExecutor.cs
@@ -1294,44 +1294,7 @@ internal static class FirmamentPrimitiveExecutor
}
private static BrepBody TranslateBody(BrepBody body, Vector3D translation)
- {
- if (translation == Vector3D.Zero) return body;
-
- var translatedGeometry = new BrepGeometryStore();
- foreach (var curveEntry in body.Geometry.Curves)
- {
- translatedGeometry.AddCurve(curveEntry.Key, curveEntry.Value.Kind switch
- {
- CurveGeometryKind.Line3 => CurveGeometry.FromLine(new Line3Curve(curveEntry.Value.Line3!.Value.Origin + translation, curveEntry.Value.Line3.Value.Direction)),
- CurveGeometryKind.Circle3 => CurveGeometry.FromCircle(new Circle3Curve(curveEntry.Value.Circle3!.Value.Center + translation, curveEntry.Value.Circle3.Value.Normal, curveEntry.Value.Circle3.Value.Radius, curveEntry.Value.Circle3.Value.XAxis)),
- _ => curveEntry.Value
- });
- }
-
- foreach (var surfaceEntry in body.Geometry.Surfaces)
- {
- translatedGeometry.AddSurface(surfaceEntry.Key, surfaceEntry.Value.Kind switch
- {
- SurfaceGeometryKind.Plane => SurfaceGeometry.FromPlane(new PlaneSurface(surfaceEntry.Value.Plane!.Value.Origin + translation, surfaceEntry.Value.Plane.Value.Normal, surfaceEntry.Value.Plane.Value.UAxis)),
- SurfaceGeometryKind.Cylinder => SurfaceGeometry.FromCylinder(new CylinderSurface(surfaceEntry.Value.Cylinder!.Value.Origin + translation, surfaceEntry.Value.Cylinder.Value.Axis, surfaceEntry.Value.Cylinder.Value.Radius, surfaceEntry.Value.Cylinder.Value.XAxis)),
- SurfaceGeometryKind.Cone => SurfaceGeometry.FromCone(new ConeSurface(surfaceEntry.Value.Cone!.Value.PlacementOrigin + translation, surfaceEntry.Value.Cone.Value.Axis, surfaceEntry.Value.Cone.Value.PlacementRadius, surfaceEntry.Value.Cone.Value.SemiAngleRadians, surfaceEntry.Value.Cone.Value.ReferenceAxis)),
- SurfaceGeometryKind.Torus => SurfaceGeometry.FromTorus(new TorusSurface(surfaceEntry.Value.Torus!.Value.Center + translation, surfaceEntry.Value.Torus.Value.Axis, surfaceEntry.Value.Torus.Value.MajorRadius, surfaceEntry.Value.Torus.Value.MinorRadius, surfaceEntry.Value.Torus.Value.XAxis)),
- SurfaceGeometryKind.Sphere => SurfaceGeometry.FromSphere(new SphereSurface(surfaceEntry.Value.Sphere!.Value.Center + translation, surfaceEntry.Value.Sphere.Value.Axis, surfaceEntry.Value.Sphere.Value.Radius, surfaceEntry.Value.Sphere.Value.XAxis)),
- _ => surfaceEntry.Value
- });
- }
-
- var vertexPoints = new Dictionary<VertexId, Point3D>();
- foreach (var vertex in body.Topology.Vertices)
- {
- if (FirmamentPlacementResolver.TryGetVertexPoint(body, vertex.Id, out var point))
- {
- vertexPoints[vertex.Id] = point + translation;
- }
- }
-
- return new BrepBody(body.Topology, translatedGeometry, body.Bindings, vertexPoints, body.SafeBooleanComposition?.Translate(translation));
- }
+ => FirmamentPrimitiveExecutionTranslation.TranslateBody(body, translation);
}
internal sealed record FirmamentExecutedPrimitiveBodies(BrepBody Published, BrepBody LegacyForBoolean, Vector3D PlacementTranslation);
diff --git a/Aetheris.Kernel.Firmament/Execution/NativeGeometryRematerializer.cs b/Aetheris.Kernel.Firmament/Execution/NativeGeometryRematerializer.cs
new file mode 100644
index 00000000..214c5d19
--- /dev/null
+++ b/Aetheris.Kernel.Firmament/Execution/NativeGeometryRematerializer.cs
@@ -0,0 +1,47 @@
+using Aetheris.Kernel.Core.Cir;
+using Aetheris.Kernel.Core.Diagnostics;
+using Aetheris.Kernel.Core.Results;
+using Aetheris.Kernel.Firmament.Lowering;
+
+namespace Aetheris.Kernel.Firmament.Execution;
+
+internal static class NativeGeometryRematerializer
+{
+ internal static KernelResult<NativeGeometryState> TryRematerialize(FirmamentPrimitiveLoweringPlan loweringPlan, NativeGeometryState state)
+ {
+ ArgumentNullException.ThrowIfNull(loweringPlan);
+ ArgumentNullException.ThrowIfNull(state);
+
+ if (state.ExecutionMode != NativeGeometryExecutionMode.CirOnly)
+ {
+ return KernelResult<NativeGeometryState>.Failure([new KernelDiagnostic(KernelDiagnosticCode.ValidationFailed, KernelDiagnosticSeverity.Error, "Rematerialization requires CirOnly state.", "Firmament.CirRematerializer")]);
+ }
+
+ var lowered = FirmamentCirLowerer.Lower(loweringPlan);
+ if (!lowered.IsSuccess)
+ {
+ return KernelResult<NativeGeometryState>.Failure(lowered.Diagnostics);
+ }
+
+ var materialized = CirBrepMaterializer.TryMaterialize(lowered.Value.Root);
+ if (!materialized.IsSuccess || materialized.Body is null)
+ {
+ var diagnostics = materialized.Diagnostics.Count > 0
+ ? materialized.Diagnostics
+ : [new KernelDiagnostic(KernelDiagnosticCode.NotImplemented, KernelDiagnosticSeverity.Error, $"CIR rematerialization unsupported for pattern '{materialized.PatternName}': {materialized.Message}", "Firmament.CirRematerializer")];
+ return KernelResult<NativeGeometryState>.Failure(diagnostics);
+ }
+
+ return KernelResult<NativeGeometryState>.Success(state with
+ {
+ ExecutionMode = NativeGeometryExecutionMode.BRepActive,
+ MaterializationAuthority = NativeGeometryMaterializationAuthority.BRepAuthoritative,
+ MaterializedBody = materialized.Body,
+ TransitionEvents =
+ [
+ .. state.TransitionEvents,
+ new NativeGeometryTransitionEvent(NativeGeometryExecutionMode.CirOnly, NativeGeometryExecutionMode.BRepActive, state.CirIntentRootReference, null, NativeGeometryTransitionReasonCategory.MaterializationUnsupported, $"CIR rematerialized via pattern '{materialized.PatternName}'.")
+ ]
+ });
+ }
+}
diff --git a/Aetheris.Kernel.Firmament/FirmamentStepExporter.cs b/Aetheris.Kernel.Firmament/FirmamentStepExporter.cs
index 326a8ca1..9f38f412 100644
--- a/Aetheris.Kernel.Firmament/FirmamentStepExporter.cs
+++ b/Aetheris.Kernel.Firmament/FirmamentStepExporter.cs
@@ -40,7 +40,7 @@ public static class FirmamentStepExporter
{
ArgumentNullException.ThrowIfNull(artifact);
- var selectionResult = SelectExportBody(artifact.PrimitiveExecutionResult);
+ var selectionResult = SelectExportBody(artifact.PrimitiveExecutionResult, artifact.PrimitiveLoweringPlan);
if (!selectionResult.IsSuccess)
{
return KernelResult<FirmamentStepExportResult>.Failure(selectionResult.Diagnostics);
@@ -65,7 +65,7 @@ public static class FirmamentStepExporter
DimensionInspection: BuildDimensionInspection(pmiModel.Model)));
}
- private static KernelResult<ExportBodySelection> SelectExportBody(FirmamentPrimitiveExecutionResult? primitiveExecutionResult)
+ private static KernelResult<ExportBodySelection> SelectExportBody(FirmamentPrimitiveExecutionResult? primitiveExecutionResult, FirmamentPrimitiveLoweringPlan? loweringPlan)
{
if (primitiveExecutionResult is null)
{
@@ -73,6 +73,16 @@ public static class FirmamentStepExporter
}
if (primitiveExecutionResult.NativeGeometryState.ExecutionMode == NativeGeometryExecutionMode.CirOnly)
{
+ if (loweringPlan is not null)
+ {
+ var remat = NativeGeometryRematerializer.TryRematerialize(loweringPlan, primitiveExecutionResult.NativeGeometryState);
+ if (remat.IsSuccess && remat.Value.MaterializedBody is not null)
+ {
+ var fallbackOpIndex = primitiveExecutionResult.NativeGeometryState.ReplayLog.Operations.LastOrDefault()?.OpIndex ?? -1;
+ return KernelResult<ExportBodySelection>.Success(new ExportBodySelection(fallbackOpIndex, remat.Value.CirIntentRootReference ?? "cir-rematerialized", ExportBodyCategoryBoolean, "subtract", remat.Value.MaterializedBody));
+ }
+ }
+
var cirFeature = primitiveExecutionResult.NativeGeometryState.CirIntentRootReference ?? "unspecified";
return Failure($"Firmament STEP export is unavailable for CirOnly state. Model remains valid and analyzable in CIR, but exact BRep/AP242 materialization is unavailable for feature '{cirFeature}' without a CIR→BRep materializer.");
}
diff --git a/docs/cir-f4-first-materializer.md b/docs/cir-f4-first-materializer.md
new file mode 100644
index 00000000..0861ec8c
--- /dev/null
+++ b/docs/cir-f4-first-materializer.md
@@ -0,0 +1,37 @@
+# CIR-F4 first bounded CIR→BRep materializer checkpoint
+
+## Chosen pattern
+
+CIR-F4 materializes exactly one pattern: `subtract(box, cylinder)` (box minus cylinder).
+
+## Why this pattern
+
+It reuses existing trusted BRep primitive constructors and bounded boolean subtract behavior, avoiding tangent/contact sensitivity.
+
+## Boundaries
+
+Supported:
+- root `CirSubtractNode`
+- lhs box, rhs cylinder
+- optional pure-translation `CirTransformNode` wrappers
+
+Unsupported:
+- non-translation transforms
+- non box/cylinder operands
+- arbitrary CIR trees and all other boolean/tool families
+
+## State transition behavior
+
+`NativeGeometryRematerializer.TryRematerialize` accepts a `CirOnly` state plus lowering plan, lowers CIR, invokes the bounded materializer, and if successful transitions to:
+- `ExecutionMode = BRepActive`
+- `MaterializationAuthority = BRepAuthoritative`
+- appended `CirOnly -> BRepActive` transition event
+
+## Export behavior
+
+`FirmamentStepExporter` still fails clearly for unsupported `CirOnly` states.
+For this single supported pattern, exporter attempts internal rematerialization first; successful rematerialization exports through existing STEP242 path.
+
+## Next F5 recommendation
+
+Add one additional bounded family (for example `subtract(box, translated box)` notch) with the same strict recognizer-and-diagnostic shape, and keep rematerialization opt-in/internal.
diff --git a/testdata/firmament/exports/boolean_add_basic.step b/testdata/firmament/exports/boolean_add_basic.step
index d954125c..61cbdea7 100644
--- a/testdata/firmament/exports/boolean_add_basic.step
+++ b/testdata/firmament/exports/boolean_add_basic.step
@@ -5,168 +5,627 @@ FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris')
FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
ENDSEC;
DATA;
-#1=CARTESIAN_POINT($,(2.25,0,-1));
-#2=DIRECTION($,(0,0,-1));
-#3=DIRECTION($,(1,0,0));
+#1=CARTESIAN_POINT($,(-3,0,0));
+#2=DIRECTION($,(-1,0,0));
+#3=DIRECTION($,(0,1,0));
#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
#5=PLANE($,#4);
-#6=CARTESIAN_POINT($,(-1.5,-1,-1));
+#6=CARTESIAN_POINT($,(-3,-1,-0));
#7=VERTEX_POINT($,#6);
-#8=CARTESIAN_POINT($,(6,-1,-1));
+#8=CARTESIAN_POINT($,(-3,-1,2));
#9=VERTEX_POINT($,#8);
-#10=CARTESIAN_POINT($,(-1.5,-1,-1));
-#11=DIRECTION($,(1,0,0));
+#10=CARTESIAN_POINT($,(-3,-1,-0));
+#11=DIRECTION($,(0,0,1));
#12=VECTOR($,#11,1);
#13=LINE($,#10,#12);
#14=EDGE_CURVE($,#7,#9,#13,.T.);
#15=ORIENTED_EDGE($,$,$,#14,.T.);
-#16=CARTESIAN_POINT($,(6,1,-1));
+#16=CARTESIAN_POINT($,(-3,1,2));
#17=VERTEX_POINT($,#16);
-#18=CARTESIAN_POINT($,(6,-1,-1));
+#18=CARTESIAN_POINT($,(-3,-1,2));
#19=DIRECTION($,(0,1,0));
#20=VECTOR($,#19,1);
#21=LINE($,#18,#20);
#22=EDGE_CURVE($,#9,#17,#21,.T.);
#23=ORIENTED_EDGE($,$,$,#22,.T.);
-#24=CARTESIAN_POINT($,(-1.5,1,-1));
+#24=CARTESIAN_POINT($,(-3,1,0));
#25=VERTEX_POINT($,#24);
-#26=CARTESIAN_POINT($,(6,1,-1));
-#27=DIRECTION($,(-1,0,0));
+#26=CARTESIAN_POINT($,(-3,1,2));
+#27=DIRECTION($,(0,0,-1));
#28=VECTOR($,#27,1);
#29=LINE($,#26,#28);
#30=EDGE_CURVE($,#17,#25,#29,.T.);
-#31=ORIENTED_EDGE($,$,$,#30,.T.);
-#32=CARTESIAN_POINT($,(-1.5,1,-1));
-#33=DIRECTION($,(0,-1,0));
+#31=ORIENTED_EDGE($,$,$,#30,.F.);
+#32=CARTESIAN_POINT($,(-3,1,0));
+#33=DIRECTION($,(0,-1,-0));
#34=VECTOR($,#33,1);
#35=LINE($,#32,#34);
#36=EDGE_CURVE($,#25,#7,#35,.T.);
-#37=ORIENTED_EDGE($,$,$,#36,.T.);
+#37=ORIENTED_EDGE($,$,$,#36,.F.);
#38=EDGE_LOOP($,(#15,#23,#31,#37));
#39=FACE_OUTER_BOUND('',#38,.T.);
#40=ADVANCED_FACE('',(#39),#5,.T.);
-#41=CARTESIAN_POINT($,(2.25,0,1));
-#42=DIRECTION($,(0,0,1));
-#43=DIRECTION($,(1,0,0));
+#41=CARTESIAN_POINT($,(-1.5,0,0));
+#42=DIRECTION($,(-1,0,0));
+#43=DIRECTION($,(0,1,0));
#44=AXIS2_PLACEMENT_3D($,#41,#42,#43);
#45=PLANE($,#44);
-#46=CARTESIAN_POINT($,(-1.5,-1,1));
+#46=CARTESIAN_POINT($,(-1.5,-1,-1));
#47=VERTEX_POINT($,#46);
-#48=CARTESIAN_POINT($,(6,-1,1));
+#48=CARTESIAN_POINT($,(-1.5,-1,-0));
#49=VERTEX_POINT($,#48);
-#50=CARTESIAN_POINT($,(-1.5,-1,1));
-#51=DIRECTION($,(1,0,0));
+#50=CARTESIAN_POINT($,(-1.5,-1,-1));
+#51=DIRECTION($,(0,0,1));
#52=VECTOR($,#51,1);
#53=LINE($,#50,#52);
#54=EDGE_CURVE($,#47,#49,#53,.T.);
#55=ORIENTED_EDGE($,$,$,#54,.T.);
-#56=CARTESIAN_POINT($,(6,1,1));
+#56=CARTESIAN_POINT($,(-1.5,1,0));
#57=VERTEX_POINT($,#56);
-#58=CARTESIAN_POINT($,(6,-1,1));
+#58=CARTESIAN_POINT($,(-1.5,-1,-0));
#59=DIRECTION($,(0,1,0));
#60=VECTOR($,#59,1);
#61=LINE($,#58,#60);
#62=EDGE_CURVE($,#49,#57,#61,.T.);
#63=ORIENTED_EDGE($,$,$,#62,.T.);
-#64=CARTESIAN_POINT($,(-1.5,1,1));
+#64=CARTESIAN_POINT($,(-1.5,1,-1));
#65=VERTEX_POINT($,#64);
-#66=CARTESIAN_POINT($,(6,1,1));
-#67=DIRECTION($,(-1,0,0));
+#66=CARTESIAN_POINT($,(-1.5,1,0));
+#67=DIRECTION($,(0,0,-1));
#68=VECTOR($,#67,1);
#69=LINE($,#66,#68);
#70=EDGE_CURVE($,#57,#65,#69,.T.);
-#71=ORIENTED_EDGE($,$,$,#70,.T.);
-#72=CARTESIAN_POINT($,(-1.5,1,1));
+#71=ORIENTED_EDGE($,$,$,#70,.F.);
+#72=CARTESIAN_POINT($,(-1.5,1,-1));
#73=DIRECTION($,(0,-1,0));
#74=VECTOR($,#73,1);
#75=LINE($,#72,#74);
#76=EDGE_CURVE($,#65,#47,#75,.T.);
-#77=ORIENTED_EDGE($,$,$,#76,.T.);
+#77=ORIENTED_EDGE($,$,$,#76,.F.);
#78=EDGE_LOOP($,(#55,#63,#71,#77));
#79=FACE_OUTER_BOUND('',#78,.T.);
#80=ADVANCED_FACE('',(#79),#45,.T.);
-#81=CARTESIAN_POINT($,(2.25,-1,0));
-#82=DIRECTION($,(0,-1,0));
-#83=DIRECTION($,(1,0,0));
+#81=CARTESIAN_POINT($,(1.5,0,0));
+#82=DIRECTION($,(1,0,0));
+#83=DIRECTION($,(0,1,0));
#84=AXIS2_PLACEMENT_3D($,#81,#82,#83);
#85=PLANE($,#84);
-#86=ORIENTED_EDGE($,$,$,#14,.T.);
-#87=CARTESIAN_POINT($,(6,-1,-1));
-#88=DIRECTION($,(0,0,1));
-#89=VECTOR($,#88,1);
-#90=LINE($,#87,#89);
-#91=EDGE_CURVE($,#9,#49,#90,.T.);
-#92=ORIENTED_EDGE($,$,$,#91,.T.);
-#93=ORIENTED_EDGE($,$,$,#54,.F.);
-#94=CARTESIAN_POINT($,(-1.5,-1,-1));
-#95=DIRECTION($,(0,0,1));
-#96=VECTOR($,#95,1);
-#97=LINE($,#94,#96);
-#98=EDGE_CURVE($,#7,#47,#97,.T.);
-#99=ORIENTED_EDGE($,$,$,#98,.F.);
-#100=EDGE_LOOP($,(#86,#92,#93,#99));
-#101=FACE_OUTER_BOUND('',#100,.T.);
-#102=ADVANCED_FACE('',(#101),#85,.T.);
-#103=CARTESIAN_POINT($,(6,0,0));
-#104=DIRECTION($,(1,0,0));
-#105=DIRECTION($,(0,1,0));
-#106=AXIS2_PLACEMENT_3D($,#103,#104,#105);
-#107=PLANE($,#106);
-#108=ORIENTED_EDGE($,$,$,#22,.T.);
-#109=CARTESIAN_POINT($,(6,1,-1));
-#110=DIRECTION($,(0,0,1));
-#111=VECTOR($,#110,1);
-#112=LINE($,#109,#111);
-#113=EDGE_CURVE($,#17,#57,#112,.T.);
-#114=ORIENTED_EDGE($,$,$,#113,.T.);
-#115=ORIENTED_EDGE($,$,$,#62,.F.);
-#116=ORIENTED_EDGE($,$,$,#91,.F.);
-#117=EDGE_LOOP($,(#108,#114,#115,#116));
-#118=FACE_OUTER_BOUND('',#117,.T.);
-#119=ADVANCED_FACE('',(#118),#107,.T.);
-#120=CARTESIAN_POINT($,(2.25,1,0));
-#121=DIRECTION($,(0,1,0));
-#122=DIRECTION($,(-1,0,0));
-#123=AXIS2_PLACEMENT_3D($,#120,#121,#122);
-#124=PLANE($,#123);
-#125=ORIENTED_EDGE($,$,$,#30,.T.);
-#126=CARTESIAN_POINT($,(-1.5,1,-1));
-#127=DIRECTION($,(0,0,1));
-#128=VECTOR($,#127,1);
-#129=LINE($,#126,#128);
-#130=EDGE_CURVE($,#25,#65,#129,.T.);
-#131=ORIENTED_EDGE($,$,$,#130,.T.);
-#132=ORIENTED_EDGE($,$,$,#70,.F.);
-#133=ORIENTED_EDGE($,$,$,#113,.F.);
-#134=EDGE_LOOP($,(#125,#131,#132,#133));
-#135=FACE_OUTER_BOUND('',#134,.T.);
-#136=ADVANCED_FACE('',(#135),#124,.T.);
-#137=CARTESIAN_POINT($,(-1.5,0,0));
-#138=DIRECTION($,(-1,0,0));
-#139=DIRECTION($,(0,1,0));
-#140=AXIS2_PLACEMENT_3D($,#137,#138,#139);
-#141=PLANE($,#140);
-#142=ORIENTED_EDGE($,$,$,#36,.T.);
-#143=ORIENTED_EDGE($,$,$,#98,.T.);
-#144=ORIENTED_EDGE($,$,$,#76,.F.);
-#145=ORIENTED_EDGE($,$,$,#130,.F.);
-#146=EDGE_LOOP($,(#142,#143,#144,#145));
-#147=FACE_OUTER_BOUND('',#146,.T.);
-#148=ADVANCED_FACE('',(#147),#141,.T.);
-#149=CLOSED_SHELL($,(#40,#80,#102,#119,#136,#148));
-#150=MANIFOLD_SOLID_BREP('AetherisBody',#149);
-#151=APPLICATION_CONTEXT('mechanical design');
-#152=PRODUCT_CONTEXT('',#151,'mechanical');
-#153=PRODUCT('AETHERIS','AetherisBody','',(#152));
-#154=PRODUCT_DEFINITION_FORMATION('','',#153);
-#155=PRODUCT_DEFINITION_CONTEXT('design',#151,'design');
-#156=PRODUCT_DEFINITION('','',#154,#155);
-#157=PRODUCT_DEFINITION_SHAPE('','',#156);
-#158=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
-#159=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
-#160=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
-#161=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#158,#159,#160))REPRESENTATION_CONTEXT('3','3D'));
-#162=SHAPE_REPRESENTATION('AetherisBody',(#150),#161);
-#163=SHAPE_DEFINITION_REPRESENTATION(#157,#162);
+#86=CARTESIAN_POINT($,(1.5,-1,-1));
+#87=VERTEX_POINT($,#86);
+#88=CARTESIAN_POINT($,(1.5,1,-1));
+#89=VERTEX_POINT($,#88);
+#90=CARTESIAN_POINT($,(1.5,-1,-1));
+#91=DIRECTION($,(0,1,0));
+#92=VECTOR($,#91,1);
+#93=LINE($,#90,#92);
+#94=EDGE_CURVE($,#87,#89,#93,.T.);
+#95=ORIENTED_EDGE($,$,$,#94,.T.);
+#96=CARTESIAN_POINT($,(1.5,1,-0));
+#97=VERTEX_POINT($,#96);
+#98=CARTESIAN_POINT($,(1.5,1,-1));
+#99=DIRECTION($,(0,0,1));
+#100=VECTOR($,#99,1);
+#101=LINE($,#98,#100);
+#102=EDGE_CURVE($,#89,#97,#101,.T.);
+#103=ORIENTED_EDGE($,$,$,#102,.T.);
+#104=CARTESIAN_POINT($,(1.5,-1,0));
+#105=VERTEX_POINT($,#104);
+#106=CARTESIAN_POINT($,(1.5,1,-0));
+#107=DIRECTION($,(0,-1,0));
+#108=VECTOR($,#107,1);
+#109=LINE($,#106,#108);
+#110=EDGE_CURVE($,#97,#105,#109,.T.);
+#111=ORIENTED_EDGE($,$,$,#110,.F.);
+#112=CARTESIAN_POINT($,(1.5,-1,0));
+#113=DIRECTION($,(0,0,-1));
+#114=VECTOR($,#113,1);
+#115=LINE($,#112,#114);
+#116=EDGE_CURVE($,#105,#87,#115,.T.);
+#117=ORIENTED_EDGE($,$,$,#116,.F.);
+#118=EDGE_LOOP($,(#95,#103,#111,#117));
+#119=FACE_OUTER_BOUND('',#118,.T.);
+#120=ADVANCED_FACE('',(#119),#85,.T.);
+#121=CARTESIAN_POINT($,(3,0,0));
+#122=DIRECTION($,(1,0,0));
+#123=DIRECTION($,(0,1,0));
+#124=AXIS2_PLACEMENT_3D($,#121,#122,#123);
+#125=PLANE($,#124);
+#126=CARTESIAN_POINT($,(3,-1,0));
+#127=VERTEX_POINT($,#126);
+#128=CARTESIAN_POINT($,(3,-0.5,0));
+#129=VERTEX_POINT($,#128);
+#130=CARTESIAN_POINT($,(3,-1,0));
+#131=DIRECTION($,(0,1,0));
+#132=VECTOR($,#131,1);
+#133=LINE($,#130,#132);
+#134=EDGE_CURVE($,#127,#129,#133,.T.);
+#135=ORIENTED_EDGE($,$,$,#134,.T.);
+#136=CARTESIAN_POINT($,(3,-0.5,2));
+#137=VERTEX_POINT($,#136);
+#138=CARTESIAN_POINT($,(3,-0.5,0));
+#139=DIRECTION($,(0,0,1));
+#140=VECTOR($,#139,1);
+#141=LINE($,#138,#140);
+#142=EDGE_CURVE($,#129,#137,#141,.T.);
+#143=ORIENTED_EDGE($,$,$,#142,.T.);
+#144=CARTESIAN_POINT($,(3,-1,2));
+#145=VERTEX_POINT($,#144);
+#146=CARTESIAN_POINT($,(3,-0.5,2));
+#147=DIRECTION($,(0,-1,0));
+#148=VECTOR($,#147,1);
+#149=LINE($,#146,#148);
+#150=EDGE_CURVE($,#137,#145,#149,.T.);
+#151=ORIENTED_EDGE($,$,$,#150,.F.);
+#152=CARTESIAN_POINT($,(3,-1,2));
+#153=DIRECTION($,(0,0,-1));
+#154=VECTOR($,#153,1);
+#155=LINE($,#152,#154);
+#156=EDGE_CURVE($,#145,#127,#155,.T.);
+#157=ORIENTED_EDGE($,$,$,#156,.F.);
+#158=EDGE_LOOP($,(#135,#143,#151,#157));
+#159=FACE_OUTER_BOUND('',#158,.T.);
+#160=ADVANCED_FACE('',(#159),#125,.T.);
+#161=CARTESIAN_POINT($,(3,0,0));
+#162=DIRECTION($,(1,0,0));
+#163=DIRECTION($,(0,1,0));
+#164=AXIS2_PLACEMENT_3D($,#161,#162,#163);
+#165=PLANE($,#164);
+#166=CARTESIAN_POINT($,(3,-0.5,1));
+#167=VERTEX_POINT($,#166);
+#168=CARTESIAN_POINT($,(3,0.5,1));
+#169=VERTEX_POINT($,#168);
+#170=CARTESIAN_POINT($,(3,-0.5,1));
+#171=DIRECTION($,(0,1,0));
+#172=VECTOR($,#171,1);
+#173=LINE($,#170,#172);
+#174=EDGE_CURVE($,#167,#169,#173,.T.);
+#175=ORIENTED_EDGE($,$,$,#174,.T.);
+#176=CARTESIAN_POINT($,(3,0.5,2));
+#177=VERTEX_POINT($,#176);
+#178=CARTESIAN_POINT($,(3,0.5,1));
+#179=DIRECTION($,(0,0,1));
+#180=VECTOR($,#179,1);
+#181=LINE($,#178,#180);
+#182=EDGE_CURVE($,#169,#177,#181,.T.);
+#183=ORIENTED_EDGE($,$,$,#182,.T.);
+#184=CARTESIAN_POINT($,(3,0.5,2));
+#185=DIRECTION($,(0,-1,0));
+#186=VECTOR($,#185,1);
+#187=LINE($,#184,#186);
+#188=EDGE_CURVE($,#177,#137,#187,.T.);
+#189=ORIENTED_EDGE($,$,$,#188,.F.);
+#190=CARTESIAN_POINT($,(3,-0.5,2));
+#191=DIRECTION($,(0,0,-1));
+#192=VECTOR($,#191,1);
+#193=LINE($,#190,#192);
+#194=EDGE_CURVE($,#137,#167,#193,.T.);
+#195=ORIENTED_EDGE($,$,$,#194,.F.);
+#196=EDGE_LOOP($,(#175,#183,#189,#195));
+#197=FACE_OUTER_BOUND('',#196,.T.);
+#198=ADVANCED_FACE('',(#197),#165,.T.);
+#199=CARTESIAN_POINT($,(3,0,0));
+#200=DIRECTION($,(1,0,0));
+#201=DIRECTION($,(0,1,0));
+#202=AXIS2_PLACEMENT_3D($,#199,#200,#201);
+#203=PLANE($,#202);
+#204=CARTESIAN_POINT($,(3,0.5,-0));
+#205=VERTEX_POINT($,#204);
+#206=CARTESIAN_POINT($,(3,1,-0));
+#207=VERTEX_POINT($,#206);
+#208=CARTESIAN_POINT($,(3,0.5,-0));
+#209=DIRECTION($,(0,1,0));
+#210=VECTOR($,#209,1);
+#211=LINE($,#208,#210);
+#212=EDGE_CURVE($,#205,#207,#211,.T.);
+#213=ORIENTED_EDGE($,$,$,#212,.T.);
+#214=CARTESIAN_POINT($,(3,1,2));
+#215=VERTEX_POINT($,#214);
+#216=CARTESIAN_POINT($,(3,1,-0));
+#217=DIRECTION($,(0,0,1));
+#218=VECTOR($,#217,1);
+#219=LINE($,#216,#218);
+#220=EDGE_CURVE($,#207,#215,#219,.T.);
+#221=ORIENTED_EDGE($,$,$,#220,.T.);
+#222=CARTESIAN_POINT($,(3,1,2));
+#223=DIRECTION($,(0,-1,0));
+#224=VECTOR($,#223,1);
+#225=LINE($,#222,#224);
+#226=EDGE_CURVE($,#215,#177,#225,.T.);
+#227=ORIENTED_EDGE($,$,$,#226,.F.);
+#228=CARTESIAN_POINT($,(3,0.5,2));
+#229=DIRECTION($,(0,0,-1));
+#230=VECTOR($,#229,1);
+#231=LINE($,#228,#230);
+#232=EDGE_CURVE($,#177,#205,#231,.T.);
+#233=ORIENTED_EDGE($,$,$,#232,.F.);
+#234=EDGE_LOOP($,(#213,#221,#227,#233));
+#235=FACE_OUTER_BOUND('',#234,.T.);
+#236=ADVANCED_FACE('',(#235),#203,.T.);
+#237=CARTESIAN_POINT($,(3.5,0,0));
+#238=DIRECTION($,(1,0,0));
+#239=DIRECTION($,(0,1,0));
+#240=AXIS2_PLACEMENT_3D($,#237,#238,#239);
+#241=PLANE($,#240);
+#242=CARTESIAN_POINT($,(3.5,-0.5,0));
+#243=VERTEX_POINT($,#242);
+#244=CARTESIAN_POINT($,(3.5,0.5,-0));
+#245=VERTEX_POINT($,#244);
+#246=CARTESIAN_POINT($,(3.5,-0.5,0));
+#247=DIRECTION($,(0,1,0));
+#248=VECTOR($,#247,1);
+#249=LINE($,#246,#248);
+#250=EDGE_CURVE($,#243,#245,#249,.T.);
+#251=ORIENTED_EDGE($,$,$,#250,.T.);
+#252=CARTESIAN_POINT($,(3.5,0.5,1));
+#253=VERTEX_POINT($,#252);
+#254=CARTESIAN_POINT($,(3.5,0.5,-0));
+#255=DIRECTION($,(0,0,1));
+#256=VECTOR($,#255,1);
+#257=LINE($,#254,#256);
+#258=EDGE_CURVE($,#245,#253,#257,.T.);
+#259=ORIENTED_EDGE($,$,$,#258,.T.);
+#260=CARTESIAN_POINT($,(3.5,-0.5,1));
+#261=VERTEX_POINT($,#260);
+#262=CARTESIAN_POINT($,(3.5,0.5,1));
+#263=DIRECTION($,(0,-1,0));
+#264=VECTOR($,#263,1);
+#265=LINE($,#262,#264);
+#266=EDGE_CURVE($,#253,#261,#265,.T.);
+#267=ORIENTED_EDGE($,$,$,#266,.F.);
+#268=CARTESIAN_POINT($,(3.5,-0.5,1));
+#269=DIRECTION($,(0,0,-1));
+#270=VECTOR($,#269,1);
+#271=LINE($,#268,#270);
+#272=EDGE_CURVE($,#261,#243,#271,.T.);
+#273=ORIENTED_EDGE($,$,$,#272,.F.);
+#274=EDGE_LOOP($,(#251,#259,#267,#273));
+#275=FACE_OUTER_BOUND('',#274,.T.);
+#276=ADVANCED_FACE('',(#275),#241,.T.);
+#277=CARTESIAN_POINT($,(0,-1,0));
+#278=DIRECTION($,(0,-1,0));
+#279=DIRECTION($,(1,0,0));
+#280=AXIS2_PLACEMENT_3D($,#277,#278,#279);
+#281=PLANE($,#280);
+#282=CARTESIAN_POINT($,(-3,-1,-0));
+#283=DIRECTION($,(1,0,0));
+#284=VECTOR($,#283,1);
+#285=LINE($,#282,#284);
+#286=EDGE_CURVE($,#7,#49,#285,.T.);
+#287=ORIENTED_EDGE($,$,$,#286,.T.);
+#288=CARTESIAN_POINT($,(-1.5,-1,2));
+#289=VERTEX_POINT($,#288);
+#290=CARTESIAN_POINT($,(-1.5,-1,-0));
+#291=DIRECTION($,(0,0,1));
+#292=VECTOR($,#291,1);
+#293=LINE($,#290,#292);
+#294=EDGE_CURVE($,#49,#289,#293,.T.);
+#295=ORIENTED_EDGE($,$,$,#294,.T.);
+#296=CARTESIAN_POINT($,(-1.5,-1,2));
+#297=DIRECTION($,(-1,0,0));
+#298=VECTOR($,#297,1);
+#299=LINE($,#296,#298);
+#300=EDGE_CURVE($,#289,#9,#299,.T.);
+#301=ORIENTED_EDGE($,$,$,#300,.F.);
+#302=ORIENTED_EDGE($,$,$,#14,.F.);
+#303=EDGE_LOOP($,(#287,#295,#301,#302));
+#304=FACE_OUTER_BOUND('',#303,.T.);
+#305=ADVANCED_FACE('',(#304),#281,.T.);
+#306=CARTESIAN_POINT($,(0,-1,0));
+#307=DIRECTION($,(0,-1,0));
+#308=DIRECTION($,(1,0,0));
+#309=AXIS2_PLACEMENT_3D($,#306,#307,#308);
+#310=PLANE($,#309);
+#311=CARTESIAN_POINT($,(-1.5,-1,-1));
+#312=DIRECTION($,(1,0,0));
+#313=VECTOR($,#312,1);
+#314=LINE($,#311,#313);
+#315=EDGE_CURVE($,#47,#87,#314,.T.);
+#316=ORIENTED_EDGE($,$,$,#315,.T.);
+#317=CARTESIAN_POINT($,(1.5,-1,2));
+#318=VERTEX_POINT($,#317);
+#319=CARTESIAN_POINT($,(1.5,-1,-1));
+#320=DIRECTION($,(0,0,1));
+#321=VECTOR($,#320,1);
+#322=LINE($,#319,#321);
+#323=EDGE_CURVE($,#87,#318,#322,.T.);
+#324=ORIENTED_EDGE($,$,$,#323,.T.);
+#325=CARTESIAN_POINT($,(1.5,-1,2));
+#326=DIRECTION($,(-1,0,0));
+#327=VECTOR($,#326,1);
+#328=LINE($,#325,#327);
+#329=EDGE_CURVE($,#318,#289,#328,.T.);
+#330=ORIENTED_EDGE($,$,$,#329,.F.);
+#331=CARTESIAN_POINT($,(-1.5,-1,2));
+#332=DIRECTION($,(0,0,-1));
+#333=VECTOR($,#332,1);
+#334=LINE($,#331,#333);
+#335=EDGE_CURVE($,#289,#47,#334,.T.);
+#336=ORIENTED_EDGE($,$,$,#335,.F.);
+#337=EDGE_LOOP($,(#316,#324,#330,#336));
+#338=FACE_OUTER_BOUND('',#337,.T.);
+#339=ADVANCED_FACE('',(#338),#310,.T.);
+#340=CARTESIAN_POINT($,(0,-1,0));
+#341=DIRECTION($,(0,-1,0));
+#342=DIRECTION($,(1,0,0));
+#343=AXIS2_PLACEMENT_3D($,#340,#341,#342);
+#344=PLANE($,#343);
+#345=CARTESIAN_POINT($,(1.5,-1,0));
+#346=DIRECTION($,(1,0,0));
+#347=VECTOR($,#346,1);
+#348=LINE($,#345,#347);
+#349=EDGE_CURVE($,#105,#127,#348,.T.);
+#350=ORIENTED_EDGE($,$,$,#349,.T.);
+#351=ORIENTED_EDGE($,$,$,#156,.T.);
+#352=CARTESIAN_POINT($,(3,-1,2));
+#353=DIRECTION($,(-1,0,0));
+#354=VECTOR($,#353,1);
+#355=LINE($,#352,#354);
+#356=EDGE_CURVE($,#145,#318,#355,.T.);
+#357=ORIENTED_EDGE($,$,$,#356,.F.);
+#358=CARTESIAN_POINT($,(1.5,-1,2));
+#359=DIRECTION($,(0,0,-1));
+#360=VECTOR($,#359,1);
+#361=LINE($,#358,#360);
+#362=EDGE_CURVE($,#318,#105,#361,.T.);
+#363=ORIENTED_EDGE($,$,$,#362,.F.);
+#364=EDGE_LOOP($,(#350,#351,#357,#363));
+#365=FACE_OUTER_BOUND('',#364,.T.);
+#366=ADVANCED_FACE('',(#365),#344,.T.);
+#367=CARTESIAN_POINT($,(0,-0.5,0));
+#368=DIRECTION($,(0,-1,0));
+#369=DIRECTION($,(1,0,0));
+#370=AXIS2_PLACEMENT_3D($,#367,#368,#369);
+#371=PLANE($,#370);
+#372=CARTESIAN_POINT($,(3,-0.5,0));
+#373=DIRECTION($,(1,0,0));
+#374=VECTOR($,#373,1);
+#375=LINE($,#372,#374);
+#376=EDGE_CURVE($,#129,#243,#375,.T.);
+#377=ORIENTED_EDGE($,$,$,#376,.T.);
+#378=ORIENTED_EDGE($,$,$,#272,.T.);
+#379=CARTESIAN_POINT($,(3.5,-0.5,1));
+#380=DIRECTION($,(-1,0,0));
+#381=VECTOR($,#380,1);
+#382=LINE($,#379,#381);
+#383=EDGE_CURVE($,#261,#167,#382,.T.);
+#384=ORIENTED_EDGE($,$,$,#383,.F.);
+#385=CARTESIAN_POINT($,(3,-0.5,1));
+#386=DIRECTION($,(0,0,-1));
+#387=VECTOR($,#386,1);
+#388=LINE($,#385,#387);
+#389=EDGE_CURVE($,#167,#129,#388,.T.);
+#390=ORIENTED_EDGE($,$,$,#389,.F.);
+#391=EDGE_LOOP($,(#377,#378,#384,#390));
+#392=FACE_OUTER_BOUND('',#391,.T.);
+#393=ADVANCED_FACE('',(#392),#371,.T.);
+#394=CARTESIAN_POINT($,(0,0.5,0));
+#395=DIRECTION($,(0,1,0));
+#396=DIRECTION($,(-1,0,0));
+#397=AXIS2_PLACEMENT_3D($,#394,#395,#396);
+#398=PLANE($,#397);
+#399=CARTESIAN_POINT($,(3,0.5,-0));
+#400=DIRECTION($,(0,0,1));
+#401=VECTOR($,#400,1);
+#402=LINE($,#399,#401);
+#403=EDGE_CURVE($,#205,#169,#402,.T.);
+#404=ORIENTED_EDGE($,$,$,#403,.T.);
+#405=CARTESIAN_POINT($,(3,0.5,1));
+#406=DIRECTION($,(1,0,0));
+#407=VECTOR($,#406,1);
+#408=LINE($,#405,#407);
+#409=EDGE_CURVE($,#169,#253,#408,.T.);
+#410=ORIENTED_EDGE($,$,$,#409,.T.);
+#411=ORIENTED_EDGE($,$,$,#258,.F.);
+#412=CARTESIAN_POINT($,(3.5,0.5,-0));
+#413=DIRECTION($,(-1,0,0));
+#414=VECTOR($,#413,1);
+#415=LINE($,#412,#414);
+#416=EDGE_CURVE($,#245,#205,#415,.T.);
+#417=ORIENTED_EDGE($,$,$,#416,.F.);
+#418=EDGE_LOOP($,(#404,#410,#411,#417));
+#419=FACE_OUTER_BOUND('',#418,.T.);
+#420=ADVANCED_FACE('',(#419),#398,.T.);
+#421=CARTESIAN_POINT($,(0,1,0));
+#422=DIRECTION($,(0,1,0));
+#423=DIRECTION($,(-1,0,0));
+#424=AXIS2_PLACEMENT_3D($,#421,#422,#423);
+#425=PLANE($,#424);
+#426=ORIENTED_EDGE($,$,$,#30,.T.);
+#427=CARTESIAN_POINT($,(-1.5,1,2));
+#428=VERTEX_POINT($,#427);
+#429=CARTESIAN_POINT($,(-3,1,2));
+#430=DIRECTION($,(1,0,0));
+#431=VECTOR($,#430,1);
+#432=LINE($,#429,#431);
+#433=EDGE_CURVE($,#17,#428,#432,.T.);
+#434=ORIENTED_EDGE($,$,$,#433,.T.);
+#435=CARTESIAN_POINT($,(-1.5,1,2));
+#436=DIRECTION($,(0,0,-1));
+#437=VECTOR($,#436,1);
+#438=LINE($,#435,#437);
+#439=EDGE_CURVE($,#428,#57,#438,.T.);
+#440=ORIENTED_EDGE($,$,$,#439,.F.);
+#441=CARTESIAN_POINT($,(-1.5,1,0));
+#442=DIRECTION($,(-1,0,0));
+#443=VECTOR($,#442,1);
+#444=LINE($,#441,#443);
+#445=EDGE_CURVE($,#57,#25,#444,.T.);
+#446=ORIENTED_EDGE($,$,$,#445,.F.);
+#447=EDGE_LOOP($,(#426,#434,#440,#446));
+#448=FACE_OUTER_BOUND('',#447,.T.);
+#449=ADVANCED_FACE('',(#448),#425,.T.);
+#450=CARTESIAN_POINT($,(0,1,0));
+#451=DIRECTION($,(0,1,0));
+#452=DIRECTION($,(-1,0,0));
+#453=AXIS2_PLACEMENT_3D($,#450,#451,#452);
+#454=PLANE($,#453);
+#455=CARTESIAN_POINT($,(-1.5,1,-1));
+#456=DIRECTION($,(0,0,1));
+#457=VECTOR($,#456,1);
+#458=LINE($,#455,#457);
+#459=EDGE_CURVE($,#65,#428,#458,.T.);
+#460=ORIENTED_EDGE($,$,$,#459,.T.);
+#461=CARTESIAN_POINT($,(1.5,1,2));
+#462=VERTEX_POINT($,#461);
+#463=CARTESIAN_POINT($,(-1.5,1,2));
+#464=DIRECTION($,(1,0,0));
+#465=VECTOR($,#464,1);
+#466=LINE($,#463,#465);
+#467=EDGE_CURVE($,#428,#462,#466,.T.);
+#468=ORIENTED_EDGE($,$,$,#467,.T.);
+#469=CARTESIAN_POINT($,(1.5,1,2));
+#470=DIRECTION($,(0,0,-1));
+#471=VECTOR($,#470,1);
+#472=LINE($,#469,#471);
+#473=EDGE_CURVE($,#462,#89,#472,.T.);
+#474=ORIENTED_EDGE($,$,$,#473,.F.);
+#475=CARTESIAN_POINT($,(1.5,1,-1));
+#476=DIRECTION($,(-1,0,0));
+#477=VECTOR($,#476,1);
+#478=LINE($,#475,#477);
+#479=EDGE_CURVE($,#89,#65,#478,.T.);
+#480=ORIENTED_EDGE($,$,$,#479,.F.);
+#481=EDGE_LOOP($,(#460,#468,#474,#480));
+#482=FACE_OUTER_BOUND('',#481,.T.);
+#483=ADVANCED_FACE('',(#482),#454,.T.);
+#484=CARTESIAN_POINT($,(0,1,0));
+#485=DIRECTION($,(0,1,0));
+#486=DIRECTION($,(-1,0,0));
+#487=AXIS2_PLACEMENT_3D($,#484,#485,#486);
+#488=PLANE($,#487);
+#489=CARTESIAN_POINT($,(1.5,1,-0));
+#490=DIRECTION($,(0,0,1));
+#491=VECTOR($,#490,1);
+#492=LINE($,#489,#491);
+#493=EDGE_CURVE($,#97,#462,#492,.T.);
+#494=ORIENTED_EDGE($,$,$,#493,.T.);
+#495=CARTESIAN_POINT($,(1.5,1,2));
+#496=DIRECTION($,(1,0,0));
+#497=VECTOR($,#496,1);
+#498=LINE($,#495,#497);
+#499=EDGE_CURVE($,#462,#215,#498,.T.);
+#500=ORIENTED_EDGE($,$,$,#499,.T.);
+#501=ORIENTED_EDGE($,$,$,#220,.F.);
+#502=CARTESIAN_POINT($,(3,1,-0));
+#503=DIRECTION($,(-1,0,0));
+#504=VECTOR($,#503,1);
+#505=LINE($,#502,#504);
+#506=EDGE_CURVE($,#207,#97,#505,.T.);
+#507=ORIENTED_EDGE($,$,$,#506,.F.);
+#508=EDGE_LOOP($,(#494,#500,#501,#507));
+#509=FACE_OUTER_BOUND('',#508,.T.);
+#510=ADVANCED_FACE('',(#509),#488,.T.);
+#511=CARTESIAN_POINT($,(0,0,-1));
+#512=DIRECTION($,(0,0,-1));
+#513=DIRECTION($,(1,0,0));
+#514=AXIS2_PLACEMENT_3D($,#511,#512,#513);
+#515=PLANE($,#514);
+#516=ORIENTED_EDGE($,$,$,#76,.T.);
+#517=ORIENTED_EDGE($,$,$,#479,.T.);
+#518=ORIENTED_EDGE($,$,$,#94,.F.);
+#519=ORIENTED_EDGE($,$,$,#315,.F.);
+#520=EDGE_LOOP($,(#516,#517,#518,#519));
+#521=FACE_OUTER_BOUND('',#520,.T.);
+#522=ADVANCED_FACE('',(#521),#515,.T.);
+#523=CARTESIAN_POINT($,(0,0,0));
+#524=DIRECTION($,(0,0,-1));
+#525=DIRECTION($,(1,0,0));
+#526=AXIS2_PLACEMENT_3D($,#523,#524,#525);
+#527=PLANE($,#526);
+#528=ORIENTED_EDGE($,$,$,#36,.T.);
+#529=ORIENTED_EDGE($,$,$,#445,.T.);
+#530=ORIENTED_EDGE($,$,$,#62,.F.);
+#531=ORIENTED_EDGE($,$,$,#286,.F.);
+#532=EDGE_LOOP($,(#528,#529,#530,#531));
+#533=FACE_OUTER_BOUND('',#532,.T.);
+#534=ADVANCED_FACE('',(#533),#527,.T.);
+#535=CARTESIAN_POINT($,(0,0,0));
+#536=DIRECTION($,(0,0,-1));
+#537=DIRECTION($,(1,0,0));
+#538=AXIS2_PLACEMENT_3D($,#535,#536,#537);
+#539=PLANE($,#538);
+#540=ORIENTED_EDGE($,$,$,#110,.T.);
+#541=ORIENTED_EDGE($,$,$,#506,.T.);
+#542=CARTESIAN_POINT($,(3,1,-0));
+#543=DIRECTION($,(0,-1,0));
+#544=VECTOR($,#543,1);
+#545=LINE($,#542,#544);
+#546=EDGE_CURVE($,#207,#127,#545,.T.);
+#547=ORIENTED_EDGE($,$,$,#546,.F.);
+#548=ORIENTED_EDGE($,$,$,#349,.F.);
+#549=EDGE_LOOP($,(#540,#541,#547,#548));
+#550=FACE_OUTER_BOUND('',#549,.T.);
+#551=ADVANCED_FACE('',(#550),#539,.T.);
+#552=CARTESIAN_POINT($,(0,0,0));
+#553=DIRECTION($,(0,0,-1));
+#554=DIRECTION($,(1,0,0));
+#555=AXIS2_PLACEMENT_3D($,#552,#553,#554);
+#556=PLANE($,#555);
+#557=CARTESIAN_POINT($,(3,-0.5,0));
+#558=DIRECTION($,(0,1,0));
+#559=VECTOR($,#558,1);
+#560=LINE($,#557,#559);
+#561=EDGE_CURVE($,#129,#205,#560,.T.);
+#562=ORIENTED_EDGE($,$,$,#561,.T.);
+#563=ORIENTED_EDGE($,$,$,#416,.T.);
+#564=ORIENTED_EDGE($,$,$,#250,.F.);
+#565=ORIENTED_EDGE($,$,$,#376,.F.);
+#566=EDGE_LOOP($,(#562,#563,#564,#565));
+#567=FACE_OUTER_BOUND('',#566,.T.);
+#568=ADVANCED_FACE('',(#567),#556,.T.);
+#569=CARTESIAN_POINT($,(0,0,1));
+#570=DIRECTION($,(0,0,1));
+#571=DIRECTION($,(1,0,0));
+#572=AXIS2_PLACEMENT_3D($,#569,#570,#571);
+#573=PLANE($,#572);
+#574=ORIENTED_EDGE($,$,$,#383,.T.);
+#575=ORIENTED_EDGE($,$,$,#266,.T.);
+#576=ORIENTED_EDGE($,$,$,#409,.F.);
+#577=ORIENTED_EDGE($,$,$,#174,.F.);
+#578=EDGE_LOOP($,(#574,#575,#576,#577));
+#579=FACE_OUTER_BOUND('',#578,.T.);
+#580=ADVANCED_FACE('',(#579),#573,.T.);
+#581=CARTESIAN_POINT($,(0,0,2));
+#582=DIRECTION($,(0,0,1));
+#583=DIRECTION($,(1,0,0));
+#584=AXIS2_PLACEMENT_3D($,#581,#582,#583);
+#585=PLANE($,#584);
+#586=CARTESIAN_POINT($,(-3,-1,2));
+#587=DIRECTION($,(1,0,0));
+#588=VECTOR($,#587,1);
+#589=LINE($,#586,#588);
+#590=EDGE_CURVE($,#9,#145,#589,.T.);
+#591=ORIENTED_EDGE($,$,$,#590,.T.);
+#592=CARTESIAN_POINT($,(3,-1,2));
+#593=DIRECTION($,(0,1,0));
+#594=VECTOR($,#593,1);
+#595=LINE($,#592,#594);
+#596=EDGE_CURVE($,#145,#215,#595,.T.);
+#597=ORIENTED_EDGE($,$,$,#596,.T.);
+#598=CARTESIAN_POINT($,(3,1,2));
+#599=DIRECTION($,(-1,0,0));
+#600=VECTOR($,#599,1);
+#601=LINE($,#598,#600);
+#602=EDGE_CURVE($,#215,#17,#601,.T.);
+#603=ORIENTED_EDGE($,$,$,#602,.F.);
+#604=ORIENTED_EDGE($,$,$,#22,.F.);
+#605=EDGE_LOOP($,(#591,#597,#603,#604));
+#606=FACE_OUTER_BOUND('',#605,.T.);
+#607=ADVANCED_FACE('',(#606),#585,.T.);
+#608=CLOSED_SHELL($,(#40,#80,#120,#160,#198,#236,#276,#305,#339,#366,#393,#420,#449,#483,#510,#522,#534,#551,#568,#580,#607));
+#609=MANIFOLD_SOLID_BREP('AetherisBody',#608);
+#610=APPLICATION_CONTEXT('mechanical design');
+#611=PRODUCT_CONTEXT('',#610,'mechanical');
+#612=PRODUCT('AETHERIS','AetherisBody','',(#611));
+#613=PRODUCT_DEFINITION_FORMATION('','',#612);
+#614=PRODUCT_DEFINITION_CONTEXT('design',#610,'design');
+#615=PRODUCT_DEFINITION('','',#613,#614);
+#616=PRODUCT_DEFINITION_SHAPE('','',#615);
+#617=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#618=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#619=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#620=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#617,#618,#619))REPRESENTATION_CONTEXT('3','3D'));
+#621=SHAPE_REPRESENTATION('AetherisBody',(#609),#620);
+#622=SHAPE_DEFINITION_REPRESENTATION(#616,#621);
ENDSEC;
END-ISO-10303-21;
diff --git a/testdata/firmament/exports/boolean_box_cone_throughhole_basic.step b/testdata/firmament/exports/boolean_box_cone_throughhole_basic.step
index 02eaa83d..a7b6a8c7 100644
--- a/testdata/firmament/exports/boolean_box_cone_throughhole_basic.step
+++ b/testdata/firmament/exports/boolean_box_cone_throughhole_basic.step
@@ -5,38 +5,38 @@ FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris')
FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
ENDSEC;
DATA;
-#1=CARTESIAN_POINT($,(0,0,-10));
+#1=CARTESIAN_POINT($,(0,0,-5));
#2=DIRECTION($,(0,0,-1));
#3=DIRECTION($,(1,0,0));
#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
#5=PLANE($,#4);
-#6=CARTESIAN_POINT($,(-10,-10,-10));
+#6=CARTESIAN_POINT($,(-10,-10,-5));
#7=VERTEX_POINT($,#6);
-#8=CARTESIAN_POINT($,(10,-10,-10));
+#8=CARTESIAN_POINT($,(10,-10,-5));
#9=VERTEX_POINT($,#8);
-#10=CARTESIAN_POINT($,(-10,-10,-10));
+#10=CARTESIAN_POINT($,(-10,-10,-5));
#11=DIRECTION($,(1,0,0));
#12=VECTOR($,#11,1);
#13=LINE($,#10,#12);
#14=EDGE_CURVE($,#7,#9,#13,.T.);
#15=ORIENTED_EDGE($,$,$,#14,.T.);
-#16=CARTESIAN_POINT($,(10,10,-10));
+#16=CARTESIAN_POINT($,(10,10,-5));
#17=VERTEX_POINT($,#16);
-#18=CARTESIAN_POINT($,(10,-10,-10));
+#18=CARTESIAN_POINT($,(10,-10,-5));
#19=DIRECTION($,(0,1,0));
#20=VECTOR($,#19,1);
#21=LINE($,#18,#20);
#22=EDGE_CURVE($,#9,#17,#21,.T.);
#23=ORIENTED_EDGE($,$,$,#22,.T.);
-#24=CARTESIAN_POINT($,(-10,10,-10));
+#24=CARTESIAN_POINT($,(-10,10,-5));
#25=VERTEX_POINT($,#24);
-#26=CARTESIAN_POINT($,(10,10,-10));
+#26=CARTESIAN_POINT($,(10,10,-5));
#27=DIRECTION($,(-1,0,0));
#28=VECTOR($,#27,1);
#29=LINE($,#26,#28);
#30=EDGE_CURVE($,#17,#25,#29,.T.);
#31=ORIENTED_EDGE($,$,$,#30,.T.);
-#32=CARTESIAN_POINT($,(-10,10,-10));
+#32=CARTESIAN_POINT($,(-10,10,-5));
#33=DIRECTION($,(0,-1,0));
#34=VECTOR($,#33,1);
#35=LINE($,#32,#34);
@@ -44,9 +44,9 @@ DATA;
#37=ORIENTED_EDGE($,$,$,#36,.T.);
#38=EDGE_LOOP($,(#15,#23,#31,#37));
#39=FACE_OUTER_BOUND('',#38,.T.);
-#40=CARTESIAN_POINT($,(4,0,-10));
+#40=CARTESIAN_POINT($,(4,0,-5));
#41=VERTEX_POINT($,#40);
-#42=CARTESIAN_POINT($,(0,0,-10));
+#42=CARTESIAN_POINT($,(0,0,-5));
#43=DIRECTION($,(-0,-0,-1));
#44=DIRECTION($,(1,0,0));
#45=AXIS2_PLACEMENT_3D($,#42,#43,#44);
@@ -56,38 +56,38 @@ DATA;
#49=EDGE_LOOP($,(#48));
#50=FACE_BOUND('',#49,.T.);
#51=ADVANCED_FACE('',(#39,#50),#5,.T.);
-#52=CARTESIAN_POINT($,(0,0,0));
+#52=CARTESIAN_POINT($,(0,0,5));
#53=DIRECTION($,(0,0,1));
#54=DIRECTION($,(1,0,0));
#55=AXIS2_PLACEMENT_3D($,#52,#53,#54);
#56=PLANE($,#55);
-#57=CARTESIAN_POINT($,(-10,-10,0));
+#57=CARTESIAN_POINT($,(-10,-10,5));
#58=VERTEX_POINT($,#57);
-#59=CARTESIAN_POINT($,(10,-10,0));
+#59=CARTESIAN_POINT($,(10,-10,5));
#60=VERTEX_POINT($,#59);
-#61=CARTESIAN_POINT($,(-10,-10,0));
+#61=CARTESIAN_POINT($,(-10,-10,5));
#62=DIRECTION($,(1,0,0));
#63=VECTOR($,#62,1);
#64=LINE($,#61,#63);
#65=EDGE_CURVE($,#58,#60,#64,.T.);
#66=ORIENTED_EDGE($,$,$,#65,.T.);
-#67=CARTESIAN_POINT($,(10,10,0));
+#67=CARTESIAN_POINT($,(10,10,5));
#68=VERTEX_POINT($,#67);
-#69=CARTESIAN_POINT($,(10,-10,0));
+#69=CARTESIAN_POINT($,(10,-10,5));
#70=DIRECTION($,(0,1,0));
#71=VECTOR($,#70,1);
#72=LINE($,#69,#71);
#73=EDGE_CURVE($,#60,#68,#72,.T.);
#74=ORIENTED_EDGE($,$,$,#73,.T.);
-#75=CARTESIAN_POINT($,(-10,10,0));
+#75=CARTESIAN_POINT($,(-10,10,5));
#76=VERTEX_POINT($,#75);
-#77=CARTESIAN_POINT($,(10,10,0));
+#77=CARTESIAN_POINT($,(10,10,5));
#78=DIRECTION($,(-1,0,0));
#79=VECTOR($,#78,1);
#80=LINE($,#77,#79);
#81=EDGE_CURVE($,#68,#76,#80,.T.);
#82=ORIENTED_EDGE($,$,$,#81,.T.);
-#83=CARTESIAN_POINT($,(-10,10,0));
+#83=CARTESIAN_POINT($,(-10,10,5));
#84=DIRECTION($,(0,-1,0));
#85=VECTOR($,#84,1);
#86=LINE($,#83,#85);
@@ -95,9 +95,9 @@ DATA;
#88=ORIENTED_EDGE($,$,$,#87,.T.);
#89=EDGE_LOOP($,(#66,#74,#82,#88));
#90=FACE_OUTER_BOUND('',#89,.T.);
-#91=CARTESIAN_POINT($,(2,0,0));
+#91=CARTESIAN_POINT($,(2,0,5));
#92=VERTEX_POINT($,#91);
-#93=CARTESIAN_POINT($,(0,0,0));
+#93=CARTESIAN_POINT($,(0,0,5));
#94=DIRECTION($,(-0,-0,-1));
#95=DIRECTION($,(1,0,0));
#96=AXIS2_PLACEMENT_3D($,#93,#94,#95);
@@ -107,20 +107,20 @@ DATA;
#100=EDGE_LOOP($,(#99));
#101=FACE_BOUND('',#100,.T.);
#102=ADVANCED_FACE('',(#90,#101),#56,.T.);
-#103=CARTESIAN_POINT($,(0,-10,-5));
+#103=CARTESIAN_POINT($,(0,-10,0));
#104=DIRECTION($,(0,-1,0));
#105=DIRECTION($,(1,0,0));
#106=AXIS2_PLACEMENT_3D($,#103,#104,#105);
#107=PLANE($,#106);
#108=ORIENTED_EDGE($,$,$,#14,.T.);
-#109=CARTESIAN_POINT($,(10,-10,-10));
+#109=CARTESIAN_POINT($,(10,-10,-5));
#110=DIRECTION($,(0,0,1));
#111=VECTOR($,#110,1);
#112=LINE($,#109,#111);
#113=EDGE_CURVE($,#9,#60,#112,.T.);
#114=ORIENTED_EDGE($,$,$,#113,.T.);
#115=ORIENTED_EDGE($,$,$,#65,.F.);
-#116=CARTESIAN_POINT($,(-10,-10,-10));
+#116=CARTESIAN_POINT($,(-10,-10,-5));
#117=DIRECTION($,(0,0,1));
#118=VECTOR($,#117,1);
#119=LINE($,#116,#118);
@@ -129,13 +129,13 @@ DATA;
#122=EDGE_LOOP($,(#108,#114,#115,#121));
#123=FACE_OUTER_BOUND('',#122,.T.);
#124=ADVANCED_FACE('',(#123),#107,.T.);
-#125=CARTESIAN_POINT($,(10,0,-5));
+#125=CARTESIAN_POINT($,(10,0,0));
#126=DIRECTION($,(1,0,0));
#127=DIRECTION($,(0,1,0));
#128=AXIS2_PLACEMENT_3D($,#125,#126,#127);
#129=PLANE($,#128);
#130=ORIENTED_EDGE($,$,$,#22,.T.);
-#131=CARTESIAN_POINT($,(10,10,-10));
+#131=CARTESIAN_POINT($,(10,10,-5));
#132=DIRECTION($,(0,0,1));
#133=VECTOR($,#132,1);
#134=LINE($,#131,#133);
@@ -146,13 +146,13 @@ DATA;
#139=EDGE_LOOP($,(#130,#136,#137,#138));
#140=FACE_OUTER_BOUND('',#139,.T.);
#141=ADVANCED_FACE('',(#140),#129,.T.);
-#142=CARTESIAN_POINT($,(0,10,-5));
+#142=CARTESIAN_POINT($,(0,10,0));
#143=DIRECTION($,(0,1,0));
#144=DIRECTION($,(-1,0,0));
#145=AXIS2_PLACEMENT_3D($,#142,#143,#144);
#146=PLANE($,#145);
#147=ORIENTED_EDGE($,$,$,#30,.T.);
-#148=CARTESIAN_POINT($,(-10,10,-10));
+#148=CARTESIAN_POINT($,(-10,10,-5));
#149=DIRECTION($,(0,0,1));
#150=VECTOR($,#149,1);
#151=LINE($,#148,#150);
@@ -163,7 +163,7 @@ DATA;
#156=EDGE_LOOP($,(#147,#153,#154,#155));
#157=FACE_OUTER_BOUND('',#156,.T.);
#158=ADVANCED_FACE('',(#157),#146,.T.);
-#159=CARTESIAN_POINT($,(-10,0,-5));
+#159=CARTESIAN_POINT($,(-10,0,0));
#160=DIRECTION($,(-1,0,0));
#161=DIRECTION($,(0,1,0));
#162=AXIS2_PLACEMENT_3D($,#159,#160,#161);
@@ -175,16 +175,16 @@ DATA;
#168=EDGE_LOOP($,(#164,#165,#166,#167));
#169=FACE_OUTER_BOUND('',#168,.T.);
#170=ADVANCED_FACE('',(#169),#163,.T.);
-#171=CARTESIAN_POINT($,(0,0,0));
+#171=CARTESIAN_POINT($,(0,0,5));
#172=DIRECTION($,(-0,-0,-1));
#173=DIRECTION($,(1,0,0));
#174=AXIS2_PLACEMENT_3D($,#171,#172,#173);
#175=CONICAL_SURFACE($,#174,2,0.197395559849881);
-#176=CARTESIAN_POINT($,(2,0,0));
+#176=CARTESIAN_POINT($,(2,0,5));
#177=VERTEX_POINT($,#176);
-#178=CARTESIAN_POINT($,(4,0,-10));
+#178=CARTESIAN_POINT($,(4,0,-5));
#179=VERTEX_POINT($,#178);
-#180=CARTESIAN_POINT($,(2,0,0));
+#180=CARTESIAN_POINT($,(2,0,5));
#181=DIRECTION($,(0.196116135138184,0,-0.98058067569092));
#182=VECTOR($,#181,1);
#183=LINE($,#180,#182);
diff --git a/testdata/firmament/exports/boolean_intersect_basic.step b/testdata/firmament/exports/boolean_intersect_basic.step
index e7570bc0..7d8c485a 100644
--- a/testdata/firmament/exports/boolean_intersect_basic.step
+++ b/testdata/firmament/exports/boolean_intersect_basic.step
@@ -5,155 +5,155 @@ FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris')
FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
ENDSEC;
DATA;
-#1=CARTESIAN_POINT($,(0.75,0,-1));
-#2=DIRECTION($,(0,0,-1));
-#3=DIRECTION($,(1,0,0));
+#1=CARTESIAN_POINT($,(-1.5,0,0));
+#2=DIRECTION($,(-1,0,0));
+#3=DIRECTION($,(0,1,0));
#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
#5=PLANE($,#4);
-#6=CARTESIAN_POINT($,(-0,-1,-1));
+#6=CARTESIAN_POINT($,(-1.5,-1,-0));
#7=VERTEX_POINT($,#6);
-#8=CARTESIAN_POINT($,(1.5,-1,-1));
+#8=CARTESIAN_POINT($,(-1.5,-1,1));
#9=VERTEX_POINT($,#8);
-#10=CARTESIAN_POINT($,(-0,-1,-1));
-#11=DIRECTION($,(1,0,0));
+#10=CARTESIAN_POINT($,(-1.5,-1,-0));
+#11=DIRECTION($,(0,0,1));
#12=VECTOR($,#11,1);
#13=LINE($,#10,#12);
#14=EDGE_CURVE($,#7,#9,#13,.T.);
#15=ORIENTED_EDGE($,$,$,#14,.T.);
-#16=CARTESIAN_POINT($,(1.5,1,-1));
+#16=CARTESIAN_POINT($,(-1.5,1,1));
#17=VERTEX_POINT($,#16);
-#18=CARTESIAN_POINT($,(1.5,-1,-1));
+#18=CARTESIAN_POINT($,(-1.5,-1,1));
#19=DIRECTION($,(0,1,0));
#20=VECTOR($,#19,1);
#21=LINE($,#18,#20);
#22=EDGE_CURVE($,#9,#17,#21,.T.);
#23=ORIENTED_EDGE($,$,$,#22,.T.);
-#24=CARTESIAN_POINT($,(-0,1,-1));
+#24=CARTESIAN_POINT($,(-1.5,1,0));
#25=VERTEX_POINT($,#24);
-#26=CARTESIAN_POINT($,(1.5,1,-1));
-#27=DIRECTION($,(-1,0,0));
+#26=CARTESIAN_POINT($,(-1.5,1,1));
+#27=DIRECTION($,(0,0,-1));
#28=VECTOR($,#27,1);
#29=LINE($,#26,#28);
#30=EDGE_CURVE($,#17,#25,#29,.T.);
-#31=ORIENTED_EDGE($,$,$,#30,.T.);
-#32=CARTESIAN_POINT($,(-0,1,-1));
-#33=DIRECTION($,(0,-1,0));
+#31=ORIENTED_EDGE($,$,$,#30,.F.);
+#32=CARTESIAN_POINT($,(-1.5,1,0));
+#33=DIRECTION($,(0,-1,-0));
#34=VECTOR($,#33,1);
#35=LINE($,#32,#34);
#36=EDGE_CURVE($,#25,#7,#35,.T.);
-#37=ORIENTED_EDGE($,$,$,#36,.T.);
+#37=ORIENTED_EDGE($,$,$,#36,.F.);
#38=EDGE_LOOP($,(#15,#23,#31,#37));
#39=FACE_OUTER_BOUND('',#38,.T.);
#40=ADVANCED_FACE('',(#39),#5,.T.);
-#41=CARTESIAN_POINT($,(0.75,0,1));
-#42=DIRECTION($,(0,0,1));
-#43=DIRECTION($,(1,0,0));
+#41=CARTESIAN_POINT($,(1.5,0,0));
+#42=DIRECTION($,(1,0,0));
+#43=DIRECTION($,(0,1,0));
#44=AXIS2_PLACEMENT_3D($,#41,#42,#43);
#45=PLANE($,#44);
-#46=CARTESIAN_POINT($,(-0,-1,1));
+#46=CARTESIAN_POINT($,(1.5,-1,0));
#47=VERTEX_POINT($,#46);
-#48=CARTESIAN_POINT($,(1.5,-1,1));
+#48=CARTESIAN_POINT($,(1.5,1,-0));
#49=VERTEX_POINT($,#48);
-#50=CARTESIAN_POINT($,(-0,-1,1));
-#51=DIRECTION($,(1,0,0));
+#50=CARTESIAN_POINT($,(1.5,-1,0));
+#51=DIRECTION($,(0,1,0));
#52=VECTOR($,#51,1);
#53=LINE($,#50,#52);
#54=EDGE_CURVE($,#47,#49,#53,.T.);
#55=ORIENTED_EDGE($,$,$,#54,.T.);
#56=CARTESIAN_POINT($,(1.5,1,1));
#57=VERTEX_POINT($,#56);
-#58=CARTESIAN_POINT($,(1.5,-1,1));
-#59=DIRECTION($,(0,1,0));
+#58=CARTESIAN_POINT($,(1.5,1,-0));
+#59=DIRECTION($,(0,0,1));
#60=VECTOR($,#59,1);
#61=LINE($,#58,#60);
#62=EDGE_CURVE($,#49,#57,#61,.T.);
#63=ORIENTED_EDGE($,$,$,#62,.T.);
-#64=CARTESIAN_POINT($,(0,1,1));
+#64=CARTESIAN_POINT($,(1.5,-1,1));
#65=VERTEX_POINT($,#64);
#66=CARTESIAN_POINT($,(1.5,1,1));
-#67=DIRECTION($,(-1,0,0));
+#67=DIRECTION($,(0,-1,0));
#68=VECTOR($,#67,1);
#69=LINE($,#66,#68);
#70=EDGE_CURVE($,#57,#65,#69,.T.);
-#71=ORIENTED_EDGE($,$,$,#70,.T.);
-#72=CARTESIAN_POINT($,(0,1,1));
-#73=DIRECTION($,(0,-1,0));
+#71=ORIENTED_EDGE($,$,$,#70,.F.);
+#72=CARTESIAN_POINT($,(1.5,-1,1));
+#73=DIRECTION($,(0,0,-1));
#74=VECTOR($,#73,1);
#75=LINE($,#72,#74);
#76=EDGE_CURVE($,#65,#47,#75,.T.);
-#77=ORIENTED_EDGE($,$,$,#76,.T.);
+#77=ORIENTED_EDGE($,$,$,#76,.F.);
#78=EDGE_LOOP($,(#55,#63,#71,#77));
#79=FACE_OUTER_BOUND('',#78,.T.);
#80=ADVANCED_FACE('',(#79),#45,.T.);
-#81=CARTESIAN_POINT($,(0.75,-1,0));
+#81=CARTESIAN_POINT($,(0,-1,0));
#82=DIRECTION($,(0,-1,0));
#83=DIRECTION($,(1,0,0));
#84=AXIS2_PLACEMENT_3D($,#81,#82,#83);
#85=PLANE($,#84);
-#86=ORIENTED_EDGE($,$,$,#14,.T.);
-#87=CARTESIAN_POINT($,(1.5,-1,-1));
-#88=DIRECTION($,(0,0,1));
-#89=VECTOR($,#88,1);
-#90=LINE($,#87,#89);
-#91=EDGE_CURVE($,#9,#49,#90,.T.);
-#92=ORIENTED_EDGE($,$,$,#91,.T.);
-#93=ORIENTED_EDGE($,$,$,#54,.F.);
-#94=CARTESIAN_POINT($,(-0,-1,-1));
-#95=DIRECTION($,(0,0,1));
-#96=VECTOR($,#95,1);
-#97=LINE($,#94,#96);
-#98=EDGE_CURVE($,#7,#47,#97,.T.);
-#99=ORIENTED_EDGE($,$,$,#98,.F.);
-#100=EDGE_LOOP($,(#86,#92,#93,#99));
+#86=CARTESIAN_POINT($,(-1.5,-1,-0));
+#87=DIRECTION($,(1,0,0));
+#88=VECTOR($,#87,1);
+#89=LINE($,#86,#88);
+#90=EDGE_CURVE($,#7,#47,#89,.T.);
+#91=ORIENTED_EDGE($,$,$,#90,.T.);
+#92=ORIENTED_EDGE($,$,$,#76,.T.);
+#93=CARTESIAN_POINT($,(1.5,-1,1));
+#94=DIRECTION($,(-1,0,0));
+#95=VECTOR($,#94,1);
+#96=LINE($,#93,#95);
+#97=EDGE_CURVE($,#65,#9,#96,.T.);
+#98=ORIENTED_EDGE($,$,$,#97,.F.);
+#99=ORIENTED_EDGE($,$,$,#14,.F.);
+#100=EDGE_LOOP($,(#91,#92,#98,#99));
#101=FACE_OUTER_BOUND('',#100,.T.);
#102=ADVANCED_FACE('',(#101),#85,.T.);
-#103=CARTESIAN_POINT($,(1.5,0,0));
-#104=DIRECTION($,(1,0,0));
-#105=DIRECTION($,(0,1,0));
+#103=CARTESIAN_POINT($,(0,1,0));
+#104=DIRECTION($,(0,1,0));
+#105=DIRECTION($,(-1,0,0));
#106=AXIS2_PLACEMENT_3D($,#103,#104,#105);
#107=PLANE($,#106);
-#108=ORIENTED_EDGE($,$,$,#22,.T.);
-#109=CARTESIAN_POINT($,(1.5,1,-1));
-#110=DIRECTION($,(0,0,1));
+#108=ORIENTED_EDGE($,$,$,#30,.T.);
+#109=CARTESIAN_POINT($,(-1.5,1,1));
+#110=DIRECTION($,(1,0,0));
#111=VECTOR($,#110,1);
#112=LINE($,#109,#111);
#113=EDGE_CURVE($,#17,#57,#112,.T.);
#114=ORIENTED_EDGE($,$,$,#113,.T.);
#115=ORIENTED_EDGE($,$,$,#62,.F.);
-#116=ORIENTED_EDGE($,$,$,#91,.F.);
-#117=EDGE_LOOP($,(#108,#114,#115,#116));
-#118=FACE_OUTER_BOUND('',#117,.T.);
-#119=ADVANCED_FACE('',(#118),#107,.T.);
-#120=CARTESIAN_POINT($,(0.75,1,0));
-#121=DIRECTION($,(0,1,0));
-#122=DIRECTION($,(-1,0,0));
-#123=AXIS2_PLACEMENT_3D($,#120,#121,#122);
-#124=PLANE($,#123);
-#125=ORIENTED_EDGE($,$,$,#30,.T.);
-#126=CARTESIAN_POINT($,(-0,1,-1));
-#127=DIRECTION($,(0,0,1));
-#128=VECTOR($,#127,1);
-#129=LINE($,#126,#128);
-#130=EDGE_CURVE($,#25,#65,#129,.T.);
-#131=ORIENTED_EDGE($,$,$,#130,.T.);
-#132=ORIENTED_EDGE($,$,$,#70,.F.);
-#133=ORIENTED_EDGE($,$,$,#113,.F.);
-#134=EDGE_LOOP($,(#125,#131,#132,#133));
+#116=CARTESIAN_POINT($,(1.5,1,-0));
+#117=DIRECTION($,(-1,0,0));
+#118=VECTOR($,#117,1);
+#119=LINE($,#116,#118);
+#120=EDGE_CURVE($,#49,#25,#119,.T.);
+#121=ORIENTED_EDGE($,$,$,#120,.F.);
+#122=EDGE_LOOP($,(#108,#114,#115,#121));
+#123=FACE_OUTER_BOUND('',#122,.T.);
+#124=ADVANCED_FACE('',(#123),#107,.T.);
+#125=CARTESIAN_POINT($,(0,0,0));
+#126=DIRECTION($,(0,0,-1));
+#127=DIRECTION($,(1,0,0));
+#128=AXIS2_PLACEMENT_3D($,#125,#126,#127);
+#129=PLANE($,#128);
+#130=ORIENTED_EDGE($,$,$,#36,.T.);
+#131=ORIENTED_EDGE($,$,$,#120,.T.);
+#132=ORIENTED_EDGE($,$,$,#54,.F.);
+#133=ORIENTED_EDGE($,$,$,#90,.F.);
+#134=EDGE_LOOP($,(#130,#131,#132,#133));
#135=FACE_OUTER_BOUND('',#134,.T.);
-#136=ADVANCED_FACE('',(#135),#124,.T.);
-#137=CARTESIAN_POINT($,(0,0,0));
-#138=DIRECTION($,(-1,0,0));
-#139=DIRECTION($,(0,1,0));
+#136=ADVANCED_FACE('',(#135),#129,.T.);
+#137=CARTESIAN_POINT($,(0,0,1));
+#138=DIRECTION($,(0,0,1));
+#139=DIRECTION($,(1,0,0));
#140=AXIS2_PLACEMENT_3D($,#137,#138,#139);
#141=PLANE($,#140);
-#142=ORIENTED_EDGE($,$,$,#36,.T.);
-#143=ORIENTED_EDGE($,$,$,#98,.T.);
-#144=ORIENTED_EDGE($,$,$,#76,.F.);
-#145=ORIENTED_EDGE($,$,$,#130,.F.);
+#142=ORIENTED_EDGE($,$,$,#97,.T.);
+#143=ORIENTED_EDGE($,$,$,#70,.T.);
+#144=ORIENTED_EDGE($,$,$,#113,.F.);
+#145=ORIENTED_EDGE($,$,$,#22,.F.);
#146=EDGE_LOOP($,(#142,#143,#144,#145));
#147=FACE_OUTER_BOUND('',#146,.T.);
#148=ADVANCED_FACE('',(#147),#141,.T.);
-#149=CLOSED_SHELL($,(#40,#80,#102,#119,#136,#148));
+#149=CLOSED_SHELL($,(#40,#80,#102,#124,#136,#148));
#150=MANIFOLD_SOLID_BREP('AetherisBody',#149);
#151=APPLICATION_CONTEXT('mechanical design');
#152=PRODUCT_CONTEXT('',#151,'mechanical');
diff --git a/testdata/firmament/exports/f2_flange_center_bore.step b/testdata/firmament/exports/f2_flange_center_bore.step
index 9c32ccea..ff1faa21 100644
--- a/testdata/firmament/exports/f2_flange_center_bore.step
+++ b/testdata/firmament/exports/f2_flange_center_bore.step
@@ -130,12 +130,7 @@ DATA;
#123=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
#124=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
#125=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#122,#123,#124))REPRESENTATION_CONTEXT('3','3D'));
-#126=SHAPE_ASPECT('firmament-feature:center_bore','supported cylinder through-hole feature',#121,.FALSE.);
-#127=PROPERTY_DEFINITION('diameter:center_bore','auto-derived semantic PMI diameter',#126);
-#128=MEASURE_REPRESENTATION_ITEM('diameter',24,#122);
-#129=SHAPE_DIMENSION_REPRESENTATION('diameter:center_bore',(#128),#125);
-#130=PROPERTY_DEFINITION_REPRESENTATION(#127,#129);
-#131=SHAPE_REPRESENTATION('AetherisBody',(#114),#125);
-#132=SHAPE_DEFINITION_REPRESENTATION(#121,#131);
+#126=SHAPE_REPRESENTATION('AetherisBody',(#114),#125);
+#127=SHAPE_DEFINITION_REPRESENTATION(#121,#126);
ENDSEC;
END-ISO-10303-21;
diff --git a/testdata/firmament/exports/m10h1-unsupported-box-with-cylinder-hole.step b/testdata/firmament/exports/m10h1-unsupported-box-with-cylinder-hole.step
new file mode 100644
index 00000000..f3f64643
--- /dev/null
+++ b/testdata/firmament/exports/m10h1-unsupported-box-with-cylinder-hole.step
@@ -0,0 +1,234 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('Aetheris AP242 subset export'),'2;1');
+FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris'),'Aetheris.Kernel','Aetheris.Kernel','');
+FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
+ENDSEC;
+DATA;
+#1=CARTESIAN_POINT($,(0,0,-6));
+#2=DIRECTION($,(0,0,-1));
+#3=DIRECTION($,(1,0,0));
+#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
+#5=PLANE($,#4);
+#6=CARTESIAN_POINT($,(-20,-15,-6));
+#7=VERTEX_POINT($,#6);
+#8=CARTESIAN_POINT($,(20,-15,-6));
+#9=VERTEX_POINT($,#8);
+#10=CARTESIAN_POINT($,(-20,-15,-6));
+#11=DIRECTION($,(1,0,0));
+#12=VECTOR($,#11,1);
+#13=LINE($,#10,#12);
+#14=EDGE_CURVE($,#7,#9,#13,.T.);
+#15=ORIENTED_EDGE($,$,$,#14,.T.);
+#16=CARTESIAN_POINT($,(20,15,-6));
+#17=VERTEX_POINT($,#16);
+#18=CARTESIAN_POINT($,(20,-15,-6));
+#19=DIRECTION($,(0,1,0));
+#20=VECTOR($,#19,1);
+#21=LINE($,#18,#20);
+#22=EDGE_CURVE($,#9,#17,#21,.T.);
+#23=ORIENTED_EDGE($,$,$,#22,.T.);
+#24=CARTESIAN_POINT($,(-20,15,-6));
+#25=VERTEX_POINT($,#24);
+#26=CARTESIAN_POINT($,(20,15,-6));
+#27=DIRECTION($,(-1,0,0));
+#28=VECTOR($,#27,1);
+#29=LINE($,#26,#28);
+#30=EDGE_CURVE($,#17,#25,#29,.T.);
+#31=ORIENTED_EDGE($,$,$,#30,.T.);
+#32=CARTESIAN_POINT($,(-20,15,-6));
+#33=DIRECTION($,(0,-1,0));
+#34=VECTOR($,#33,1);
+#35=LINE($,#32,#34);
+#36=EDGE_CURVE($,#25,#7,#35,.T.);
+#37=ORIENTED_EDGE($,$,$,#36,.T.);
+#38=EDGE_LOOP($,(#15,#23,#31,#37));
+#39=FACE_OUTER_BOUND('',#38,.T.);
+#40=ADVANCED_FACE('',(#39),#5,.T.);
+#41=CARTESIAN_POINT($,(0,0,6));
+#42=DIRECTION($,(0,0,1));
+#43=DIRECTION($,(1,0,0));
+#44=AXIS2_PLACEMENT_3D($,#41,#42,#43);
+#45=PLANE($,#44);
+#46=CARTESIAN_POINT($,(-20,-15,6));
+#47=VERTEX_POINT($,#46);
+#48=CARTESIAN_POINT($,(20,-15,6));
+#49=VERTEX_POINT($,#48);
+#50=CARTESIAN_POINT($,(-20,-15,6));
+#51=DIRECTION($,(1,0,0));
+#52=VECTOR($,#51,1);
+#53=LINE($,#50,#52);
+#54=EDGE_CURVE($,#47,#49,#53,.T.);
+#55=ORIENTED_EDGE($,$,$,#54,.T.);
+#56=CARTESIAN_POINT($,(20,15,6));
+#57=VERTEX_POINT($,#56);
+#58=CARTESIAN_POINT($,(20,-15,6));
+#59=DIRECTION($,(0,1,0));
+#60=VECTOR($,#59,1);
+#61=LINE($,#58,#60);
+#62=EDGE_CURVE($,#49,#57,#61,.T.);
+#63=ORIENTED_EDGE($,$,$,#62,.T.);
+#64=CARTESIAN_POINT($,(-20,15,6));
+#65=VERTEX_POINT($,#64);
+#66=CARTESIAN_POINT($,(20,15,6));
+#67=DIRECTION($,(-1,0,0));
+#68=VECTOR($,#67,1);
+#69=LINE($,#66,#68);
+#70=EDGE_CURVE($,#57,#65,#69,.T.);
+#71=ORIENTED_EDGE($,$,$,#70,.T.);
+#72=CARTESIAN_POINT($,(-20,15,6));
+#73=DIRECTION($,(0,-1,0));
+#74=VECTOR($,#73,1);
+#75=LINE($,#72,#74);
+#76=EDGE_CURVE($,#65,#47,#75,.T.);
+#77=ORIENTED_EDGE($,$,$,#76,.T.);
+#78=EDGE_LOOP($,(#55,#63,#71,#77));
+#79=FACE_OUTER_BOUND('',#78,.T.);
+#80=ADVANCED_FACE('',(#79),#45,.T.);
+#81=CARTESIAN_POINT($,(0,-15,0));
+#82=DIRECTION($,(0,-1,0));
+#83=DIRECTION($,(1,0,0));
+#84=AXIS2_PLACEMENT_3D($,#81,#82,#83);
+#85=PLANE($,#84);
+#86=ORIENTED_EDGE($,$,$,#14,.T.);
+#87=CARTESIAN_POINT($,(20,-15,-6));
+#88=DIRECTION($,(0,0,1));
+#89=VECTOR($,#88,1);
+#90=LINE($,#87,#89);
+#91=EDGE_CURVE($,#9,#49,#90,.T.);
+#92=ORIENTED_EDGE($,$,$,#91,.T.);
+#93=ORIENTED_EDGE($,$,$,#54,.F.);
+#94=CARTESIAN_POINT($,(-20,-15,-6));
+#95=DIRECTION($,(0,0,1));
+#96=VECTOR($,#95,1);
+#97=LINE($,#94,#96);
+#98=EDGE_CURVE($,#7,#47,#97,.T.);
+#99=ORIENTED_EDGE($,$,$,#98,.F.);
+#100=EDGE_LOOP($,(#86,#92,#93,#99));
+#101=FACE_OUTER_BOUND('',#100,.T.);
+#102=ADVANCED_FACE('',(#101),#85,.T.);
+#103=CARTESIAN_POINT($,(20,0,0));
+#104=DIRECTION($,(1,0,0));
+#105=DIRECTION($,(0,1,0));
+#106=AXIS2_PLACEMENT_3D($,#103,#104,#105);
+#107=PLANE($,#106);
+#108=ORIENTED_EDGE($,$,$,#22,.T.);
+#109=CARTESIAN_POINT($,(20,15,-6));
+#110=DIRECTION($,(0,0,1));
+#111=VECTOR($,#110,1);
+#112=LINE($,#109,#111);
+#113=EDGE_CURVE($,#17,#57,#112,.T.);
+#114=ORIENTED_EDGE($,$,$,#113,.T.);
+#115=ORIENTED_EDGE($,$,$,#62,.F.);
+#116=ORIENTED_EDGE($,$,$,#91,.F.);
+#117=EDGE_LOOP($,(#108,#114,#115,#116));
+#118=FACE_OUTER_BOUND('',#117,.T.);
+#119=ADVANCED_FACE('',(#118),#107,.T.);
+#120=CARTESIAN_POINT($,(0,15,0));
+#121=DIRECTION($,(0,1,0));
+#122=DIRECTION($,(-1,0,0));
+#123=AXIS2_PLACEMENT_3D($,#120,#121,#122);
+#124=PLANE($,#123);
+#125=ORIENTED_EDGE($,$,$,#30,.T.);
+#126=CARTESIAN_POINT($,(-20,15,-6));
+#127=DIRECTION($,(0,0,1));
+#128=VECTOR($,#127,1);
+#129=LINE($,#126,#128);
+#130=EDGE_CURVE($,#25,#65,#129,.T.);
+#131=ORIENTED_EDGE($,$,$,#130,.T.);
+#132=ORIENTED_EDGE($,$,$,#70,.F.);
+#133=ORIENTED_EDGE($,$,$,#113,.F.);
+#134=EDGE_LOOP($,(#125,#131,#132,#133));
+#135=FACE_OUTER_BOUND('',#134,.T.);
+#136=ADVANCED_FACE('',(#135),#124,.T.);
+#137=CARTESIAN_POINT($,(-20,0,0));
+#138=DIRECTION($,(-1,0,0));
+#139=DIRECTION($,(0,1,0));
+#140=AXIS2_PLACEMENT_3D($,#137,#138,#139);
+#141=PLANE($,#140);
+#142=ORIENTED_EDGE($,$,$,#36,.T.);
+#143=ORIENTED_EDGE($,$,$,#98,.T.);
+#144=ORIENTED_EDGE($,$,$,#76,.F.);
+#145=ORIENTED_EDGE($,$,$,#130,.F.);
+#146=EDGE_LOOP($,(#142,#143,#144,#145));
+#147=FACE_OUTER_BOUND('',#146,.T.);
+#148=ADVANCED_FACE('',(#147),#141,.T.);
+#149=CLOSED_SHELL($,(#40,#80,#102,#119,#136,#148));
+#150=CARTESIAN_POINT($,(0,0,-4));
+#151=DIRECTION($,(0,0,1));
+#152=DIRECTION($,(1,0,0));
+#153=AXIS2_PLACEMENT_3D($,#150,#151,#152);
+#154=CYLINDRICAL_SURFACE($,#153,4);
+#155=CARTESIAN_POINT($,(4,0,-4));
+#156=VERTEX_POINT($,#155);
+#157=CARTESIAN_POINT($,(4,0,4));
+#158=VERTEX_POINT($,#157);
+#159=CARTESIAN_POINT($,(4,0,-4));
+#160=DIRECTION($,(0,0,1));
+#161=VECTOR($,#160,1);
+#162=LINE($,#159,#161);
+#163=EDGE_CURVE($,#156,#158,#162,.T.);
+#164=ORIENTED_EDGE($,$,$,#163,.T.);
+#165=CARTESIAN_POINT($,(4,0,4));
+#166=VERTEX_POINT($,#165);
+#167=CARTESIAN_POINT($,(0,0,4));
+#168=DIRECTION($,(0,0,1));
+#169=DIRECTION($,(1,0,0));
+#170=AXIS2_PLACEMENT_3D($,#167,#168,#169);
+#171=CIRCLE($,#170,4);
+#172=EDGE_CURVE($,#166,#166,#171,.T.);
+#173=ORIENTED_EDGE($,$,$,#172,.T.);
+#174=ORIENTED_EDGE($,$,$,#163,.F.);
+#175=CARTESIAN_POINT($,(4,0,-4));
+#176=VERTEX_POINT($,#175);
+#177=CARTESIAN_POINT($,(0,0,-4));
+#178=DIRECTION($,(0,0,1));
+#179=DIRECTION($,(1,0,0));
+#180=AXIS2_PLACEMENT_3D($,#177,#178,#179);
+#181=CIRCLE($,#180,4);
+#182=EDGE_CURVE($,#176,#176,#181,.T.);
+#183=ORIENTED_EDGE($,$,$,#182,.F.);
+#184=EDGE_LOOP($,(#164,#173,#174,#183));
+#185=FACE_OUTER_BOUND('',#184,.T.);
+#186=ADVANCED_FACE('',(#185),#154,.T.);
+#187=CARTESIAN_POINT($,(0,0,4));
+#188=DIRECTION($,(0,0,1));
+#189=DIRECTION($,(1,0,0));
+#190=AXIS2_PLACEMENT_3D($,#187,#188,#189);
+#191=PLANE($,#190);
+#192=ORIENTED_EDGE($,$,$,#172,.F.);
+#193=EDGE_LOOP($,(#192));
+#194=FACE_OUTER_BOUND('',#193,.T.);
+#195=ADVANCED_FACE('',(#194),#191,.T.);
+#196=CARTESIAN_POINT($,(0,0,-4));
+#197=DIRECTION($,(0,0,-1));
+#198=DIRECTION($,(0,1,0));
+#199=AXIS2_PLACEMENT_3D($,#196,#197,#198);
+#200=PLANE($,#199);
+#201=ORIENTED_EDGE($,$,$,#182,.T.);
+#202=EDGE_LOOP($,(#201));
+#203=FACE_OUTER_BOUND('',#202,.T.);
+#204=ADVANCED_FACE('',(#203),#200,.T.);
+#205=CLOSED_SHELL($,(#186,#195,#204));
+#206=ORIENTED_CLOSED_SHELL($,#205,.F.);
+#207=BREP_WITH_VOIDS('AetherisBody',#149,(#206));
+#208=APPLICATION_CONTEXT('mechanical design');
+#209=PRODUCT_CONTEXT('',#208,'mechanical');
+#210=PRODUCT('AETHERIS','AetherisBody','',(#209));
+#211=PRODUCT_DEFINITION_FORMATION('','',#210);
+#212=PRODUCT_DEFINITION_CONTEXT('design',#208,'design');
+#213=PRODUCT_DEFINITION('','',#211,#212);
+#214=PRODUCT_DEFINITION_SHAPE('','',#213);
+#215=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#216=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#217=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#218=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#215,#216,#217))REPRESENTATION_CONTEXT('3','3D'));
+#219=SHAPE_ASPECT('firmament-feature:hole','supported cylinder through-hole feature',#214,.FALSE.);
+#220=PROPERTY_DEFINITION('diameter:hole','auto-derived semantic PMI diameter',#219);
+#221=MEASURE_REPRESENTATION_ITEM('diameter',8,#215);
+#222=SHAPE_DIMENSION_REPRESENTATION('diameter:hole',(#221),#218);
+#223=PROPERTY_DEFINITION_REPRESENTATION(#220,#222);
+#224=SHAPE_REPRESENTATION('AetherisBody',(#207),#218);
+#225=SHAPE_DEFINITION_REPRESENTATION(#214,#224);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/testdata/firmament/exports/m13b-invalid-composed-reenter-safe-family.step b/testdata/firmament/exports/m13b-invalid-composed-reenter-safe-family.step
new file mode 100644
index 00000000..203bfa06
--- /dev/null
+++ b/testdata/firmament/exports/m13b-invalid-composed-reenter-safe-family.step
@@ -0,0 +1,220 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('Aetheris AP242 subset export'),'2;1');
+FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris'),'Aetheris.Kernel','Aetheris.Kernel','');
+FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
+ENDSEC;
+DATA;
+#1=CARTESIAN_POINT($,(0,0,-6));
+#2=DIRECTION($,(0,0,-1));
+#3=DIRECTION($,(1,0,0));
+#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
+#5=PLANE($,#4);
+#6=CARTESIAN_POINT($,(-20,-15,-6));
+#7=VERTEX_POINT($,#6);
+#8=CARTESIAN_POINT($,(20,-15,-6));
+#9=VERTEX_POINT($,#8);
+#10=CARTESIAN_POINT($,(-20,-15,-6));
+#11=DIRECTION($,(1,0,0));
+#12=VECTOR($,#11,1);
+#13=LINE($,#10,#12);
+#14=EDGE_CURVE($,#7,#9,#13,.T.);
+#15=ORIENTED_EDGE($,$,$,#14,.T.);
+#16=CARTESIAN_POINT($,(20,15,-6));
+#17=VERTEX_POINT($,#16);
+#18=CARTESIAN_POINT($,(20,-15,-6));
+#19=DIRECTION($,(0,1,0));
+#20=VECTOR($,#19,1);
+#21=LINE($,#18,#20);
+#22=EDGE_CURVE($,#9,#17,#21,.T.);
+#23=ORIENTED_EDGE($,$,$,#22,.T.);
+#24=CARTESIAN_POINT($,(-20,15,-6));
+#25=VERTEX_POINT($,#24);
+#26=CARTESIAN_POINT($,(20,15,-6));
+#27=DIRECTION($,(-1,0,0));
+#28=VECTOR($,#27,1);
+#29=LINE($,#26,#28);
+#30=EDGE_CURVE($,#17,#25,#29,.T.);
+#31=ORIENTED_EDGE($,$,$,#30,.T.);
+#32=CARTESIAN_POINT($,(-20,15,-6));
+#33=DIRECTION($,(0,-1,0));
+#34=VECTOR($,#33,1);
+#35=LINE($,#32,#34);
+#36=EDGE_CURVE($,#25,#7,#35,.T.);
+#37=ORIENTED_EDGE($,$,$,#36,.T.);
+#38=EDGE_LOOP($,(#15,#23,#31,#37));
+#39=FACE_OUTER_BOUND('',#38,.T.);
+#40=CARTESIAN_POINT($,(2,0,-6));
+#41=VERTEX_POINT($,#40);
+#42=CARTESIAN_POINT($,(0,0,-6));
+#43=DIRECTION($,(0,0,1));
+#44=DIRECTION($,(1,0,0));
+#45=AXIS2_PLACEMENT_3D($,#42,#43,#44);
+#46=CIRCLE($,#45,2);
+#47=EDGE_CURVE($,#41,#41,#46,.T.);
+#48=ORIENTED_EDGE($,$,$,#47,.F.);
+#49=EDGE_LOOP($,(#48));
+#50=FACE_BOUND('',#49,.T.);
+#51=ADVANCED_FACE('',(#39,#50),#5,.T.);
+#52=CARTESIAN_POINT($,(0,0,6));
+#53=DIRECTION($,(0,0,1));
+#54=DIRECTION($,(1,0,0));
+#55=AXIS2_PLACEMENT_3D($,#52,#53,#54);
+#56=PLANE($,#55);
+#57=CARTESIAN_POINT($,(-20,-15,6));
+#58=VERTEX_POINT($,#57);
+#59=CARTESIAN_POINT($,(20,-15,6));
+#60=VERTEX_POINT($,#59);
+#61=CARTESIAN_POINT($,(-20,-15,6));
+#62=DIRECTION($,(1,0,0));
+#63=VECTOR($,#62,1);
+#64=LINE($,#61,#63);
+#65=EDGE_CURVE($,#58,#60,#64,.T.);
+#66=ORIENTED_EDGE($,$,$,#65,.T.);
+#67=CARTESIAN_POINT($,(20,15,6));
+#68=VERTEX_POINT($,#67);
+#69=CARTESIAN_POINT($,(20,-15,6));
+#70=DIRECTION($,(0,1,0));
+#71=VECTOR($,#70,1);
+#72=LINE($,#69,#71);
+#73=EDGE_CURVE($,#60,#68,#72,.T.);
+#74=ORIENTED_EDGE($,$,$,#73,.T.);
+#75=CARTESIAN_POINT($,(-20,15,6));
+#76=VERTEX_POINT($,#75);
+#77=CARTESIAN_POINT($,(20,15,6));
+#78=DIRECTION($,(-1,0,0));
+#79=VECTOR($,#78,1);
+#80=LINE($,#77,#79);
+#81=EDGE_CURVE($,#68,#76,#80,.T.);
+#82=ORIENTED_EDGE($,$,$,#81,.T.);
+#83=CARTESIAN_POINT($,(-20,15,6));
+#84=DIRECTION($,(0,-1,0));
+#85=VECTOR($,#84,1);
+#86=LINE($,#83,#85);
+#87=EDGE_CURVE($,#76,#58,#86,.T.);
+#88=ORIENTED_EDGE($,$,$,#87,.T.);
+#89=EDGE_LOOP($,(#66,#74,#82,#88));
+#90=FACE_OUTER_BOUND('',#89,.T.);
+#91=CARTESIAN_POINT($,(2,0,6));
+#92=VERTEX_POINT($,#91);
+#93=CARTESIAN_POINT($,(0,0,6));
+#94=DIRECTION($,(0,0,1));
+#95=DIRECTION($,(1,0,0));
+#96=AXIS2_PLACEMENT_3D($,#93,#94,#95);
+#97=CIRCLE($,#96,2);
+#98=EDGE_CURVE($,#92,#92,#97,.T.);
+#99=ORIENTED_EDGE($,$,$,#98,.T.);
+#100=EDGE_LOOP($,(#99));
+#101=FACE_BOUND('',#100,.T.);
+#102=ADVANCED_FACE('',(#90,#101),#56,.T.);
+#103=CARTESIAN_POINT($,(0,-15,0));
+#104=DIRECTION($,(0,-1,0));
+#105=DIRECTION($,(1,0,0));
+#106=AXIS2_PLACEMENT_3D($,#103,#104,#105);
+#107=PLANE($,#106);
+#108=ORIENTED_EDGE($,$,$,#14,.T.);
+#109=CARTESIAN_POINT($,(20,-15,-6));
+#110=DIRECTION($,(0,0,1));
+#111=VECTOR($,#110,1);
+#112=LINE($,#109,#111);
+#113=EDGE_CURVE($,#9,#60,#112,.T.);
+#114=ORIENTED_EDGE($,$,$,#113,.T.);
+#115=ORIENTED_EDGE($,$,$,#65,.F.);
+#116=CARTESIAN_POINT($,(-20,-15,-6));
+#117=DIRECTION($,(0,0,1));
+#118=VECTOR($,#117,1);
+#119=LINE($,#116,#118);
+#120=EDGE_CURVE($,#7,#58,#119,.T.);
+#121=ORIENTED_EDGE($,$,$,#120,.F.);
+#122=EDGE_LOOP($,(#108,#114,#115,#121));
+#123=FACE_OUTER_BOUND('',#122,.T.);
+#124=ADVANCED_FACE('',(#123),#107,.T.);
+#125=CARTESIAN_POINT($,(20,0,0));
+#126=DIRECTION($,(1,0,0));
+#127=DIRECTION($,(0,1,0));
+#128=AXIS2_PLACEMENT_3D($,#125,#126,#127);
+#129=PLANE($,#128);
+#130=ORIENTED_EDGE($,$,$,#22,.T.);
+#131=CARTESIAN_POINT($,(20,15,-6));
+#132=DIRECTION($,(0,0,1));
+#133=VECTOR($,#132,1);
+#134=LINE($,#131,#133);
+#135=EDGE_CURVE($,#17,#68,#134,.T.);
+#136=ORIENTED_EDGE($,$,$,#135,.T.);
+#137=ORIENTED_EDGE($,$,$,#73,.F.);
+#138=ORIENTED_EDGE($,$,$,#113,.F.);
+#139=EDGE_LOOP($,(#130,#136,#137,#138));
+#140=FACE_OUTER_BOUND('',#139,.T.);
+#141=ADVANCED_FACE('',(#140),#129,.T.);
+#142=CARTESIAN_POINT($,(0,15,0));
+#143=DIRECTION($,(0,1,0));
+#144=DIRECTION($,(-1,0,0));
+#145=AXIS2_PLACEMENT_3D($,#142,#143,#144);
+#146=PLANE($,#145);
+#147=ORIENTED_EDGE($,$,$,#30,.T.);
+#148=CARTESIAN_POINT($,(-20,15,-6));
+#149=DIRECTION($,(0,0,1));
+#150=VECTOR($,#149,1);
+#151=LINE($,#148,#150);
+#152=EDGE_CURVE($,#25,#76,#151,.T.);
+#153=ORIENTED_EDGE($,$,$,#152,.T.);
+#154=ORIENTED_EDGE($,$,$,#81,.F.);
+#155=ORIENTED_EDGE($,$,$,#135,.F.);
+#156=EDGE_LOOP($,(#147,#153,#154,#155));
+#157=FACE_OUTER_BOUND('',#156,.T.);
+#158=ADVANCED_FACE('',(#157),#146,.T.);
+#159=CARTESIAN_POINT($,(-20,0,0));
+#160=DIRECTION($,(-1,0,0));
+#161=DIRECTION($,(0,1,0));
+#162=AXIS2_PLACEMENT_3D($,#159,#160,#161);
+#163=PLANE($,#162);
+#164=ORIENTED_EDGE($,$,$,#36,.T.);
+#165=ORIENTED_EDGE($,$,$,#120,.T.);
+#166=ORIENTED_EDGE($,$,$,#87,.F.);
+#167=ORIENTED_EDGE($,$,$,#152,.F.);
+#168=EDGE_LOOP($,(#164,#165,#166,#167));
+#169=FACE_OUTER_BOUND('',#168,.T.);
+#170=ADVANCED_FACE('',(#169),#163,.T.);
+#171=CARTESIAN_POINT($,(0,0,-6));
+#172=DIRECTION($,(0,0,1));
+#173=DIRECTION($,(1,0,0));
+#174=AXIS2_PLACEMENT_3D($,#171,#172,#173);
+#175=CYLINDRICAL_SURFACE($,#174,2);
+#176=CARTESIAN_POINT($,(2,0,6));
+#177=VERTEX_POINT($,#176);
+#178=CARTESIAN_POINT($,(2,0,-6));
+#179=VERTEX_POINT($,#178);
+#180=CARTESIAN_POINT($,(2,0,6));
+#181=DIRECTION($,(0,0,-1));
+#182=VECTOR($,#181,1);
+#183=LINE($,#180,#182);
+#184=EDGE_CURVE($,#177,#179,#183,.T.);
+#185=ORIENTED_EDGE($,$,$,#184,.T.);
+#186=ORIENTED_EDGE($,$,$,#98,.F.);
+#187=ORIENTED_EDGE($,$,$,#184,.F.);
+#188=ORIENTED_EDGE($,$,$,#47,.T.);
+#189=EDGE_LOOP($,(#185,#186,#187,#188));
+#190=FACE_OUTER_BOUND('',#189,.T.);
+#191=ADVANCED_FACE('',(#190),#175,.T.);
+#192=CLOSED_SHELL($,(#51,#102,#124,#141,#158,#170,#191));
+#193=MANIFOLD_SOLID_BREP('AetherisBody',#192);
+#194=APPLICATION_CONTEXT('mechanical design');
+#195=PRODUCT_CONTEXT('',#194,'mechanical');
+#196=PRODUCT('AETHERIS','AetherisBody','',(#195));
+#197=PRODUCT_DEFINITION_FORMATION('','',#196);
+#198=PRODUCT_DEFINITION_CONTEXT('design',#194,'design');
+#199=PRODUCT_DEFINITION('','',#197,#198);
+#200=PRODUCT_DEFINITION_SHAPE('','',#199);
+#201=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#202=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#203=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#204=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#201,#202,#203))REPRESENTATION_CONTEXT('3','3D'));
+#205=SHAPE_ASPECT('firmament-feature:hole','supported cylinder through-hole feature',#200,.FALSE.);
+#206=PROPERTY_DEFINITION('diameter:hole','auto-derived semantic PMI diameter',#205);
+#207=MEASURE_REPRESENTATION_ITEM('diameter',4,#201);
+#208=SHAPE_DIMENSION_REPRESENTATION('diameter:hole',(#207),#204);
+#209=PROPERTY_DEFINITION_REPRESENTATION(#206,#208);
+#210=SHAPE_REPRESENTATION('AetherisBody',(#193),#204);
+#211=SHAPE_DEFINITION_REPRESENTATION(#200,#210);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/testdata/firmament/exports/m3b-valid-box-subtract-hexagonal-prism.step b/testdata/firmament/exports/m3b-valid-box-subtract-hexagonal-prism.step
new file mode 100644
index 00000000..d1c0fd9d
--- /dev/null
+++ b/testdata/firmament/exports/m3b-valid-box-subtract-hexagonal-prism.step
@@ -0,0 +1,374 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('Aetheris AP242 subset export'),'2;1');
+FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris'),'Aetheris.Kernel','Aetheris.Kernel','');
+FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
+ENDSEC;
+DATA;
+#1=CARTESIAN_POINT($,(-20,-15,-10));
+#2=DIRECTION($,(0,0,-1));
+#3=DIRECTION($,(1,0,0));
+#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
+#5=PLANE($,#4);
+#6=CARTESIAN_POINT($,(-20,-15,-10));
+#7=VERTEX_POINT($,#6);
+#8=CARTESIAN_POINT($,(20,-15,-10));
+#9=VERTEX_POINT($,#8);
+#10=CARTESIAN_POINT($,(-20,-15,-10));
+#11=DIRECTION($,(1,0,0));
+#12=VECTOR($,#11,1);
+#13=LINE($,#10,#12);
+#14=EDGE_CURVE($,#7,#9,#13,.T.);
+#15=ORIENTED_EDGE($,$,$,#14,.T.);
+#16=CARTESIAN_POINT($,(20,15,-10));
+#17=VERTEX_POINT($,#16);
+#18=CARTESIAN_POINT($,(20,-15,-10));
+#19=DIRECTION($,(0,1,0));
+#20=VECTOR($,#19,1);
+#21=LINE($,#18,#20);
+#22=EDGE_CURVE($,#9,#17,#21,.T.);
+#23=ORIENTED_EDGE($,$,$,#22,.T.);
+#24=CARTESIAN_POINT($,(-20,15,-10));
+#25=VERTEX_POINT($,#24);
+#26=CARTESIAN_POINT($,(20,15,-10));
+#27=DIRECTION($,(-1,0,0));
+#28=VECTOR($,#27,1);
+#29=LINE($,#26,#28);
+#30=EDGE_CURVE($,#17,#25,#29,.T.);
+#31=ORIENTED_EDGE($,$,$,#30,.T.);
+#32=CARTESIAN_POINT($,(-20,15,-10));
+#33=DIRECTION($,(0,-1,0));
+#34=VECTOR($,#33,1);
+#35=LINE($,#32,#34);
+#36=EDGE_CURVE($,#25,#7,#35,.T.);
+#37=ORIENTED_EDGE($,$,$,#36,.T.);
+#38=EDGE_LOOP($,(#15,#23,#31,#37));
+#39=FACE_OUTER_BOUND('',#38,.T.);
+#40=CARTESIAN_POINT($,(-3.46410161513776,-6,-10));
+#41=VERTEX_POINT($,#40);
+#42=CARTESIAN_POINT($,(3.46410161513775,-6,-10));
+#43=VERTEX_POINT($,#42);
+#44=CARTESIAN_POINT($,(-3.46410161513776,-6,-10));
+#45=DIRECTION($,(1,-0.000000000000001,0));
+#46=VECTOR($,#45,1);
+#47=LINE($,#44,#46);
+#48=EDGE_CURVE($,#41,#43,#47,.T.);
+#49=ORIENTED_EDGE($,$,$,#48,.F.);
+#50=CARTESIAN_POINT($,(6.92820323027551,-0,-10));
+#51=VERTEX_POINT($,#50);
+#52=CARTESIAN_POINT($,(3.46410161513775,-6,-10));
+#53=DIRECTION($,(0.5,0.866025403784439,0));
+#54=VECTOR($,#53,1);
+#55=LINE($,#52,#54);
+#56=EDGE_CURVE($,#43,#51,#55,.T.);
+#57=ORIENTED_EDGE($,$,$,#56,.F.);
+#58=CARTESIAN_POINT($,(3.46410161513776,6,-10));
+#59=VERTEX_POINT($,#58);
+#60=CARTESIAN_POINT($,(6.92820323027551,-0,-10));
+#61=DIRECTION($,(-0.5,0.866025403784439,0));
+#62=VECTOR($,#61,1);
+#63=LINE($,#60,#62);
+#64=EDGE_CURVE($,#51,#59,#63,.T.);
+#65=ORIENTED_EDGE($,$,$,#64,.F.);
+#66=CARTESIAN_POINT($,(-3.46410161513775,6,-10));
+#67=VERTEX_POINT($,#66);
+#68=CARTESIAN_POINT($,(3.46410161513776,6,-10));
+#69=DIRECTION($,(-1,0,0));
+#70=VECTOR($,#69,1);
+#71=LINE($,#68,#70);
+#72=EDGE_CURVE($,#59,#67,#71,.T.);
+#73=ORIENTED_EDGE($,$,$,#72,.F.);
+#74=CARTESIAN_POINT($,(-6.92820323027551,0.000000000000002,-10));
+#75=VERTEX_POINT($,#74);
+#76=CARTESIAN_POINT($,(-3.46410161513775,6,-10));
+#77=DIRECTION($,(-0.5,-0.866025403784439,0));
+#78=VECTOR($,#77,1);
+#79=LINE($,#76,#78);
+#80=EDGE_CURVE($,#67,#75,#79,.T.);
+#81=ORIENTED_EDGE($,$,$,#80,.F.);
+#82=CARTESIAN_POINT($,(-6.92820323027551,0.000000000000002,-10));
+#83=DIRECTION($,(0.5,-0.866025403784439,0));
+#84=VECTOR($,#83,1);
+#85=LINE($,#82,#84);
+#86=EDGE_CURVE($,#75,#41,#85,.T.);
+#87=ORIENTED_EDGE($,$,$,#86,.F.);
+#88=EDGE_LOOP($,(#49,#57,#65,#73,#81,#87));
+#89=FACE_BOUND('',#88,.T.);
+#90=ADVANCED_FACE('',(#39,#89),#5,.T.);
+#91=CARTESIAN_POINT($,(-20,-15,10));
+#92=DIRECTION($,(0,0,1));
+#93=DIRECTION($,(1,0,0));
+#94=AXIS2_PLACEMENT_3D($,#91,#92,#93);
+#95=PLANE($,#94);
+#96=CARTESIAN_POINT($,(-20,15,10));
+#97=VERTEX_POINT($,#96);
+#98=CARTESIAN_POINT($,(-20,-15,10));
+#99=VERTEX_POINT($,#98);
+#100=CARTESIAN_POINT($,(-20,15,10));
+#101=DIRECTION($,(0,-1,0));
+#102=VECTOR($,#101,1);
+#103=LINE($,#100,#102);
+#104=EDGE_CURVE($,#97,#99,#103,.T.);
+#105=ORIENTED_EDGE($,$,$,#104,.F.);
+#106=CARTESIAN_POINT($,(20,15,10));
+#107=VERTEX_POINT($,#106);
+#108=CARTESIAN_POINT($,(20,15,10));
+#109=DIRECTION($,(-1,0,0));
+#110=VECTOR($,#109,1);
+#111=LINE($,#108,#110);
+#112=EDGE_CURVE($,#107,#97,#111,.T.);
+#113=ORIENTED_EDGE($,$,$,#112,.F.);
+#114=CARTESIAN_POINT($,(20,-15,10));
+#115=VERTEX_POINT($,#114);
+#116=CARTESIAN_POINT($,(20,-15,10));
+#117=DIRECTION($,(0,1,0));
+#118=VECTOR($,#117,1);
+#119=LINE($,#116,#118);
+#120=EDGE_CURVE($,#115,#107,#119,.T.);
+#121=ORIENTED_EDGE($,$,$,#120,.F.);
+#122=CARTESIAN_POINT($,(-20,-15,10));
+#123=DIRECTION($,(1,0,0));
+#124=VECTOR($,#123,1);
+#125=LINE($,#122,#124);
+#126=EDGE_CURVE($,#99,#115,#125,.T.);
+#127=ORIENTED_EDGE($,$,$,#126,.F.);
+#128=EDGE_LOOP($,(#105,#113,#121,#127));
+#129=FACE_OUTER_BOUND('',#128,.T.);
+#130=CARTESIAN_POINT($,(-3.46410161513776,-6,10));
+#131=VERTEX_POINT($,#130);
+#132=CARTESIAN_POINT($,(3.46410161513775,-6,10));
+#133=VERTEX_POINT($,#132);
+#134=CARTESIAN_POINT($,(-3.46410161513776,-6,10));
+#135=DIRECTION($,(1,-0.000000000000001,0));
+#136=VECTOR($,#135,1);
+#137=LINE($,#134,#136);
+#138=EDGE_CURVE($,#131,#133,#137,.T.);
+#139=ORIENTED_EDGE($,$,$,#138,.T.);
+#140=CARTESIAN_POINT($,(6.92820323027551,0,10));
+#141=VERTEX_POINT($,#140);
+#142=CARTESIAN_POINT($,(3.46410161513775,-6,10));
+#143=DIRECTION($,(0.5,0.866025403784439,0));
+#144=VECTOR($,#143,1);
+#145=LINE($,#142,#144);
+#146=EDGE_CURVE($,#133,#141,#145,.T.);
+#147=ORIENTED_EDGE($,$,$,#146,.T.);
+#148=CARTESIAN_POINT($,(3.46410161513776,6,10));
+#149=VERTEX_POINT($,#148);
+#150=CARTESIAN_POINT($,(6.92820323027551,0,10));
+#151=DIRECTION($,(-0.5,0.866025403784439,0));
+#152=VECTOR($,#151,1);
+#153=LINE($,#150,#152);
+#154=EDGE_CURVE($,#141,#149,#153,.T.);
+#155=ORIENTED_EDGE($,$,$,#154,.T.);
+#156=CARTESIAN_POINT($,(-3.46410161513775,6,10));
+#157=VERTEX_POINT($,#156);
+#158=CARTESIAN_POINT($,(3.46410161513776,6,10));
+#159=DIRECTION($,(-1,0,0));
+#160=VECTOR($,#159,1);
+#161=LINE($,#158,#160);
+#162=EDGE_CURVE($,#149,#157,#161,.T.);
+#163=ORIENTED_EDGE($,$,$,#162,.T.);
+#164=CARTESIAN_POINT($,(-6.92820323027551,0.000000000000002,10));
+#165=VERTEX_POINT($,#164);
+#166=CARTESIAN_POINT($,(-3.46410161513775,6,10));
+#167=DIRECTION($,(-0.5,-0.866025403784439,0));
+#168=VECTOR($,#167,1);
+#169=LINE($,#166,#168);
+#170=EDGE_CURVE($,#157,#165,#169,.T.);
+#171=ORIENTED_EDGE($,$,$,#170,.T.);
+#172=CARTESIAN_POINT($,(-6.92820323027551,0.000000000000002,10));
+#173=DIRECTION($,(0.5,-0.866025403784439,0));
+#174=VECTOR($,#173,1);
+#175=LINE($,#172,#174);
+#176=EDGE_CURVE($,#165,#131,#175,.T.);
+#177=ORIENTED_EDGE($,$,$,#176,.T.);
+#178=EDGE_LOOP($,(#139,#147,#155,#163,#171,#177));
+#179=FACE_BOUND('',#178,.T.);
+#180=ADVANCED_FACE('',(#129,#179),#95,.T.);
+#181=CARTESIAN_POINT($,(-20,-15,-10));
+#182=DIRECTION($,(0,-1,0));
+#183=DIRECTION($,(0,0,1));
+#184=AXIS2_PLACEMENT_3D($,#181,#182,#183);
+#185=PLANE($,#184);
+#186=ORIENTED_EDGE($,$,$,#14,.T.);
+#187=CARTESIAN_POINT($,(20,-15,-10));
+#188=DIRECTION($,(0,0,1));
+#189=VECTOR($,#188,1);
+#190=LINE($,#187,#189);
+#191=EDGE_CURVE($,#9,#115,#190,.T.);
+#192=ORIENTED_EDGE($,$,$,#191,.T.);
+#193=ORIENTED_EDGE($,$,$,#126,.F.);
+#194=CARTESIAN_POINT($,(-20,-15,-10));
+#195=DIRECTION($,(0,0,1));
+#196=VECTOR($,#195,1);
+#197=LINE($,#194,#196);
+#198=EDGE_CURVE($,#7,#99,#197,.T.);
+#199=ORIENTED_EDGE($,$,$,#198,.F.);
+#200=EDGE_LOOP($,(#186,#192,#193,#199));
+#201=FACE_OUTER_BOUND('',#200,.T.);
+#202=ADVANCED_FACE('',(#201),#185,.T.);
+#203=CARTESIAN_POINT($,(20,-15,-10));
+#204=DIRECTION($,(1,-0,0));
+#205=DIRECTION($,(0,0,1));
+#206=AXIS2_PLACEMENT_3D($,#203,#204,#205);
+#207=PLANE($,#206);
+#208=ORIENTED_EDGE($,$,$,#22,.T.);
+#209=CARTESIAN_POINT($,(20,15,-10));
+#210=DIRECTION($,(0,0,1));
+#211=VECTOR($,#210,1);
+#212=LINE($,#209,#211);
+#213=EDGE_CURVE($,#17,#107,#212,.T.);
+#214=ORIENTED_EDGE($,$,$,#213,.T.);
+#215=ORIENTED_EDGE($,$,$,#120,.F.);
+#216=ORIENTED_EDGE($,$,$,#191,.F.);
+#217=EDGE_LOOP($,(#208,#214,#215,#216));
+#218=FACE_OUTER_BOUND('',#217,.T.);
+#219=ADVANCED_FACE('',(#218),#207,.T.);
+#220=CARTESIAN_POINT($,(20,15,-10));
+#221=DIRECTION($,(0,1,0));
+#222=DIRECTION($,(0,0,1));
+#223=AXIS2_PLACEMENT_3D($,#220,#221,#222);
+#224=PLANE($,#223);
+#225=ORIENTED_EDGE($,$,$,#30,.T.);
+#226=CARTESIAN_POINT($,(-20,15,-10));
+#227=DIRECTION($,(0,0,1));
+#228=VECTOR($,#227,1);
+#229=LINE($,#226,#228);
+#230=EDGE_CURVE($,#25,#97,#229,.T.);
+#231=ORIENTED_EDGE($,$,$,#230,.T.);
+#232=ORIENTED_EDGE($,$,$,#112,.F.);
+#233=ORIENTED_EDGE($,$,$,#213,.F.);
+#234=EDGE_LOOP($,(#225,#231,#232,#233));
+#235=FACE_OUTER_BOUND('',#234,.T.);
+#236=ADVANCED_FACE('',(#235),#224,.T.);
+#237=CARTESIAN_POINT($,(-20,15,-10));
+#238=DIRECTION($,(-1,-0,0));
+#239=DIRECTION($,(0,0,1));
+#240=AXIS2_PLACEMENT_3D($,#237,#238,#239);
+#241=PLANE($,#240);
+#242=ORIENTED_EDGE($,$,$,#36,.T.);
+#243=ORIENTED_EDGE($,$,$,#198,.T.);
+#244=ORIENTED_EDGE($,$,$,#104,.F.);
+#245=ORIENTED_EDGE($,$,$,#230,.F.);
+#246=EDGE_LOOP($,(#242,#243,#244,#245));
+#247=FACE_OUTER_BOUND('',#246,.T.);
+#248=ADVANCED_FACE('',(#247),#241,.T.);
+#249=CARTESIAN_POINT($,(-3.46410161513776,-6,-10));
+#250=DIRECTION($,(0.000000000000001,1,0));
+#251=DIRECTION($,(0,0,1));
+#252=AXIS2_PLACEMENT_3D($,#249,#250,#251);
+#253=PLANE($,#252);
+#254=ORIENTED_EDGE($,$,$,#48,.F.);
+#255=CARTESIAN_POINT($,(-3.46410161513776,-6,-10));
+#256=DIRECTION($,(0,0,1));
+#257=VECTOR($,#256,1);
+#258=LINE($,#255,#257);
+#259=EDGE_CURVE($,#41,#131,#258,.T.);
+#260=ORIENTED_EDGE($,$,$,#259,.T.);
+#261=ORIENTED_EDGE($,$,$,#138,.T.);
+#262=CARTESIAN_POINT($,(3.46410161513775,-6,-10));
+#263=DIRECTION($,(0,0,1));
+#264=VECTOR($,#263,1);
+#265=LINE($,#262,#264);
+#266=EDGE_CURVE($,#43,#133,#265,.T.);
+#267=ORIENTED_EDGE($,$,$,#266,.F.);
+#268=EDGE_LOOP($,(#254,#260,#261,#267));
+#269=FACE_OUTER_BOUND('',#268,.T.);
+#270=ADVANCED_FACE('',(#269),#253,.T.);
+#271=CARTESIAN_POINT($,(3.46410161513775,-6,-10));
+#272=DIRECTION($,(-0.866025403784439,0.5,0));
+#273=DIRECTION($,(0,0,1));
+#274=AXIS2_PLACEMENT_3D($,#271,#272,#273);
+#275=PLANE($,#274);
+#276=ORIENTED_EDGE($,$,$,#56,.F.);
+#277=ORIENTED_EDGE($,$,$,#266,.T.);
+#278=ORIENTED_EDGE($,$,$,#146,.T.);
+#279=CARTESIAN_POINT($,(6.92820323027551,-0,-10));
+#280=DIRECTION($,(0,0,1));
+#281=VECTOR($,#280,1);
+#282=LINE($,#279,#281);
+#283=EDGE_CURVE($,#51,#141,#282,.T.);
+#284=ORIENTED_EDGE($,$,$,#283,.F.);
+#285=EDGE_LOOP($,(#276,#277,#278,#284));
+#286=FACE_OUTER_BOUND('',#285,.T.);
+#287=ADVANCED_FACE('',(#286),#275,.T.);
+#288=CARTESIAN_POINT($,(6.92820323027551,0,-10));
+#289=DIRECTION($,(-0.866025403784439,-0.5,0));
+#290=DIRECTION($,(0,0,1));
+#291=AXIS2_PLACEMENT_3D($,#288,#289,#290);
+#292=PLANE($,#291);
+#293=ORIENTED_EDGE($,$,$,#64,.F.);
+#294=ORIENTED_EDGE($,$,$,#283,.T.);
+#295=ORIENTED_EDGE($,$,$,#154,.T.);
+#296=CARTESIAN_POINT($,(3.46410161513776,6,-10));
+#297=DIRECTION($,(0,0,1));
+#298=VECTOR($,#297,1);
+#299=LINE($,#296,#298);
+#300=EDGE_CURVE($,#59,#149,#299,.T.);
+#301=ORIENTED_EDGE($,$,$,#300,.F.);
+#302=EDGE_LOOP($,(#293,#294,#295,#301));
+#303=FACE_OUTER_BOUND('',#302,.T.);
+#304=ADVANCED_FACE('',(#303),#292,.T.);
+#305=CARTESIAN_POINT($,(3.46410161513776,6,-10));
+#306=DIRECTION($,(-0,-1,0));
+#307=DIRECTION($,(0,0,1));
+#308=AXIS2_PLACEMENT_3D($,#305,#306,#307);
+#309=PLANE($,#308);
+#310=ORIENTED_EDGE($,$,$,#72,.F.);
+#311=ORIENTED_EDGE($,$,$,#300,.T.);
+#312=ORIENTED_EDGE($,$,$,#162,.T.);
+#313=CARTESIAN_POINT($,(-3.46410161513775,6,-10));
+#314=DIRECTION($,(0,0,1));
+#315=VECTOR($,#314,1);
+#316=LINE($,#313,#315);
+#317=EDGE_CURVE($,#67,#157,#316,.T.);
+#318=ORIENTED_EDGE($,$,$,#317,.F.);
+#319=EDGE_LOOP($,(#310,#311,#312,#318));
+#320=FACE_OUTER_BOUND('',#319,.T.);
+#321=ADVANCED_FACE('',(#320),#309,.T.);
+#322=CARTESIAN_POINT($,(-3.46410161513775,6,-10));
+#323=DIRECTION($,(0.866025403784439,-0.5,0));
+#324=DIRECTION($,(0,0,1));
+#325=AXIS2_PLACEMENT_3D($,#322,#323,#324);
+#326=PLANE($,#325);
+#327=ORIENTED_EDGE($,$,$,#80,.F.);
+#328=ORIENTED_EDGE($,$,$,#317,.T.);
+#329=ORIENTED_EDGE($,$,$,#170,.T.);
+#330=CARTESIAN_POINT($,(-6.92820323027551,0.000000000000002,-10));
+#331=DIRECTION($,(0,0,1));
+#332=VECTOR($,#331,1);
+#333=LINE($,#330,#332);
+#334=EDGE_CURVE($,#75,#165,#333,.T.);
+#335=ORIENTED_EDGE($,$,$,#334,.F.);
+#336=EDGE_LOOP($,(#327,#328,#329,#335));
+#337=FACE_OUTER_BOUND('',#336,.T.);
+#338=ADVANCED_FACE('',(#337),#326,.T.);
+#339=CARTESIAN_POINT($,(-6.92820323027551,0.000000000000001,-10));
+#340=DIRECTION($,(0.866025403784439,0.5,0));
+#341=DIRECTION($,(0,0,1));
+#342=AXIS2_PLACEMENT_3D($,#339,#340,#341);
+#343=PLANE($,#342);
+#344=ORIENTED_EDGE($,$,$,#86,.F.);
+#345=ORIENTED_EDGE($,$,$,#334,.T.);
+#346=ORIENTED_EDGE($,$,$,#176,.T.);
+#347=ORIENTED_EDGE($,$,$,#259,.F.);
+#348=EDGE_LOOP($,(#344,#345,#346,#347));
+#349=FACE_OUTER_BOUND('',#348,.T.);
+#350=ADVANCED_FACE('',(#349),#343,.T.);
+#351=CLOSED_SHELL($,(#90,#180,#202,#219,#236,#248,#270,#287,#304,#321,#338,#350));
+#352=MANIFOLD_SOLID_BREP('AetherisBody',#351);
+#353=APPLICATION_CONTEXT('mechanical design');
+#354=PRODUCT_CONTEXT('',#353,'mechanical');
+#355=PRODUCT('AETHERIS','AetherisBody','',(#354));
+#356=PRODUCT_DEFINITION_FORMATION('','',#355);
+#357=PRODUCT_DEFINITION_CONTEXT('design',#353,'design');
+#358=PRODUCT_DEFINITION('','',#356,#357);
+#359=PRODUCT_DEFINITION_SHAPE('','',#358);
+#360=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#361=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#362=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#363=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#360,#361,#362))REPRESENTATION_CONTEXT('3','3D'));
+#364=SHAPE_REPRESENTATION('AetherisBody',(#352),#363);
+#365=SHAPE_DEFINITION_REPRESENTATION(#359,#364);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/testdata/firmament/exports/m3b-valid-box-subtract-straight-slot.step b/testdata/firmament/exports/m3b-valid-box-subtract-straight-slot.step
new file mode 100644
index 00000000..b56df9a1
--- /dev/null
+++ b/testdata/firmament/exports/m3b-valid-box-subtract-straight-slot.step
@@ -0,0 +1,770 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('Aetheris AP242 subset export'),'2;1');
+FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris'),'Aetheris.Kernel','Aetheris.Kernel','');
+FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
+ENDSEC;
+DATA;
+#1=CARTESIAN_POINT($,(-20,-15,-10));
+#2=DIRECTION($,(0,0,-1));
+#3=DIRECTION($,(1,0,0));
+#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
+#5=PLANE($,#4);
+#6=CARTESIAN_POINT($,(-20,-15,-10));
+#7=VERTEX_POINT($,#6);
+#8=CARTESIAN_POINT($,(20,-15,-10));
+#9=VERTEX_POINT($,#8);
+#10=CARTESIAN_POINT($,(-20,-15,-10));
+#11=DIRECTION($,(1,0,0));
+#12=VECTOR($,#11,1);
+#13=LINE($,#10,#12);
+#14=EDGE_CURVE($,#7,#9,#13,.T.);
+#15=ORIENTED_EDGE($,$,$,#14,.T.);
+#16=CARTESIAN_POINT($,(20,15,-10));
+#17=VERTEX_POINT($,#16);
+#18=CARTESIAN_POINT($,(20,-15,-10));
+#19=DIRECTION($,(0,1,0));
+#20=VECTOR($,#19,1);
+#21=LINE($,#18,#20);
+#22=EDGE_CURVE($,#9,#17,#21,.T.);
+#23=ORIENTED_EDGE($,$,$,#22,.T.);
+#24=CARTESIAN_POINT($,(-20,15,-10));
+#25=VERTEX_POINT($,#24);
+#26=CARTESIAN_POINT($,(20,15,-10));
+#27=DIRECTION($,(-1,0,0));
+#28=VECTOR($,#27,1);
+#29=LINE($,#26,#28);
+#30=EDGE_CURVE($,#17,#25,#29,.T.);
+#31=ORIENTED_EDGE($,$,$,#30,.T.);
+#32=CARTESIAN_POINT($,(-20,15,-10));
+#33=DIRECTION($,(0,-1,0));
+#34=VECTOR($,#33,1);
+#35=LINE($,#32,#34);
+#36=EDGE_CURVE($,#25,#7,#35,.T.);
+#37=ORIENTED_EDGE($,$,$,#36,.T.);
+#38=EDGE_LOOP($,(#15,#23,#31,#37));
+#39=FACE_OUTER_BOUND('',#38,.T.);
+#40=CARTESIAN_POINT($,(-11.6955181300451,-1.53073372946035,-10));
+#41=VERTEX_POINT($,#40);
+#42=CARTESIAN_POINT($,(-10.8284271247462,-2.82842712474619,-10));
+#43=VERTEX_POINT($,#42);
+#44=CARTESIAN_POINT($,(-11.6955181300451,-1.53073372946035,-10));
+#45=DIRECTION($,(0.555570233019602,-0.831469612302545,0));
+#46=VECTOR($,#45,1);
+#47=LINE($,#44,#46);
+#48=EDGE_CURVE($,#41,#43,#47,.T.);
+#49=ORIENTED_EDGE($,$,$,#48,.F.);
+#50=CARTESIAN_POINT($,(-9.53073372946037,-3.69551813004515,-10));
+#51=VERTEX_POINT($,#50);
+#52=CARTESIAN_POINT($,(-10.8284271247462,-2.82842712474619,-10));
+#53=DIRECTION($,(0.831469612302545,-0.555570233019602,0));
+#54=VECTOR($,#53,1);
+#55=LINE($,#52,#54);
+#56=EDGE_CURVE($,#43,#51,#55,.T.);
+#57=ORIENTED_EDGE($,$,$,#56,.F.);
+#58=CARTESIAN_POINT($,(-8,-4,-10));
+#59=VERTEX_POINT($,#58);
+#60=CARTESIAN_POINT($,(-9.53073372946037,-3.69551813004515,-10));
+#61=DIRECTION($,(0.98078528040323,-0.195090322016129,0));
+#62=VECTOR($,#61,1);
+#63=LINE($,#60,#62);
+#64=EDGE_CURVE($,#51,#59,#63,.T.);
+#65=ORIENTED_EDGE($,$,$,#64,.F.);
+#66=CARTESIAN_POINT($,(8,-4,-10));
+#67=VERTEX_POINT($,#66);
+#68=CARTESIAN_POINT($,(-8,-4,-10));
+#69=DIRECTION($,(1,0,0));
+#70=VECTOR($,#69,1);
+#71=LINE($,#68,#70);
+#72=EDGE_CURVE($,#59,#67,#71,.T.);
+#73=ORIENTED_EDGE($,$,$,#72,.F.);
+#74=CARTESIAN_POINT($,(9.53073372946036,-3.69551813004515,-10));
+#75=VERTEX_POINT($,#74);
+#76=CARTESIAN_POINT($,(8,-4,-10));
+#77=DIRECTION($,(0.98078528040323,0.195090322016128,0));
+#78=VECTOR($,#77,1);
+#79=LINE($,#76,#78);
+#80=EDGE_CURVE($,#67,#75,#79,.T.);
+#81=ORIENTED_EDGE($,$,$,#80,.F.);
+#82=CARTESIAN_POINT($,(10.8284271247462,-2.82842712474619,-10));
+#83=VERTEX_POINT($,#82);
+#84=CARTESIAN_POINT($,(9.53073372946036,-3.69551813004515,-10));
+#85=DIRECTION($,(0.831469612302545,0.555570233019602,0));
+#86=VECTOR($,#85,1);
+#87=LINE($,#84,#86);
+#88=EDGE_CURVE($,#75,#83,#87,.T.);
+#89=ORIENTED_EDGE($,$,$,#88,.F.);
+#90=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946036,-10));
+#91=VERTEX_POINT($,#90);
+#92=CARTESIAN_POINT($,(10.8284271247462,-2.82842712474619,-10));
+#93=DIRECTION($,(0.555570233019603,0.831469612302545,0));
+#94=VECTOR($,#93,1);
+#95=LINE($,#92,#94);
+#96=EDGE_CURVE($,#83,#91,#95,.T.);
+#97=ORIENTED_EDGE($,$,$,#96,.F.);
+#98=CARTESIAN_POINT($,(12,-0,-10));
+#99=VERTEX_POINT($,#98);
+#100=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946036,-10));
+#101=DIRECTION($,(0.195090322016128,0.980785280403231,0));
+#102=VECTOR($,#101,1);
+#103=LINE($,#100,#102);
+#104=EDGE_CURVE($,#91,#99,#103,.T.);
+#105=ORIENTED_EDGE($,$,$,#104,.F.);
+#106=CARTESIAN_POINT($,(11.6955181300451,1.53073372946035,-10));
+#107=VERTEX_POINT($,#106);
+#108=CARTESIAN_POINT($,(12,-0,-10));
+#109=DIRECTION($,(-0.195090322016128,0.980785280403231,0));
+#110=VECTOR($,#109,1);
+#111=LINE($,#108,#110);
+#112=EDGE_CURVE($,#99,#107,#111,.T.);
+#113=ORIENTED_EDGE($,$,$,#112,.F.);
+#114=CARTESIAN_POINT($,(10.8284271247462,2.82842712474619,-10));
+#115=VERTEX_POINT($,#114);
+#116=CARTESIAN_POINT($,(11.6955181300451,1.53073372946035,-10));
+#117=DIRECTION($,(-0.555570233019603,0.831469612302545,0));
+#118=VECTOR($,#117,1);
+#119=LINE($,#116,#118);
+#120=EDGE_CURVE($,#107,#115,#119,.T.);
+#121=ORIENTED_EDGE($,$,$,#120,.F.);
+#122=CARTESIAN_POINT($,(9.53073372946036,3.69551813004515,-10));
+#123=VERTEX_POINT($,#122);
+#124=CARTESIAN_POINT($,(10.8284271247462,2.82842712474619,-10));
+#125=DIRECTION($,(-0.831469612302545,0.555570233019602,0));
+#126=VECTOR($,#125,1);
+#127=LINE($,#124,#126);
+#128=EDGE_CURVE($,#115,#123,#127,.T.);
+#129=ORIENTED_EDGE($,$,$,#128,.F.);
+#130=CARTESIAN_POINT($,(8,4,-10));
+#131=VERTEX_POINT($,#130);
+#132=CARTESIAN_POINT($,(9.53073372946036,3.69551813004515,-10));
+#133=DIRECTION($,(-0.98078528040323,0.195090322016128,0));
+#134=VECTOR($,#133,1);
+#135=LINE($,#132,#134);
+#136=EDGE_CURVE($,#123,#131,#135,.T.);
+#137=ORIENTED_EDGE($,$,$,#136,.F.);
+#138=CARTESIAN_POINT($,(-8,4,-10));
+#139=VERTEX_POINT($,#138);
+#140=CARTESIAN_POINT($,(8,4,-10));
+#141=DIRECTION($,(-1,0,0));
+#142=VECTOR($,#141,1);
+#143=LINE($,#140,#142);
+#144=EDGE_CURVE($,#131,#139,#143,.T.);
+#145=ORIENTED_EDGE($,$,$,#144,.F.);
+#146=CARTESIAN_POINT($,(-9.53073372946036,3.69551813004515,-10));
+#147=VERTEX_POINT($,#146);
+#148=CARTESIAN_POINT($,(-8,4,-10));
+#149=DIRECTION($,(-0.98078528040323,-0.195090322016128,0));
+#150=VECTOR($,#149,1);
+#151=LINE($,#148,#150);
+#152=EDGE_CURVE($,#139,#147,#151,.T.);
+#153=ORIENTED_EDGE($,$,$,#152,.F.);
+#154=CARTESIAN_POINT($,(-10.8284271247462,2.82842712474619,-10));
+#155=VERTEX_POINT($,#154);
+#156=CARTESIAN_POINT($,(-9.53073372946036,3.69551813004515,-10));
+#157=DIRECTION($,(-0.831469612302545,-0.555570233019602,0));
+#158=VECTOR($,#157,1);
+#159=LINE($,#156,#158);
+#160=EDGE_CURVE($,#147,#155,#159,.T.);
+#161=ORIENTED_EDGE($,$,$,#160,.F.);
+#162=CARTESIAN_POINT($,(-11.6955181300451,1.53073372946036,-10));
+#163=VERTEX_POINT($,#162);
+#164=CARTESIAN_POINT($,(-10.8284271247462,2.82842712474619,-10));
+#165=DIRECTION($,(-0.555570233019603,-0.831469612302545,0));
+#166=VECTOR($,#165,1);
+#167=LINE($,#164,#166);
+#168=EDGE_CURVE($,#155,#163,#167,.T.);
+#169=ORIENTED_EDGE($,$,$,#168,.F.);
+#170=CARTESIAN_POINT($,(-12,-0,-10));
+#171=VERTEX_POINT($,#170);
+#172=CARTESIAN_POINT($,(-11.6955181300451,1.53073372946036,-10));
+#173=DIRECTION($,(-0.195090322016128,-0.980785280403231,0));
+#174=VECTOR($,#173,1);
+#175=LINE($,#172,#174);
+#176=EDGE_CURVE($,#163,#171,#175,.T.);
+#177=ORIENTED_EDGE($,$,$,#176,.F.);
+#178=CARTESIAN_POINT($,(-12,-0,-10));
+#179=DIRECTION($,(0.195090322016128,-0.980785280403231,0));
+#180=VECTOR($,#179,1);
+#181=LINE($,#178,#180);
+#182=EDGE_CURVE($,#171,#41,#181,.T.);
+#183=ORIENTED_EDGE($,$,$,#182,.F.);
+#184=EDGE_LOOP($,(#49,#57,#65,#73,#81,#89,#97,#105,#113,#121,#129,#137,#145,#153,#161,#169,#177,#183));
+#185=FACE_BOUND('',#184,.T.);
+#186=ADVANCED_FACE('',(#39,#185),#5,.T.);
+#187=CARTESIAN_POINT($,(-20,-15,10));
+#188=DIRECTION($,(0,0,1));
+#189=DIRECTION($,(1,0,0));
+#190=AXIS2_PLACEMENT_3D($,#187,#188,#189);
+#191=PLANE($,#190);
+#192=CARTESIAN_POINT($,(-20,15,10));
+#193=VERTEX_POINT($,#192);
+#194=CARTESIAN_POINT($,(-20,-15,10));
+#195=VERTEX_POINT($,#194);
+#196=CARTESIAN_POINT($,(-20,15,10));
+#197=DIRECTION($,(0,-1,0));
+#198=VECTOR($,#197,1);
+#199=LINE($,#196,#198);
+#200=EDGE_CURVE($,#193,#195,#199,.T.);
+#201=ORIENTED_EDGE($,$,$,#200,.F.);
+#202=CARTESIAN_POINT($,(20,15,10));
+#203=VERTEX_POINT($,#202);
+#204=CARTESIAN_POINT($,(20,15,10));
+#205=DIRECTION($,(-1,0,0));
+#206=VECTOR($,#205,1);
+#207=LINE($,#204,#206);
+#208=EDGE_CURVE($,#203,#193,#207,.T.);
+#209=ORIENTED_EDGE($,$,$,#208,.F.);
+#210=CARTESIAN_POINT($,(20,-15,10));
+#211=VERTEX_POINT($,#210);
+#212=CARTESIAN_POINT($,(20,-15,10));
+#213=DIRECTION($,(0,1,0));
+#214=VECTOR($,#213,1);
+#215=LINE($,#212,#214);
+#216=EDGE_CURVE($,#211,#203,#215,.T.);
+#217=ORIENTED_EDGE($,$,$,#216,.F.);
+#218=CARTESIAN_POINT($,(-20,-15,10));
+#219=DIRECTION($,(1,0,0));
+#220=VECTOR($,#219,1);
+#221=LINE($,#218,#220);
+#222=EDGE_CURVE($,#195,#211,#221,.T.);
+#223=ORIENTED_EDGE($,$,$,#222,.F.);
+#224=EDGE_LOOP($,(#201,#209,#217,#223));
+#225=FACE_OUTER_BOUND('',#224,.T.);
+#226=CARTESIAN_POINT($,(-11.6955181300451,-1.53073372946035,10));
+#227=VERTEX_POINT($,#226);
+#228=CARTESIAN_POINT($,(-10.8284271247462,-2.82842712474619,10));
+#229=VERTEX_POINT($,#228);
+#230=CARTESIAN_POINT($,(-11.6955181300451,-1.53073372946035,10));
+#231=DIRECTION($,(0.555570233019602,-0.831469612302545,0));
+#232=VECTOR($,#231,1);
+#233=LINE($,#230,#232);
+#234=EDGE_CURVE($,#227,#229,#233,.T.);
+#235=ORIENTED_EDGE($,$,$,#234,.T.);
+#236=CARTESIAN_POINT($,(-9.53073372946037,-3.69551813004515,10));
+#237=VERTEX_POINT($,#236);
+#238=CARTESIAN_POINT($,(-10.8284271247462,-2.82842712474619,10));
+#239=DIRECTION($,(0.831469612302545,-0.555570233019602,0));
+#240=VECTOR($,#239,1);
+#241=LINE($,#238,#240);
+#242=EDGE_CURVE($,#229,#237,#241,.T.);
+#243=ORIENTED_EDGE($,$,$,#242,.T.);
+#244=CARTESIAN_POINT($,(-8,-4,10));
+#245=VERTEX_POINT($,#244);
+#246=CARTESIAN_POINT($,(-9.53073372946037,-3.69551813004515,10));
+#247=DIRECTION($,(0.98078528040323,-0.195090322016129,0));
+#248=VECTOR($,#247,1);
+#249=LINE($,#246,#248);
+#250=EDGE_CURVE($,#237,#245,#249,.T.);
+#251=ORIENTED_EDGE($,$,$,#250,.T.);
+#252=CARTESIAN_POINT($,(8,-4,10));
+#253=VERTEX_POINT($,#252);
+#254=CARTESIAN_POINT($,(-8,-4,10));
+#255=DIRECTION($,(1,0,0));
+#256=VECTOR($,#255,1);
+#257=LINE($,#254,#256);
+#258=EDGE_CURVE($,#245,#253,#257,.T.);
+#259=ORIENTED_EDGE($,$,$,#258,.T.);
+#260=CARTESIAN_POINT($,(9.53073372946036,-3.69551813004515,10));
+#261=VERTEX_POINT($,#260);
+#262=CARTESIAN_POINT($,(8,-4,10));
+#263=DIRECTION($,(0.98078528040323,0.195090322016128,0));
+#264=VECTOR($,#263,1);
+#265=LINE($,#262,#264);
+#266=EDGE_CURVE($,#253,#261,#265,.T.);
+#267=ORIENTED_EDGE($,$,$,#266,.T.);
+#268=CARTESIAN_POINT($,(10.8284271247462,-2.82842712474619,10));
+#269=VERTEX_POINT($,#268);
+#270=CARTESIAN_POINT($,(9.53073372946036,-3.69551813004515,10));
+#271=DIRECTION($,(0.831469612302545,0.555570233019602,0));
+#272=VECTOR($,#271,1);
+#273=LINE($,#270,#272);
+#274=EDGE_CURVE($,#261,#269,#273,.T.);
+#275=ORIENTED_EDGE($,$,$,#274,.T.);
+#276=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946036,10));
+#277=VERTEX_POINT($,#276);
+#278=CARTESIAN_POINT($,(10.8284271247462,-2.82842712474619,10));
+#279=DIRECTION($,(0.555570233019603,0.831469612302545,0));
+#280=VECTOR($,#279,1);
+#281=LINE($,#278,#280);
+#282=EDGE_CURVE($,#269,#277,#281,.T.);
+#283=ORIENTED_EDGE($,$,$,#282,.T.);
+#284=CARTESIAN_POINT($,(12,0,10));
+#285=VERTEX_POINT($,#284);
+#286=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946036,10));
+#287=DIRECTION($,(0.195090322016128,0.980785280403231,0));
+#288=VECTOR($,#287,1);
+#289=LINE($,#286,#288);
+#290=EDGE_CURVE($,#277,#285,#289,.T.);
+#291=ORIENTED_EDGE($,$,$,#290,.T.);
+#292=CARTESIAN_POINT($,(11.6955181300451,1.53073372946035,10));
+#293=VERTEX_POINT($,#292);
+#294=CARTESIAN_POINT($,(12,0,10));
+#295=DIRECTION($,(-0.195090322016128,0.980785280403231,0));
+#296=VECTOR($,#295,1);
+#297=LINE($,#294,#296);
+#298=EDGE_CURVE($,#285,#293,#297,.T.);
+#299=ORIENTED_EDGE($,$,$,#298,.T.);
+#300=CARTESIAN_POINT($,(10.8284271247462,2.82842712474619,10));
+#301=VERTEX_POINT($,#300);
+#302=CARTESIAN_POINT($,(11.6955181300451,1.53073372946035,10));
+#303=DIRECTION($,(-0.555570233019603,0.831469612302545,0));
+#304=VECTOR($,#303,1);
+#305=LINE($,#302,#304);
+#306=EDGE_CURVE($,#293,#301,#305,.T.);
+#307=ORIENTED_EDGE($,$,$,#306,.T.);
+#308=CARTESIAN_POINT($,(9.53073372946036,3.69551813004515,10));
+#309=VERTEX_POINT($,#308);
+#310=CARTESIAN_POINT($,(10.8284271247462,2.82842712474619,10));
+#311=DIRECTION($,(-0.831469612302545,0.555570233019602,0));
+#312=VECTOR($,#311,1);
+#313=LINE($,#310,#312);
+#314=EDGE_CURVE($,#301,#309,#313,.T.);
+#315=ORIENTED_EDGE($,$,$,#314,.T.);
+#316=CARTESIAN_POINT($,(8,4,10));
+#317=VERTEX_POINT($,#316);
+#318=CARTESIAN_POINT($,(9.53073372946036,3.69551813004515,10));
+#319=DIRECTION($,(-0.98078528040323,0.195090322016128,0));
+#320=VECTOR($,#319,1);
+#321=LINE($,#318,#320);
+#322=EDGE_CURVE($,#309,#317,#321,.T.);
+#323=ORIENTED_EDGE($,$,$,#322,.T.);
+#324=CARTESIAN_POINT($,(-8,4,10));
+#325=VERTEX_POINT($,#324);
+#326=CARTESIAN_POINT($,(8,4,10));
+#327=DIRECTION($,(-1,0,0));
+#328=VECTOR($,#327,1);
+#329=LINE($,#326,#328);
+#330=EDGE_CURVE($,#317,#325,#329,.T.);
+#331=ORIENTED_EDGE($,$,$,#330,.T.);
+#332=CARTESIAN_POINT($,(-9.53073372946036,3.69551813004515,10));
+#333=VERTEX_POINT($,#332);
+#334=CARTESIAN_POINT($,(-8,4,10));
+#335=DIRECTION($,(-0.98078528040323,-0.195090322016128,0));
+#336=VECTOR($,#335,1);
+#337=LINE($,#334,#336);
+#338=EDGE_CURVE($,#325,#333,#337,.T.);
+#339=ORIENTED_EDGE($,$,$,#338,.T.);
+#340=CARTESIAN_POINT($,(-10.8284271247462,2.82842712474619,10));
+#341=VERTEX_POINT($,#340);
+#342=CARTESIAN_POINT($,(-9.53073372946036,3.69551813004515,10));
+#343=DIRECTION($,(-0.831469612302545,-0.555570233019602,0));
+#344=VECTOR($,#343,1);
+#345=LINE($,#342,#344);
+#346=EDGE_CURVE($,#333,#341,#345,.T.);
+#347=ORIENTED_EDGE($,$,$,#346,.T.);
+#348=CARTESIAN_POINT($,(-11.6955181300451,1.53073372946036,10));
+#349=VERTEX_POINT($,#348);
+#350=CARTESIAN_POINT($,(-10.8284271247462,2.82842712474619,10));
+#351=DIRECTION($,(-0.555570233019603,-0.831469612302545,0));
+#352=VECTOR($,#351,1);
+#353=LINE($,#350,#352);
+#354=EDGE_CURVE($,#341,#349,#353,.T.);
+#355=ORIENTED_EDGE($,$,$,#354,.T.);
+#356=CARTESIAN_POINT($,(-12,0,10));
+#357=VERTEX_POINT($,#356);
+#358=CARTESIAN_POINT($,(-11.6955181300451,1.53073372946036,10));
+#359=DIRECTION($,(-0.195090322016128,-0.980785280403231,0));
+#360=VECTOR($,#359,1);
+#361=LINE($,#358,#360);
+#362=EDGE_CURVE($,#349,#357,#361,.T.);
+#363=ORIENTED_EDGE($,$,$,#362,.T.);
+#364=CARTESIAN_POINT($,(-12,0,10));
+#365=DIRECTION($,(0.195090322016128,-0.980785280403231,0));
+#366=VECTOR($,#365,1);
+#367=LINE($,#364,#366);
+#368=EDGE_CURVE($,#357,#227,#367,.T.);
+#369=ORIENTED_EDGE($,$,$,#368,.T.);
+#370=EDGE_LOOP($,(#235,#243,#251,#259,#267,#275,#283,#291,#299,#307,#315,#323,#331,#339,#347,#355,#363,#369));
+#371=FACE_BOUND('',#370,.T.);
+#372=ADVANCED_FACE('',(#225,#371),#191,.T.);
+#373=CARTESIAN_POINT($,(-20,-15,-10));
+#374=DIRECTION($,(0,-1,0));
+#375=DIRECTION($,(0,0,1));
+#376=AXIS2_PLACEMENT_3D($,#373,#374,#375);
+#377=PLANE($,#376);
+#378=ORIENTED_EDGE($,$,$,#14,.T.);
+#379=CARTESIAN_POINT($,(20,-15,-10));
+#380=DIRECTION($,(0,0,1));
+#381=VECTOR($,#380,1);
+#382=LINE($,#379,#381);
+#383=EDGE_CURVE($,#9,#211,#382,.T.);
+#384=ORIENTED_EDGE($,$,$,#383,.T.);
+#385=ORIENTED_EDGE($,$,$,#222,.F.);
+#386=CARTESIAN_POINT($,(-20,-15,-10));
+#387=DIRECTION($,(0,0,1));
+#388=VECTOR($,#387,1);
+#389=LINE($,#386,#388);
+#390=EDGE_CURVE($,#7,#195,#389,.T.);
+#391=ORIENTED_EDGE($,$,$,#390,.F.);
+#392=EDGE_LOOP($,(#378,#384,#385,#391));
+#393=FACE_OUTER_BOUND('',#392,.T.);
+#394=ADVANCED_FACE('',(#393),#377,.T.);
+#395=CARTESIAN_POINT($,(20,-15,-10));
+#396=DIRECTION($,(1,-0,0));
+#397=DIRECTION($,(0,0,1));
+#398=AXIS2_PLACEMENT_3D($,#395,#396,#397);
+#399=PLANE($,#398);
+#400=ORIENTED_EDGE($,$,$,#22,.T.);
+#401=CARTESIAN_POINT($,(20,15,-10));
+#402=DIRECTION($,(0,0,1));
+#403=VECTOR($,#402,1);
+#404=LINE($,#401,#403);
+#405=EDGE_CURVE($,#17,#203,#404,.T.);
+#406=ORIENTED_EDGE($,$,$,#405,.T.);
+#407=ORIENTED_EDGE($,$,$,#216,.F.);
+#408=ORIENTED_EDGE($,$,$,#383,.F.);
+#409=EDGE_LOOP($,(#400,#406,#407,#408));
+#410=FACE_OUTER_BOUND('',#409,.T.);
+#411=ADVANCED_FACE('',(#410),#399,.T.);
+#412=CARTESIAN_POINT($,(20,15,-10));
+#413=DIRECTION($,(0,1,0));
+#414=DIRECTION($,(0,0,1));
+#415=AXIS2_PLACEMENT_3D($,#412,#413,#414);
+#416=PLANE($,#415);
+#417=ORIENTED_EDGE($,$,$,#30,.T.);
+#418=CARTESIAN_POINT($,(-20,15,-10));
+#419=DIRECTION($,(0,0,1));
+#420=VECTOR($,#419,1);
+#421=LINE($,#418,#420);
+#422=EDGE_CURVE($,#25,#193,#421,.T.);
+#423=ORIENTED_EDGE($,$,$,#422,.T.);
+#424=ORIENTED_EDGE($,$,$,#208,.F.);
+#425=ORIENTED_EDGE($,$,$,#405,.F.);
+#426=EDGE_LOOP($,(#417,#423,#424,#425));
+#427=FACE_OUTER_BOUND('',#426,.T.);
+#428=ADVANCED_FACE('',(#427),#416,.T.);
+#429=CARTESIAN_POINT($,(-20,15,-10));
+#430=DIRECTION($,(-1,-0,0));
+#431=DIRECTION($,(0,0,1));
+#432=AXIS2_PLACEMENT_3D($,#429,#430,#431);
+#433=PLANE($,#432);
+#434=ORIENTED_EDGE($,$,$,#36,.T.);
+#435=ORIENTED_EDGE($,$,$,#390,.T.);
+#436=ORIENTED_EDGE($,$,$,#200,.F.);
+#437=ORIENTED_EDGE($,$,$,#422,.F.);
+#438=EDGE_LOOP($,(#434,#435,#436,#437));
+#439=FACE_OUTER_BOUND('',#438,.T.);
+#440=ADVANCED_FACE('',(#439),#433,.T.);
+#441=CARTESIAN_POINT($,(-11.6955181300451,-1.53073372946036,-10));
+#442=DIRECTION($,(0.831469612302545,0.555570233019602,0));
+#443=DIRECTION($,(0,0,1));
+#444=AXIS2_PLACEMENT_3D($,#441,#442,#443);
+#445=PLANE($,#444);
+#446=ORIENTED_EDGE($,$,$,#48,.F.);
+#447=CARTESIAN_POINT($,(-11.6955181300451,-1.53073372946035,-10));
+#448=DIRECTION($,(0,0,1));
+#449=VECTOR($,#448,1);
+#450=LINE($,#447,#449);
+#451=EDGE_CURVE($,#41,#227,#450,.T.);
+#452=ORIENTED_EDGE($,$,$,#451,.T.);
+#453=ORIENTED_EDGE($,$,$,#234,.T.);
+#454=CARTESIAN_POINT($,(-10.8284271247462,-2.82842712474619,-10));
+#455=DIRECTION($,(0,0,1));
+#456=VECTOR($,#455,1);
+#457=LINE($,#454,#456);
+#458=EDGE_CURVE($,#43,#229,#457,.T.);
+#459=ORIENTED_EDGE($,$,$,#458,.F.);
+#460=EDGE_LOOP($,(#446,#452,#453,#459));
+#461=FACE_OUTER_BOUND('',#460,.T.);
+#462=ADVANCED_FACE('',(#461),#445,.T.);
+#463=CARTESIAN_POINT($,(-10.8284271247462,-2.82842712474619,-10));
+#464=DIRECTION($,(0.555570233019602,0.831469612302545,0));
+#465=DIRECTION($,(0,0,1));
+#466=AXIS2_PLACEMENT_3D($,#463,#464,#465);
+#467=PLANE($,#466);
+#468=ORIENTED_EDGE($,$,$,#56,.F.);
+#469=ORIENTED_EDGE($,$,$,#458,.T.);
+#470=ORIENTED_EDGE($,$,$,#242,.T.);
+#471=CARTESIAN_POINT($,(-9.53073372946037,-3.69551813004515,-10));
+#472=DIRECTION($,(0,0,1));
+#473=VECTOR($,#472,1);
+#474=LINE($,#471,#473);
+#475=EDGE_CURVE($,#51,#237,#474,.T.);
+#476=ORIENTED_EDGE($,$,$,#475,.F.);
+#477=EDGE_LOOP($,(#468,#469,#470,#476));
+#478=FACE_OUTER_BOUND('',#477,.T.);
+#479=ADVANCED_FACE('',(#478),#467,.T.);
+#480=CARTESIAN_POINT($,(-9.53073372946036,-3.69551813004515,-10));
+#481=DIRECTION($,(0.195090322016129,0.98078528040323,0));
+#482=DIRECTION($,(0,0,1));
+#483=AXIS2_PLACEMENT_3D($,#480,#481,#482);
+#484=PLANE($,#483);
+#485=ORIENTED_EDGE($,$,$,#64,.F.);
+#486=ORIENTED_EDGE($,$,$,#475,.T.);
+#487=ORIENTED_EDGE($,$,$,#250,.T.);
+#488=CARTESIAN_POINT($,(-8,-4,-10));
+#489=DIRECTION($,(0,0,1));
+#490=VECTOR($,#489,1);
+#491=LINE($,#488,#490);
+#492=EDGE_CURVE($,#59,#245,#491,.T.);
+#493=ORIENTED_EDGE($,$,$,#492,.F.);
+#494=EDGE_LOOP($,(#485,#486,#487,#493));
+#495=FACE_OUTER_BOUND('',#494,.T.);
+#496=ADVANCED_FACE('',(#495),#484,.T.);
+#497=CARTESIAN_POINT($,(-8,-4,-10));
+#498=DIRECTION($,(-0,1,0));
+#499=DIRECTION($,(0,0,1));
+#500=AXIS2_PLACEMENT_3D($,#497,#498,#499);
+#501=PLANE($,#500);
+#502=ORIENTED_EDGE($,$,$,#72,.F.);
+#503=ORIENTED_EDGE($,$,$,#492,.T.);
+#504=ORIENTED_EDGE($,$,$,#258,.T.);
+#505=CARTESIAN_POINT($,(8,-4,-10));
+#506=DIRECTION($,(0,0,1));
+#507=VECTOR($,#506,1);
+#508=LINE($,#505,#507);
+#509=EDGE_CURVE($,#67,#253,#508,.T.);
+#510=ORIENTED_EDGE($,$,$,#509,.F.);
+#511=EDGE_LOOP($,(#502,#503,#504,#510));
+#512=FACE_OUTER_BOUND('',#511,.T.);
+#513=ADVANCED_FACE('',(#512),#501,.T.);
+#514=CARTESIAN_POINT($,(8,-4,-10));
+#515=DIRECTION($,(-0.195090322016128,0.98078528040323,0));
+#516=DIRECTION($,(0,0,1));
+#517=AXIS2_PLACEMENT_3D($,#514,#515,#516);
+#518=PLANE($,#517);
+#519=ORIENTED_EDGE($,$,$,#80,.F.);
+#520=ORIENTED_EDGE($,$,$,#509,.T.);
+#521=ORIENTED_EDGE($,$,$,#266,.T.);
+#522=CARTESIAN_POINT($,(9.53073372946036,-3.69551813004515,-10));
+#523=DIRECTION($,(0,0,1));
+#524=VECTOR($,#523,1);
+#525=LINE($,#522,#524);
+#526=EDGE_CURVE($,#75,#261,#525,.T.);
+#527=ORIENTED_EDGE($,$,$,#526,.F.);
+#528=EDGE_LOOP($,(#519,#520,#521,#527));
+#529=FACE_OUTER_BOUND('',#528,.T.);
+#530=ADVANCED_FACE('',(#529),#518,.T.);
+#531=CARTESIAN_POINT($,(9.53073372946036,-3.69551813004515,-10));
+#532=DIRECTION($,(-0.555570233019602,0.831469612302545,0));
+#533=DIRECTION($,(0,0,1));
+#534=AXIS2_PLACEMENT_3D($,#531,#532,#533);
+#535=PLANE($,#534);
+#536=ORIENTED_EDGE($,$,$,#88,.F.);
+#537=ORIENTED_EDGE($,$,$,#526,.T.);
+#538=ORIENTED_EDGE($,$,$,#274,.T.);
+#539=CARTESIAN_POINT($,(10.8284271247462,-2.82842712474619,-10));
+#540=DIRECTION($,(0,0,1));
+#541=VECTOR($,#540,1);
+#542=LINE($,#539,#541);
+#543=EDGE_CURVE($,#83,#269,#542,.T.);
+#544=ORIENTED_EDGE($,$,$,#543,.F.);
+#545=EDGE_LOOP($,(#536,#537,#538,#544));
+#546=FACE_OUTER_BOUND('',#545,.T.);
+#547=ADVANCED_FACE('',(#546),#535,.T.);
+#548=CARTESIAN_POINT($,(10.8284271247462,-2.82842712474619,-10));
+#549=DIRECTION($,(-0.831469612302545,0.555570233019603,0));
+#550=DIRECTION($,(0,0,1));
+#551=AXIS2_PLACEMENT_3D($,#548,#549,#550);
+#552=PLANE($,#551);
+#553=ORIENTED_EDGE($,$,$,#96,.F.);
+#554=ORIENTED_EDGE($,$,$,#543,.T.);
+#555=ORIENTED_EDGE($,$,$,#282,.T.);
+#556=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946036,-10));
+#557=DIRECTION($,(0,0,1));
+#558=VECTOR($,#557,1);
+#559=LINE($,#556,#558);
+#560=EDGE_CURVE($,#91,#277,#559,.T.);
+#561=ORIENTED_EDGE($,$,$,#560,.F.);
+#562=EDGE_LOOP($,(#553,#554,#555,#561));
+#563=FACE_OUTER_BOUND('',#562,.T.);
+#564=ADVANCED_FACE('',(#563),#552,.T.);
+#565=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946036,-10));
+#566=DIRECTION($,(-0.980785280403231,0.195090322016128,0));
+#567=DIRECTION($,(0,0,1));
+#568=AXIS2_PLACEMENT_3D($,#565,#566,#567);
+#569=PLANE($,#568);
+#570=ORIENTED_EDGE($,$,$,#104,.F.);
+#571=ORIENTED_EDGE($,$,$,#560,.T.);
+#572=ORIENTED_EDGE($,$,$,#290,.T.);
+#573=CARTESIAN_POINT($,(12,-0,-10));
+#574=DIRECTION($,(0,0,1));
+#575=VECTOR($,#574,1);
+#576=LINE($,#573,#575);
+#577=EDGE_CURVE($,#99,#285,#576,.T.);
+#578=ORIENTED_EDGE($,$,$,#577,.F.);
+#579=EDGE_LOOP($,(#570,#571,#572,#578));
+#580=FACE_OUTER_BOUND('',#579,.T.);
+#581=ADVANCED_FACE('',(#580),#569,.T.);
+#582=CARTESIAN_POINT($,(12,0,-10));
+#583=DIRECTION($,(-0.980785280403231,-0.195090322016128,0));
+#584=DIRECTION($,(0,0,1));
+#585=AXIS2_PLACEMENT_3D($,#582,#583,#584);
+#586=PLANE($,#585);
+#587=ORIENTED_EDGE($,$,$,#112,.F.);
+#588=ORIENTED_EDGE($,$,$,#577,.T.);
+#589=ORIENTED_EDGE($,$,$,#298,.T.);
+#590=CARTESIAN_POINT($,(11.6955181300451,1.53073372946035,-10));
+#591=DIRECTION($,(0,0,1));
+#592=VECTOR($,#591,1);
+#593=LINE($,#590,#592);
+#594=EDGE_CURVE($,#107,#293,#593,.T.);
+#595=ORIENTED_EDGE($,$,$,#594,.F.);
+#596=EDGE_LOOP($,(#587,#588,#589,#595));
+#597=FACE_OUTER_BOUND('',#596,.T.);
+#598=ADVANCED_FACE('',(#597),#586,.T.);
+#599=CARTESIAN_POINT($,(11.6955181300451,1.53073372946036,-10));
+#600=DIRECTION($,(-0.831469612302545,-0.555570233019603,0));
+#601=DIRECTION($,(0,0,1));
+#602=AXIS2_PLACEMENT_3D($,#599,#600,#601);
+#603=PLANE($,#602);
+#604=ORIENTED_EDGE($,$,$,#120,.F.);
+#605=ORIENTED_EDGE($,$,$,#594,.T.);
+#606=ORIENTED_EDGE($,$,$,#306,.T.);
+#607=CARTESIAN_POINT($,(10.8284271247462,2.82842712474619,-10));
+#608=DIRECTION($,(0,0,1));
+#609=VECTOR($,#608,1);
+#610=LINE($,#607,#609);
+#611=EDGE_CURVE($,#115,#301,#610,.T.);
+#612=ORIENTED_EDGE($,$,$,#611,.F.);
+#613=EDGE_LOOP($,(#604,#605,#606,#612));
+#614=FACE_OUTER_BOUND('',#613,.T.);
+#615=ADVANCED_FACE('',(#614),#603,.T.);
+#616=CARTESIAN_POINT($,(10.8284271247462,2.82842712474619,-10));
+#617=DIRECTION($,(-0.555570233019602,-0.831469612302545,0));
+#618=DIRECTION($,(0,0,1));
+#619=AXIS2_PLACEMENT_3D($,#616,#617,#618);
+#620=PLANE($,#619);
+#621=ORIENTED_EDGE($,$,$,#128,.F.);
+#622=ORIENTED_EDGE($,$,$,#611,.T.);
+#623=ORIENTED_EDGE($,$,$,#314,.T.);
+#624=CARTESIAN_POINT($,(9.53073372946036,3.69551813004515,-10));
+#625=DIRECTION($,(0,0,1));
+#626=VECTOR($,#625,1);
+#627=LINE($,#624,#626);
+#628=EDGE_CURVE($,#123,#309,#627,.T.);
+#629=ORIENTED_EDGE($,$,$,#628,.F.);
+#630=EDGE_LOOP($,(#621,#622,#623,#629));
+#631=FACE_OUTER_BOUND('',#630,.T.);
+#632=ADVANCED_FACE('',(#631),#620,.T.);
+#633=CARTESIAN_POINT($,(9.53073372946036,3.69551813004515,-10));
+#634=DIRECTION($,(-0.195090322016128,-0.98078528040323,0));
+#635=DIRECTION($,(0,0,1));
+#636=AXIS2_PLACEMENT_3D($,#633,#634,#635);
+#637=PLANE($,#636);
+#638=ORIENTED_EDGE($,$,$,#136,.F.);
+#639=ORIENTED_EDGE($,$,$,#628,.T.);
+#640=ORIENTED_EDGE($,$,$,#322,.T.);
+#641=CARTESIAN_POINT($,(8,4,-10));
+#642=DIRECTION($,(0,0,1));
+#643=VECTOR($,#642,1);
+#644=LINE($,#641,#643);
+#645=EDGE_CURVE($,#131,#317,#644,.T.);
+#646=ORIENTED_EDGE($,$,$,#645,.F.);
+#647=EDGE_LOOP($,(#638,#639,#640,#646));
+#648=FACE_OUTER_BOUND('',#647,.T.);
+#649=ADVANCED_FACE('',(#648),#637,.T.);
+#650=CARTESIAN_POINT($,(8,4,-10));
+#651=DIRECTION($,(-0,-1,0));
+#652=DIRECTION($,(0,0,1));
+#653=AXIS2_PLACEMENT_3D($,#650,#651,#652);
+#654=PLANE($,#653);
+#655=ORIENTED_EDGE($,$,$,#144,.F.);
+#656=ORIENTED_EDGE($,$,$,#645,.T.);
+#657=ORIENTED_EDGE($,$,$,#330,.T.);
+#658=CARTESIAN_POINT($,(-8,4,-10));
+#659=DIRECTION($,(0,0,1));
+#660=VECTOR($,#659,1);
+#661=LINE($,#658,#660);
+#662=EDGE_CURVE($,#139,#325,#661,.T.);
+#663=ORIENTED_EDGE($,$,$,#662,.F.);
+#664=EDGE_LOOP($,(#655,#656,#657,#663));
+#665=FACE_OUTER_BOUND('',#664,.T.);
+#666=ADVANCED_FACE('',(#665),#654,.T.);
+#667=CARTESIAN_POINT($,(-8,4,-10));
+#668=DIRECTION($,(0.195090322016128,-0.98078528040323,0));
+#669=DIRECTION($,(0,0,1));
+#670=AXIS2_PLACEMENT_3D($,#667,#668,#669);
+#671=PLANE($,#670);
+#672=ORIENTED_EDGE($,$,$,#152,.F.);
+#673=ORIENTED_EDGE($,$,$,#662,.T.);
+#674=ORIENTED_EDGE($,$,$,#338,.T.);
+#675=CARTESIAN_POINT($,(-9.53073372946036,3.69551813004515,-10));
+#676=DIRECTION($,(0,0,1));
+#677=VECTOR($,#676,1);
+#678=LINE($,#675,#677);
+#679=EDGE_CURVE($,#147,#333,#678,.T.);
+#680=ORIENTED_EDGE($,$,$,#679,.F.);
+#681=EDGE_LOOP($,(#672,#673,#674,#680));
+#682=FACE_OUTER_BOUND('',#681,.T.);
+#683=ADVANCED_FACE('',(#682),#671,.T.);
+#684=CARTESIAN_POINT($,(-9.53073372946036,3.69551813004515,-10));
+#685=DIRECTION($,(0.555570233019602,-0.831469612302545,0));
+#686=DIRECTION($,(0,0,1));
+#687=AXIS2_PLACEMENT_3D($,#684,#685,#686);
+#688=PLANE($,#687);
+#689=ORIENTED_EDGE($,$,$,#160,.F.);
+#690=ORIENTED_EDGE($,$,$,#679,.T.);
+#691=ORIENTED_EDGE($,$,$,#346,.T.);
+#692=CARTESIAN_POINT($,(-10.8284271247462,2.82842712474619,-10));
+#693=DIRECTION($,(0,0,1));
+#694=VECTOR($,#693,1);
+#695=LINE($,#692,#694);
+#696=EDGE_CURVE($,#155,#341,#695,.T.);
+#697=ORIENTED_EDGE($,$,$,#696,.F.);
+#698=EDGE_LOOP($,(#689,#690,#691,#697));
+#699=FACE_OUTER_BOUND('',#698,.T.);
+#700=ADVANCED_FACE('',(#699),#688,.T.);
+#701=CARTESIAN_POINT($,(-10.8284271247462,2.82842712474619,-10));
+#702=DIRECTION($,(0.831469612302545,-0.555570233019603,0));
+#703=DIRECTION($,(0,0,1));
+#704=AXIS2_PLACEMENT_3D($,#701,#702,#703);
+#705=PLANE($,#704);
+#706=ORIENTED_EDGE($,$,$,#168,.F.);
+#707=ORIENTED_EDGE($,$,$,#696,.T.);
+#708=ORIENTED_EDGE($,$,$,#354,.T.);
+#709=CARTESIAN_POINT($,(-11.6955181300451,1.53073372946036,-10));
+#710=DIRECTION($,(0,0,1));
+#711=VECTOR($,#710,1);
+#712=LINE($,#709,#711);
+#713=EDGE_CURVE($,#163,#349,#712,.T.);
+#714=ORIENTED_EDGE($,$,$,#713,.F.);
+#715=EDGE_LOOP($,(#706,#707,#708,#714));
+#716=FACE_OUTER_BOUND('',#715,.T.);
+#717=ADVANCED_FACE('',(#716),#705,.T.);
+#718=CARTESIAN_POINT($,(-11.6955181300451,1.53073372946036,-10));
+#719=DIRECTION($,(0.980785280403231,-0.195090322016128,0));
+#720=DIRECTION($,(0,0,1));
+#721=AXIS2_PLACEMENT_3D($,#718,#719,#720);
+#722=PLANE($,#721);
+#723=ORIENTED_EDGE($,$,$,#176,.F.);
+#724=ORIENTED_EDGE($,$,$,#713,.T.);
+#725=ORIENTED_EDGE($,$,$,#362,.T.);
+#726=CARTESIAN_POINT($,(-12,-0,-10));
+#727=DIRECTION($,(0,0,1));
+#728=VECTOR($,#727,1);
+#729=LINE($,#726,#728);
+#730=EDGE_CURVE($,#171,#357,#729,.T.);
+#731=ORIENTED_EDGE($,$,$,#730,.F.);
+#732=EDGE_LOOP($,(#723,#724,#725,#731));
+#733=FACE_OUTER_BOUND('',#732,.T.);
+#734=ADVANCED_FACE('',(#733),#722,.T.);
+#735=CARTESIAN_POINT($,(-12,0,-10));
+#736=DIRECTION($,(0.980785280403231,0.195090322016128,0));
+#737=DIRECTION($,(0,0,1));
+#738=AXIS2_PLACEMENT_3D($,#735,#736,#737);
+#739=PLANE($,#738);
+#740=ORIENTED_EDGE($,$,$,#182,.F.);
+#741=ORIENTED_EDGE($,$,$,#730,.T.);
+#742=ORIENTED_EDGE($,$,$,#368,.T.);
+#743=ORIENTED_EDGE($,$,$,#451,.F.);
+#744=EDGE_LOOP($,(#740,#741,#742,#743));
+#745=FACE_OUTER_BOUND('',#744,.T.);
+#746=ADVANCED_FACE('',(#745),#739,.T.);
+#747=CLOSED_SHELL($,(#186,#372,#394,#411,#428,#440,#462,#479,#496,#513,#530,#547,#564,#581,#598,#615,#632,#649,#666,#683,#700,#717,#734,#746));
+#748=MANIFOLD_SOLID_BREP('AetherisBody',#747);
+#749=APPLICATION_CONTEXT('mechanical design');
+#750=PRODUCT_CONTEXT('',#749,'mechanical');
+#751=PRODUCT('AETHERIS','AetherisBody','',(#750));
+#752=PRODUCT_DEFINITION_FORMATION('','',#751);
+#753=PRODUCT_DEFINITION_CONTEXT('design',#749,'design');
+#754=PRODUCT_DEFINITION('','',#752,#753);
+#755=PRODUCT_DEFINITION_SHAPE('','',#754);
+#756=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#757=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#758=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#759=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#756,#757,#758))REPRESENTATION_CONTEXT('3','3D'));
+#760=SHAPE_REPRESENTATION('AetherisBody',(#748),#759);
+#761=SHAPE_DEFINITION_REPRESENTATION(#755,#760);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/testdata/firmament/exports/m3b-valid-box-subtract-triangular-prism.step b/testdata/firmament/exports/m3b-valid-box-subtract-triangular-prism.step
new file mode 100644
index 00000000..6e184e73
--- /dev/null
+++ b/testdata/firmament/exports/m3b-valid-box-subtract-triangular-prism.step
@@ -0,0 +1,275 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('Aetheris AP242 subset export'),'2;1');
+FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris'),'Aetheris.Kernel','Aetheris.Kernel','');
+FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
+ENDSEC;
+DATA;
+#1=CARTESIAN_POINT($,(-20,-15,-10));
+#2=DIRECTION($,(0,0,-1));
+#3=DIRECTION($,(1,0,0));
+#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
+#5=PLANE($,#4);
+#6=CARTESIAN_POINT($,(-20,-15,-10));
+#7=VERTEX_POINT($,#6);
+#8=CARTESIAN_POINT($,(20,-15,-10));
+#9=VERTEX_POINT($,#8);
+#10=CARTESIAN_POINT($,(-20,-15,-10));
+#11=DIRECTION($,(1,0,0));
+#12=VECTOR($,#11,1);
+#13=LINE($,#10,#12);
+#14=EDGE_CURVE($,#7,#9,#13,.T.);
+#15=ORIENTED_EDGE($,$,$,#14,.T.);
+#16=CARTESIAN_POINT($,(20,15,-10));
+#17=VERTEX_POINT($,#16);
+#18=CARTESIAN_POINT($,(20,-15,-10));
+#19=DIRECTION($,(0,1,0));
+#20=VECTOR($,#19,1);
+#21=LINE($,#18,#20);
+#22=EDGE_CURVE($,#9,#17,#21,.T.);
+#23=ORIENTED_EDGE($,$,$,#22,.T.);
+#24=CARTESIAN_POINT($,(-20,15,-10));
+#25=VERTEX_POINT($,#24);
+#26=CARTESIAN_POINT($,(20,15,-10));
+#27=DIRECTION($,(-1,0,0));
+#28=VECTOR($,#27,1);
+#29=LINE($,#26,#28);
+#30=EDGE_CURVE($,#17,#25,#29,.T.);
+#31=ORIENTED_EDGE($,$,$,#30,.T.);
+#32=CARTESIAN_POINT($,(-20,15,-10));
+#33=DIRECTION($,(0,-1,0));
+#34=VECTOR($,#33,1);
+#35=LINE($,#32,#34);
+#36=EDGE_CURVE($,#25,#7,#35,.T.);
+#37=ORIENTED_EDGE($,$,$,#36,.T.);
+#38=EDGE_LOOP($,(#15,#23,#31,#37));
+#39=FACE_OUTER_BOUND('',#38,.T.);
+#40=CARTESIAN_POINT($,(-9,-5,-10));
+#41=VERTEX_POINT($,#40);
+#42=CARTESIAN_POINT($,(9,-5,-10));
+#43=VERTEX_POINT($,#42);
+#44=CARTESIAN_POINT($,(-9,-5,-10));
+#45=DIRECTION($,(1,0,0));
+#46=VECTOR($,#45,1);
+#47=LINE($,#44,#46);
+#48=EDGE_CURVE($,#41,#43,#47,.T.);
+#49=ORIENTED_EDGE($,$,$,#48,.F.);
+#50=CARTESIAN_POINT($,(-0,5,-10));
+#51=VERTEX_POINT($,#50);
+#52=CARTESIAN_POINT($,(9,-5,-10));
+#53=DIRECTION($,(-0.66896473162245,0.743294146247166,0));
+#54=VECTOR($,#53,1);
+#55=LINE($,#52,#54);
+#56=EDGE_CURVE($,#43,#51,#55,.T.);
+#57=ORIENTED_EDGE($,$,$,#56,.F.);
+#58=CARTESIAN_POINT($,(-0,5,-10));
+#59=DIRECTION($,(-0.66896473162245,-0.743294146247166,0));
+#60=VECTOR($,#59,1);
+#61=LINE($,#58,#60);
+#62=EDGE_CURVE($,#51,#41,#61,.T.);
+#63=ORIENTED_EDGE($,$,$,#62,.F.);
+#64=EDGE_LOOP($,(#49,#57,#63));
+#65=FACE_BOUND('',#64,.T.);
+#66=ADVANCED_FACE('',(#39,#65),#5,.T.);
+#67=CARTESIAN_POINT($,(-20,-15,10));
+#68=DIRECTION($,(0,0,1));
+#69=DIRECTION($,(1,0,0));
+#70=AXIS2_PLACEMENT_3D($,#67,#68,#69);
+#71=PLANE($,#70);
+#72=CARTESIAN_POINT($,(-20,15,10));
+#73=VERTEX_POINT($,#72);
+#74=CARTESIAN_POINT($,(-20,-15,10));
+#75=VERTEX_POINT($,#74);
+#76=CARTESIAN_POINT($,(-20,15,10));
+#77=DIRECTION($,(0,-1,0));
+#78=VECTOR($,#77,1);
+#79=LINE($,#76,#78);
+#80=EDGE_CURVE($,#73,#75,#79,.T.);
+#81=ORIENTED_EDGE($,$,$,#80,.F.);
+#82=CARTESIAN_POINT($,(20,15,10));
+#83=VERTEX_POINT($,#82);
+#84=CARTESIAN_POINT($,(20,15,10));
+#85=DIRECTION($,(-1,0,0));
+#86=VECTOR($,#85,1);
+#87=LINE($,#84,#86);
+#88=EDGE_CURVE($,#83,#73,#87,.T.);
+#89=ORIENTED_EDGE($,$,$,#88,.F.);
+#90=CARTESIAN_POINT($,(20,-15,10));
+#91=VERTEX_POINT($,#90);
+#92=CARTESIAN_POINT($,(20,-15,10));
+#93=DIRECTION($,(0,1,0));
+#94=VECTOR($,#93,1);
+#95=LINE($,#92,#94);
+#96=EDGE_CURVE($,#91,#83,#95,.T.);
+#97=ORIENTED_EDGE($,$,$,#96,.F.);
+#98=CARTESIAN_POINT($,(-20,-15,10));
+#99=DIRECTION($,(1,0,0));
+#100=VECTOR($,#99,1);
+#101=LINE($,#98,#100);
+#102=EDGE_CURVE($,#75,#91,#101,.T.);
+#103=ORIENTED_EDGE($,$,$,#102,.F.);
+#104=EDGE_LOOP($,(#81,#89,#97,#103));
+#105=FACE_OUTER_BOUND('',#104,.T.);
+#106=CARTESIAN_POINT($,(-9,-5,10));
+#107=VERTEX_POINT($,#106);
+#108=CARTESIAN_POINT($,(9,-5,10));
+#109=VERTEX_POINT($,#108);
+#110=CARTESIAN_POINT($,(-9,-5,10));
+#111=DIRECTION($,(1,0,0));
+#112=VECTOR($,#111,1);
+#113=LINE($,#110,#112);
+#114=EDGE_CURVE($,#107,#109,#113,.T.);
+#115=ORIENTED_EDGE($,$,$,#114,.T.);
+#116=CARTESIAN_POINT($,(0,5,10));
+#117=VERTEX_POINT($,#116);
+#118=CARTESIAN_POINT($,(9,-5,10));
+#119=DIRECTION($,(-0.66896473162245,0.743294146247166,0));
+#120=VECTOR($,#119,1);
+#121=LINE($,#118,#120);
+#122=EDGE_CURVE($,#109,#117,#121,.T.);
+#123=ORIENTED_EDGE($,$,$,#122,.T.);
+#124=CARTESIAN_POINT($,(0,5,10));
+#125=DIRECTION($,(-0.66896473162245,-0.743294146247166,0));
+#126=VECTOR($,#125,1);
+#127=LINE($,#124,#126);
+#128=EDGE_CURVE($,#117,#107,#127,.T.);
+#129=ORIENTED_EDGE($,$,$,#128,.T.);
+#130=EDGE_LOOP($,(#115,#123,#129));
+#131=FACE_BOUND('',#130,.T.);
+#132=ADVANCED_FACE('',(#105,#131),#71,.T.);
+#133=CARTESIAN_POINT($,(-20,-15,-10));
+#134=DIRECTION($,(0,-1,0));
+#135=DIRECTION($,(0,0,1));
+#136=AXIS2_PLACEMENT_3D($,#133,#134,#135);
+#137=PLANE($,#136);
+#138=ORIENTED_EDGE($,$,$,#14,.T.);
+#139=CARTESIAN_POINT($,(20,-15,-10));
+#140=DIRECTION($,(0,0,1));
+#141=VECTOR($,#140,1);
+#142=LINE($,#139,#141);
+#143=EDGE_CURVE($,#9,#91,#142,.T.);
+#144=ORIENTED_EDGE($,$,$,#143,.T.);
+#145=ORIENTED_EDGE($,$,$,#102,.F.);
+#146=CARTESIAN_POINT($,(-20,-15,-10));
+#147=DIRECTION($,(0,0,1));
+#148=VECTOR($,#147,1);
+#149=LINE($,#146,#148);
+#150=EDGE_CURVE($,#7,#75,#149,.T.);
+#151=ORIENTED_EDGE($,$,$,#150,.F.);
+#152=EDGE_LOOP($,(#138,#144,#145,#151));
+#153=FACE_OUTER_BOUND('',#152,.T.);
+#154=ADVANCED_FACE('',(#153),#137,.T.);
+#155=CARTESIAN_POINT($,(20,-15,-10));
+#156=DIRECTION($,(1,-0,0));
+#157=DIRECTION($,(0,0,1));
+#158=AXIS2_PLACEMENT_3D($,#155,#156,#157);
+#159=PLANE($,#158);
+#160=ORIENTED_EDGE($,$,$,#22,.T.);
+#161=CARTESIAN_POINT($,(20,15,-10));
+#162=DIRECTION($,(0,0,1));
+#163=VECTOR($,#162,1);
+#164=LINE($,#161,#163);
+#165=EDGE_CURVE($,#17,#83,#164,.T.);
+#166=ORIENTED_EDGE($,$,$,#165,.T.);
+#167=ORIENTED_EDGE($,$,$,#96,.F.);
+#168=ORIENTED_EDGE($,$,$,#143,.F.);
+#169=EDGE_LOOP($,(#160,#166,#167,#168));
+#170=FACE_OUTER_BOUND('',#169,.T.);
+#171=ADVANCED_FACE('',(#170),#159,.T.);
+#172=CARTESIAN_POINT($,(20,15,-10));
+#173=DIRECTION($,(0,1,0));
+#174=DIRECTION($,(0,0,1));
+#175=AXIS2_PLACEMENT_3D($,#172,#173,#174);
+#176=PLANE($,#175);
+#177=ORIENTED_EDGE($,$,$,#30,.T.);
+#178=CARTESIAN_POINT($,(-20,15,-10));
+#179=DIRECTION($,(0,0,1));
+#180=VECTOR($,#179,1);
+#181=LINE($,#178,#180);
+#182=EDGE_CURVE($,#25,#73,#181,.T.);
+#183=ORIENTED_EDGE($,$,$,#182,.T.);
+#184=ORIENTED_EDGE($,$,$,#88,.F.);
+#185=ORIENTED_EDGE($,$,$,#165,.F.);
+#186=EDGE_LOOP($,(#177,#183,#184,#185));
+#187=FACE_OUTER_BOUND('',#186,.T.);
+#188=ADVANCED_FACE('',(#187),#176,.T.);
+#189=CARTESIAN_POINT($,(-20,15,-10));
+#190=DIRECTION($,(-1,-0,0));
+#191=DIRECTION($,(0,0,1));
+#192=AXIS2_PLACEMENT_3D($,#189,#190,#191);
+#193=PLANE($,#192);
+#194=ORIENTED_EDGE($,$,$,#36,.T.);
+#195=ORIENTED_EDGE($,$,$,#150,.T.);
+#196=ORIENTED_EDGE($,$,$,#80,.F.);
+#197=ORIENTED_EDGE($,$,$,#182,.F.);
+#198=EDGE_LOOP($,(#194,#195,#196,#197));
+#199=FACE_OUTER_BOUND('',#198,.T.);
+#200=ADVANCED_FACE('',(#199),#193,.T.);
+#201=CARTESIAN_POINT($,(-9,-5,-10));
+#202=DIRECTION($,(-0,1,0));
+#203=DIRECTION($,(0,0,1));
+#204=AXIS2_PLACEMENT_3D($,#201,#202,#203);
+#205=PLANE($,#204);
+#206=ORIENTED_EDGE($,$,$,#48,.F.);
+#207=CARTESIAN_POINT($,(-9,-5,-10));
+#208=DIRECTION($,(0,0,1));
+#209=VECTOR($,#208,1);
+#210=LINE($,#207,#209);
+#211=EDGE_CURVE($,#41,#107,#210,.T.);
+#212=ORIENTED_EDGE($,$,$,#211,.T.);
+#213=ORIENTED_EDGE($,$,$,#114,.T.);
+#214=CARTESIAN_POINT($,(9,-5,-10));
+#215=DIRECTION($,(0,0,1));
+#216=VECTOR($,#215,1);
+#217=LINE($,#214,#216);
+#218=EDGE_CURVE($,#43,#109,#217,.T.);
+#219=ORIENTED_EDGE($,$,$,#218,.F.);
+#220=EDGE_LOOP($,(#206,#212,#213,#219));
+#221=FACE_OUTER_BOUND('',#220,.T.);
+#222=ADVANCED_FACE('',(#221),#205,.T.);
+#223=CARTESIAN_POINT($,(9,-5,-10));
+#224=DIRECTION($,(-0.743294146247166,-0.66896473162245,0));
+#225=DIRECTION($,(0,0,1));
+#226=AXIS2_PLACEMENT_3D($,#223,#224,#225);
+#227=PLANE($,#226);
+#228=ORIENTED_EDGE($,$,$,#56,.F.);
+#229=ORIENTED_EDGE($,$,$,#218,.T.);
+#230=ORIENTED_EDGE($,$,$,#122,.T.);
+#231=CARTESIAN_POINT($,(-0,5,-10));
+#232=DIRECTION($,(0,0,1));
+#233=VECTOR($,#232,1);
+#234=LINE($,#231,#233);
+#235=EDGE_CURVE($,#51,#117,#234,.T.);
+#236=ORIENTED_EDGE($,$,$,#235,.F.);
+#237=EDGE_LOOP($,(#228,#229,#230,#236));
+#238=FACE_OUTER_BOUND('',#237,.T.);
+#239=ADVANCED_FACE('',(#238),#227,.T.);
+#240=CARTESIAN_POINT($,(0,5,-10));
+#241=DIRECTION($,(0.743294146247166,-0.66896473162245,0));
+#242=DIRECTION($,(0,0,1));
+#243=AXIS2_PLACEMENT_3D($,#240,#241,#242);
+#244=PLANE($,#243);
+#245=ORIENTED_EDGE($,$,$,#62,.F.);
+#246=ORIENTED_EDGE($,$,$,#235,.T.);
+#247=ORIENTED_EDGE($,$,$,#128,.T.);
+#248=ORIENTED_EDGE($,$,$,#211,.F.);
+#249=EDGE_LOOP($,(#245,#246,#247,#248));
+#250=FACE_OUTER_BOUND('',#249,.T.);
+#251=ADVANCED_FACE('',(#250),#244,.T.);
+#252=CLOSED_SHELL($,(#66,#132,#154,#171,#188,#200,#222,#239,#251));
+#253=MANIFOLD_SOLID_BREP('AetherisBody',#252);
+#254=APPLICATION_CONTEXT('mechanical design');
+#255=PRODUCT_CONTEXT('',#254,'mechanical');
+#256=PRODUCT('AETHERIS','AetherisBody','',(#255));
+#257=PRODUCT_DEFINITION_FORMATION('','',#256);
+#258=PRODUCT_DEFINITION_CONTEXT('design',#254,'design');
+#259=PRODUCT_DEFINITION('','',#257,#258);
+#260=PRODUCT_DEFINITION_SHAPE('','',#259);
+#261=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#262=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#263=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#264=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#261,#262,#263))REPRESENTATION_CONTEXT('3','3D'));
+#265=SHAPE_REPRESENTATION('AetherisBody',(#253),#264);
+#266=SHAPE_DEFINITION_REPRESENTATION(#260,#265);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/testdata/firmament/exports/m4_draft_box_basic.step b/testdata/firmament/exports/m4_draft_box_basic.step
new file mode 100644
index 00000000..9a937dee
--- /dev/null
+++ b/testdata/firmament/exports/m4_draft_box_basic.step
@@ -0,0 +1,172 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('Aetheris AP242 subset export'),'2;1');
+FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris'),'Aetheris.Kernel','Aetheris.Kernel','');
+FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
+ENDSEC;
+DATA;
+#1=CARTESIAN_POINT($,(-20,-15,-10));
+#2=DIRECTION($,(0,0,-1));
+#3=DIRECTION($,(1,0,0));
+#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
+#5=PLANE($,#4);
+#6=CARTESIAN_POINT($,(-20,-15,-10));
+#7=VERTEX_POINT($,#6);
+#8=CARTESIAN_POINT($,(20,-15,-10));
+#9=VERTEX_POINT($,#8);
+#10=CARTESIAN_POINT($,(-20,-15,-10));
+#11=DIRECTION($,(1,0,0));
+#12=VECTOR($,#11,1);
+#13=LINE($,#10,#12);
+#14=EDGE_CURVE($,#7,#9,#13,.T.);
+#15=ORIENTED_EDGE($,$,$,#14,.T.);
+#16=CARTESIAN_POINT($,(20,15,-10));
+#17=VERTEX_POINT($,#16);
+#18=CARTESIAN_POINT($,(20,-15,-10));
+#19=DIRECTION($,(0,1,0));
+#20=VECTOR($,#19,1);
+#21=LINE($,#18,#20);
+#22=EDGE_CURVE($,#9,#17,#21,.T.);
+#23=ORIENTED_EDGE($,$,$,#22,.T.);
+#24=CARTESIAN_POINT($,(-20,15,-10));
+#25=VERTEX_POINT($,#24);
+#26=CARTESIAN_POINT($,(20,15,-10));
+#27=DIRECTION($,(-1,0,0));
+#28=VECTOR($,#27,1);
+#29=LINE($,#26,#28);
+#30=EDGE_CURVE($,#17,#25,#29,.T.);
+#31=ORIENTED_EDGE($,$,$,#30,.T.);
+#32=CARTESIAN_POINT($,(-20,15,-10));
+#33=DIRECTION($,(0,-1,0));
+#34=VECTOR($,#33,1);
+#35=LINE($,#32,#34);
+#36=EDGE_CURVE($,#25,#7,#35,.T.);
+#37=ORIENTED_EDGE($,$,$,#36,.T.);
+#38=EDGE_LOOP($,(#15,#23,#31,#37));
+#39=FACE_OUTER_BOUND('',#38,.T.);
+#40=ADVANCED_FACE('',(#39),#5,.T.);
+#41=CARTESIAN_POINT($,(-19.301584610165,-14.301584610165,10));
+#42=DIRECTION($,(0,0,1));
+#43=DIRECTION($,(1,0,0));
+#44=AXIS2_PLACEMENT_3D($,#41,#42,#43);
+#45=PLANE($,#44);
+#46=CARTESIAN_POINT($,(-19.301584610165,-14.301584610165,10));
+#47=VERTEX_POINT($,#46);
+#48=CARTESIAN_POINT($,(19.301584610165,-14.301584610165,10));
+#49=VERTEX_POINT($,#48);
+#50=CARTESIAN_POINT($,(-19.301584610165,-14.301584610165,10));
+#51=DIRECTION($,(1,0,0));
+#52=VECTOR($,#51,1);
+#53=LINE($,#50,#52);
+#54=EDGE_CURVE($,#47,#49,#53,.T.);
+#55=ORIENTED_EDGE($,$,$,#54,.F.);
+#56=CARTESIAN_POINT($,(19.301584610165,14.301584610165,10));
+#57=VERTEX_POINT($,#56);
+#58=CARTESIAN_POINT($,(19.301584610165,-14.301584610165,10));
+#59=DIRECTION($,(0,1,0));
+#60=VECTOR($,#59,1);
+#61=LINE($,#58,#60);
+#62=EDGE_CURVE($,#49,#57,#61,.T.);
+#63=ORIENTED_EDGE($,$,$,#62,.F.);
+#64=CARTESIAN_POINT($,(-19.301584610165,14.301584610165,10));
+#65=VERTEX_POINT($,#64);
+#66=CARTESIAN_POINT($,(19.301584610165,14.301584610165,10));
+#67=DIRECTION($,(-1,0,0));
+#68=VECTOR($,#67,1);
+#69=LINE($,#66,#68);
+#70=EDGE_CURVE($,#57,#65,#69,.T.);
+#71=ORIENTED_EDGE($,$,$,#70,.F.);
+#72=CARTESIAN_POINT($,(-19.301584610165,14.301584610165,10));
+#73=DIRECTION($,(0,-1,0));
+#74=VECTOR($,#73,1);
+#75=LINE($,#72,#74);
+#76=EDGE_CURVE($,#65,#47,#75,.T.);
+#77=ORIENTED_EDGE($,$,$,#76,.F.);
+#78=EDGE_LOOP($,(#55,#63,#71,#77));
+#79=FACE_OUTER_BOUND('',#78,.T.);
+#80=ADVANCED_FACE('',(#79),#45,.T.);
+#81=CARTESIAN_POINT($,(-20,-15,-10));
+#82=DIRECTION($,(0,-0.999390827019096,0.034899496702501));
+#83=DIRECTION($,(1,0,0));
+#84=AXIS2_PLACEMENT_3D($,#81,#82,#83);
+#85=PLANE($,#84);
+#86=ORIENTED_EDGE($,$,$,#14,.T.);
+#87=CARTESIAN_POINT($,(20,-15,-10));
+#88=DIRECTION($,(-0.034878262742375,0.034878262742375,0.998782765958718));
+#89=VECTOR($,#88,1);
+#90=LINE($,#87,#89);
+#91=EDGE_CURVE($,#9,#49,#90,.T.);
+#92=ORIENTED_EDGE($,$,$,#91,.T.);
+#93=ORIENTED_EDGE($,$,$,#54,.F.);
+#94=CARTESIAN_POINT($,(-20,-15,-10));
+#95=DIRECTION($,(0.034878262742375,0.034878262742375,0.998782765958718));
+#96=VECTOR($,#95,1);
+#97=LINE($,#94,#96);
+#98=EDGE_CURVE($,#7,#47,#97,.T.);
+#99=ORIENTED_EDGE($,$,$,#98,.F.);
+#100=EDGE_LOOP($,(#86,#92,#93,#99));
+#101=FACE_OUTER_BOUND('',#100,.T.);
+#102=ADVANCED_FACE('',(#101),#85,.T.);
+#103=CARTESIAN_POINT($,(20,-15,-10));
+#104=DIRECTION($,(0.999390827019096,-0,0.034899496702501));
+#105=DIRECTION($,(0,1,0));
+#106=AXIS2_PLACEMENT_3D($,#103,#104,#105);
+#107=PLANE($,#106);
+#108=ORIENTED_EDGE($,$,$,#22,.T.);
+#109=CARTESIAN_POINT($,(20,15,-10));
+#110=DIRECTION($,(-0.034878262742375,-0.034878262742375,0.998782765958718));
+#111=VECTOR($,#110,1);
+#112=LINE($,#109,#111);
+#113=EDGE_CURVE($,#17,#57,#112,.T.);
+#114=ORIENTED_EDGE($,$,$,#113,.T.);
+#115=ORIENTED_EDGE($,$,$,#62,.F.);
+#116=ORIENTED_EDGE($,$,$,#91,.F.);
+#117=EDGE_LOOP($,(#108,#114,#115,#116));
+#118=FACE_OUTER_BOUND('',#117,.T.);
+#119=ADVANCED_FACE('',(#118),#107,.T.);
+#120=CARTESIAN_POINT($,(20,15,-10));
+#121=DIRECTION($,(0,0.999390827019096,0.034899496702501));
+#122=DIRECTION($,(-1,0,0));
+#123=AXIS2_PLACEMENT_3D($,#120,#121,#122);
+#124=PLANE($,#123);
+#125=ORIENTED_EDGE($,$,$,#30,.T.);
+#126=CARTESIAN_POINT($,(-20,15,-10));
+#127=DIRECTION($,(0.034878262742375,-0.034878262742375,0.998782765958718));
+#128=VECTOR($,#127,1);
+#129=LINE($,#126,#128);
+#130=EDGE_CURVE($,#25,#65,#129,.T.);
+#131=ORIENTED_EDGE($,$,$,#130,.T.);
+#132=ORIENTED_EDGE($,$,$,#70,.F.);
+#133=ORIENTED_EDGE($,$,$,#113,.F.);
+#134=EDGE_LOOP($,(#125,#131,#132,#133));
+#135=FACE_OUTER_BOUND('',#134,.T.);
+#136=ADVANCED_FACE('',(#135),#124,.T.);
+#137=CARTESIAN_POINT($,(-20,15,-10));
+#138=DIRECTION($,(-0.999390827019096,0,0.034899496702501));
+#139=DIRECTION($,(0,-1,0));
+#140=AXIS2_PLACEMENT_3D($,#137,#138,#139);
+#141=PLANE($,#140);
+#142=ORIENTED_EDGE($,$,$,#36,.T.);
+#143=ORIENTED_EDGE($,$,$,#98,.T.);
+#144=ORIENTED_EDGE($,$,$,#76,.F.);
+#145=ORIENTED_EDGE($,$,$,#130,.F.);
+#146=EDGE_LOOP($,(#142,#143,#144,#145));
+#147=FACE_OUTER_BOUND('',#146,.T.);
+#148=ADVANCED_FACE('',(#147),#141,.T.);
+#149=CLOSED_SHELL($,(#40,#80,#102,#119,#136,#148));
+#150=MANIFOLD_SOLID_BREP('AetherisBody',#149);
+#151=APPLICATION_CONTEXT('mechanical design');
+#152=PRODUCT_CONTEXT('',#151,'mechanical');
+#153=PRODUCT('AETHERIS','AetherisBody','',(#152));
+#154=PRODUCT_DEFINITION_FORMATION('','',#153);
+#155=PRODUCT_DEFINITION_CONTEXT('design',#151,'design');
+#156=PRODUCT_DEFINITION('','',#154,#155);
+#157=PRODUCT_DEFINITION_SHAPE('','',#156);
+#158=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#159=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#160=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#161=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#158,#159,#160))REPRESENTATION_CONTEXT('3','3D'));
+#162=SHAPE_REPRESENTATION('AetherisBody',(#150),#161);
+#163=SHAPE_DEFINITION_REPRESENTATION(#157,#162);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/testdata/firmament/exports/m5a_chamfer_box_corner_e2_basic.step b/testdata/firmament/exports/m5a_chamfer_box_corner_e2_basic.step
new file mode 100644
index 00000000..1bae8612
--- /dev/null
+++ b/testdata/firmament/exports/m5a_chamfer_box_corner_e2_basic.step
@@ -0,0 +1,205 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('Aetheris AP242 subset export'),'2;1');
+FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris'),'Aetheris.Kernel','Aetheris.Kernel','');
+FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
+ENDSEC;
+DATA;
+#1=CARTESIAN_POINT($,(-20,-10,-5));
+#2=DIRECTION($,(0,0,-1));
+#3=DIRECTION($,(1,0,0));
+#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
+#5=PLANE($,#4);
+#6=CARTESIAN_POINT($,(-20,-10,-5));
+#7=VERTEX_POINT($,#6);
+#8=CARTESIAN_POINT($,(20,-10,-5));
+#9=VERTEX_POINT($,#8);
+#10=CARTESIAN_POINT($,(-20,-10,-5));
+#11=DIRECTION($,(1,0,0));
+#12=VECTOR($,#11,1);
+#13=LINE($,#10,#12);
+#14=EDGE_CURVE($,#7,#9,#13,.T.);
+#15=ORIENTED_EDGE($,$,$,#14,.T.);
+#16=CARTESIAN_POINT($,(20,10,-5));
+#17=VERTEX_POINT($,#16);
+#18=CARTESIAN_POINT($,(20,-10,-5));
+#19=DIRECTION($,(0,1,0));
+#20=VECTOR($,#19,1);
+#21=LINE($,#18,#20);
+#22=EDGE_CURVE($,#9,#17,#21,.T.);
+#23=ORIENTED_EDGE($,$,$,#22,.T.);
+#24=CARTESIAN_POINT($,(-20,10,-5));
+#25=VERTEX_POINT($,#24);
+#26=CARTESIAN_POINT($,(20,10,-5));
+#27=DIRECTION($,(-1,0,0));
+#28=VECTOR($,#27,1);
+#29=LINE($,#26,#28);
+#30=EDGE_CURVE($,#17,#25,#29,.T.);
+#31=ORIENTED_EDGE($,$,$,#30,.T.);
+#32=CARTESIAN_POINT($,(-20,10,-5));
+#33=DIRECTION($,(0,-1,0));
+#34=VECTOR($,#33,1);
+#35=LINE($,#32,#34);
+#36=EDGE_CURVE($,#25,#7,#35,.T.);
+#37=ORIENTED_EDGE($,$,$,#36,.T.);
+#38=EDGE_LOOP($,(#15,#23,#31,#37));
+#39=FACE_OUTER_BOUND('',#38,.T.);
+#40=ADVANCED_FACE('',(#39),#5,.T.);
+#41=CARTESIAN_POINT($,(-20,-10,5));
+#42=DIRECTION($,(0,0,1));
+#43=DIRECTION($,(1,0,0));
+#44=AXIS2_PLACEMENT_3D($,#41,#42,#43);
+#45=PLANE($,#44);
+#46=CARTESIAN_POINT($,(-20,-10,5));
+#47=VERTEX_POINT($,#46);
+#48=CARTESIAN_POINT($,(20,-10,5));
+#49=VERTEX_POINT($,#48);
+#50=CARTESIAN_POINT($,(-20,-10,5));
+#51=DIRECTION($,(1,0,0));
+#52=VECTOR($,#51,1);
+#53=LINE($,#50,#52);
+#54=EDGE_CURVE($,#47,#49,#53,.T.);
+#55=ORIENTED_EDGE($,$,$,#54,.T.);
+#56=CARTESIAN_POINT($,(20,8.5,5));
+#57=VERTEX_POINT($,#56);
+#58=CARTESIAN_POINT($,(20,-10,5));
+#59=DIRECTION($,(0,1,0));
+#60=VECTOR($,#59,1);
+#61=LINE($,#58,#60);
+#62=EDGE_CURVE($,#49,#57,#61,.T.);
+#63=ORIENTED_EDGE($,$,$,#62,.T.);
+#64=CARTESIAN_POINT($,(18.5,10,5));
+#65=VERTEX_POINT($,#64);
+#66=CARTESIAN_POINT($,(20,8.5,5));
+#67=DIRECTION($,(-0.707106781186548,0.707106781186548,0));
+#68=VECTOR($,#67,1);
+#69=LINE($,#66,#68);
+#70=EDGE_CURVE($,#57,#65,#69,.T.);
+#71=ORIENTED_EDGE($,$,$,#70,.T.);
+#72=CARTESIAN_POINT($,(-20,10,5));
+#73=VERTEX_POINT($,#72);
+#74=CARTESIAN_POINT($,(18.5,10,5));
+#75=DIRECTION($,(-1,0,0));
+#76=VECTOR($,#75,1);
+#77=LINE($,#74,#76);
+#78=EDGE_CURVE($,#65,#73,#77,.T.);
+#79=ORIENTED_EDGE($,$,$,#78,.T.);
+#80=CARTESIAN_POINT($,(-20,10,5));
+#81=DIRECTION($,(0,-1,0));
+#82=VECTOR($,#81,1);
+#83=LINE($,#80,#82);
+#84=EDGE_CURVE($,#73,#47,#83,.T.);
+#85=ORIENTED_EDGE($,$,$,#84,.T.);
+#86=EDGE_LOOP($,(#55,#63,#71,#79,#85));
+#87=FACE_OUTER_BOUND('',#86,.T.);
+#88=ADVANCED_FACE('',(#87),#45,.T.);
+#89=CARTESIAN_POINT($,(-20,-10,-5));
+#90=DIRECTION($,(-1,0,0));
+#91=DIRECTION($,(0,1,0));
+#92=AXIS2_PLACEMENT_3D($,#89,#90,#91);
+#93=PLANE($,#92);
+#94=CARTESIAN_POINT($,(-20,-10,-5));
+#95=DIRECTION($,(0,0,1));
+#96=VECTOR($,#95,1);
+#97=LINE($,#94,#96);
+#98=EDGE_CURVE($,#7,#47,#97,.T.);
+#99=ORIENTED_EDGE($,$,$,#98,.T.);
+#100=ORIENTED_EDGE($,$,$,#84,.F.);
+#101=CARTESIAN_POINT($,(-20,10,-5));
+#102=DIRECTION($,(0,0,1));
+#103=VECTOR($,#102,1);
+#104=LINE($,#101,#103);
+#105=EDGE_CURVE($,#25,#73,#104,.T.);
+#106=ORIENTED_EDGE($,$,$,#105,.F.);
+#107=ORIENTED_EDGE($,$,$,#36,.T.);
+#108=EDGE_LOOP($,(#99,#100,#106,#107));
+#109=FACE_OUTER_BOUND('',#108,.T.);
+#110=ADVANCED_FACE('',(#109),#93,.T.);
+#111=CARTESIAN_POINT($,(-20,-10,-5));
+#112=DIRECTION($,(0,-1,0));
+#113=DIRECTION($,(1,0,0));
+#114=AXIS2_PLACEMENT_3D($,#111,#112,#113);
+#115=PLANE($,#114);
+#116=ORIENTED_EDGE($,$,$,#14,.T.);
+#117=CARTESIAN_POINT($,(20,-10,-5));
+#118=DIRECTION($,(0,0,1));
+#119=VECTOR($,#118,1);
+#120=LINE($,#117,#119);
+#121=EDGE_CURVE($,#9,#49,#120,.T.);
+#122=ORIENTED_EDGE($,$,$,#121,.T.);
+#123=ORIENTED_EDGE($,$,$,#54,.F.);
+#124=ORIENTED_EDGE($,$,$,#98,.F.);
+#125=EDGE_LOOP($,(#116,#122,#123,#124));
+#126=FACE_OUTER_BOUND('',#125,.T.);
+#127=ADVANCED_FACE('',(#126),#115,.T.);
+#128=CARTESIAN_POINT($,(20,-10,-5));
+#129=DIRECTION($,(1,0,0));
+#130=DIRECTION($,(0,1,0));
+#131=AXIS2_PLACEMENT_3D($,#128,#129,#130);
+#132=PLANE($,#131);
+#133=ORIENTED_EDGE($,$,$,#22,.T.);
+#134=CARTESIAN_POINT($,(20,10,3.5));
+#135=VERTEX_POINT($,#134);
+#136=CARTESIAN_POINT($,(20,10,-5));
+#137=DIRECTION($,(0,0,1));
+#138=VECTOR($,#137,1);
+#139=LINE($,#136,#138);
+#140=EDGE_CURVE($,#17,#135,#139,.T.);
+#141=ORIENTED_EDGE($,$,$,#140,.T.);
+#142=CARTESIAN_POINT($,(20,10,3.5));
+#143=DIRECTION($,(0,-0.707106781186548,0.707106781186548));
+#144=VECTOR($,#143,1);
+#145=LINE($,#142,#144);
+#146=EDGE_CURVE($,#135,#57,#145,.T.);
+#147=ORIENTED_EDGE($,$,$,#146,.T.);
+#148=ORIENTED_EDGE($,$,$,#62,.F.);
+#149=ORIENTED_EDGE($,$,$,#121,.F.);
+#150=EDGE_LOOP($,(#133,#141,#147,#148,#149));
+#151=FACE_OUTER_BOUND('',#150,.T.);
+#152=ADVANCED_FACE('',(#151),#132,.T.);
+#153=CARTESIAN_POINT($,(-20,10,-5));
+#154=DIRECTION($,(0,1,0));
+#155=DIRECTION($,(-1,0,0));
+#156=AXIS2_PLACEMENT_3D($,#153,#154,#155);
+#157=PLANE($,#156);
+#158=ORIENTED_EDGE($,$,$,#30,.T.);
+#159=ORIENTED_EDGE($,$,$,#105,.T.);
+#160=ORIENTED_EDGE($,$,$,#78,.F.);
+#161=CARTESIAN_POINT($,(18.5,10,5));
+#162=DIRECTION($,(0.707106781186548,0,-0.707106781186548));
+#163=VECTOR($,#162,1);
+#164=LINE($,#161,#163);
+#165=EDGE_CURVE($,#65,#135,#164,.T.);
+#166=ORIENTED_EDGE($,$,$,#165,.T.);
+#167=ORIENTED_EDGE($,$,$,#140,.F.);
+#168=EDGE_LOOP($,(#158,#159,#160,#166,#167));
+#169=FACE_OUTER_BOUND('',#168,.T.);
+#170=ADVANCED_FACE('',(#169),#157,.T.);
+#171=CARTESIAN_POINT($,(18.5,10,5));
+#172=DIRECTION($,(0.577350269189626,0.577350269189626,0.577350269189626));
+#173=DIRECTION($,(0.707106781186548,-0.707106781186548,0));
+#174=AXIS2_PLACEMENT_3D($,#171,#172,#173);
+#175=PLANE($,#174);
+#176=ORIENTED_EDGE($,$,$,#70,.F.);
+#177=ORIENTED_EDGE($,$,$,#146,.T.);
+#178=ORIENTED_EDGE($,$,$,#165,.F.);
+#179=EDGE_LOOP($,(#176,#177,#178));
+#180=FACE_OUTER_BOUND('',#179,.T.);
+#181=ADVANCED_FACE('',(#180),#175,.T.);
+#182=CLOSED_SHELL($,(#40,#88,#110,#127,#152,#170,#181));
+#183=MANIFOLD_SOLID_BREP('AetherisBody',#182);
+#184=APPLICATION_CONTEXT('mechanical design');
+#185=PRODUCT_CONTEXT('',#184,'mechanical');
+#186=PRODUCT('AETHERIS','AetherisBody','',(#185));
+#187=PRODUCT_DEFINITION_FORMATION('','',#186);
+#188=PRODUCT_DEFINITION_CONTEXT('design',#184,'design');
+#189=PRODUCT_DEFINITION('','',#187,#188);
+#190=PRODUCT_DEFINITION_SHAPE('','',#189);
+#191=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#192=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#193=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#194=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#191,#192,#193))REPRESENTATION_CONTEXT('3','3D'));
+#195=SHAPE_REPRESENTATION('AetherisBody',(#183),#194);
+#196=SHAPE_DEFINITION_REPRESENTATION(#190,#195);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/testdata/firmament/exports/m5a_chamfer_box_edge_basic.step b/testdata/firmament/exports/m5a_chamfer_box_edge_basic.step
new file mode 100644
index 00000000..1de11faf
--- /dev/null
+++ b/testdata/firmament/exports/m5a_chamfer_box_edge_basic.step
@@ -0,0 +1,205 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('Aetheris AP242 subset export'),'2;1');
+FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris'),'Aetheris.Kernel','Aetheris.Kernel','');
+FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
+ENDSEC;
+DATA;
+#1=CARTESIAN_POINT($,(0,0,-5));
+#2=DIRECTION($,(-0,-0,-1));
+#3=DIRECTION($,(1,0,0));
+#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
+#5=PLANE($,#4);
+#6=CARTESIAN_POINT($,(-20,-10,-5));
+#7=VERTEX_POINT($,#6);
+#8=CARTESIAN_POINT($,(20,-10,-5));
+#9=VERTEX_POINT($,#8);
+#10=CARTESIAN_POINT($,(-20,-10,-5));
+#11=DIRECTION($,(1,0,0));
+#12=VECTOR($,#11,1);
+#13=LINE($,#10,#12);
+#14=EDGE_CURVE($,#7,#9,#13,.T.);
+#15=ORIENTED_EDGE($,$,$,#14,.T.);
+#16=CARTESIAN_POINT($,(20,8.5,-5));
+#17=VERTEX_POINT($,#16);
+#18=CARTESIAN_POINT($,(20,-10,-5));
+#19=DIRECTION($,(0,1,0));
+#20=VECTOR($,#19,1);
+#21=LINE($,#18,#20);
+#22=EDGE_CURVE($,#9,#17,#21,.T.);
+#23=ORIENTED_EDGE($,$,$,#22,.T.);
+#24=CARTESIAN_POINT($,(18.5,10,-5));
+#25=VERTEX_POINT($,#24);
+#26=CARTESIAN_POINT($,(20,8.5,-5));
+#27=DIRECTION($,(-0.707106781186548,0.707106781186548,0));
+#28=VECTOR($,#27,1);
+#29=LINE($,#26,#28);
+#30=EDGE_CURVE($,#17,#25,#29,.T.);
+#31=ORIENTED_EDGE($,$,$,#30,.T.);
+#32=CARTESIAN_POINT($,(-20,10,-5));
+#33=VERTEX_POINT($,#32);
+#34=CARTESIAN_POINT($,(18.5,10,-5));
+#35=DIRECTION($,(-1,0,0));
+#36=VECTOR($,#35,1);
+#37=LINE($,#34,#36);
+#38=EDGE_CURVE($,#25,#33,#37,.T.);
+#39=ORIENTED_EDGE($,$,$,#38,.T.);
+#40=CARTESIAN_POINT($,(-20,10,-5));
+#41=DIRECTION($,(0,-1,0));
+#42=VECTOR($,#41,1);
+#43=LINE($,#40,#42);
+#44=EDGE_CURVE($,#33,#7,#43,.T.);
+#45=ORIENTED_EDGE($,$,$,#44,.T.);
+#46=EDGE_LOOP($,(#15,#23,#31,#39,#45));
+#47=FACE_OUTER_BOUND('',#46,.T.);
+#48=ADVANCED_FACE('',(#47),#5,.T.);
+#49=CARTESIAN_POINT($,(0,0,5));
+#50=DIRECTION($,(0,0,1));
+#51=DIRECTION($,(1,0,0));
+#52=AXIS2_PLACEMENT_3D($,#49,#50,#51);
+#53=PLANE($,#52);
+#54=CARTESIAN_POINT($,(-20,-10,5));
+#55=VERTEX_POINT($,#54);
+#56=CARTESIAN_POINT($,(20,-10,5));
+#57=VERTEX_POINT($,#56);
+#58=CARTESIAN_POINT($,(-20,-10,5));
+#59=DIRECTION($,(1,0,0));
+#60=VECTOR($,#59,1);
+#61=LINE($,#58,#60);
+#62=EDGE_CURVE($,#55,#57,#61,.T.);
+#63=ORIENTED_EDGE($,$,$,#62,.F.);
+#64=CARTESIAN_POINT($,(20,8.5,5));
+#65=VERTEX_POINT($,#64);
+#66=CARTESIAN_POINT($,(20,-10,5));
+#67=DIRECTION($,(0,1,0));
+#68=VECTOR($,#67,1);
+#69=LINE($,#66,#68);
+#70=EDGE_CURVE($,#57,#65,#69,.T.);
+#71=ORIENTED_EDGE($,$,$,#70,.F.);
+#72=CARTESIAN_POINT($,(18.5,10,5));
+#73=VERTEX_POINT($,#72);
+#74=CARTESIAN_POINT($,(20,8.5,5));
+#75=DIRECTION($,(-0.707106781186548,0.707106781186548,0));
+#76=VECTOR($,#75,1);
+#77=LINE($,#74,#76);
+#78=EDGE_CURVE($,#65,#73,#77,.T.);
+#79=ORIENTED_EDGE($,$,$,#78,.F.);
+#80=CARTESIAN_POINT($,(-20,10,5));
+#81=VERTEX_POINT($,#80);
+#82=CARTESIAN_POINT($,(18.5,10,5));
+#83=DIRECTION($,(-1,0,0));
+#84=VECTOR($,#83,1);
+#85=LINE($,#82,#84);
+#86=EDGE_CURVE($,#73,#81,#85,.T.);
+#87=ORIENTED_EDGE($,$,$,#86,.F.);
+#88=CARTESIAN_POINT($,(-20,10,5));
+#89=DIRECTION($,(0,-1,0));
+#90=VECTOR($,#89,1);
+#91=LINE($,#88,#90);
+#92=EDGE_CURVE($,#81,#55,#91,.T.);
+#93=ORIENTED_EDGE($,$,$,#92,.F.);
+#94=EDGE_LOOP($,(#63,#71,#79,#87,#93));
+#95=FACE_OUTER_BOUND('',#94,.T.);
+#96=ADVANCED_FACE('',(#95),#53,.T.);
+#97=CARTESIAN_POINT($,(-20,-10,-5));
+#98=DIRECTION($,(0,-1,0));
+#99=DIRECTION($,(0,0,1));
+#100=AXIS2_PLACEMENT_3D($,#97,#98,#99);
+#101=PLANE($,#100);
+#102=ORIENTED_EDGE($,$,$,#14,.T.);
+#103=CARTESIAN_POINT($,(20,-10,-5));
+#104=DIRECTION($,(0,0,1));
+#105=VECTOR($,#104,1);
+#106=LINE($,#103,#105);
+#107=EDGE_CURVE($,#9,#57,#106,.T.);
+#108=ORIENTED_EDGE($,$,$,#107,.T.);
+#109=ORIENTED_EDGE($,$,$,#62,.F.);
+#110=CARTESIAN_POINT($,(-20,-10,-5));
+#111=DIRECTION($,(0,0,1));
+#112=VECTOR($,#111,1);
+#113=LINE($,#110,#112);
+#114=EDGE_CURVE($,#7,#55,#113,.T.);
+#115=ORIENTED_EDGE($,$,$,#114,.F.);
+#116=EDGE_LOOP($,(#102,#108,#109,#115));
+#117=FACE_OUTER_BOUND('',#116,.T.);
+#118=ADVANCED_FACE('',(#117),#101,.T.);
+#119=CARTESIAN_POINT($,(20,-10,-5));
+#120=DIRECTION($,(1,0,0));
+#121=DIRECTION($,(0,0,1));
+#122=AXIS2_PLACEMENT_3D($,#119,#120,#121);
+#123=PLANE($,#122);
+#124=ORIENTED_EDGE($,$,$,#22,.T.);
+#125=CARTESIAN_POINT($,(20,8.5,-5));
+#126=DIRECTION($,(0,0,1));
+#127=VECTOR($,#126,1);
+#128=LINE($,#125,#127);
+#129=EDGE_CURVE($,#17,#65,#128,.T.);
+#130=ORIENTED_EDGE($,$,$,#129,.T.);
+#131=ORIENTED_EDGE($,$,$,#70,.F.);
+#132=ORIENTED_EDGE($,$,$,#107,.F.);
+#133=EDGE_LOOP($,(#124,#130,#131,#132));
+#134=FACE_OUTER_BOUND('',#133,.T.);
+#135=ADVANCED_FACE('',(#134),#123,.T.);
+#136=CARTESIAN_POINT($,(20,8.5,-5));
+#137=DIRECTION($,(0.707106781186548,0.707106781186548,-0));
+#138=DIRECTION($,(0,0,1));
+#139=AXIS2_PLACEMENT_3D($,#136,#137,#138);
+#140=PLANE($,#139);
+#141=ORIENTED_EDGE($,$,$,#30,.T.);
+#142=CARTESIAN_POINT($,(18.5,10,-5));
+#143=DIRECTION($,(0,0,1));
+#144=VECTOR($,#143,1);
+#145=LINE($,#142,#144);
+#146=EDGE_CURVE($,#25,#73,#145,.T.);
+#147=ORIENTED_EDGE($,$,$,#146,.T.);
+#148=ORIENTED_EDGE($,$,$,#78,.F.);
+#149=ORIENTED_EDGE($,$,$,#129,.F.);
+#150=EDGE_LOOP($,(#141,#147,#148,#149));
+#151=FACE_OUTER_BOUND('',#150,.T.);
+#152=ADVANCED_FACE('',(#151),#140,.T.);
+#153=CARTESIAN_POINT($,(18.5,10,-5));
+#154=DIRECTION($,(0,1,-0));
+#155=DIRECTION($,(0,0,1));
+#156=AXIS2_PLACEMENT_3D($,#153,#154,#155);
+#157=PLANE($,#156);
+#158=ORIENTED_EDGE($,$,$,#38,.T.);
+#159=CARTESIAN_POINT($,(-20,10,-5));
+#160=DIRECTION($,(0,0,1));
+#161=VECTOR($,#160,1);
+#162=LINE($,#159,#161);
+#163=EDGE_CURVE($,#33,#81,#162,.T.);
+#164=ORIENTED_EDGE($,$,$,#163,.T.);
+#165=ORIENTED_EDGE($,$,$,#86,.F.);
+#166=ORIENTED_EDGE($,$,$,#146,.F.);
+#167=EDGE_LOOP($,(#158,#164,#165,#166));
+#168=FACE_OUTER_BOUND('',#167,.T.);
+#169=ADVANCED_FACE('',(#168),#157,.T.);
+#170=CARTESIAN_POINT($,(-20,10,-5));
+#171=DIRECTION($,(-1,0,0));
+#172=DIRECTION($,(0,0,1));
+#173=AXIS2_PLACEMENT_3D($,#170,#171,#172);
+#174=PLANE($,#173);
+#175=ORIENTED_EDGE($,$,$,#44,.T.);
+#176=ORIENTED_EDGE($,$,$,#114,.T.);
+#177=ORIENTED_EDGE($,$,$,#92,.F.);
+#178=ORIENTED_EDGE($,$,$,#163,.F.);
+#179=EDGE_LOOP($,(#175,#176,#177,#178));
+#180=FACE_OUTER_BOUND('',#179,.T.);
+#181=ADVANCED_FACE('',(#180),#174,.T.);
+#182=CLOSED_SHELL($,(#48,#96,#118,#135,#152,#169,#181));
+#183=MANIFOLD_SOLID_BREP('AetherisBody',#182);
+#184=APPLICATION_CONTEXT('mechanical design');
+#185=PRODUCT_CONTEXT('',#184,'mechanical');
+#186=PRODUCT('AETHERIS','AetherisBody','',(#185));
+#187=PRODUCT_DEFINITION_FORMATION('','',#186);
+#188=PRODUCT_DEFINITION_CONTEXT('design',#184,'design');
+#189=PRODUCT_DEFINITION('','',#187,#188);
+#190=PRODUCT_DEFINITION_SHAPE('','',#189);
+#191=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#192=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#193=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#194=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#191,#192,#193))REPRESENTATION_CONTEXT('3','3D'));
+#195=SHAPE_REPRESENTATION('AetherisBody',(#183),#194);
+#196=SHAPE_DEFINITION_REPRESENTATION(#190,#195);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/testdata/firmament/exports/m5a_chamfer_triangular_prism_corner_e4_basic.step b/testdata/firmament/exports/m5a_chamfer_triangular_prism_corner_e4_basic.step
new file mode 100644
index 00000000..ad793171
--- /dev/null
+++ b/testdata/firmament/exports/m5a_chamfer_triangular_prism_corner_e4_basic.step
@@ -0,0 +1,172 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('Aetheris AP242 subset export'),'2;1');
+FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris'),'Aetheris.Kernel','Aetheris.Kernel','');
+FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
+ENDSEC;
+DATA;
+#1=CARTESIAN_POINT($,(-5,-3,-4));
+#2=DIRECTION($,(0,0,1));
+#3=DIRECTION($,(1,0,0));
+#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
+#5=PLANE($,#4);
+#6=CARTESIAN_POINT($,(-5,-3,-4));
+#7=VERTEX_POINT($,#6);
+#8=CARTESIAN_POINT($,(5,-3,-4));
+#9=VERTEX_POINT($,#8);
+#10=CARTESIAN_POINT($,(-5,-3,-4));
+#11=DIRECTION($,(1,0,0));
+#12=VECTOR($,#11,1);
+#13=LINE($,#10,#12);
+#14=EDGE_CURVE($,#7,#9,#13,.T.);
+#15=ORIENTED_EDGE($,$,$,#14,.T.);
+#16=CARTESIAN_POINT($,(-0,3,-4));
+#17=VERTEX_POINT($,#16);
+#18=CARTESIAN_POINT($,(5,-3,-4));
+#19=DIRECTION($,(-0.64018439966448,0.768221279597376,0));
+#20=VECTOR($,#19,1);
+#21=LINE($,#18,#20);
+#22=EDGE_CURVE($,#9,#17,#21,.T.);
+#23=ORIENTED_EDGE($,$,$,#22,.T.);
+#24=CARTESIAN_POINT($,(-0,3,-4));
+#25=DIRECTION($,(-0.64018439966448,-0.768221279597376,0));
+#26=VECTOR($,#25,1);
+#27=LINE($,#24,#26);
+#28=EDGE_CURVE($,#17,#7,#27,.T.);
+#29=ORIENTED_EDGE($,$,$,#28,.T.);
+#30=EDGE_LOOP($,(#15,#23,#29));
+#31=FACE_OUTER_BOUND('',#30,.T.);
+#32=ADVANCED_FACE('',(#31),#5,.T.);
+#33=CARTESIAN_POINT($,(5,-3,4));
+#34=DIRECTION($,(0,0,1));
+#35=DIRECTION($,(-0.64018439966448,0.768221279597376,0));
+#36=AXIS2_PLACEMENT_3D($,#33,#34,#35);
+#37=PLANE($,#36);
+#38=CARTESIAN_POINT($,(5,-3,4));
+#39=VERTEX_POINT($,#38);
+#40=CARTESIAN_POINT($,(4.35981560033552,-2.23177872040262,4));
+#41=VERTEX_POINT($,#40);
+#42=CARTESIAN_POINT($,(5,-3,4));
+#43=DIRECTION($,(-0.64018439966448,0.768221279597376,0));
+#44=VECTOR($,#43,1);
+#45=LINE($,#42,#44);
+#46=EDGE_CURVE($,#39,#41,#45,.T.);
+#47=ORIENTED_EDGE($,$,$,#46,.T.);
+#48=CARTESIAN_POINT($,(-4.35981560033552,-2.23177872040262,4));
+#49=VERTEX_POINT($,#48);
+#50=CARTESIAN_POINT($,(4.35981560033552,-2.23177872040262,4));
+#51=DIRECTION($,(-1,0,0));
+#52=VECTOR($,#51,1);
+#53=LINE($,#50,#52);
+#54=EDGE_CURVE($,#41,#49,#53,.T.);
+#55=ORIENTED_EDGE($,$,$,#54,.T.);
+#56=CARTESIAN_POINT($,(-5,-3,4));
+#57=VERTEX_POINT($,#56);
+#58=CARTESIAN_POINT($,(-4.35981560033552,-2.23177872040262,4));
+#59=DIRECTION($,(-0.64018439966448,-0.768221279597376,0));
+#60=VECTOR($,#59,1);
+#61=LINE($,#58,#60);
+#62=EDGE_CURVE($,#49,#57,#61,.T.);
+#63=ORIENTED_EDGE($,$,$,#62,.T.);
+#64=CARTESIAN_POINT($,(-5,-3,4));
+#65=DIRECTION($,(1,0,0));
+#66=VECTOR($,#65,1);
+#67=LINE($,#64,#66);
+#68=EDGE_CURVE($,#57,#39,#67,.T.);
+#69=ORIENTED_EDGE($,$,$,#68,.T.);
+#70=EDGE_LOOP($,(#47,#55,#63,#69));
+#71=FACE_OUTER_BOUND('',#70,.T.);
+#72=ADVANCED_FACE('',(#71),#37,.T.);
+#73=CARTESIAN_POINT($,(-5,-3,-4));
+#74=DIRECTION($,(0,-1,0));
+#75=DIRECTION($,(1,0,0));
+#76=AXIS2_PLACEMENT_3D($,#73,#74,#75);
+#77=PLANE($,#76);
+#78=ORIENTED_EDGE($,$,$,#14,.T.);
+#79=CARTESIAN_POINT($,(5,-3,-4));
+#80=DIRECTION($,(0,0,1));
+#81=VECTOR($,#80,1);
+#82=LINE($,#79,#81);
+#83=EDGE_CURVE($,#9,#39,#82,.T.);
+#84=ORIENTED_EDGE($,$,$,#83,.T.);
+#85=ORIENTED_EDGE($,$,$,#68,.F.);
+#86=CARTESIAN_POINT($,(-5,-3,4));
+#87=DIRECTION($,(0,0,-1));
+#88=VECTOR($,#87,1);
+#89=LINE($,#86,#88);
+#90=EDGE_CURVE($,#57,#7,#89,.T.);
+#91=ORIENTED_EDGE($,$,$,#90,.T.);
+#92=EDGE_LOOP($,(#78,#84,#85,#91));
+#93=FACE_OUTER_BOUND('',#92,.T.);
+#94=ADVANCED_FACE('',(#93),#77,.T.);
+#95=CARTESIAN_POINT($,(5,-3,-4));
+#96=DIRECTION($,(0.768221279597376,0.64018439966448,0));
+#97=DIRECTION($,(-0.64018439966448,0.768221279597376,0));
+#98=AXIS2_PLACEMENT_3D($,#95,#96,#97);
+#99=PLANE($,#98);
+#100=ORIENTED_EDGE($,$,$,#22,.T.);
+#101=CARTESIAN_POINT($,(-0,3,-3));
+#102=VERTEX_POINT($,#101);
+#103=CARTESIAN_POINT($,(-0,3,-4));
+#104=DIRECTION($,(0,0,1));
+#105=VECTOR($,#104,1);
+#106=LINE($,#103,#105);
+#107=EDGE_CURVE($,#17,#102,#106,.T.);
+#108=ORIENTED_EDGE($,$,$,#107,.T.);
+#109=CARTESIAN_POINT($,(-0,3,-3));
+#110=DIRECTION($,(0.446416870734112,-0.535700244880934,0.716754647810861));
+#111=VECTOR($,#110,1);
+#112=LINE($,#109,#111);
+#113=EDGE_CURVE($,#102,#41,#112,.T.);
+#114=ORIENTED_EDGE($,$,$,#113,.T.);
+#115=ORIENTED_EDGE($,$,$,#46,.F.);
+#116=ORIENTED_EDGE($,$,$,#83,.F.);
+#117=EDGE_LOOP($,(#100,#108,#114,#115,#116));
+#118=FACE_OUTER_BOUND('',#117,.T.);
+#119=ADVANCED_FACE('',(#118),#99,.T.);
+#120=CARTESIAN_POINT($,(0,3,-4));
+#121=DIRECTION($,(-0.768221279597376,0.64018439966448,0));
+#122=DIRECTION($,(-0.64018439966448,-0.768221279597376,0));
+#123=AXIS2_PLACEMENT_3D($,#120,#121,#122);
+#124=PLANE($,#123);
+#125=ORIENTED_EDGE($,$,$,#28,.T.);
+#126=ORIENTED_EDGE($,$,$,#90,.F.);
+#127=ORIENTED_EDGE($,$,$,#62,.F.);
+#128=CARTESIAN_POINT($,(-4.35981560033552,-2.23177872040262,4));
+#129=DIRECTION($,(0.446416870734112,0.535700244880934,-0.716754647810861));
+#130=VECTOR($,#129,1);
+#131=LINE($,#128,#130);
+#132=EDGE_CURVE($,#49,#102,#131,.T.);
+#133=ORIENTED_EDGE($,$,$,#132,.T.);
+#134=ORIENTED_EDGE($,$,$,#107,.F.);
+#135=EDGE_LOOP($,(#125,#126,#127,#133,#134));
+#136=FACE_OUTER_BOUND('',#135,.T.);
+#137=ADVANCED_FACE('',(#136),#124,.T.);
+#138=CARTESIAN_POINT($,(0,3,-3));
+#139=DIRECTION($,(0,0.800999703499713,0.598664743402659));
+#140=DIRECTION($,(-0.446416870734112,-0.535700244880934,0.716754647810861));
+#141=AXIS2_PLACEMENT_3D($,#138,#139,#140);
+#142=PLANE($,#141);
+#143=ORIENTED_EDGE($,$,$,#132,.F.);
+#144=ORIENTED_EDGE($,$,$,#54,.F.);
+#145=ORIENTED_EDGE($,$,$,#113,.F.);
+#146=EDGE_LOOP($,(#143,#144,#145));
+#147=FACE_OUTER_BOUND('',#146,.T.);
+#148=ADVANCED_FACE('',(#147),#142,.T.);
+#149=CLOSED_SHELL($,(#32,#72,#94,#119,#137,#148));
+#150=MANIFOLD_SOLID_BREP('AetherisBody',#149);
+#151=APPLICATION_CONTEXT('mechanical design');
+#152=PRODUCT_CONTEXT('',#151,'mechanical');
+#153=PRODUCT('AETHERIS','AetherisBody','',(#152));
+#154=PRODUCT_DEFINITION_FORMATION('','',#153);
+#155=PRODUCT_DEFINITION_CONTEXT('design',#151,'design');
+#156=PRODUCT_DEFINITION('','',#154,#155);
+#157=PRODUCT_DEFINITION_SHAPE('','',#156);
+#158=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#159=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#160=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#161=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#158,#159,#160))REPRESENTATION_CONTEXT('3','3D'));
+#162=SHAPE_REPRESENTATION('AetherisBody',(#150),#161);
+#163=SHAPE_DEFINITION_REPRESENTATION(#157,#162);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/testdata/firmament/exports/p1_blind_hole_on_face_semantic.step b/testdata/firmament/exports/p1_blind_hole_on_face_semantic.step
new file mode 100644
index 00000000..84db9b13
--- /dev/null
+++ b/testdata/firmament/exports/p1_blind_hole_on_face_semantic.step
@@ -0,0 +1,79 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('Aetheris AP242 subset export'),'2;1');
+FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris'),'Aetheris.Kernel','Aetheris.Kernel','');
+FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
+ENDSEC;
+DATA;
+#1=CARTESIAN_POINT($,(0,0,4));
+#2=DIRECTION($,(0,0,1));
+#3=DIRECTION($,(1,0,0));
+#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
+#5=CYLINDRICAL_SURFACE($,#4,4);
+#6=CARTESIAN_POINT($,(4,0,4));
+#7=VERTEX_POINT($,#6);
+#8=CARTESIAN_POINT($,(4,0,12));
+#9=VERTEX_POINT($,#8);
+#10=CARTESIAN_POINT($,(4,0,4));
+#11=DIRECTION($,(0,0,1));
+#12=VECTOR($,#11,1);
+#13=LINE($,#10,#12);
+#14=EDGE_CURVE($,#7,#9,#13,.T.);
+#15=ORIENTED_EDGE($,$,$,#14,.T.);
+#16=CARTESIAN_POINT($,(4,0,12));
+#17=VERTEX_POINT($,#16);
+#18=CARTESIAN_POINT($,(0,0,12));
+#19=DIRECTION($,(0,0,1));
+#20=DIRECTION($,(1,0,0));
+#21=AXIS2_PLACEMENT_3D($,#18,#19,#20);
+#22=CIRCLE($,#21,4);
+#23=EDGE_CURVE($,#17,#17,#22,.T.);
+#24=ORIENTED_EDGE($,$,$,#23,.T.);
+#25=ORIENTED_EDGE($,$,$,#14,.F.);
+#26=CARTESIAN_POINT($,(4,0,4));
+#27=VERTEX_POINT($,#26);
+#28=CARTESIAN_POINT($,(0,0,4));
+#29=DIRECTION($,(0,0,1));
+#30=DIRECTION($,(1,0,0));
+#31=AXIS2_PLACEMENT_3D($,#28,#29,#30);
+#32=CIRCLE($,#31,4);
+#33=EDGE_CURVE($,#27,#27,#32,.T.);
+#34=ORIENTED_EDGE($,$,$,#33,.F.);
+#35=EDGE_LOOP($,(#15,#24,#25,#34));
+#36=FACE_OUTER_BOUND('',#35,.T.);
+#37=ADVANCED_FACE('',(#36),#5,.T.);
+#38=CARTESIAN_POINT($,(0,0,12));
+#39=DIRECTION($,(0,0,1));
+#40=DIRECTION($,(1,0,0));
+#41=AXIS2_PLACEMENT_3D($,#38,#39,#40);
+#42=PLANE($,#41);
+#43=ORIENTED_EDGE($,$,$,#23,.F.);
+#44=EDGE_LOOP($,(#43));
+#45=FACE_OUTER_BOUND('',#44,.T.);
+#46=ADVANCED_FACE('',(#45),#42,.T.);
+#47=CARTESIAN_POINT($,(0,0,4));
+#48=DIRECTION($,(0,0,-1));
+#49=DIRECTION($,(0,1,0));
+#50=AXIS2_PLACEMENT_3D($,#47,#48,#49);
+#51=PLANE($,#50);
+#52=ORIENTED_EDGE($,$,$,#33,.T.);
+#53=EDGE_LOOP($,(#52));
+#54=FACE_OUTER_BOUND('',#53,.T.);
+#55=ADVANCED_FACE('',(#54),#51,.T.);
+#56=CLOSED_SHELL($,(#37,#46,#55));
+#57=MANIFOLD_SOLID_BREP('AetherisBody',#56);
+#58=APPLICATION_CONTEXT('mechanical design');
+#59=PRODUCT_CONTEXT('',#58,'mechanical');
+#60=PRODUCT('AETHERIS','AetherisBody','',(#59));
+#61=PRODUCT_DEFINITION_FORMATION('','',#60);
+#62=PRODUCT_DEFINITION_CONTEXT('design',#58,'design');
+#63=PRODUCT_DEFINITION('','',#61,#62);
+#64=PRODUCT_DEFINITION_SHAPE('','',#63);
+#65=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#66=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#67=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#68=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#65,#66,#67))REPRESENTATION_CONTEXT('3','3D'));
+#69=SHAPE_REPRESENTATION('AetherisBody',(#57),#68);
+#70=SHAPE_DEFINITION_REPRESENTATION(#64,#69);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/testdata/firmament/exports/p1_flange_radial_hole_semantic.step b/testdata/firmament/exports/p1_flange_radial_hole_semantic.step
new file mode 100644
index 00000000..2dd33595
--- /dev/null
+++ b/testdata/firmament/exports/p1_flange_radial_hole_semantic.step
@@ -0,0 +1,79 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('Aetheris AP242 subset export'),'2;1');
+FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris'),'Aetheris.Kernel','Aetheris.Kernel','');
+FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
+ENDSEC;
+DATA;
+#1=CARTESIAN_POINT($,(17.3205080756888,10,0));
+#2=DIRECTION($,(0,0,1));
+#3=DIRECTION($,(1,0,0));
+#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
+#5=CYLINDRICAL_SURFACE($,#4,3);
+#6=CARTESIAN_POINT($,(20.3205080756888,10,0));
+#7=VERTEX_POINT($,#6);
+#8=CARTESIAN_POINT($,(20.3205080756888,10,12));
+#9=VERTEX_POINT($,#8);
+#10=CARTESIAN_POINT($,(20.3205080756888,10,0));
+#11=DIRECTION($,(0,0,1));
+#12=VECTOR($,#11,1);
+#13=LINE($,#10,#12);
+#14=EDGE_CURVE($,#7,#9,#13,.T.);
+#15=ORIENTED_EDGE($,$,$,#14,.T.);
+#16=CARTESIAN_POINT($,(20.3205080756888,10,12));
+#17=VERTEX_POINT($,#16);
+#18=CARTESIAN_POINT($,(17.3205080756888,10,12));
+#19=DIRECTION($,(0,0,1));
+#20=DIRECTION($,(1,0,0));
+#21=AXIS2_PLACEMENT_3D($,#18,#19,#20);
+#22=CIRCLE($,#21,3);
+#23=EDGE_CURVE($,#17,#17,#22,.T.);
+#24=ORIENTED_EDGE($,$,$,#23,.T.);
+#25=ORIENTED_EDGE($,$,$,#14,.F.);
+#26=CARTESIAN_POINT($,(20.3205080756888,10,0));
+#27=VERTEX_POINT($,#26);
+#28=CARTESIAN_POINT($,(17.3205080756888,10,0));
+#29=DIRECTION($,(0,0,1));
+#30=DIRECTION($,(1,0,0));
+#31=AXIS2_PLACEMENT_3D($,#28,#29,#30);
+#32=CIRCLE($,#31,3);
+#33=EDGE_CURVE($,#27,#27,#32,.T.);
+#34=ORIENTED_EDGE($,$,$,#33,.F.);
+#35=EDGE_LOOP($,(#15,#24,#25,#34));
+#36=FACE_OUTER_BOUND('',#35,.T.);
+#37=ADVANCED_FACE('',(#36),#5,.T.);
+#38=CARTESIAN_POINT($,(17.3205080756888,10,12));
+#39=DIRECTION($,(0,0,1));
+#40=DIRECTION($,(1,0,0));
+#41=AXIS2_PLACEMENT_3D($,#38,#39,#40);
+#42=PLANE($,#41);
+#43=ORIENTED_EDGE($,$,$,#23,.F.);
+#44=EDGE_LOOP($,(#43));
+#45=FACE_OUTER_BOUND('',#44,.T.);
+#46=ADVANCED_FACE('',(#45),#42,.T.);
+#47=CARTESIAN_POINT($,(17.3205080756888,10,0));
+#48=DIRECTION($,(0,0,-1));
+#49=DIRECTION($,(0,1,0));
+#50=AXIS2_PLACEMENT_3D($,#47,#48,#49);
+#51=PLANE($,#50);
+#52=ORIENTED_EDGE($,$,$,#33,.T.);
+#53=EDGE_LOOP($,(#52));
+#54=FACE_OUTER_BOUND('',#53,.T.);
+#55=ADVANCED_FACE('',(#54),#51,.T.);
+#56=CLOSED_SHELL($,(#37,#46,#55));
+#57=MANIFOLD_SOLID_BREP('AetherisBody',#56);
+#58=APPLICATION_CONTEXT('mechanical design');
+#59=PRODUCT_CONTEXT('',#58,'mechanical');
+#60=PRODUCT('AETHERIS','AetherisBody','',(#59));
+#61=PRODUCT_DEFINITION_FORMATION('','',#60);
+#62=PRODUCT_DEFINITION_CONTEXT('design',#58,'design');
+#63=PRODUCT_DEFINITION('','',#61,#62);
+#64=PRODUCT_DEFINITION_SHAPE('','',#63);
+#65=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#66=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#67=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#68=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#65,#66,#67))REPRESENTATION_CONTEXT('3','3D'));
+#69=SHAPE_REPRESENTATION('AetherisBody',(#57),#68);
+#70=SHAPE_DEFINITION_REPRESENTATION(#64,#69);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/testdata/firmament/exports/p2_flange_bolt_circle_pattern.step b/testdata/firmament/exports/p2_flange_bolt_circle_pattern.step
index 656936eb..005de9c2 100644
--- a/testdata/firmament/exports/p2_flange_bolt_circle_pattern.step
+++ b/testdata/firmament/exports/p2_flange_bolt_circle_pattern.step
@@ -429,32 +429,7 @@ DATA;
#422=MEASURE_REPRESENTATION_ITEM('diameter',6,#416);
#423=SHAPE_DIMENSION_REPRESENTATION('diameter:bolt_hole_1',(#422),#419);
#424=PROPERTY_DEFINITION_REPRESENTATION(#421,#423);
-#425=SHAPE_ASPECT('firmament-feature:bolt_hole_1__cir1','supported cylinder through-hole feature',#415,.FALSE.);
-#426=PROPERTY_DEFINITION('diameter:bolt_hole_1__cir1','auto-derived semantic PMI diameter',#425);
-#427=MEASURE_REPRESENTATION_ITEM('diameter',6,#416);
-#428=SHAPE_DIMENSION_REPRESENTATION('diameter:bolt_hole_1__cir1',(#427),#419);
-#429=PROPERTY_DEFINITION_REPRESENTATION(#426,#428);
-#430=SHAPE_ASPECT('firmament-feature:bolt_hole_1__cir2','supported cylinder through-hole feature',#415,.FALSE.);
-#431=PROPERTY_DEFINITION('diameter:bolt_hole_1__cir2','auto-derived semantic PMI diameter',#430);
-#432=MEASURE_REPRESENTATION_ITEM('diameter',6,#416);
-#433=SHAPE_DIMENSION_REPRESENTATION('diameter:bolt_hole_1__cir2',(#432),#419);
-#434=PROPERTY_DEFINITION_REPRESENTATION(#431,#433);
-#435=SHAPE_ASPECT('firmament-feature:bolt_hole_1__cir3','supported cylinder through-hole feature',#415,.FALSE.);
-#436=PROPERTY_DEFINITION('diameter:bolt_hole_1__cir3','auto-derived semantic PMI diameter',#435);
-#437=MEASURE_REPRESENTATION_ITEM('diameter',6,#416);
-#438=SHAPE_DIMENSION_REPRESENTATION('diameter:bolt_hole_1__cir3',(#437),#419);
-#439=PROPERTY_DEFINITION_REPRESENTATION(#436,#438);
-#440=SHAPE_ASPECT('firmament-feature:bolt_hole_1__cir4','supported cylinder through-hole feature',#415,.FALSE.);
-#441=PROPERTY_DEFINITION('diameter:bolt_hole_1__cir4','auto-derived semantic PMI diameter',#440);
-#442=MEASURE_REPRESENTATION_ITEM('diameter',6,#416);
-#443=SHAPE_DIMENSION_REPRESENTATION('diameter:bolt_hole_1__cir4',(#442),#419);
-#444=PROPERTY_DEFINITION_REPRESENTATION(#441,#443);
-#445=SHAPE_ASPECT('firmament-feature:bolt_hole_1__cir5','supported cylinder through-hole feature',#415,.FALSE.);
-#446=PROPERTY_DEFINITION('diameter:bolt_hole_1__cir5','auto-derived semantic PMI diameter',#445);
-#447=MEASURE_REPRESENTATION_ITEM('diameter',6,#416);
-#448=SHAPE_DIMENSION_REPRESENTATION('diameter:bolt_hole_1__cir5',(#447),#419);
-#449=PROPERTY_DEFINITION_REPRESENTATION(#446,#448);
-#450=SHAPE_REPRESENTATION('AetherisBody',(#408),#419);
-#451=SHAPE_DEFINITION_REPRESENTATION(#415,#450);
+#425=SHAPE_REPRESENTATION('AetherisBody',(#408),#419);
+#426=SHAPE_DEFINITION_REPRESENTATION(#415,#425);
ENDSEC;
END-ISO-10303-21;
diff --git a/testdata/firmament/exports/p2_linear_hole_row.step b/testdata/firmament/exports/p2_linear_hole_row.step
index eaa68f60..88243c5d 100644
--- a/testdata/firmament/exports/p2_linear_hole_row.step
+++ b/testdata/firmament/exports/p2_linear_hole_row.step
@@ -343,22 +343,7 @@ DATA;
#336=MEASURE_REPRESENTATION_ITEM('diameter',4,#330);
#337=SHAPE_DIMENSION_REPRESENTATION('diameter:hole_cut_1',(#336),#333);
#338=PROPERTY_DEFINITION_REPRESENTATION(#335,#337);
-#339=SHAPE_ASPECT('firmament-feature:hole_cut_1__lin1','supported cylinder through-hole feature',#329,.FALSE.);
-#340=PROPERTY_DEFINITION('diameter:hole_cut_1__lin1','auto-derived semantic PMI diameter',#339);
-#341=MEASURE_REPRESENTATION_ITEM('diameter',4,#330);
-#342=SHAPE_DIMENSION_REPRESENTATION('diameter:hole_cut_1__lin1',(#341),#333);
-#343=PROPERTY_DEFINITION_REPRESENTATION(#340,#342);
-#344=SHAPE_ASPECT('firmament-feature:hole_cut_1__lin2','supported cylinder through-hole feature',#329,.FALSE.);
-#345=PROPERTY_DEFINITION('diameter:hole_cut_1__lin2','auto-derived semantic PMI diameter',#344);
-#346=MEASURE_REPRESENTATION_ITEM('diameter',4,#330);
-#347=SHAPE_DIMENSION_REPRESENTATION('diameter:hole_cut_1__lin2',(#346),#333);
-#348=PROPERTY_DEFINITION_REPRESENTATION(#345,#347);
-#349=SHAPE_ASPECT('firmament-feature:hole_cut_1__lin3','supported cylinder through-hole feature',#329,.FALSE.);
-#350=PROPERTY_DEFINITION('diameter:hole_cut_1__lin3','auto-derived semantic PMI diameter',#349);
-#351=MEASURE_REPRESENTATION_ITEM('diameter',4,#330);
-#352=SHAPE_DIMENSION_REPRESENTATION('diameter:hole_cut_1__lin3',(#351),#333);
-#353=PROPERTY_DEFINITION_REPRESENTATION(#350,#352);
-#354=SHAPE_REPRESENTATION('AetherisBody',(#322),#333);
-#355=SHAPE_DEFINITION_REPRESENTATION(#329,#354);
+#339=SHAPE_REPRESENTATION('AetherisBody',(#322),#333);
+#340=SHAPE_DEFINITION_REPRESENTATION(#329,#339);
ENDSEC;
END-ISO-10303-21;
diff --git a/testdata/firmament/exports/p2_mirror_hole_pair.step b/testdata/firmament/exports/p2_mirror_hole_pair.step
new file mode 100644
index 00000000..0e946f2d
--- /dev/null
+++ b/testdata/firmament/exports/p2_mirror_hole_pair.step
@@ -0,0 +1,263 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('Aetheris AP242 subset export'),'2;1');
+FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris'),'Aetheris.Kernel','Aetheris.Kernel','');
+FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
+ENDSEC;
+DATA;
+#1=CARTESIAN_POINT($,(0,0,-4));
+#2=DIRECTION($,(0,0,-1));
+#3=DIRECTION($,(1,0,0));
+#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
+#5=PLANE($,#4);
+#6=CARTESIAN_POINT($,(-80,-40,-4));
+#7=VERTEX_POINT($,#6);
+#8=CARTESIAN_POINT($,(40,-40,-4));
+#9=VERTEX_POINT($,#8);
+#10=CARTESIAN_POINT($,(-80,-40,-4));
+#11=DIRECTION($,(1,0,0));
+#12=VECTOR($,#11,1);
+#13=LINE($,#10,#12);
+#14=EDGE_CURVE($,#7,#9,#13,.T.);
+#15=ORIENTED_EDGE($,$,$,#14,.T.);
+#16=CARTESIAN_POINT($,(40,40,-4));
+#17=VERTEX_POINT($,#16);
+#18=CARTESIAN_POINT($,(40,-40,-4));
+#19=DIRECTION($,(0,1,0));
+#20=VECTOR($,#19,1);
+#21=LINE($,#18,#20);
+#22=EDGE_CURVE($,#9,#17,#21,.T.);
+#23=ORIENTED_EDGE($,$,$,#22,.T.);
+#24=CARTESIAN_POINT($,(-80,40,-4));
+#25=VERTEX_POINT($,#24);
+#26=CARTESIAN_POINT($,(40,40,-4));
+#27=DIRECTION($,(-1,0,0));
+#28=VECTOR($,#27,1);
+#29=LINE($,#26,#28);
+#30=EDGE_CURVE($,#17,#25,#29,.T.);
+#31=ORIENTED_EDGE($,$,$,#30,.T.);
+#32=CARTESIAN_POINT($,(-80,40,-4));
+#33=DIRECTION($,(0,-1,0));
+#34=VECTOR($,#33,1);
+#35=LINE($,#32,#34);
+#36=EDGE_CURVE($,#25,#7,#35,.T.);
+#37=ORIENTED_EDGE($,$,$,#36,.T.);
+#38=EDGE_LOOP($,(#15,#23,#31,#37));
+#39=FACE_OUTER_BOUND('',#38,.T.);
+#40=CARTESIAN_POINT($,(-17,0,-4));
+#41=VERTEX_POINT($,#40);
+#42=CARTESIAN_POINT($,(-20,0,-4));
+#43=DIRECTION($,(0,0,1));
+#44=DIRECTION($,(1,0,0));
+#45=AXIS2_PLACEMENT_3D($,#42,#43,#44);
+#46=CIRCLE($,#45,3);
+#47=EDGE_CURVE($,#41,#41,#46,.T.);
+#48=ORIENTED_EDGE($,$,$,#47,.F.);
+#49=EDGE_LOOP($,(#48));
+#50=FACE_BOUND('',#49,.T.);
+#51=CARTESIAN_POINT($,(23,0,-4));
+#52=VERTEX_POINT($,#51);
+#53=CARTESIAN_POINT($,(20,0,-4));
+#54=DIRECTION($,(0,0,1));
+#55=DIRECTION($,(1,0,0));
+#56=AXIS2_PLACEMENT_3D($,#53,#54,#55);
+#57=CIRCLE($,#56,3);
+#58=EDGE_CURVE($,#52,#52,#57,.T.);
+#59=ORIENTED_EDGE($,$,$,#58,.F.);
+#60=EDGE_LOOP($,(#59));
+#61=FACE_BOUND('',#60,.T.);
+#62=ADVANCED_FACE('',(#39,#50,#61),#5,.T.);
+#63=CARTESIAN_POINT($,(0,0,4));
+#64=DIRECTION($,(0,0,1));
+#65=DIRECTION($,(1,0,0));
+#66=AXIS2_PLACEMENT_3D($,#63,#64,#65);
+#67=PLANE($,#66);
+#68=CARTESIAN_POINT($,(-80,-40,4));
+#69=VERTEX_POINT($,#68);
+#70=CARTESIAN_POINT($,(40,-40,4));
+#71=VERTEX_POINT($,#70);
+#72=CARTESIAN_POINT($,(-80,-40,4));
+#73=DIRECTION($,(1,0,0));
+#74=VECTOR($,#73,1);
+#75=LINE($,#72,#74);
+#76=EDGE_CURVE($,#69,#71,#75,.T.);
+#77=ORIENTED_EDGE($,$,$,#76,.T.);
+#78=CARTESIAN_POINT($,(40,40,4));
+#79=VERTEX_POINT($,#78);
+#80=CARTESIAN_POINT($,(40,-40,4));
+#81=DIRECTION($,(0,1,0));
+#82=VECTOR($,#81,1);
+#83=LINE($,#80,#82);
+#84=EDGE_CURVE($,#71,#79,#83,.T.);
+#85=ORIENTED_EDGE($,$,$,#84,.T.);
+#86=CARTESIAN_POINT($,(-80,40,4));
+#87=VERTEX_POINT($,#86);
+#88=CARTESIAN_POINT($,(40,40,4));
+#89=DIRECTION($,(-1,0,0));
+#90=VECTOR($,#89,1);
+#91=LINE($,#88,#90);
+#92=EDGE_CURVE($,#79,#87,#91,.T.);
+#93=ORIENTED_EDGE($,$,$,#92,.T.);
+#94=CARTESIAN_POINT($,(-80,40,4));
+#95=DIRECTION($,(0,-1,0));
+#96=VECTOR($,#95,1);
+#97=LINE($,#94,#96);
+#98=EDGE_CURVE($,#87,#69,#97,.T.);
+#99=ORIENTED_EDGE($,$,$,#98,.T.);
+#100=EDGE_LOOP($,(#77,#85,#93,#99));
+#101=FACE_OUTER_BOUND('',#100,.T.);
+#102=CARTESIAN_POINT($,(-17,0,4));
+#103=VERTEX_POINT($,#102);
+#104=CARTESIAN_POINT($,(-20,0,4));
+#105=DIRECTION($,(0,0,1));
+#106=DIRECTION($,(1,0,0));
+#107=AXIS2_PLACEMENT_3D($,#104,#105,#106);
+#108=CIRCLE($,#107,3);
+#109=EDGE_CURVE($,#103,#103,#108,.T.);
+#110=ORIENTED_EDGE($,$,$,#109,.T.);
+#111=EDGE_LOOP($,(#110));
+#112=FACE_BOUND('',#111,.T.);
+#113=CARTESIAN_POINT($,(23,0,4));
+#114=VERTEX_POINT($,#113);
+#115=CARTESIAN_POINT($,(20,0,4));
+#116=DIRECTION($,(0,0,1));
+#117=DIRECTION($,(1,0,0));
+#118=AXIS2_PLACEMENT_3D($,#115,#116,#117);
+#119=CIRCLE($,#118,3);
+#120=EDGE_CURVE($,#114,#114,#119,.T.);
+#121=ORIENTED_EDGE($,$,$,#120,.T.);
+#122=EDGE_LOOP($,(#121));
+#123=FACE_BOUND('',#122,.T.);
+#124=ADVANCED_FACE('',(#101,#112,#123),#67,.T.);
+#125=CARTESIAN_POINT($,(0,-40,0));
+#126=DIRECTION($,(0,-1,0));
+#127=DIRECTION($,(1,0,0));
+#128=AXIS2_PLACEMENT_3D($,#125,#126,#127);
+#129=PLANE($,#128);
+#130=ORIENTED_EDGE($,$,$,#14,.T.);
+#131=CARTESIAN_POINT($,(40,-40,-4));
+#132=DIRECTION($,(0,0,1));
+#133=VECTOR($,#132,1);
+#134=LINE($,#131,#133);
+#135=EDGE_CURVE($,#9,#71,#134,.T.);
+#136=ORIENTED_EDGE($,$,$,#135,.T.);
+#137=ORIENTED_EDGE($,$,$,#76,.F.);
+#138=CARTESIAN_POINT($,(-80,-40,-4));
+#139=DIRECTION($,(0,0,1));
+#140=VECTOR($,#139,1);
+#141=LINE($,#138,#140);
+#142=EDGE_CURVE($,#7,#69,#141,.T.);
+#143=ORIENTED_EDGE($,$,$,#142,.F.);
+#144=EDGE_LOOP($,(#130,#136,#137,#143));
+#145=FACE_OUTER_BOUND('',#144,.T.);
+#146=ADVANCED_FACE('',(#145),#129,.T.);
+#147=CARTESIAN_POINT($,(40,0,0));
+#148=DIRECTION($,(1,0,0));
+#149=DIRECTION($,(0,1,0));
+#150=AXIS2_PLACEMENT_3D($,#147,#148,#149);
+#151=PLANE($,#150);
+#152=ORIENTED_EDGE($,$,$,#22,.T.);
+#153=CARTESIAN_POINT($,(40,40,-4));
+#154=DIRECTION($,(0,0,1));
+#155=VECTOR($,#154,1);
+#156=LINE($,#153,#155);
+#157=EDGE_CURVE($,#17,#79,#156,.T.);
+#158=ORIENTED_EDGE($,$,$,#157,.T.);
+#159=ORIENTED_EDGE($,$,$,#84,.F.);
+#160=ORIENTED_EDGE($,$,$,#135,.F.);
+#161=EDGE_LOOP($,(#152,#158,#159,#160));
+#162=FACE_OUTER_BOUND('',#161,.T.);
+#163=ADVANCED_FACE('',(#162),#151,.T.);
+#164=CARTESIAN_POINT($,(0,40,0));
+#165=DIRECTION($,(0,1,0));
+#166=DIRECTION($,(-1,0,0));
+#167=AXIS2_PLACEMENT_3D($,#164,#165,#166);
+#168=PLANE($,#167);
+#169=ORIENTED_EDGE($,$,$,#30,.T.);
+#170=CARTESIAN_POINT($,(-80,40,-4));
+#171=DIRECTION($,(0,0,1));
+#172=VECTOR($,#171,1);
+#173=LINE($,#170,#172);
+#174=EDGE_CURVE($,#25,#87,#173,.T.);
+#175=ORIENTED_EDGE($,$,$,#174,.T.);
+#176=ORIENTED_EDGE($,$,$,#92,.F.);
+#177=ORIENTED_EDGE($,$,$,#157,.F.);
+#178=EDGE_LOOP($,(#169,#175,#176,#177));
+#179=FACE_OUTER_BOUND('',#178,.T.);
+#180=ADVANCED_FACE('',(#179),#168,.T.);
+#181=CARTESIAN_POINT($,(-80,0,0));
+#182=DIRECTION($,(-1,0,0));
+#183=DIRECTION($,(0,1,0));
+#184=AXIS2_PLACEMENT_3D($,#181,#182,#183);
+#185=PLANE($,#184);
+#186=ORIENTED_EDGE($,$,$,#36,.T.);
+#187=ORIENTED_EDGE($,$,$,#142,.T.);
+#188=ORIENTED_EDGE($,$,$,#98,.F.);
+#189=ORIENTED_EDGE($,$,$,#174,.F.);
+#190=EDGE_LOOP($,(#186,#187,#188,#189));
+#191=FACE_OUTER_BOUND('',#190,.T.);
+#192=ADVANCED_FACE('',(#191),#185,.T.);
+#193=CARTESIAN_POINT($,(-20,0,-4));
+#194=DIRECTION($,(0,0,1));
+#195=DIRECTION($,(1,0,0));
+#196=AXIS2_PLACEMENT_3D($,#193,#194,#195);
+#197=CYLINDRICAL_SURFACE($,#196,3);
+#198=CARTESIAN_POINT($,(-17,0,4));
+#199=VERTEX_POINT($,#198);
+#200=CARTESIAN_POINT($,(-17,0,-4));
+#201=VERTEX_POINT($,#200);
+#202=CARTESIAN_POINT($,(-17,0,4));
+#203=DIRECTION($,(0,0,-1));
+#204=VECTOR($,#203,1);
+#205=LINE($,#202,#204);
+#206=EDGE_CURVE($,#199,#201,#205,.T.);
+#207=ORIENTED_EDGE($,$,$,#206,.T.);
+#208=ORIENTED_EDGE($,$,$,#109,.F.);
+#209=ORIENTED_EDGE($,$,$,#206,.F.);
+#210=ORIENTED_EDGE($,$,$,#47,.T.);
+#211=EDGE_LOOP($,(#207,#208,#209,#210));
+#212=FACE_OUTER_BOUND('',#211,.T.);
+#213=ADVANCED_FACE('',(#212),#197,.T.);
+#214=CARTESIAN_POINT($,(20,0,-4));
+#215=DIRECTION($,(0,0,1));
+#216=DIRECTION($,(1,0,0));
+#217=AXIS2_PLACEMENT_3D($,#214,#215,#216);
+#218=CYLINDRICAL_SURFACE($,#217,3);
+#219=CARTESIAN_POINT($,(23,0,4));
+#220=VERTEX_POINT($,#219);
+#221=CARTESIAN_POINT($,(23,0,-4));
+#222=VERTEX_POINT($,#221);
+#223=CARTESIAN_POINT($,(23,0,4));
+#224=DIRECTION($,(0,0,-1));
+#225=VECTOR($,#224,1);
+#226=LINE($,#223,#225);
+#227=EDGE_CURVE($,#220,#222,#226,.T.);
+#228=ORIENTED_EDGE($,$,$,#227,.T.);
+#229=ORIENTED_EDGE($,$,$,#120,.F.);
+#230=ORIENTED_EDGE($,$,$,#227,.F.);
+#231=ORIENTED_EDGE($,$,$,#58,.T.);
+#232=EDGE_LOOP($,(#228,#229,#230,#231));
+#233=FACE_OUTER_BOUND('',#232,.T.);
+#234=ADVANCED_FACE('',(#233),#218,.T.);
+#235=CLOSED_SHELL($,(#62,#124,#146,#163,#180,#192,#213,#234));
+#236=MANIFOLD_SOLID_BREP('AetherisBody',#235);
+#237=APPLICATION_CONTEXT('mechanical design');
+#238=PRODUCT_CONTEXT('',#237,'mechanical');
+#239=PRODUCT('AETHERIS','AetherisBody','',(#238));
+#240=PRODUCT_DEFINITION_FORMATION('','',#239);
+#241=PRODUCT_DEFINITION_CONTEXT('design',#237,'design');
+#242=PRODUCT_DEFINITION('','',#240,#241);
+#243=PRODUCT_DEFINITION_SHAPE('','',#242);
+#244=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#245=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#246=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#247=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#244,#245,#246))REPRESENTATION_CONTEXT('3','3D'));
+#248=SHAPE_ASPECT('firmament-feature:hole_cut_left','supported cylinder through-hole feature',#243,.FALSE.);
+#249=PROPERTY_DEFINITION('diameter:hole_cut_left','auto-derived semantic PMI diameter',#248);
+#250=MEASURE_REPRESENTATION_ITEM('diameter',6,#244);
+#251=SHAPE_DIMENSION_REPRESENTATION('diameter:hole_cut_left',(#250),#247);
+#252=PROPERTY_DEFINITION_REPRESENTATION(#249,#251);
+#253=SHAPE_REPRESENTATION('AetherisBody',(#236),#247);
+#254=SHAPE_DEFINITION_REPRESENTATION(#243,#253);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/testdata/firmament/exports/part.step b/testdata/firmament/exports/part.step
index c2872566..92c23cf0 100644
--- a/testdata/firmament/exports/part.step
+++ b/testdata/firmament/exports/part.step
@@ -5,298 +5,276 @@ FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris')
FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
ENDSEC;
DATA;
-#1=CARTESIAN_POINT($,(0,0,0));
-#2=DIRECTION($,(-1,0,0));
-#3=DIRECTION($,(0,1,0));
+#1=CARTESIAN_POINT($,(0,0,4));
+#2=DIRECTION($,(0,0,-1));
+#3=DIRECTION($,(1,0,0));
#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
#5=PLANE($,#4);
-#6=CARTESIAN_POINT($,(-0,-0,-0));
+#6=CARTESIAN_POINT($,(-19,-15,4));
#7=VERTEX_POINT($,#6);
-#8=CARTESIAN_POINT($,(0,0,60));
+#8=CARTESIAN_POINT($,(41,-15,4));
#9=VERTEX_POINT($,#8);
-#10=CARTESIAN_POINT($,(-0,-0,-0));
-#11=DIRECTION($,(0,0,1));
+#10=CARTESIAN_POINT($,(-19,-15,4));
+#11=DIRECTION($,(1,0,0));
#12=VECTOR($,#11,1);
#13=LINE($,#10,#12);
#14=EDGE_CURVE($,#7,#9,#13,.T.);
#15=ORIENTED_EDGE($,$,$,#14,.T.);
-#16=CARTESIAN_POINT($,(-0,20,60));
+#16=CARTESIAN_POINT($,(41,15,4));
#17=VERTEX_POINT($,#16);
-#18=CARTESIAN_POINT($,(0,0,60));
+#18=CARTESIAN_POINT($,(41,-15,4));
#19=DIRECTION($,(0,1,0));
#20=VECTOR($,#19,1);
#21=LINE($,#18,#20);
#22=EDGE_CURVE($,#9,#17,#21,.T.);
#23=ORIENTED_EDGE($,$,$,#22,.T.);
-#24=CARTESIAN_POINT($,(0,20,0));
+#24=CARTESIAN_POINT($,(-19,15,4));
#25=VERTEX_POINT($,#24);
-#26=CARTESIAN_POINT($,(-0,20,60));
-#27=DIRECTION($,(0,0,1));
+#26=CARTESIAN_POINT($,(41,15,4));
+#27=DIRECTION($,(-1,0,0));
#28=VECTOR($,#27,1);
#29=LINE($,#26,#28);
#30=EDGE_CURVE($,#17,#25,#29,.T.);
-#31=ORIENTED_EDGE($,$,$,#30,.F.);
-#32=CARTESIAN_POINT($,(0,20,0));
-#33=DIRECTION($,(0,1,0));
+#31=ORIENTED_EDGE($,$,$,#30,.T.);
+#32=CARTESIAN_POINT($,(-19,15,4));
+#33=DIRECTION($,(0,-1,0));
#34=VECTOR($,#33,1);
#35=LINE($,#32,#34);
#36=EDGE_CURVE($,#25,#7,#35,.T.);
-#37=ORIENTED_EDGE($,$,$,#36,.F.);
+#37=ORIENTED_EDGE($,$,$,#36,.T.);
#38=EDGE_LOOP($,(#15,#23,#31,#37));
#39=FACE_OUTER_BOUND('',#38,.T.);
-#40=ADVANCED_FACE('',(#39),#5,.T.);
-#41=CARTESIAN_POINT($,(10,0,0));
-#42=DIRECTION($,(1,0,0));
-#43=DIRECTION($,(0,1,0));
-#44=AXIS2_PLACEMENT_3D($,#41,#42,#43);
-#45=PLANE($,#44);
-#46=CARTESIAN_POINT($,(10,-0,10));
-#47=VERTEX_POINT($,#46);
-#48=CARTESIAN_POINT($,(10,20,10));
-#49=VERTEX_POINT($,#48);
-#50=CARTESIAN_POINT($,(10,-0,10));
-#51=DIRECTION($,(0,1,0));
-#52=VECTOR($,#51,1);
-#53=LINE($,#50,#52);
-#54=EDGE_CURVE($,#47,#49,#53,.T.);
-#55=ORIENTED_EDGE($,$,$,#54,.T.);
-#56=CARTESIAN_POINT($,(10,20,60));
-#57=VERTEX_POINT($,#56);
-#58=CARTESIAN_POINT($,(10,20,10));
-#59=DIRECTION($,(0,0,1));
-#60=VECTOR($,#59,1);
-#61=LINE($,#58,#60);
-#62=EDGE_CURVE($,#49,#57,#61,.T.);
-#63=ORIENTED_EDGE($,$,$,#62,.T.);
-#64=CARTESIAN_POINT($,(10,-0,60));
-#65=VERTEX_POINT($,#64);
-#66=CARTESIAN_POINT($,(10,20,60));
-#67=DIRECTION($,(0,1,0));
-#68=VECTOR($,#67,1);
-#69=LINE($,#66,#68);
-#70=EDGE_CURVE($,#57,#65,#69,.T.);
-#71=ORIENTED_EDGE($,$,$,#70,.F.);
-#72=CARTESIAN_POINT($,(10,-0,60));
-#73=DIRECTION($,(0,0,1));
+#40=CARTESIAN_POINT($,(-11.5,0,4));
+#41=VERTEX_POINT($,#40);
+#42=CARTESIAN_POINT($,(-15,0,4));
+#43=DIRECTION($,(0,0,1));
+#44=DIRECTION($,(1,0,0));
+#45=AXIS2_PLACEMENT_3D($,#42,#43,#44);
+#46=CIRCLE($,#45,3.5);
+#47=EDGE_CURVE($,#41,#41,#46,.T.);
+#48=ORIENTED_EDGE($,$,$,#47,.F.);
+#49=EDGE_LOOP($,(#48));
+#50=FACE_BOUND('',#49,.T.);
+#51=CARTESIAN_POINT($,(29.5,0,18));
+#52=VERTEX_POINT($,#51);
+#53=CARTESIAN_POINT($,(26,0,18));
+#54=DIRECTION($,(0,0,1));
+#55=DIRECTION($,(1,0,0));
+#56=AXIS2_PLACEMENT_3D($,#53,#54,#55);
+#57=CIRCLE($,#56,3.5);
+#58=EDGE_CURVE($,#52,#52,#57,.T.);
+#59=ORIENTED_EDGE($,$,$,#58,.F.);
+#60=EDGE_LOOP($,(#59));
+#61=FACE_BOUND('',#60,.T.);
+#62=ADVANCED_FACE('',(#39,#50,#61),#5,.T.);
+#63=CARTESIAN_POINT($,(0,0,44));
+#64=DIRECTION($,(0,0,1));
+#65=DIRECTION($,(1,0,0));
+#66=AXIS2_PLACEMENT_3D($,#63,#64,#65);
+#67=PLANE($,#66);
+#68=CARTESIAN_POINT($,(-19,-15,44));
+#69=VERTEX_POINT($,#68);
+#70=CARTESIAN_POINT($,(41,-15,44));
+#71=VERTEX_POINT($,#70);
+#72=CARTESIAN_POINT($,(-19,-15,44));
+#73=DIRECTION($,(1,0,0));
#74=VECTOR($,#73,1);
#75=LINE($,#72,#74);
-#76=EDGE_CURVE($,#65,#47,#75,.T.);
-#77=ORIENTED_EDGE($,$,$,#76,.F.);
-#78=EDGE_LOOP($,(#55,#63,#71,#77));
-#79=FACE_OUTER_BOUND('',#78,.T.);
-#80=ADVANCED_FACE('',(#79),#45,.T.);
-#81=CARTESIAN_POINT($,(60,0,0));
-#82=DIRECTION($,(1,0,0));
-#83=DIRECTION($,(0,1,0));
-#84=AXIS2_PLACEMENT_3D($,#81,#82,#83);
-#85=PLANE($,#84);
-#86=CARTESIAN_POINT($,(60,0,0));
+#76=EDGE_CURVE($,#69,#71,#75,.T.);
+#77=ORIENTED_EDGE($,$,$,#76,.T.);
+#78=CARTESIAN_POINT($,(41,15,44));
+#79=VERTEX_POINT($,#78);
+#80=CARTESIAN_POINT($,(41,-15,44));
+#81=DIRECTION($,(0,1,0));
+#82=VECTOR($,#81,1);
+#83=LINE($,#80,#82);
+#84=EDGE_CURVE($,#71,#79,#83,.T.);
+#85=ORIENTED_EDGE($,$,$,#84,.T.);
+#86=CARTESIAN_POINT($,(-19,15,44));
#87=VERTEX_POINT($,#86);
-#88=CARTESIAN_POINT($,(60,20,-0));
-#89=VERTEX_POINT($,#88);
-#90=CARTESIAN_POINT($,(60,0,0));
-#91=DIRECTION($,(0,1,0));
-#92=VECTOR($,#91,1);
-#93=LINE($,#90,#92);
-#94=EDGE_CURVE($,#87,#89,#93,.T.);
-#95=ORIENTED_EDGE($,$,$,#94,.T.);
-#96=CARTESIAN_POINT($,(60,20,10));
-#97=VERTEX_POINT($,#96);
-#98=CARTESIAN_POINT($,(60,20,-0));
-#99=DIRECTION($,(0,0,1));
-#100=VECTOR($,#99,1);
-#101=LINE($,#98,#100);
-#102=EDGE_CURVE($,#89,#97,#101,.T.);
-#103=ORIENTED_EDGE($,$,$,#102,.T.);
-#104=CARTESIAN_POINT($,(60,-0,10));
-#105=VERTEX_POINT($,#104);
-#106=CARTESIAN_POINT($,(60,20,10));
-#107=DIRECTION($,(0,1,0));
-#108=VECTOR($,#107,1);
-#109=LINE($,#106,#108);
-#110=EDGE_CURVE($,#97,#105,#109,.T.);
-#111=ORIENTED_EDGE($,$,$,#110,.F.);
-#112=CARTESIAN_POINT($,(60,-0,10));
-#113=DIRECTION($,(0,0,1));
-#114=VECTOR($,#113,1);
-#115=LINE($,#112,#114);
-#116=EDGE_CURVE($,#105,#87,#115,.T.);
-#117=ORIENTED_EDGE($,$,$,#116,.F.);
-#118=EDGE_LOOP($,(#95,#103,#111,#117));
-#119=FACE_OUTER_BOUND('',#118,.T.);
-#120=ADVANCED_FACE('',(#119),#85,.T.);
-#121=CARTESIAN_POINT($,(0,0,0));
-#122=DIRECTION($,(0,-1,0));
-#123=DIRECTION($,(1,0,0));
-#124=AXIS2_PLACEMENT_3D($,#121,#122,#123);
-#125=PLANE($,#124);
-#126=CARTESIAN_POINT($,(-0,-0,-0));
-#127=DIRECTION($,(1,0,0));
-#128=VECTOR($,#127,1);
-#129=LINE($,#126,#128);
-#130=EDGE_CURVE($,#7,#87,#129,.T.);
-#131=ORIENTED_EDGE($,$,$,#130,.T.);
-#132=ORIENTED_EDGE($,$,$,#116,.T.);
-#133=CARTESIAN_POINT($,(1,0,10));
-#134=VERTEX_POINT($,#133);
-#135=CARTESIAN_POINT($,(60,-0,10));
-#136=DIRECTION($,(1,0,0));
-#137=VECTOR($,#136,1);
-#138=LINE($,#135,#137);
-#139=EDGE_CURVE($,#105,#134,#138,.T.);
-#140=ORIENTED_EDGE($,$,$,#139,.F.);
-#141=CARTESIAN_POINT($,(1,0,10));
-#142=DIRECTION($,(-0.099503719020999,-0,-0.995037190209989));
-#143=VECTOR($,#142,1);
-#144=LINE($,#141,#143);
-#145=EDGE_CURVE($,#134,#7,#144,.T.);
-#146=ORIENTED_EDGE($,$,$,#145,.F.);
-#147=EDGE_LOOP($,(#131,#132,#140,#146));
-#148=FACE_OUTER_BOUND('',#147,.T.);
-#149=ADVANCED_FACE('',(#148),#125,.T.);
-#150=CARTESIAN_POINT($,(0,0,0));
-#151=DIRECTION($,(0,-1,0));
-#152=DIRECTION($,(1,0,0));
-#153=AXIS2_PLACEMENT_3D($,#150,#151,#152);
-#154=PLANE($,#153);
-#155=CARTESIAN_POINT($,(1,0,10));
-#156=DIRECTION($,(1,0,0));
-#157=VECTOR($,#156,1);
-#158=LINE($,#155,#157);
-#159=EDGE_CURVE($,#134,#47,#158,.T.);
-#160=ORIENTED_EDGE($,$,$,#159,.T.);
-#161=ORIENTED_EDGE($,$,$,#76,.T.);
-#162=CARTESIAN_POINT($,(10,-0,60));
-#163=DIRECTION($,(1,0,0));
-#164=VECTOR($,#163,1);
-#165=LINE($,#162,#164);
-#166=EDGE_CURVE($,#65,#9,#165,.T.);
-#167=ORIENTED_EDGE($,$,$,#166,.F.);
-#168=CARTESIAN_POINT($,(0,0,60));
-#169=DIRECTION($,(0.0199960011996,0,-0.999800059980007));
-#170=VECTOR($,#169,1);
-#171=LINE($,#168,#170);
-#172=EDGE_CURVE($,#9,#134,#171,.T.);
-#173=ORIENTED_EDGE($,$,$,#172,.F.);
-#174=EDGE_LOOP($,(#160,#161,#167,#173));
-#175=FACE_OUTER_BOUND('',#174,.T.);
-#176=ADVANCED_FACE('',(#175),#154,.T.);
-#177=CARTESIAN_POINT($,(0,20,0));
-#178=DIRECTION($,(0,1,0));
-#179=DIRECTION($,(-1,0,0));
-#180=AXIS2_PLACEMENT_3D($,#177,#178,#179);
-#181=PLANE($,#180);
-#182=CARTESIAN_POINT($,(0,20,1));
-#183=VERTEX_POINT($,#182);
-#184=CARTESIAN_POINT($,(0,20,0));
-#185=DIRECTION($,(0,0,1));
-#186=VECTOR($,#185,1);
-#187=LINE($,#184,#186);
-#188=EDGE_CURVE($,#25,#183,#187,.T.);
-#189=ORIENTED_EDGE($,$,$,#188,.T.);
-#190=CARTESIAN_POINT($,(0,20,1));
-#191=DIRECTION($,(0.988936352868298,0,0.148340452930245));
-#192=VECTOR($,#191,1);
-#193=LINE($,#190,#192);
-#194=EDGE_CURVE($,#183,#97,#193,.T.);
-#195=ORIENTED_EDGE($,$,$,#194,.T.);
-#196=ORIENTED_EDGE($,$,$,#102,.F.);
-#197=CARTESIAN_POINT($,(60,20,-0));
-#198=DIRECTION($,(1,0,0));
-#199=VECTOR($,#198,1);
-#200=LINE($,#197,#199);
-#201=EDGE_CURVE($,#89,#25,#200,.T.);
-#202=ORIENTED_EDGE($,$,$,#201,.F.);
-#203=EDGE_LOOP($,(#189,#195,#196,#202));
-#204=FACE_OUTER_BOUND('',#203,.T.);
-#205=ADVANCED_FACE('',(#204),#181,.T.);
-#206=CARTESIAN_POINT($,(0,20,0));
-#207=DIRECTION($,(0,1,0));
-#208=DIRECTION($,(-1,0,0));
-#209=AXIS2_PLACEMENT_3D($,#206,#207,#208);
-#210=PLANE($,#209);
-#211=CARTESIAN_POINT($,(0,20,1));
-#212=DIRECTION($,(0,0,1));
-#213=VECTOR($,#212,1);
-#214=LINE($,#211,#213);
-#215=EDGE_CURVE($,#183,#17,#214,.T.);
-#216=ORIENTED_EDGE($,$,$,#215,.T.);
-#217=CARTESIAN_POINT($,(-0,20,60));
-#218=DIRECTION($,(1,0,0));
-#219=VECTOR($,#218,1);
-#220=LINE($,#217,#219);
-#221=EDGE_CURVE($,#17,#57,#220,.T.);
-#222=ORIENTED_EDGE($,$,$,#221,.T.);
-#223=ORIENTED_EDGE($,$,$,#62,.F.);
-#224=CARTESIAN_POINT($,(10,20,10));
-#225=DIRECTION($,(-0.743294146247166,0,-0.66896473162245));
-#226=VECTOR($,#225,1);
-#227=LINE($,#224,#226);
-#228=EDGE_CURVE($,#49,#183,#227,.T.);
-#229=ORIENTED_EDGE($,$,$,#228,.F.);
-#230=EDGE_LOOP($,(#216,#222,#223,#229));
-#231=FACE_OUTER_BOUND('',#230,.T.);
-#232=ADVANCED_FACE('',(#231),#210,.T.);
-#233=CARTESIAN_POINT($,(0,0,0));
-#234=DIRECTION($,(0,0,-1));
-#235=DIRECTION($,(1,0,0));
-#236=AXIS2_PLACEMENT_3D($,#233,#234,#235);
-#237=PLANE($,#236);
-#238=ORIENTED_EDGE($,$,$,#36,.T.);
-#239=ORIENTED_EDGE($,$,$,#201,.T.);
-#240=ORIENTED_EDGE($,$,$,#94,.F.);
-#241=ORIENTED_EDGE($,$,$,#130,.F.);
-#242=EDGE_LOOP($,(#238,#239,#240,#241));
-#243=FACE_OUTER_BOUND('',#242,.T.);
-#244=ADVANCED_FACE('',(#243),#237,.T.);
-#245=CARTESIAN_POINT($,(0,0,10));
-#246=DIRECTION($,(0,0,1));
-#247=DIRECTION($,(1,0,0));
-#248=AXIS2_PLACEMENT_3D($,#245,#246,#247);
-#249=PLANE($,#248);
-#250=CARTESIAN_POINT($,(10,-0,10));
-#251=DIRECTION($,(1,0,0));
-#252=VECTOR($,#251,1);
-#253=LINE($,#250,#252);
-#254=EDGE_CURVE($,#47,#105,#253,.T.);
-#255=ORIENTED_EDGE($,$,$,#254,.T.);
-#256=ORIENTED_EDGE($,$,$,#110,.T.);
-#257=CARTESIAN_POINT($,(60,20,10));
-#258=DIRECTION($,(1,0,0));
-#259=VECTOR($,#258,1);
-#260=LINE($,#257,#259);
-#261=EDGE_CURVE($,#97,#49,#260,.T.);
-#262=ORIENTED_EDGE($,$,$,#261,.F.);
-#263=ORIENTED_EDGE($,$,$,#54,.F.);
-#264=EDGE_LOOP($,(#255,#256,#262,#263));
-#265=FACE_OUTER_BOUND('',#264,.T.);
-#266=ADVANCED_FACE('',(#265),#249,.T.);
-#267=CARTESIAN_POINT($,(0,0,60));
-#268=DIRECTION($,(0,0,1));
-#269=DIRECTION($,(1,0,0));
-#270=AXIS2_PLACEMENT_3D($,#267,#268,#269);
-#271=PLANE($,#270);
-#272=ORIENTED_EDGE($,$,$,#166,.T.);
-#273=ORIENTED_EDGE($,$,$,#70,.T.);
-#274=ORIENTED_EDGE($,$,$,#221,.F.);
-#275=ORIENTED_EDGE($,$,$,#22,.F.);
-#276=EDGE_LOOP($,(#272,#273,#274,#275));
-#277=FACE_OUTER_BOUND('',#276,.T.);
-#278=ADVANCED_FACE('',(#277),#271,.T.);
-#279=CLOSED_SHELL($,(#40,#80,#120,#149,#176,#205,#232,#244,#266,#278));
-#280=MANIFOLD_SOLID_BREP('AetherisBody',#279);
-#281=APPLICATION_CONTEXT('mechanical design');
-#282=PRODUCT_CONTEXT('',#281,'mechanical');
-#283=PRODUCT('AETHERIS','AetherisBody','',(#282));
-#284=PRODUCT_DEFINITION_FORMATION('','',#283);
-#285=PRODUCT_DEFINITION_CONTEXT('design',#281,'design');
-#286=PRODUCT_DEFINITION('','',#284,#285);
-#287=PRODUCT_DEFINITION_SHAPE('','',#286);
-#288=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
-#289=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
-#290=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
-#291=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#288,#289,#290))REPRESENTATION_CONTEXT('3','3D'));
-#292=SHAPE_REPRESENTATION('AetherisBody',(#280),#291);
-#293=SHAPE_DEFINITION_REPRESENTATION(#287,#292);
+#88=CARTESIAN_POINT($,(41,15,44));
+#89=DIRECTION($,(-1,0,0));
+#90=VECTOR($,#89,1);
+#91=LINE($,#88,#90);
+#92=EDGE_CURVE($,#79,#87,#91,.T.);
+#93=ORIENTED_EDGE($,$,$,#92,.T.);
+#94=CARTESIAN_POINT($,(-19,15,44));
+#95=DIRECTION($,(0,-1,0));
+#96=VECTOR($,#95,1);
+#97=LINE($,#94,#96);
+#98=EDGE_CURVE($,#87,#69,#97,.T.);
+#99=ORIENTED_EDGE($,$,$,#98,.T.);
+#100=EDGE_LOOP($,(#77,#85,#93,#99));
+#101=FACE_OUTER_BOUND('',#100,.T.);
+#102=ADVANCED_FACE('',(#101),#67,.T.);
+#103=CARTESIAN_POINT($,(0,-15,0));
+#104=DIRECTION($,(0,-1,0));
+#105=DIRECTION($,(1,0,0));
+#106=AXIS2_PLACEMENT_3D($,#103,#104,#105);
+#107=PLANE($,#106);
+#108=ORIENTED_EDGE($,$,$,#14,.T.);
+#109=CARTESIAN_POINT($,(41,-15,4));
+#110=DIRECTION($,(0,0,1));
+#111=VECTOR($,#110,1);
+#112=LINE($,#109,#111);
+#113=EDGE_CURVE($,#9,#71,#112,.T.);
+#114=ORIENTED_EDGE($,$,$,#113,.T.);
+#115=ORIENTED_EDGE($,$,$,#76,.F.);
+#116=CARTESIAN_POINT($,(-19,-15,4));
+#117=DIRECTION($,(0,0,1));
+#118=VECTOR($,#117,1);
+#119=LINE($,#116,#118);
+#120=EDGE_CURVE($,#7,#69,#119,.T.);
+#121=ORIENTED_EDGE($,$,$,#120,.F.);
+#122=EDGE_LOOP($,(#108,#114,#115,#121));
+#123=FACE_OUTER_BOUND('',#122,.T.);
+#124=ADVANCED_FACE('',(#123),#107,.T.);
+#125=CARTESIAN_POINT($,(41,0,0));
+#126=DIRECTION($,(1,0,0));
+#127=DIRECTION($,(0,1,0));
+#128=AXIS2_PLACEMENT_3D($,#125,#126,#127);
+#129=PLANE($,#128);
+#130=ORIENTED_EDGE($,$,$,#22,.T.);
+#131=CARTESIAN_POINT($,(41,15,4));
+#132=DIRECTION($,(0,0,1));
+#133=VECTOR($,#132,1);
+#134=LINE($,#131,#133);
+#135=EDGE_CURVE($,#17,#79,#134,.T.);
+#136=ORIENTED_EDGE($,$,$,#135,.T.);
+#137=ORIENTED_EDGE($,$,$,#84,.F.);
+#138=ORIENTED_EDGE($,$,$,#113,.F.);
+#139=EDGE_LOOP($,(#130,#136,#137,#138));
+#140=FACE_OUTER_BOUND('',#139,.T.);
+#141=ADVANCED_FACE('',(#140),#129,.T.);
+#142=CARTESIAN_POINT($,(0,15,0));
+#143=DIRECTION($,(0,1,0));
+#144=DIRECTION($,(-1,0,0));
+#145=AXIS2_PLACEMENT_3D($,#142,#143,#144);
+#146=PLANE($,#145);
+#147=ORIENTED_EDGE($,$,$,#30,.T.);
+#148=CARTESIAN_POINT($,(-19,15,4));
+#149=DIRECTION($,(0,0,1));
+#150=VECTOR($,#149,1);
+#151=LINE($,#148,#150);
+#152=EDGE_CURVE($,#25,#87,#151,.T.);
+#153=ORIENTED_EDGE($,$,$,#152,.T.);
+#154=ORIENTED_EDGE($,$,$,#92,.F.);
+#155=ORIENTED_EDGE($,$,$,#135,.F.);
+#156=EDGE_LOOP($,(#147,#153,#154,#155));
+#157=FACE_OUTER_BOUND('',#156,.T.);
+#158=ADVANCED_FACE('',(#157),#146,.T.);
+#159=CARTESIAN_POINT($,(-19,0,0));
+#160=DIRECTION($,(-1,0,0));
+#161=DIRECTION($,(0,1,0));
+#162=AXIS2_PLACEMENT_3D($,#159,#160,#161);
+#163=PLANE($,#162);
+#164=ORIENTED_EDGE($,$,$,#36,.T.);
+#165=ORIENTED_EDGE($,$,$,#120,.T.);
+#166=ORIENTED_EDGE($,$,$,#98,.F.);
+#167=ORIENTED_EDGE($,$,$,#152,.F.);
+#168=EDGE_LOOP($,(#164,#165,#166,#167));
+#169=FACE_OUTER_BOUND('',#168,.T.);
+#170=ADVANCED_FACE('',(#169),#163,.T.);
+#171=CARTESIAN_POINT($,(-15,0,4));
+#172=DIRECTION($,(0,0,1));
+#173=DIRECTION($,(1,0,0));
+#174=AXIS2_PLACEMENT_3D($,#171,#172,#173);
+#175=CYLINDRICAL_SURFACE($,#174,3.5);
+#176=CARTESIAN_POINT($,(-11.5,0,10));
+#177=VERTEX_POINT($,#176);
+#178=CARTESIAN_POINT($,(-11.5,0,4));
+#179=VERTEX_POINT($,#178);
+#180=CARTESIAN_POINT($,(-11.5,0,10));
+#181=DIRECTION($,(0,0,-1));
+#182=VECTOR($,#181,1);
+#183=LINE($,#180,#182);
+#184=EDGE_CURVE($,#177,#179,#183,.T.);
+#185=ORIENTED_EDGE($,$,$,#184,.T.);
+#186=CARTESIAN_POINT($,(-11.5,0,10));
+#187=VERTEX_POINT($,#186);
+#188=CARTESIAN_POINT($,(-15,0,10));
+#189=DIRECTION($,(0,0,1));
+#190=DIRECTION($,(1,0,0));
+#191=AXIS2_PLACEMENT_3D($,#188,#189,#190);
+#192=CIRCLE($,#191,3.5);
+#193=EDGE_CURVE($,#187,#187,#192,.T.);
+#194=ORIENTED_EDGE($,$,$,#193,.F.);
+#195=ORIENTED_EDGE($,$,$,#184,.F.);
+#196=ORIENTED_EDGE($,$,$,#47,.T.);
+#197=EDGE_LOOP($,(#185,#194,#195,#196));
+#198=FACE_OUTER_BOUND('',#197,.T.);
+#199=ADVANCED_FACE('',(#198),#175,.T.);
+#200=CARTESIAN_POINT($,(26,0,18));
+#201=DIRECTION($,(0,0,1));
+#202=DIRECTION($,(1,0,0));
+#203=AXIS2_PLACEMENT_3D($,#200,#201,#202);
+#204=CYLINDRICAL_SURFACE($,#203,3.5);
+#205=CARTESIAN_POINT($,(29.5,0,38));
+#206=VERTEX_POINT($,#205);
+#207=CARTESIAN_POINT($,(29.5,0,18));
+#208=VERTEX_POINT($,#207);
+#209=CARTESIAN_POINT($,(29.5,0,38));
+#210=DIRECTION($,(0,0,-1));
+#211=VECTOR($,#210,1);
+#212=LINE($,#209,#211);
+#213=EDGE_CURVE($,#206,#208,#212,.T.);
+#214=ORIENTED_EDGE($,$,$,#213,.T.);
+#215=CARTESIAN_POINT($,(29.5,0,38));
+#216=VERTEX_POINT($,#215);
+#217=CARTESIAN_POINT($,(26,0,38));
+#218=DIRECTION($,(0,0,1));
+#219=DIRECTION($,(1,0,0));
+#220=AXIS2_PLACEMENT_3D($,#217,#218,#219);
+#221=CIRCLE($,#220,3.5);
+#222=EDGE_CURVE($,#216,#216,#221,.T.);
+#223=ORIENTED_EDGE($,$,$,#222,.F.);
+#224=ORIENTED_EDGE($,$,$,#213,.F.);
+#225=ORIENTED_EDGE($,$,$,#58,.T.);
+#226=EDGE_LOOP($,(#214,#223,#224,#225));
+#227=FACE_OUTER_BOUND('',#226,.T.);
+#228=ADVANCED_FACE('',(#227),#204,.T.);
+#229=CARTESIAN_POINT($,(-15,0,10));
+#230=DIRECTION($,(-0,-0,-1));
+#231=DIRECTION($,(1,0,0));
+#232=AXIS2_PLACEMENT_3D($,#229,#230,#231);
+#233=PLANE($,#232);
+#234=ORIENTED_EDGE($,$,$,#193,.T.);
+#235=EDGE_LOOP($,(#234));
+#236=FACE_OUTER_BOUND('',#235,.T.);
+#237=ADVANCED_FACE('',(#236),#233,.T.);
+#238=CARTESIAN_POINT($,(26,0,38));
+#239=DIRECTION($,(-0,-0,-1));
+#240=DIRECTION($,(1,0,0));
+#241=AXIS2_PLACEMENT_3D($,#238,#239,#240);
+#242=PLANE($,#241);
+#243=ORIENTED_EDGE($,$,$,#222,.T.);
+#244=EDGE_LOOP($,(#243));
+#245=FACE_OUTER_BOUND('',#244,.T.);
+#246=ADVANCED_FACE('',(#245),#242,.T.);
+#247=CLOSED_SHELL($,(#62,#102,#124,#141,#158,#170,#199,#228,#237,#246));
+#248=MANIFOLD_SOLID_BREP('AetherisBody',#247);
+#249=APPLICATION_CONTEXT('mechanical design');
+#250=PRODUCT_CONTEXT('',#249,'mechanical');
+#251=PRODUCT('AETHERIS','AetherisBody','',(#250));
+#252=PRODUCT_DEFINITION_FORMATION('','',#251);
+#253=PRODUCT_DEFINITION_CONTEXT('design',#249,'design');
+#254=PRODUCT_DEFINITION('','',#252,#253);
+#255=PRODUCT_DEFINITION_SHAPE('','',#254);
+#256=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#257=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#258=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#259=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#256,#257,#258))REPRESENTATION_CONTEXT('3','3D'));
+#260=SHAPE_ASPECT('firmament-feature:base_hole','supported cylinder through-hole feature',#255,.FALSE.);
+#261=PROPERTY_DEFINITION('diameter:base_hole','auto-derived semantic PMI diameter',#260);
+#262=MEASURE_REPRESENTATION_ITEM('diameter',7,#256);
+#263=SHAPE_DIMENSION_REPRESENTATION('diameter:base_hole',(#262),#259);
+#264=PROPERTY_DEFINITION_REPRESENTATION(#261,#263);
+#265=SHAPE_ASPECT('firmament-feature:upright_hole','supported cylinder through-hole feature',#255,.FALSE.);
+#266=PROPERTY_DEFINITION('diameter:upright_hole','auto-derived semantic PMI diameter',#265);
+#267=MEASURE_REPRESENTATION_ITEM('diameter',7,#256);
+#268=SHAPE_DIMENSION_REPRESENTATION('diameter:upright_hole',(#267),#259);
+#269=PROPERTY_DEFINITION_REPRESENTATION(#266,#268);
+#270=SHAPE_REPRESENTATION('AetherisBody',(#248),#259);
+#271=SHAPE_DEFINITION_REPRESENTATION(#255,#270);
ENDSEC;
END-ISO-10303-21;
diff --git a/testdata/firmament/exports/ribbed_support_f1.step b/testdata/firmament/exports/ribbed_support_f1.step
index 9951f167..21bd58ed 100644
--- a/testdata/firmament/exports/ribbed_support_f1.step
+++ b/testdata/firmament/exports/ribbed_support_f1.step
@@ -31,13 +31,13 @@ DATA;
#24=CARTESIAN_POINT($,(-4,20,18));
#25=VERTEX_POINT($,#24);
#26=CARTESIAN_POINT($,(-4,20,26));
-#27=DIRECTION($,(0,0,1));
+#27=DIRECTION($,(0,0,-1));
#28=VECTOR($,#27,1);
#29=LINE($,#26,#28);
#30=EDGE_CURVE($,#17,#25,#29,.T.);
#31=ORIENTED_EDGE($,$,$,#30,.F.);
#32=CARTESIAN_POINT($,(-4,20,18));
-#33=DIRECTION($,(0,1,0));
+#33=DIRECTION($,(0,-1,0));
#34=VECTOR($,#33,1);
#35=LINE($,#32,#34);
#36=EDGE_CURVE($,#25,#7,#35,.T.);
@@ -71,13 +71,13 @@ DATA;
#64=CARTESIAN_POINT($,(32,20,4));
#65=VERTEX_POINT($,#64);
#66=CARTESIAN_POINT($,(32,20,18));
-#67=DIRECTION($,(0,0,1));
+#67=DIRECTION($,(0,0,-1));
#68=VECTOR($,#67,1);
#69=LINE($,#66,#68);
#70=EDGE_CURVE($,#57,#65,#69,.T.);
#71=ORIENTED_EDGE($,$,$,#70,.F.);
#72=CARTESIAN_POINT($,(32,20,4));
-#73=DIRECTION($,(0,1,0));
+#73=DIRECTION($,(0,-1,0));
#74=VECTOR($,#73,1);
#75=LINE($,#72,#74);
#76=EDGE_CURVE($,#65,#47,#75,.T.);
@@ -111,13 +111,13 @@ DATA;
#104=CARTESIAN_POINT($,(32,20,26));
#105=VERTEX_POINT($,#104);
#106=CARTESIAN_POINT($,(32,20,40));
-#107=DIRECTION($,(0,0,1));
+#107=DIRECTION($,(0,0,-1));
#108=VECTOR($,#107,1);
#109=LINE($,#106,#108);
#110=EDGE_CURVE($,#97,#105,#109,.T.);
#111=ORIENTED_EDGE($,$,$,#110,.F.);
#112=CARTESIAN_POINT($,(32,20,26));
-#113=DIRECTION($,(0,1,0));
+#113=DIRECTION($,(0,-1,0));
#114=VECTOR($,#113,1);
#115=LINE($,#112,#114);
#116=EDGE_CURVE($,#105,#87,#115,.T.);
@@ -151,13 +151,13 @@ DATA;
#144=CARTESIAN_POINT($,(40,-20,18));
#145=VERTEX_POINT($,#144);
#146=CARTESIAN_POINT($,(40,20,18));
-#147=DIRECTION($,(0,1,0));
+#147=DIRECTION($,(0,-1,0));
#148=VECTOR($,#147,1);
#149=LINE($,#146,#148);
#150=EDGE_CURVE($,#137,#145,#149,.T.);
#151=ORIENTED_EDGE($,$,$,#150,.F.);
#152=CARTESIAN_POINT($,(40,-20,18));
-#153=DIRECTION($,(0,0,1));
+#153=DIRECTION($,(0,0,-1));
#154=VECTOR($,#153,1);
#155=LINE($,#152,#154);
#156=EDGE_CURVE($,#145,#127,#155,.T.);
@@ -191,13 +191,13 @@ DATA;
#184=CARTESIAN_POINT($,(40,-20,40));
#185=VERTEX_POINT($,#184);
#186=CARTESIAN_POINT($,(40,20,40));
-#187=DIRECTION($,(0,1,0));
+#187=DIRECTION($,(0,-1,0));
#188=VECTOR($,#187,1);
#189=LINE($,#186,#188);
#190=EDGE_CURVE($,#177,#185,#189,.T.);
#191=ORIENTED_EDGE($,$,$,#190,.F.);
#192=CARTESIAN_POINT($,(40,-20,40));
-#193=DIRECTION($,(0,0,1));
+#193=DIRECTION($,(0,0,-1));
#194=VECTOR($,#193,1);
#195=LINE($,#192,#194);
#196=EDGE_CURVE($,#185,#167,#195,.T.);
@@ -231,13 +231,13 @@ DATA;
#224=CARTESIAN_POINT($,(76,-20,26));
#225=VERTEX_POINT($,#224);
#226=CARTESIAN_POINT($,(76,20,26));
-#227=DIRECTION($,(0,1,0));
+#227=DIRECTION($,(0,-1,0));
#228=VECTOR($,#227,1);
#229=LINE($,#226,#228);
#230=EDGE_CURVE($,#217,#225,#229,.T.);
#231=ORIENTED_EDGE($,$,$,#230,.F.);
#232=CARTESIAN_POINT($,(76,-20,26));
-#233=DIRECTION($,(0,0,1));
+#233=DIRECTION($,(0,0,-1));
#234=VECTOR($,#233,1);
#235=LINE($,#232,#234);
#236=EDGE_CURVE($,#225,#207,#235,.T.);
@@ -263,7 +263,7 @@ DATA;
#256=EDGE_CURVE($,#49,#87,#255,.T.);
#257=ORIENTED_EDGE($,$,$,#256,.T.);
#258=CARTESIAN_POINT($,(32,-20,26));
-#259=DIRECTION($,(1,0,0));
+#259=DIRECTION($,(-1,0,0));
#260=VECTOR($,#259,1);
#261=LINE($,#258,#260);
#262=EDGE_CURVE($,#87,#9,#261,.T.);
@@ -283,274 +283,226 @@ DATA;
#276=LINE($,#273,#275);
#277=EDGE_CURVE($,#47,#127,#276,.T.);
#278=ORIENTED_EDGE($,$,$,#277,.T.);
-#279=ORIENTED_EDGE($,$,$,#156,.T.);
-#280=CARTESIAN_POINT($,(40,-20,18));
-#281=DIRECTION($,(1,0,0));
-#282=VECTOR($,#281,1);
-#283=LINE($,#280,#282);
-#284=EDGE_CURVE($,#145,#49,#283,.T.);
-#285=ORIENTED_EDGE($,$,$,#284,.F.);
-#286=ORIENTED_EDGE($,$,$,#54,.F.);
-#287=EDGE_LOOP($,(#278,#279,#285,#286));
-#288=FACE_OUTER_BOUND('',#287,.T.);
-#289=ADVANCED_FACE('',(#288),#272,.T.);
-#290=CARTESIAN_POINT($,(36,-20,22));
-#291=DIRECTION($,(0,-1,0));
-#292=DIRECTION($,(1,0,0));
-#293=AXIS2_PLACEMENT_3D($,#290,#291,#292);
-#294=PLANE($,#293);
-#295=ORIENTED_EDGE($,$,$,#284,.T.);
-#296=CARTESIAN_POINT($,(40,-20,18));
-#297=DIRECTION($,(0,0,1));
-#298=VECTOR($,#297,1);
-#299=LINE($,#296,#298);
-#300=EDGE_CURVE($,#145,#167,#299,.T.);
-#301=ORIENTED_EDGE($,$,$,#300,.T.);
-#302=CARTESIAN_POINT($,(40,-20,26));
-#303=DIRECTION($,(1,0,0));
-#304=VECTOR($,#303,1);
-#305=LINE($,#302,#304);
-#306=EDGE_CURVE($,#167,#87,#305,.T.);
-#307=ORIENTED_EDGE($,$,$,#306,.F.);
-#308=ORIENTED_EDGE($,$,$,#256,.F.);
-#309=EDGE_LOOP($,(#295,#301,#307,#308));
-#310=FACE_OUTER_BOUND('',#309,.T.);
-#311=ADVANCED_FACE('',(#310),#294,.T.);
-#312=CARTESIAN_POINT($,(36,-20,22));
-#313=DIRECTION($,(0,-1,0));
-#314=DIRECTION($,(1,0,0));
-#315=AXIS2_PLACEMENT_3D($,#312,#313,#314);
-#316=PLANE($,#315);
-#317=ORIENTED_EDGE($,$,$,#306,.T.);
-#318=ORIENTED_EDGE($,$,$,#196,.T.);
-#319=CARTESIAN_POINT($,(40,-20,40));
-#320=DIRECTION($,(1,0,0));
-#321=VECTOR($,#320,1);
-#322=LINE($,#319,#321);
-#323=EDGE_CURVE($,#185,#89,#322,.T.);
-#324=ORIENTED_EDGE($,$,$,#323,.F.);
-#325=ORIENTED_EDGE($,$,$,#94,.F.);
-#326=EDGE_LOOP($,(#317,#318,#324,#325));
-#327=FACE_OUTER_BOUND('',#326,.T.);
-#328=ADVANCED_FACE('',(#327),#316,.T.);
-#329=CARTESIAN_POINT($,(36,-20,22));
-#330=DIRECTION($,(0,-1,0));
-#331=DIRECTION($,(1,0,0));
-#332=AXIS2_PLACEMENT_3D($,#329,#330,#331);
-#333=PLANE($,#332);
-#334=CARTESIAN_POINT($,(40,-20,18));
-#335=DIRECTION($,(1,0,0));
-#336=VECTOR($,#335,1);
-#337=LINE($,#334,#336);
-#338=EDGE_CURVE($,#145,#207,#337,.T.);
-#339=ORIENTED_EDGE($,$,$,#338,.T.);
-#340=ORIENTED_EDGE($,$,$,#236,.T.);
-#341=CARTESIAN_POINT($,(76,-20,26));
-#342=DIRECTION($,(1,0,0));
-#343=VECTOR($,#342,1);
-#344=LINE($,#341,#343);
-#345=EDGE_CURVE($,#225,#167,#344,.T.);
-#346=ORIENTED_EDGE($,$,$,#345,.F.);
-#347=ORIENTED_EDGE($,$,$,#300,.F.);
-#348=EDGE_LOOP($,(#339,#340,#346,#347));
-#349=FACE_OUTER_BOUND('',#348,.T.);
-#350=ADVANCED_FACE('',(#349),#333,.T.);
-#351=CARTESIAN_POINT($,(36,20,22));
-#352=DIRECTION($,(0,1,0));
-#353=DIRECTION($,(-1,0,0));
-#354=AXIS2_PLACEMENT_3D($,#351,#352,#353);
-#355=PLANE($,#354);
-#356=ORIENTED_EDGE($,$,$,#30,.T.);
-#357=CARTESIAN_POINT($,(-4,20,26));
-#358=DIRECTION($,(1,0,0));
-#359=VECTOR($,#358,1);
-#360=LINE($,#357,#359);
-#361=EDGE_CURVE($,#17,#105,#360,.T.);
-#362=ORIENTED_EDGE($,$,$,#361,.T.);
-#363=CARTESIAN_POINT($,(32,20,26));
-#364=DIRECTION($,(0,0,1));
-#365=VECTOR($,#364,1);
-#366=LINE($,#363,#365);
-#367=EDGE_CURVE($,#105,#57,#366,.T.);
-#368=ORIENTED_EDGE($,$,$,#367,.F.);
-#369=CARTESIAN_POINT($,(32,20,18));
-#370=DIRECTION($,(1,0,0));
-#371=VECTOR($,#370,1);
-#372=LINE($,#369,#371);
-#373=EDGE_CURVE($,#57,#25,#372,.T.);
-#374=ORIENTED_EDGE($,$,$,#373,.F.);
-#375=EDGE_LOOP($,(#356,#362,#368,#374));
-#376=FACE_OUTER_BOUND('',#375,.T.);
-#377=ADVANCED_FACE('',(#376),#355,.T.);
-#378=CARTESIAN_POINT($,(36,20,22));
-#379=DIRECTION($,(0,1,0));
-#380=DIRECTION($,(-1,0,0));
-#381=AXIS2_PLACEMENT_3D($,#378,#379,#380);
-#382=PLANE($,#381);
-#383=ORIENTED_EDGE($,$,$,#70,.T.);
-#384=CARTESIAN_POINT($,(32,20,18));
-#385=DIRECTION($,(1,0,0));
-#386=VECTOR($,#385,1);
-#387=LINE($,#384,#386);
-#388=EDGE_CURVE($,#57,#137,#387,.T.);
-#389=ORIENTED_EDGE($,$,$,#388,.T.);
-#390=ORIENTED_EDGE($,$,$,#142,.F.);
-#391=CARTESIAN_POINT($,(40,20,4));
-#392=DIRECTION($,(1,0,0));
+#279=CARTESIAN_POINT($,(40,-20,4));
+#280=DIRECTION($,(0,0,1));
+#281=VECTOR($,#280,1);
+#282=LINE($,#279,#281);
+#283=EDGE_CURVE($,#127,#185,#282,.T.);
+#284=ORIENTED_EDGE($,$,$,#283,.T.);
+#285=CARTESIAN_POINT($,(40,-20,40));
+#286=DIRECTION($,(-1,0,0));
+#287=VECTOR($,#286,1);
+#288=LINE($,#285,#287);
+#289=EDGE_CURVE($,#185,#89,#288,.T.);
+#290=ORIENTED_EDGE($,$,$,#289,.F.);
+#291=CARTESIAN_POINT($,(32,-20,40));
+#292=DIRECTION($,(0,0,-1));
+#293=VECTOR($,#292,1);
+#294=LINE($,#291,#293);
+#295=EDGE_CURVE($,#89,#47,#294,.T.);
+#296=ORIENTED_EDGE($,$,$,#295,.F.);
+#297=EDGE_LOOP($,(#278,#284,#290,#296));
+#298=FACE_OUTER_BOUND('',#297,.T.);
+#299=ADVANCED_FACE('',(#298),#272,.T.);
+#300=CARTESIAN_POINT($,(36,-20,22));
+#301=DIRECTION($,(0,-1,0));
+#302=DIRECTION($,(1,0,0));
+#303=AXIS2_PLACEMENT_3D($,#300,#301,#302);
+#304=PLANE($,#303);
+#305=CARTESIAN_POINT($,(40,-20,18));
+#306=DIRECTION($,(1,0,0));
+#307=VECTOR($,#306,1);
+#308=LINE($,#305,#307);
+#309=EDGE_CURVE($,#145,#207,#308,.T.);
+#310=ORIENTED_EDGE($,$,$,#309,.T.);
+#311=ORIENTED_EDGE($,$,$,#236,.T.);
+#312=CARTESIAN_POINT($,(76,-20,26));
+#313=DIRECTION($,(-1,0,0));
+#314=VECTOR($,#313,1);
+#315=LINE($,#312,#314);
+#316=EDGE_CURVE($,#225,#167,#315,.T.);
+#317=ORIENTED_EDGE($,$,$,#316,.F.);
+#318=CARTESIAN_POINT($,(40,-20,26));
+#319=DIRECTION($,(0,0,-1));
+#320=VECTOR($,#319,1);
+#321=LINE($,#318,#320);
+#322=EDGE_CURVE($,#167,#145,#321,.T.);
+#323=ORIENTED_EDGE($,$,$,#322,.F.);
+#324=EDGE_LOOP($,(#310,#311,#317,#323));
+#325=FACE_OUTER_BOUND('',#324,.T.);
+#326=ADVANCED_FACE('',(#325),#304,.T.);
+#327=CARTESIAN_POINT($,(36,20,22));
+#328=DIRECTION($,(0,1,0));
+#329=DIRECTION($,(-1,0,0));
+#330=AXIS2_PLACEMENT_3D($,#327,#328,#329);
+#331=PLANE($,#330);
+#332=ORIENTED_EDGE($,$,$,#30,.T.);
+#333=CARTESIAN_POINT($,(-4,20,26));
+#334=DIRECTION($,(1,0,0));
+#335=VECTOR($,#334,1);
+#336=LINE($,#333,#335);
+#337=EDGE_CURVE($,#17,#105,#336,.T.);
+#338=ORIENTED_EDGE($,$,$,#337,.T.);
+#339=CARTESIAN_POINT($,(32,20,26));
+#340=DIRECTION($,(0,0,-1));
+#341=VECTOR($,#340,1);
+#342=LINE($,#339,#341);
+#343=EDGE_CURVE($,#105,#57,#342,.T.);
+#344=ORIENTED_EDGE($,$,$,#343,.F.);
+#345=CARTESIAN_POINT($,(32,20,18));
+#346=DIRECTION($,(-1,0,0));
+#347=VECTOR($,#346,1);
+#348=LINE($,#345,#347);
+#349=EDGE_CURVE($,#57,#25,#348,.T.);
+#350=ORIENTED_EDGE($,$,$,#349,.F.);
+#351=EDGE_LOOP($,(#332,#338,#344,#350));
+#352=FACE_OUTER_BOUND('',#351,.T.);
+#353=ADVANCED_FACE('',(#352),#331,.T.);
+#354=CARTESIAN_POINT($,(36,20,22));
+#355=DIRECTION($,(0,1,0));
+#356=DIRECTION($,(-1,0,0));
+#357=AXIS2_PLACEMENT_3D($,#354,#355,#356);
+#358=PLANE($,#357);
+#359=CARTESIAN_POINT($,(32,20,4));
+#360=DIRECTION($,(0,0,1));
+#361=VECTOR($,#360,1);
+#362=LINE($,#359,#361);
+#363=EDGE_CURVE($,#65,#97,#362,.T.);
+#364=ORIENTED_EDGE($,$,$,#363,.T.);
+#365=CARTESIAN_POINT($,(32,20,40));
+#366=DIRECTION($,(1,0,0));
+#367=VECTOR($,#366,1);
+#368=LINE($,#365,#367);
+#369=EDGE_CURVE($,#97,#177,#368,.T.);
+#370=ORIENTED_EDGE($,$,$,#369,.T.);
+#371=CARTESIAN_POINT($,(40,20,40));
+#372=DIRECTION($,(0,0,-1));
+#373=VECTOR($,#372,1);
+#374=LINE($,#371,#373);
+#375=EDGE_CURVE($,#177,#129,#374,.T.);
+#376=ORIENTED_EDGE($,$,$,#375,.F.);
+#377=CARTESIAN_POINT($,(40,20,4));
+#378=DIRECTION($,(-1,0,0));
+#379=VECTOR($,#378,1);
+#380=LINE($,#377,#379);
+#381=EDGE_CURVE($,#129,#65,#380,.T.);
+#382=ORIENTED_EDGE($,$,$,#381,.F.);
+#383=EDGE_LOOP($,(#364,#370,#376,#382));
+#384=FACE_OUTER_BOUND('',#383,.T.);
+#385=ADVANCED_FACE('',(#384),#358,.T.);
+#386=CARTESIAN_POINT($,(36,20,22));
+#387=DIRECTION($,(0,1,0));
+#388=DIRECTION($,(-1,0,0));
+#389=AXIS2_PLACEMENT_3D($,#386,#387,#388);
+#390=PLANE($,#389);
+#391=CARTESIAN_POINT($,(40,20,18));
+#392=DIRECTION($,(0,0,1));
#393=VECTOR($,#392,1);
#394=LINE($,#391,#393);
-#395=EDGE_CURVE($,#129,#65,#394,.T.);
-#396=ORIENTED_EDGE($,$,$,#395,.F.);
-#397=EDGE_LOOP($,(#383,#389,#390,#396));
-#398=FACE_OUTER_BOUND('',#397,.T.);
-#399=ADVANCED_FACE('',(#398),#382,.T.);
-#400=CARTESIAN_POINT($,(36,20,22));
-#401=DIRECTION($,(0,1,0));
-#402=DIRECTION($,(-1,0,0));
-#403=AXIS2_PLACEMENT_3D($,#400,#401,#402);
-#404=PLANE($,#403);
-#405=ORIENTED_EDGE($,$,$,#367,.T.);
-#406=CARTESIAN_POINT($,(32,20,26));
-#407=DIRECTION($,(1,0,0));
-#408=VECTOR($,#407,1);
-#409=LINE($,#406,#408);
-#410=EDGE_CURVE($,#105,#169,#409,.T.);
-#411=ORIENTED_EDGE($,$,$,#410,.T.);
-#412=CARTESIAN_POINT($,(40,20,26));
-#413=DIRECTION($,(0,0,1));
-#414=VECTOR($,#413,1);
-#415=LINE($,#412,#414);
-#416=EDGE_CURVE($,#169,#137,#415,.T.);
-#417=ORIENTED_EDGE($,$,$,#416,.F.);
-#418=ORIENTED_EDGE($,$,$,#388,.F.);
-#419=EDGE_LOOP($,(#405,#411,#417,#418));
-#420=FACE_OUTER_BOUND('',#419,.T.);
-#421=ADVANCED_FACE('',(#420),#404,.T.);
-#422=CARTESIAN_POINT($,(36,20,22));
-#423=DIRECTION($,(0,1,0));
-#424=DIRECTION($,(-1,0,0));
-#425=AXIS2_PLACEMENT_3D($,#422,#423,#424);
-#426=PLANE($,#425);
-#427=ORIENTED_EDGE($,$,$,#110,.T.);
-#428=CARTESIAN_POINT($,(32,20,40));
-#429=DIRECTION($,(1,0,0));
-#430=VECTOR($,#429,1);
-#431=LINE($,#428,#430);
-#432=EDGE_CURVE($,#97,#177,#431,.T.);
-#433=ORIENTED_EDGE($,$,$,#432,.T.);
-#434=ORIENTED_EDGE($,$,$,#182,.F.);
-#435=ORIENTED_EDGE($,$,$,#410,.F.);
-#436=EDGE_LOOP($,(#427,#433,#434,#435));
-#437=FACE_OUTER_BOUND('',#436,.T.);
-#438=ADVANCED_FACE('',(#437),#426,.T.);
-#439=CARTESIAN_POINT($,(36,20,22));
-#440=DIRECTION($,(0,1,0));
-#441=DIRECTION($,(-1,0,0));
-#442=AXIS2_PLACEMENT_3D($,#439,#440,#441);
-#443=PLANE($,#442);
-#444=ORIENTED_EDGE($,$,$,#416,.T.);
-#445=CARTESIAN_POINT($,(40,20,26));
-#446=DIRECTION($,(1,0,0));
-#447=VECTOR($,#446,1);
-#448=LINE($,#445,#447);
-#449=EDGE_CURVE($,#169,#217,#448,.T.);
-#450=ORIENTED_EDGE($,$,$,#449,.T.);
-#451=ORIENTED_EDGE($,$,$,#222,.F.);
-#452=CARTESIAN_POINT($,(76,20,18));
-#453=DIRECTION($,(1,0,0));
-#454=VECTOR($,#453,1);
-#455=LINE($,#452,#454);
-#456=EDGE_CURVE($,#209,#137,#455,.T.);
-#457=ORIENTED_EDGE($,$,$,#456,.F.);
-#458=EDGE_LOOP($,(#444,#450,#451,#457));
+#395=EDGE_CURVE($,#137,#169,#394,.T.);
+#396=ORIENTED_EDGE($,$,$,#395,.T.);
+#397=CARTESIAN_POINT($,(40,20,26));
+#398=DIRECTION($,(1,0,0));
+#399=VECTOR($,#398,1);
+#400=LINE($,#397,#399);
+#401=EDGE_CURVE($,#169,#217,#400,.T.);
+#402=ORIENTED_EDGE($,$,$,#401,.T.);
+#403=ORIENTED_EDGE($,$,$,#222,.F.);
+#404=CARTESIAN_POINT($,(76,20,18));
+#405=DIRECTION($,(-1,0,0));
+#406=VECTOR($,#405,1);
+#407=LINE($,#404,#406);
+#408=EDGE_CURVE($,#209,#137,#407,.T.);
+#409=ORIENTED_EDGE($,$,$,#408,.F.);
+#410=EDGE_LOOP($,(#396,#402,#403,#409));
+#411=FACE_OUTER_BOUND('',#410,.T.);
+#412=ADVANCED_FACE('',(#411),#390,.T.);
+#413=CARTESIAN_POINT($,(36,0,4));
+#414=DIRECTION($,(0,0,-1));
+#415=DIRECTION($,(1,0,0));
+#416=AXIS2_PLACEMENT_3D($,#413,#414,#415);
+#417=PLANE($,#416);
+#418=ORIENTED_EDGE($,$,$,#76,.T.);
+#419=ORIENTED_EDGE($,$,$,#381,.T.);
+#420=ORIENTED_EDGE($,$,$,#134,.F.);
+#421=ORIENTED_EDGE($,$,$,#277,.F.);
+#422=EDGE_LOOP($,(#418,#419,#420,#421));
+#423=FACE_OUTER_BOUND('',#422,.T.);
+#424=ADVANCED_FACE('',(#423),#417,.T.);
+#425=CARTESIAN_POINT($,(36,0,18));
+#426=DIRECTION($,(0,0,-1));
+#427=DIRECTION($,(1,0,0));
+#428=AXIS2_PLACEMENT_3D($,#425,#426,#427);
+#429=PLANE($,#428);
+#430=ORIENTED_EDGE($,$,$,#36,.T.);
+#431=ORIENTED_EDGE($,$,$,#349,.T.);
+#432=ORIENTED_EDGE($,$,$,#62,.F.);
+#433=ORIENTED_EDGE($,$,$,#250,.F.);
+#434=EDGE_LOOP($,(#430,#431,#432,#433));
+#435=FACE_OUTER_BOUND('',#434,.T.);
+#436=ADVANCED_FACE('',(#435),#429,.T.);
+#437=CARTESIAN_POINT($,(36,0,18));
+#438=DIRECTION($,(0,0,-1));
+#439=DIRECTION($,(1,0,0));
+#440=AXIS2_PLACEMENT_3D($,#437,#438,#439);
+#441=PLANE($,#440);
+#442=ORIENTED_EDGE($,$,$,#150,.T.);
+#443=ORIENTED_EDGE($,$,$,#408,.T.);
+#444=ORIENTED_EDGE($,$,$,#214,.F.);
+#445=ORIENTED_EDGE($,$,$,#309,.F.);
+#446=EDGE_LOOP($,(#442,#443,#444,#445));
+#447=FACE_OUTER_BOUND('',#446,.T.);
+#448=ADVANCED_FACE('',(#447),#441,.T.);
+#449=CARTESIAN_POINT($,(36,0,26));
+#450=DIRECTION($,(0,0,1));
+#451=DIRECTION($,(1,0,0));
+#452=AXIS2_PLACEMENT_3D($,#449,#450,#451);
+#453=PLANE($,#452);
+#454=ORIENTED_EDGE($,$,$,#262,.T.);
+#455=ORIENTED_EDGE($,$,$,#116,.T.);
+#456=ORIENTED_EDGE($,$,$,#337,.F.);
+#457=ORIENTED_EDGE($,$,$,#22,.F.);
+#458=EDGE_LOOP($,(#454,#455,#456,#457));
#459=FACE_OUTER_BOUND('',#458,.T.);
-#460=ADVANCED_FACE('',(#459),#443,.T.);
-#461=CARTESIAN_POINT($,(36,0,4));
-#462=DIRECTION($,(0,0,-1));
+#460=ADVANCED_FACE('',(#459),#453,.T.);
+#461=CARTESIAN_POINT($,(36,0,26));
+#462=DIRECTION($,(0,0,1));
#463=DIRECTION($,(1,0,0));
#464=AXIS2_PLACEMENT_3D($,#461,#462,#463);
#465=PLANE($,#464);
-#466=ORIENTED_EDGE($,$,$,#76,.T.);
-#467=ORIENTED_EDGE($,$,$,#395,.T.);
-#468=ORIENTED_EDGE($,$,$,#134,.F.);
-#469=ORIENTED_EDGE($,$,$,#277,.F.);
+#466=ORIENTED_EDGE($,$,$,#316,.T.);
+#467=ORIENTED_EDGE($,$,$,#230,.T.);
+#468=ORIENTED_EDGE($,$,$,#401,.F.);
+#469=ORIENTED_EDGE($,$,$,#174,.F.);
#470=EDGE_LOOP($,(#466,#467,#468,#469));
#471=FACE_OUTER_BOUND('',#470,.T.);
#472=ADVANCED_FACE('',(#471),#465,.T.);
-#473=CARTESIAN_POINT($,(36,0,18));
-#474=DIRECTION($,(0,0,-1));
+#473=CARTESIAN_POINT($,(36,0,40));
+#474=DIRECTION($,(0,0,1));
#475=DIRECTION($,(1,0,0));
#476=AXIS2_PLACEMENT_3D($,#473,#474,#475);
#477=PLANE($,#476);
-#478=ORIENTED_EDGE($,$,$,#36,.T.);
-#479=ORIENTED_EDGE($,$,$,#373,.T.);
-#480=ORIENTED_EDGE($,$,$,#62,.F.);
-#481=ORIENTED_EDGE($,$,$,#250,.F.);
+#478=ORIENTED_EDGE($,$,$,#289,.T.);
+#479=ORIENTED_EDGE($,$,$,#190,.T.);
+#480=ORIENTED_EDGE($,$,$,#369,.F.);
+#481=ORIENTED_EDGE($,$,$,#102,.F.);
#482=EDGE_LOOP($,(#478,#479,#480,#481));
#483=FACE_OUTER_BOUND('',#482,.T.);
#484=ADVANCED_FACE('',(#483),#477,.T.);
-#485=CARTESIAN_POINT($,(36,0,18));
-#486=DIRECTION($,(0,0,-1));
-#487=DIRECTION($,(1,0,0));
-#488=AXIS2_PLACEMENT_3D($,#485,#486,#487);
-#489=PLANE($,#488);
-#490=ORIENTED_EDGE($,$,$,#150,.T.);
-#491=ORIENTED_EDGE($,$,$,#456,.T.);
-#492=ORIENTED_EDGE($,$,$,#214,.F.);
-#493=ORIENTED_EDGE($,$,$,#338,.F.);
-#494=EDGE_LOOP($,(#490,#491,#492,#493));
-#495=FACE_OUTER_BOUND('',#494,.T.);
-#496=ADVANCED_FACE('',(#495),#489,.T.);
-#497=CARTESIAN_POINT($,(36,0,26));
-#498=DIRECTION($,(0,0,1));
-#499=DIRECTION($,(1,0,0));
-#500=AXIS2_PLACEMENT_3D($,#497,#498,#499);
-#501=PLANE($,#500);
-#502=ORIENTED_EDGE($,$,$,#262,.T.);
-#503=ORIENTED_EDGE($,$,$,#116,.T.);
-#504=ORIENTED_EDGE($,$,$,#361,.F.);
-#505=ORIENTED_EDGE($,$,$,#22,.F.);
-#506=EDGE_LOOP($,(#502,#503,#504,#505));
-#507=FACE_OUTER_BOUND('',#506,.T.);
-#508=ADVANCED_FACE('',(#507),#501,.T.);
-#509=CARTESIAN_POINT($,(36,0,26));
-#510=DIRECTION($,(0,0,1));
-#511=DIRECTION($,(1,0,0));
-#512=AXIS2_PLACEMENT_3D($,#509,#510,#511);
-#513=PLANE($,#512);
-#514=ORIENTED_EDGE($,$,$,#345,.T.);
-#515=ORIENTED_EDGE($,$,$,#230,.T.);
-#516=ORIENTED_EDGE($,$,$,#449,.F.);
-#517=ORIENTED_EDGE($,$,$,#174,.F.);
-#518=EDGE_LOOP($,(#514,#515,#516,#517));
-#519=FACE_OUTER_BOUND('',#518,.T.);
-#520=ADVANCED_FACE('',(#519),#513,.T.);
-#521=CARTESIAN_POINT($,(36,0,40));
-#522=DIRECTION($,(0,0,1));
-#523=DIRECTION($,(1,0,0));
-#524=AXIS2_PLACEMENT_3D($,#521,#522,#523);
-#525=PLANE($,#524);
-#526=ORIENTED_EDGE($,$,$,#323,.T.);
-#527=ORIENTED_EDGE($,$,$,#190,.T.);
-#528=ORIENTED_EDGE($,$,$,#432,.F.);
-#529=ORIENTED_EDGE($,$,$,#102,.F.);
-#530=EDGE_LOOP($,(#526,#527,#528,#529));
-#531=FACE_OUTER_BOUND('',#530,.T.);
-#532=ADVANCED_FACE('',(#531),#525,.T.);
-#533=CLOSED_SHELL($,(#40,#80,#120,#160,#200,#240,#267,#289,#311,#328,#350,#377,#399,#421,#438,#460,#472,#484,#496,#508,#520,#532));
-#534=MANIFOLD_SOLID_BREP('AetherisBody',#533);
-#535=APPLICATION_CONTEXT('mechanical design');
-#536=PRODUCT_CONTEXT('',#535,'mechanical');
-#537=PRODUCT('AETHERIS','AetherisBody','',(#536));
-#538=PRODUCT_DEFINITION_FORMATION('','',#537);
-#539=PRODUCT_DEFINITION_CONTEXT('design',#535,'design');
-#540=PRODUCT_DEFINITION('','',#538,#539);
-#541=PRODUCT_DEFINITION_SHAPE('','',#540);
-#542=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
-#543=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
-#544=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
-#545=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#542,#543,#544))REPRESENTATION_CONTEXT('3','3D'));
-#546=SHAPE_REPRESENTATION('AetherisBody',(#534),#545);
-#547=SHAPE_DEFINITION_REPRESENTATION(#541,#546);
+#485=CLOSED_SHELL($,(#40,#80,#120,#160,#200,#240,#267,#299,#326,#353,#385,#412,#424,#436,#448,#460,#472,#484));
+#486=MANIFOLD_SOLID_BREP('AetherisBody',#485);
+#487=APPLICATION_CONTEXT('mechanical design');
+#488=PRODUCT_CONTEXT('',#487,'mechanical');
+#489=PRODUCT('AETHERIS','AetherisBody','',(#488));
+#490=PRODUCT_DEFINITION_FORMATION('','',#489);
+#491=PRODUCT_DEFINITION_CONTEXT('design',#487,'design');
+#492=PRODUCT_DEFINITION('','',#490,#491);
+#493=PRODUCT_DEFINITION_SHAPE('','',#492);
+#494=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#495=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#496=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#497=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#494,#495,#496))REPRESENTATION_CONTEXT('3','3D'));
+#498=SHAPE_REPRESENTATION('AetherisBody',(#486),#497);
+#499=SHAPE_DEFINITION_REPRESENTATION(#493,#498);
ENDSEC;
END-ISO-10303-21;