Merge branch 'AndreasFMueller:master' into master

11 files changed, 31 insertions, 35 deletions

diff --git a/buch/papers/clifford/3d/common.inc b/buch/papers/clifford/3d/common.inc
index 54aa7fe..55bf6e1 100644
--- a/buch/papers/clifford/3d/common.inc
+++ b/buch/papers/clifford/3d/common.inc
@@ -245,3 +245,27 @@ cylinder {
 
 #end
 
+#macro bogen(v1, v2, center, winkelbogen, farbe)
+
+union {
+	#declare phi = 0;
+	#declare phimax = winkelbogen;
+	#declare phistep = (phimax - phi) / N;
+	#while (phi < phimax - phistep/2)
+		cylinder {
+			cos(phi        ) * v1 + sin(phi        ) * v2 + center,
+			cos(phi+phistep) * v1 + sin(phi+phistep) * v2 + center,
+			0.01
+		}
+		sphere {
+			cos(phi        ) * v1 + sin(phi        ) * v2 + center,
+			0.01
+		}
+		#declare phi = phi + phistep;
+	#end
+	pigment {
+		color farbe
+	}
+}
+
+#end
diff --git a/buch/papers/clifford/3d/dq.jpg b/buch/papers/clifford/3d/dq.jpg
index bd44a65..690cfdc 100644
--- a/buch/papers/clifford/3d/dq.jpg
+++ b/buch/papers/clifford/3d/dq.jpg
diff --git a/buch/papers/clifford/3d/dq.pdf b/buch/papers/clifford/3d/dq.pdf
index 71727d2..797a558 100644
--- a/buch/papers/clifford/3d/dq.pdf
+++ b/buch/papers/clifford/3d/dq.pdf
diff --git a/buch/papers/clifford/3d/drehung.jpg b/buch/papers/clifford/3d/drehung.jpg
index ad7cd47..2347296 100644
--- a/buch/papers/clifford/3d/drehung.jpg
+++ b/buch/papers/clifford/3d/drehung.jpg
diff --git a/buch/papers/clifford/3d/drehung.pdf b/buch/papers/clifford/3d/drehung.pdf
index de29085..bc8036e 100644
--- a/buch/papers/clifford/3d/drehung.pdf
+++ b/buch/papers/clifford/3d/drehung.pdf
diff --git a/buch/papers/clifford/3d/drehung.pov b/buch/papers/clifford/3d/drehung.pov
index 54b5a2e..b86a2c5 100644
--- a/buch/papers/clifford/3d/drehung.pov
+++ b/buch/papers/clifford/3d/drehung.pov
@@ -60,24 +60,6 @@ mesh {
 	}
 }
 
-union {
-	#declare phi = 0;
-	#declare phimax = 2*pi/3;
-	#declare phistep = (phimax - phi) / N;
-	#while (phi < phimax - phistep/2)
-		cylinder {
-			r * (cos(phi        ) * e1 + sin(phi        ) * e2),
-			r * (cos(phi+phistep) * e1 + sin(phi+phistep) * e2),
-			0.01
-		}
-		sphere { r * (cos(phi        ) * e1 + sin(phi        ) * e2), 0.01 }
-		#declare phi = phi + phistep;
-	#end
-	pigment {
-		color Blue
-	}
-}
-
 mesh {
 	#declare phi = 0;
 	#declare phimax = 2*pi/3;
@@ -100,21 +82,6 @@ mesh {
 	}
 }
 
-union {
-	#declare phi = 0;
-	#declare phimax = 2*pi/3;
-	#declare phistep = (phimax - phi) / N;
-	#while (phi < phimax - phistep/2)
-		cylinder {
-			r * (cos(phi        ) * e1 + sin(phi        ) * e2) + Vparallel,
-			r * (cos(phi+phistep) * e1 + sin(phi+phistep) * e2) + Vparallel,
-			0.01
-		}
-		sphere { r * (cos(phi        ) * e1 + sin(phi        ) * e2) + Vparallel, 0.01 }
-		#declare phi = phi + phistep;
-	#end
-	pigment {
-		color Green
-	}
-}
+bogen(r * e1, r * e2, <0,0,0>, 2*pi/3, Blue)
+bogen(r * e1, r * e2, Vparallel, 2*pi/3, Green)
 
diff --git a/buch/papers/clifford/3d/q23.jpg b/buch/papers/clifford/3d/q23.jpg
index 50ca028..929ef90 100644
--- a/buch/papers/clifford/3d/q23.jpg
+++ b/buch/papers/clifford/3d/q23.jpg
diff --git a/buch/papers/clifford/3d/q23.pov b/buch/papers/clifford/3d/q23.pov
index e3e5d49..2e55c96 100644
--- a/buch/papers/clifford/3d/q23.pov
+++ b/buch/papers/clifford/3d/q23.pov
@@ -7,6 +7,8 @@
 
 circlearrow(<1,0,0>, 0.01*<0,0,-1>, <0, 0, 0>, 1.0,         thick, 0.98*pi/2, 4)
 
+bogen( <0,1.7,0>, <-1.7, 0, 0>, <0,0,0>, pi/2, Blue)
+
 arrow( <0,0,0>, <-2.0,0,0>, 0.99*thick, Blue)
 arrow( <0,0,0>, <0,2.0,0>, 0.99*thick, Blue)
 arrow( <0,0,0>, <0,0,2.0>, 0.99*thick, Red)
diff --git a/buch/papers/clifford/3d/q31.jpg b/buch/papers/clifford/3d/q31.jpg
index 10313fa..c240b4f 100644
--- a/buch/papers/clifford/3d/q31.jpg
+++ b/buch/papers/clifford/3d/q31.jpg
diff --git a/buch/papers/clifford/3d/q31.pov b/buch/papers/clifford/3d/q31.pov
index 901f838..4abe1ed 100644
--- a/buch/papers/clifford/3d/q31.pov
+++ b/buch/papers/clifford/3d/q31.pov
@@ -10,3 +10,6 @@ circlearrow(<1,0,0>, 0.01*<0,-1,0>, <0, 0, 0>, 1.0,         thick, 0.98*pi/2, 4)
 arrow( <0,0,0>, <-2.0,0,0>, 0.99*thick, Blue)
 arrow( <0,0,0>, <0,2.0,0>, 0.99*thick, Red)
 arrow( <0,0,0>, <0,0,2.0>, 0.99*thick, Blue)
+
+bogen( <0,0,1.7>, <-1.7, 0, 0>, <0,0,0>, pi/2, Blue)
+
diff --git a/buch/papers/clifford/3d/qq.pdf b/buch/papers/clifford/3d/qq.pdf
index 4c55d57..fd7dbfa 100644
--- a/buch/papers/clifford/3d/qq.pdf
+++ b/buch/papers/clifford/3d/qq.pdf