Merge branch 'master' of github.com:openscad/openscad into planar

Conflicts:
	src/CGAL_Nef_polyhedron.cc
	tests/CMakeLists.txt

12 files changed, 235 insertions, 1 deletions

diff --git a/tests/regression/cgalpngtest/polyhedron-tests-expected.png b/tests/regression/cgalpngtest/polyhedron-tests-expected.png
index c80990f..322160d 100644
--- a/tests/regression/cgalpngtest/polyhedron-tests-expected.png
+++ b/tests/regression/cgalpngtest/polyhedron-tests-expected.png
diff --git a/tests/regression/cgalpngtest/rotate_extrude-tests-expected.png b/tests/regression/cgalpngtest/rotate_extrude-tests-expected.png
index 1488c85..d198344 100644
--- a/tests/regression/cgalpngtest/rotate_extrude-tests-expected.png
+++ b/tests/regression/cgalpngtest/rotate_extrude-tests-expected.png
diff --git a/tests/regression/cgalpngtest/stl-cgal-convert_to_Polyhedron-crash-expected.png b/tests/regression/cgalpngtest/stl-cgal-convert_to_Polyhedron-crash-expected.png
new file mode 100644
index 0000000..318cbaa
--- /dev/null
+++ b/tests/regression/cgalpngtest/stl-cgal-convert_to_Polyhedron-crash-expected.png
diff --git a/tests/regression/dumptest/polyhedron-tests-expected.csg b/tests/regression/dumptest/polyhedron-tests-expected.csg
index 1bb36d9..dabdf94 100644
--- a/tests/regression/dumptest/polyhedron-tests-expected.csg
+++ b/tests/regression/dumptest/polyhedron-tests-expected.csg
@@ -7,6 +7,9 @@ group() {
 		multmatrix([[1, 0, 0, 4], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 			polyhedron(points = [[1, 0, 0], [-1, 0, 0], [0, 1, 0], [0, -1, 0], [0, 0, 1], [0, 0, -1]], faces = [[0, 2, 4], [0, 5, 2], [0, 4, 3], [0, 3, 5], [1, 4, 2], [1, 2, 5], [1, 3, 4], [1, 5, 3]], convexity = 1);
 		}
+		multmatrix([[1, 0, 0, 6], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			polyhedron(points = [[-0.8, -0.8, -0.8], [0, 0, -0.8], [0.8, -0.8, -0.8], [0.8, 0.8, -0.8], [-0.8, 0.8, -0.8], [-0.8, -0.8, 0.8], [0, 0, 0.8], [0.8, -0.8, 0.8], [0.8, 0.8, 0.8], [-0.8, 0.8, 0.8]], triangles = [[0, 1, 2, 3, 4], [5, 6, 1, 0], [6, 7, 2, 1], [7, 8, 3, 2], [8, 9, 4, 3], [9, 5, 0, 4], [9, 8, 7, 6, 5]], convexity = 2);
+		}
 	}
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		difference() {
@@ -18,8 +21,11 @@ group() {
 				multmatrix([[1, 0, 0, 4], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 					polyhedron(points = [[1, 0, 0], [-1, 0, 0], [0, 1, 0], [0, -1, 0], [0, 0, 1], [0, 0, -1]], faces = [[0, 2, 4], [0, 5, 2], [0, 4, 3], [0, 3, 5], [1, 4, 2], [1, 2, 5], [1, 3, 4], [1, 5, 3]], convexity = 1);
 				}
+				multmatrix([[1, 0, 0, 6], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+					polyhedron(points = [[-0.8, -0.8, -0.8], [0, 0, -0.8], [0.8, -0.8, -0.8], [0.8, 0.8, -0.8], [-0.8, 0.8, -0.8], [-0.8, -0.8, 0.8], [0, 0, 0.8], [0.8, -0.8, 0.8], [0.8, 0.8, 0.8], [-0.8, 0.8, 0.8]], triangles = [[0, 1, 2, 3, 4], [5, 6, 1, 0], [6, 7, 2, 1], [7, 8, 3, 2], [8, 9, 4, 3], [9, 5, 0, 4], [9, 8, 7, 6, 5]], convexity = 2);
+				}
 			}
-			multmatrix([[1, 0, 0, 2], [0, 1, 0, 0], [0, 0, 1, 2], [0, 0, 0, 1]]) {
+			multmatrix([[1, 0, 0, 3], [0, 1, 0, 0], [0, 0, 1, 2], [0, 0, 0, 1]]) {
 				cube(size = [8, 3, 3], center = true);
 			}
 		}
diff --git a/tests/regression/dumptest/rotate_extrude-tests-expected.csg b/tests/regression/dumptest/rotate_extrude-tests-expected.csg
index a86dd8f..d010bfd 100644
--- a/tests/regression/dumptest/rotate_extrude-tests-expected.csg
+++ b/tests/regression/dumptest/rotate_extrude-tests-expected.csg
@@ -50,4 +50,11 @@ group() {
 			}
 		}
 	}
+	multmatrix([[1, 0, 0, 0], [0, 1, 0, 60], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		rotate_extrude(convexity = 1, $fn = 0, $fa = 12, $fs = 2) {
+			multmatrix([[1, 0, 0, -20], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				square(size = [10, 10], center = false);
+			}
+		}
+	}
 }
diff --git a/tests/regression/dumptest/stl-cgal-convert_to_Polyhedron-crash-expected.csg b/tests/regression/dumptest/stl-cgal-convert_to_Polyhedron-crash-expected.csg
new file mode 100644
index 0000000..acad52f
--- /dev/null
+++ b/tests/regression/dumptest/stl-cgal-convert_to_Polyhedron-crash-expected.csg
@@ -0,0 +1,5 @@
+group() {
+	render(convexity = 1) {
+		import(file = "stl-cgal-convert_to_Polyhedron-crash.stl", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
+	}
+}
diff --git a/tests/regression/echotest/search-tests-unicode-expected.echo b/tests/regression/echotest/search-tests-unicode-expected.echo
new file mode 100644
index 0000000..801bc8c
--- /dev/null
+++ b/tests/regression/echotest/search-tests-unicode-expected.echo
@@ -0,0 +1,109 @@
+ECHO: "----- Lookup of 1 byte into 1 byte"
+ECHO: "Expect [0] for search(a, aaaa)=[0]. OK"
+ECHO: "Expect [0] for search(a, aaaa, 1)=[0]. OK"
+ECHO: "Expect [0, 0] for search(aa, aaaa)=[0, 0]. OK"
+ECHO: "Expect [0, 0] for search(aa, aaaa, 1)=[0, 0]. OK"
+ECHO: "Expect [[0, 1, 2, 3]] for search(a, aaaa, 0)=[[0, 1, 2, 3]]. OK"
+ECHO: "Expect [[0, 1]] for search(a, aaaa, 2)=[[0, 1]]. OK"
+ECHO: "Expect [[0, 1, 2]] for search(a, aaaa, 3)=[[0, 1, 2]]. OK"
+ECHO: "Expect [[0, 1, 2, 3]] for search(a, aaaa, 4)=[[0, 1, 2, 3]]. OK"
+ECHO: "Expect [[0, 1, 2, 3], [0, 1, 2, 3]] for search(aa, aaaa, 0)=[[0, 1, 2, 3], [0, 1, 2, 3]]. OK"
+  WARNING: search term not found: "b"
+ECHO: "Expect [] for search(b, aaaa)=[]. OK"
+  WARNING: search term not found: "b"
+ECHO: "Expect [] for search(b, aaaa, 1)=[]. OK"
+  WARNING: search term not found: "b"
+ECHO: "Expect [[]] for search(b, aaaa, 0)=[[]]. OK"
+  WARNING: search term not found: "b"
+ECHO: "Expect [[]] for search(b, aaaa, 2)=[[]]. OK"
+  WARNING: search term not found: "b"
+  WARNING: search term not found: "b"
+ECHO: "Expect [] for search(bb, aaaa)=[]. OK"
+  WARNING: search term not found: "b"
+  WARNING: search term not found: "b"
+ECHO: "Expect [] for search(bb, aaaa, 1)=[]. OK"
+  WARNING: search term not found: "b"
+  WARNING: search term not found: "b"
+ECHO: "Expect [[], []] for search(bb, aaaa, 0)=[[], []]. OK"
+  WARNING: search term not found: "b"
+  WARNING: search term not found: "b"
+ECHO: "Expect [[], []] for search(bb, aaaa, 2)=[[], []]. OK"
+ECHO: "Expect [] for search(, aaaa)=[]. OK"
+ECHO: "Expect [] for search(, )=[]. OK"
+  WARNING: search term not found: "a"
+ECHO: "Expect [] for search(a, )=[]. OK"
+ECHO: "----- Lookup of multi-byte into 1 byte"
+  WARNING: search term not found: "Л"
+ECHO: "Expect [] for search(Л, aaaa)=[]. OK"
+  WARNING: search term not found: "🂡"
+ECHO: "Expect [] for search(🂡, aaaa)=[]. OK"
+  WARNING: search term not found: "Л"
+ECHO: "Expect [[]] for search(Л, aaaa, 0)=[[]]. OK"
+  WARNING: search term not found: "🂡"
+ECHO: "Expect [[]] for search(🂡, aaaa, 0)=[[]]. OK"
+  WARNING: search term not found: "Л"
+  WARNING: search term not found: "Л"
+ECHO: "Expect [] for search(ЛЛ, aaaa)=[]. OK"
+  WARNING: search term not found: "🂡"
+  WARNING: search term not found: "🂡"
+ECHO: "Expect [] for search(🂡🂡, aaaa)=[]. OK"
+  WARNING: search term not found: "Л"
+  WARNING: search term not found: "Л"
+ECHO: "Expect [[], []] for search(ЛЛ, aaaa, 0)=[[], []]. OK"
+  WARNING: search term not found: "🂡"
+  WARNING: search term not found: "🂡"
+ECHO: "Expect [[], []] for search(🂡🂡, aaaa, 0)=[[], []]. OK"
+ECHO: "----- Lookup of 1-byte into multi-byte"
+  WARNING: search term not found: "a"
+ECHO: "Expect [] for search(a, ЛЛЛЛ)=[]. OK"
+  WARNING: search term not found: "a"
+ECHO: "Expect [] for search(a, 🂡🂡🂡🂡)=[]. OK"
+  WARNING: search term not found: "a"
+ECHO: "Expect [] for search(a, ЛЛЛЛ, 1)=[]. OK"
+  WARNING: search term not found: "a"
+ECHO: "Expect [[]] for search(a, 🂡🂡🂡🂡, 0)=[[]]. OK"
+  WARNING: search term not found: "a"
+ECHO: "Expect [[]] for search(a, 🂡🂡🂡🂡, 2)=[[]]. OK"
+ECHO: "----- Lookup of 1-byte into mixed multi-byte"
+ECHO: "Expect [0] for search(a, aЛaЛaЛaЛa)=[0]. OK"
+ECHO: "Expect [0] for search(a, a🂡a🂡a🂡a🂡a)=[0]. OK"
+ECHO: "Expect [0] for search(a, a🂡Л🂡a🂡Л🂡a)=[0]. OK"
+ECHO: "Expect [[0, 2, 4, 6, 8]] for search(a, aЛaЛaЛaЛa, 0)=[[0, 2, 4, 6, 8]]. OK"
+ECHO: "Expect [[0, 2, 4, 6, 8]] for search(a, a🂡a🂡a🂡a🂡a, 0)=[[0, 2, 4, 6, 8]]. OK"
+ECHO: "Expect [[0, 4, 8]] for search(a, a🂡Л🂡a🂡Л🂡a, 0)=[[0, 4, 8]]. OK"
+ECHO: "----- Lookup of 2-byte into 2-byte"
+ECHO: "Expect [0] for search(Л, ЛЛЛЛ)=[0]. OK"
+ECHO: "Expect [[0, 1, 2, 3]] for search(Л, ЛЛЛЛ, 0)=[[0, 1, 2, 3]]. OK"
+ECHO: "----- Lookup of 2-byte into 4-byte"
+  WARNING: search term not found: "Л"
+ECHO: "Expect [] for search(Л, 🂡🂡🂡🂡)=[]. OK"
+ECHO: "----- Lookup of 4-byte into 4-byte"
+ECHO: "Expect [0] for search(🂡, 🂡🂡🂡🂡)=[0]. OK"
+ECHO: "Expect [[0, 1, 2, 3]] for search(🂡, 🂡🂡🂡🂡, 0)=[[0, 1, 2, 3]]. OK"
+ECHO: "----- Lookup of 4-byte into 2-byte"
+  WARNING: search term not found: "🂡"
+ECHO: "Expect [] for search(🂡, ЛЛЛЛ)=[]. OK"
+ECHO: "----- Lookup of 2-byte into mixed multi-byte"
+ECHO: "Expect [1] for search(Л, aЛaЛaЛaЛa, 1)=[1]. OK"
+  WARNING: search term not found: "Л"
+ECHO: "Expect [] for search(Л, a🂡a🂡a🂡a🂡a, 1)=[]. OK"
+ECHO: "Expect [2] for search(Л, a🂡Л🂡a🂡Л🂡a, 1)=[2]. OK"
+ECHO: "Expect [[1, 3, 5, 7]] for search(Л, aЛaЛaЛaЛa, 0)=[[1, 3, 5, 7]]. OK"
+  WARNING: search term not found: "Л"
+ECHO: "Expect [[]] for search(Л, a🂡a🂡a🂡a🂡a, 0)=[[]]. OK"
+ECHO: "Expect [[2, 6]] for search(Л, a🂡Л🂡a🂡Л🂡a, 0)=[[2, 6]]. OK"
+ECHO: "----- Lookup of 4-byte into mixed multi-byte"
+  WARNING: search term not found: "🂡"
+ECHO: "Expect [] for search(🂡, aЛaЛaЛaЛa, 1)=[]. OK"
+ECHO: "Expect [1] for search(🂡, a🂡a🂡a🂡a🂡a, 1)=[1]. OK"
+  WARNING: search term not found: "🂡"
+ECHO: "Expect [[]] for search(🂡, aЛaЛaЛaЛa, 0)=[[]]. OK"
+ECHO: "Expect [[1, 3, 5, 7]] for search(🂡, a🂡a🂡a🂡a🂡a, 0)=[[1, 3, 5, 7]]. OK"
+ECHO: "Expect [[1, 3, 5, 7]] for search(🂡, a🂡Л🂡a🂡Л🂡a, 0)=[[1, 3, 5, 7]]. OK"
+ECHO: "----- Lookup of mixed multi-byte into mixed multi-byte"
+  WARNING: search term not found: "🂡"
+ECHO: "Expect [[0, 2, 4, 6, 8], [1, 3, 5, 7], []] for search(aЛ🂡, aЛaЛaЛaЛa, 0)=[[0, 2, 4, 6, 8], [1, 3, 5, 7], []]. OK"
+  WARNING: search term not found: "Л"
+ECHO: "Expect [[0, 2, 4, 6, 8], [], [1, 3, 5, 7]] for search(aЛ🂡, a🂡a🂡a🂡a🂡a, 0)=[[0, 2, 4, 6, 8], [], [1, 3, 5, 7]]. OK"
+ECHO: "Expect [[0, 4, 8], [2, 6], [1, 3, 5, 7]] for search(aЛ🂡, a🂡Л🂡a🂡Л🂡a, 0)=[[0, 4, 8], [2, 6], [1, 3, 5, 7]]. OK"
+ECHO: "Expect [[1, 3, 5, 7], [0, 4, 8], [2, 6]] for search(🂡aЛ, a🂡Л🂡a🂡Л🂡a, 0)=[[1, 3, 5, 7], [0, 4, 8], [2, 6]]. OK"
diff --git a/tests/regression/echotest/string-unicode-expected.echo b/tests/regression/echotest/string-unicode-expected.echo
new file mode 100644
index 0000000..a1cd3be
--- /dev/null
+++ b/tests/regression/echotest/string-unicode-expected.echo
@@ -0,0 +1,107 @@
+ECHO: "text_1bytes_len = ", "1234", " len = ", 4
+ECHO: "text_2bytes_len = ", "ЛЛЛЛ", " len = ", 4
+ECHO: "text_4bytes_len = ", "🂡🂱🃁🃑", " len = ", 4
+ECHO: "[", 0, "] = ", "DEADBEEF", " of len=", 8, ":"
+ECHO: "    [", 0, "]=", "D"
+ECHO: "    [", 1, "]=", "E"
+ECHO: "    [", 2, "]=", "A"
+ECHO: "    [", 3, "]=", "D"
+ECHO: "    [", 4, "]=", "B"
+ECHO: "    [", 5, "]=", "E"
+ECHO: "    [", 6, "]=", "E"
+ECHO: "    [", 7, "]=", "F"
+ECHO: "[", 1, "] = ", "Ленивый рыжий кот", " of len=", 17, ":"
+ECHO: "    [", 0, "]=", "Л"
+ECHO: "    [", 1, "]=", "е"
+ECHO: "    [", 2, "]=", "н"
+ECHO: "    [", 3, "]=", "и"
+ECHO: "    [", 4, "]=", "в"
+ECHO: "    [", 5, "]=", "ы"
+ECHO: "    [", 6, "]=", "й"
+ECHO: "    [", 7, "]=", " "
+ECHO: "    [", 8, "]=", "р"
+ECHO: "    [", 9, "]=", "ы"
+ECHO: "    [", 10, "]=", "ж"
+ECHO: "    [", 11, "]=", "и"
+ECHO: "    [", 12, "]=", "й"
+ECHO: "    [", 13, "]=", " "
+ECHO: "    [", 14, "]=", "к"
+ECHO: "    [", 15, "]=", "о"
+ECHO: "    [", 16, "]=", "т"
+ECHO: "[", 2, "] = ", "كسول الزنجبيل القط", " of len=", 18, ":"
+ECHO: "    [", 0, "]=", "ك"
+ECHO: "    [", 1, "]=", "س"
+ECHO: "    [", 2, "]=", "و"
+ECHO: "    [", 3, "]=", "ل"
+ECHO: "    [", 4, "]=", " "
+ECHO: "    [", 5, "]=", "ا"
+ECHO: "    [", 6, "]=", "ل"
+ECHO: "    [", 7, "]=", "ز"
+ECHO: "    [", 8, "]=", "ن"
+ECHO: "    [", 9, "]=", "ج"
+ECHO: "    [", 10, "]=", "ب"
+ECHO: "    [", 11, "]=", "ي"
+ECHO: "    [", 12, "]=", "ل"
+ECHO: "    [", 13, "]=", " "
+ECHO: "    [", 14, "]=", "ا"
+ECHO: "    [", 15, "]=", "ل"
+ECHO: "    [", 16, "]=", "ق"
+ECHO: "    [", 17, "]=", "ط"
+ECHO: "[", 3, "] = ", "懶惰的姜貓", " of len=", 5, ":"
+ECHO: "    [", 0, "]=", "懶"
+ECHO: "    [", 1, "]=", "惰"
+ECHO: "    [", 2, "]=", "的"
+ECHO: "    [", 3, "]=", "姜"
+ECHO: "    [", 4, "]=", "貓"
+ECHO: "[", 4, "] = ", "äöü ÄÖÜ ß", " of len=", 9, ":"
+ECHO: "    [", 0, "]=", "ä"
+ECHO: "    [", 1, "]=", "ö"
+ECHO: "    [", 2, "]=", "ü"
+ECHO: "    [", 3, "]=", " "
+ECHO: "    [", 4, "]=", "Ä"
+ECHO: "    [", 5, "]=", "Ö"
+ECHO: "    [", 6, "]=", "Ü"
+ECHO: "    [", 7, "]=", " "
+ECHO: "    [", 8, "]=", "ß"
+ECHO: "[", 5, "] = ", "😁😂😃😄😅😆😇😈😉😊😋😌😍😎😏😐", " of len=", 16, ":"
+ECHO: "    [", 0, "]=", "😁"
+ECHO: "    [", 1, "]=", "😂"
+ECHO: "    [", 2, "]=", "😃"
+ECHO: "    [", 3, "]=", "😄"
+ECHO: "    [", 4, "]=", "😅"
+ECHO: "    [", 5, "]=", "😆"
+ECHO: "    [", 6, "]=", "😇"
+ECHO: "    [", 7, "]=", "😈"
+ECHO: "    [", 8, "]=", "😉"
+ECHO: "    [", 9, "]=", "😊"
+ECHO: "    [", 10, "]=", "😋"
+ECHO: "    [", 11, "]=", "😌"
+ECHO: "    [", 12, "]=", "😍"
+ECHO: "    [", 13, "]=", "😎"
+ECHO: "    [", 14, "]=", "😏"
+ECHO: "    [", 15, "]=", "😐"
+ECHO: "[", 6, "] = ", "⠁⠂⠃⠄⠅⠆⠇⠈⠉⠊⠋⠌⠍⠎⠏", " of len=", 15, ":"
+ECHO: "    [", 0, "]=", "⠁"
+ECHO: "    [", 1, "]=", "⠂"
+ECHO: "    [", 2, "]=", "⠃"
+ECHO: "    [", 3, "]=", "⠄"
+ECHO: "    [", 4, "]=", "⠅"
+ECHO: "    [", 5, "]=", "⠆"
+ECHO: "    [", 6, "]=", "⠇"
+ECHO: "    [", 7, "]=", "⠈"
+ECHO: "    [", 8, "]=", "⠉"
+ECHO: "    [", 9, "]=", "⠊"
+ECHO: "    [", 10, "]=", "⠋"
+ECHO: "    [", 11, "]=", "⠌"
+ECHO: "    [", 12, "]=", "⠍"
+ECHO: "    [", 13, "]=", "⠎"
+ECHO: "    [", 14, "]=", "⠏"
+ECHO: "[", 7, "] = ", "🂡🂱🃁🃑", " of len=", 4, ":"
+ECHO: "    [", 0, "]=", "🂡"
+ECHO: "    [", 1, "]=", "🂱"
+ECHO: "    [", 2, "]=", "🃁"
+ECHO: "    [", 3, "]=", "🃑"
+ECHO: "Past end of unicode only 2-byte ", undef
+ECHO: "Past end of unicode only 4-byte ", undef
+ECHO: "Past end of both 2-byte ", undef
+ECHO: "Past end of both 4-byte ", undef
diff --git a/tests/regression/opencsgtest/polyhedron-tests-expected.png b/tests/regression/opencsgtest/polyhedron-tests-expected.png
index 0740f1a..f6665cf 100644
--- a/tests/regression/opencsgtest/polyhedron-tests-expected.png
+++ b/tests/regression/opencsgtest/polyhedron-tests-expected.png
diff --git a/tests/regression/opencsgtest/rotate_extrude-tests-expected.png b/tests/regression/opencsgtest/rotate_extrude-tests-expected.png
index 861f6ab..0be247e 100644
--- a/tests/regression/opencsgtest/rotate_extrude-tests-expected.png
+++ b/tests/regression/opencsgtest/rotate_extrude-tests-expected.png
diff --git a/tests/regression/throwntogethertest/polyhedron-tests-expected.png b/tests/regression/throwntogethertest/polyhedron-tests-expected.png
index 95ffeaa..c293d88 100644
--- a/tests/regression/throwntogethertest/polyhedron-tests-expected.png
+++ b/tests/regression/throwntogethertest/polyhedron-tests-expected.png
diff --git a/tests/regression/throwntogethertest/rotate_extrude-tests-expected.png b/tests/regression/throwntogethertest/rotate_extrude-tests-expected.png
index 8956be2..1da4873 100644
--- a/tests/regression/throwntogethertest/rotate_extrude-tests-expected.png
+++ b/tests/regression/throwntogethertest/rotate_extrude-tests-expected.png