Merge remote branch 'upstream/master' into cakebaby

Conflicts:
	doc/testing.txt
	tests/CMakeLists.txt
	tests/system-gl.cc
	tests/system-gl.h

4 files changed, 39 insertions, 40 deletions

diff --git a/examples/example007.scad b/examples/example007.scad
index fe69f84..6a57a3b 100644
--- a/examples/example007.scad
+++ b/examples/example007.scad
@@ -5,30 +5,27 @@ module cutout()
 		{
 			rotate(90, [1, 0, 0])
 			translate([0, 0, -50])
-				dxf_linear_extrude(
-						file = "example007.dxf",
-						layer = "cutout1",
-						height = 100,
-						convexity = 1);
+				linear_extrude(height = 100, convexity = 1)
+					import(file = "example007.dxf", layer = "cutout1");
 			
 			rotate(90, [0, 0, 1])
 			rotate(90, [1, 0, 0])
 			translate([0, 0, -50])
-				dxf_linear_extrude(
-						file = "example007.dxf",
-						layer = "cutout2",
-						height = 100,
-						convexity = 2);
+				linear_extrude(height = 100, convexity = 2)
+					import(file = "example007.dxf", layer = "cutout2");
 		}
 }
 
 module clip()
 {
 	difference() {
-		dxf_rotate_extrude(
-				file = "example007.dxf",
-				layer="dorn",
-				convexity = 3);
+		// NB! We have to use the deprecated module here since the "dorn"
+                // layer contains an open polyline, which is not yet supported
+                // by the import() module.
+		rotate_extrude(
+			file = "example007.dxf",
+			layer="dorn",
+			convexity = 3);
 		for (r = [0, 90])
 			rotate(r, [0, 0, 1])
 				cutout();
diff --git a/examples/example008.scad b/examples/example008.scad
index e1b0ac4..a12ef96 100644
--- a/examples/example008.scad
+++ b/examples/example008.scad
@@ -4,29 +4,29 @@ difference()
 	intersection()
 	{
 		translate([ -25, -25, -25])
-		dxf_linear_extrude(file = "example008.dxf",
-			layer = "G", height = 50, convexity = 3);
+		linear_extrude(height = 50, convexity = 3)
+			import(file = "example008.dxf", layer = "G");
 		
 		rotate(90, [1, 0, 0])
 		translate([ -25, -125, -25])
-		dxf_linear_extrude(file = "example008.dxf",
-			layer = "E", height = 50, convexity = 3);
+		linear_extrude(height = 50, convexity = 3)
+			import(file = "example008.dxf", layer = "E");
 		
 		rotate(90, [0, 1, 0])
 		translate([ -125, -125, -25])
-		dxf_linear_extrude(file = "example008.dxf",
-			layer = "B", height = 50, convexity = 3);
+		linear_extrude(height = 50, convexity = 3)
+			import(file = "example008.dxf", layer = "B");
 	}
 
 	intersection()
 	{
 		translate([ -125, -25, -25])
-		dxf_linear_extrude(file = "example008.dxf",
-			layer = "X", height = 50, convexity = 1);
+		linear_extrude(height = 50, convexity = 1)
+			import(file = "example008.dxf", layer = "X");
 
 		rotate(90, [0, 1, 0])
 		translate([ -125, -25, -25])
-		dxf_linear_extrude(file = "example008.dxf",
-			layer = "X", height = 50, convexity = 1);
+		linear_extrude(height = 50, convexity = 1)
+			import(file = "example008.dxf", layer = "X");
 	}
 }
\ No newline at end of file
diff --git a/examples/example009.scad b/examples/example009.scad
index 5f39f00..017ecc3 100644
--- a/examples/example009.scad
+++ b/examples/example009.scad
@@ -2,27 +2,29 @@
 bodywidth = dxf_dim(file = "example009.dxf", name = "bodywidth");
 fanwidth = dxf_dim(file = "example009.dxf", name = "fanwidth");
 platewidth = dxf_dim(file = "example009.dxf", name = "platewidth");
-fan_side_center = dxf_cross(file = "example009.dxf",
-		layer = "fan_side_center");
+fan_side_center = dxf_cross(file = "example009.dxf", layer = "fan_side_center");
 fanrot = dxf_dim(file = "example009.dxf", name = "fanrot");
 
-% dxf_linear_extrude(file = "example009.dxf", layer = "body",
-	height = bodywidth, center = true, convexity = 10);
+% linear_extrude(height = bodywidth, center = true, convexity = 10)
+	import(file = "example009.dxf", layer = "body");
 
 % for (z = [+(bodywidth/2 + platewidth/2),
 		-(bodywidth/2 + platewidth/2)])
 {
 	translate([0, 0, z])
-	dxf_linear_extrude(file = "example009.dxf", layer = "plate",
-		height = platewidth, center = true, convexity = 10);
+	linear_extrude(height = platewidth, center = true, convexity = 10)
+		import(file = "example009.dxf", layer = "plate");
 }
 
 intersection()
 {
-	dxf_linear_extrude(file = "example009.dxf", layer = "fan_top",
-		height = fanwidth, center = true, convexity = 10,
-		twist = -fanrot);
-	dxf_rotate_extrude(file = "example009.dxf", layer = "fan_side",
+	linear_extrude(height = fanwidth, center = true, convexity = 10, twist = -fanrot)
+		import(file = "example009.dxf", layer = "fan_top");
+		
+	// NB! We have to use the deprecated module here since the "fan_side"
+	// layer contains an open polyline, which is not yet supported
+	// by the import() module.
+	rotate_extrude(file = "example009.dxf", layer = "fan_side",
 		origin = fan_side_center, convexity = 10);
 }
 
diff --git a/examples/example013.scad b/examples/example013.scad
index 18f1f04..c17422f 100644
--- a/examples/example013.scad
+++ b/examples/example013.scad
@@ -1,12 +1,12 @@
 
 intersection()
 {
-	dxf_linear_extrude(file = "example013.dxf",
-			height = 100, center = true, convexity= 3);
+	linear_extrude(height = 100, center = true, convexity= 3)
+		import(file = "example013.dxf");
 	rotate([0, 90, 0])
-	dxf_linear_extrude(file = "example013.dxf",
-			height = 100, center = true, convexity= 3);
+	linear_extrude(height = 100, center = true, convexity= 3)
+		import(file = "example013.dxf");
 	rotate([90, 0, 0])
-	dxf_linear_extrude(file = "example013.dxf",
-			height = 100, center = true, convexity= 3);
+	linear_extrude(height = 100, center = true, convexity= 3)
+		import(file = "example013.dxf");
 }
\ No newline at end of file