Merge branch 'master' of github.com:AndreasFMueller/SeminarSpezielleFunktionen

4 files changed, 51 insertions, 8 deletions

diff --git a/buch/chapters/110-elliptisch/images/Makefile b/buch/chapters/110-elliptisch/images/Makefile
index 3094877..e6e5b09 100644
--- a/buch/chapters/110-elliptisch/images/Makefile
+++ b/buch/chapters/110-elliptisch/images/Makefile
@@ -96,7 +96,7 @@ torusschnitt.png:	torusschnitt.pov
 	povray +A0.1 -W1920 -H1080 -Otorusschnitt.png torusschnitt.pov
 
 torusschnitt.jpg:	torusschnitt.png Makefile
-	convert -extract 1560x1080+180+0 torusschnitt.png \
+	convert -extract 1640x1080+140+0 torusschnitt.png \
 		-density 300 -units PixelsPerInch torusschnitt.jpg
 
 torusschnitt.pdf:	torusschnitt.tex torusschnitt.jpg
diff --git a/buch/chapters/110-elliptisch/images/torusschnitt.pdf b/buch/chapters/110-elliptisch/images/torusschnitt.pdf
deleted file mode 100644
index fde5268..0000000
--- a/buch/chapters/110-elliptisch/images/torusschnitt.pdf
+++ /dev/null
diff --git a/buch/chapters/110-elliptisch/images/torusschnitt.pov b/buch/chapters/110-elliptisch/images/torusschnitt.pov
index 43d50c6..e5602df 100644
--- a/buch/chapters/110-elliptisch/images/torusschnitt.pov
+++ b/buch/chapters/110-elliptisch/images/torusschnitt.pov
@@ -67,14 +67,51 @@ union {
 }
 #end
 
-arrow(<-2,0,0>,<2,0,0>,0.02,White)
-arrow(<0,-1.1,0>,<0,2.2,0>,0.02,White)
-arrow(<0,0,-1.6>,<0,0,2.4>,0.02,White)
+
+#macro Ticks(tl, tr) 
+union {
+	#declare s = 1;
+	#while (s <= 3.1)
+		cylinder { <-0.5*s-tl, 0, 0>, <-0.5*s+tl, 0, 0>, tr }
+		cylinder { < 0.5*s-tl, 0, 0>, < 0.5*s+tl, 0, 0>, tr }
+		#declare s = s + 1;
+	#end
+
+	#declare s = 1;
+	#while (s <= 4.1)
+		cylinder { <0, 0.5*s-tl, 0>, <0, 0.5*s+tl, 0>, tr }
+		#declare s = s + 1;
+	#end
+	#declare s = 1;
+	#while (s <= 2.1)
+		cylinder { <0,-0.5*s-tl, 0>, <0,-0.5*s+tl, 0>, tr }
+		#declare s = s + 1;
+	#end
+
+	#declare s = 1;
+	#while (s <= 4)
+		cylinder { <0, 0,  0.5*s-tl>, <0, 0,  0.5*s+tl>, tr }
+		#declare s = s + 1;
+	#end
+	#declare s = 1;
+	#while (s <= 3)
+		cylinder { <0, 0, -0.5*s-tl>, <0, 0, -0.5*s+tl>, tr }
+		#declare s = s + 1;
+	#end
+
+	pigment {
+		color White
+	}
+	finish {
+		specular 0.9
+		metallic
+	}
+}
+#end
 
 #declare epsilon = 0.001;
 #declare l = 1.5;
 
-
 #declare a = sqrt(2);
 #macro G2(phi,sg)
 	a * sqrt(cos(2*phi)) * < sg * cos(phi), 0, sin(phi)>
@@ -258,8 +295,14 @@ mesh {
 #declare torusfarbe = rgbt<0.2,0.6,0.2,0.2>;
 #declare ebenenfarbe = rgbt<0.2,0.6,1.0,0.2>;
 
+arrow(<-2,0,0>,<2,0,0>,0.02,White)
+arrow(<0,-1.1,0>,<0,2.2,0>,0.02,White)
+arrow(<0,0,-1.7>,<0,0,2.4>,0.02,White)
+Ticks(0.007,0.036)
+
 Lemniskate(0.02, Red)
-Ebene(1.8, 1.4, ebenenfarbe)
-Ebenengitter(1.8, 1.4, 0.5, 0.005, rgb<0.4,1,1>)
+Ebene(1.8, 1.6, ebenenfarbe)
+Ebenengitter(1.8, 1.6, 0.5, 0.005, rgb<0.4,1,1>)
 Torus(torusfarbe)
 Torusgitter(Yellow, 0.005)
+
diff --git a/buch/chapters/110-elliptisch/images/torusschnitt.tex b/buch/chapters/110-elliptisch/images/torusschnitt.tex
index 3053ac5..63351ad 100644
--- a/buch/chapters/110-elliptisch/images/torusschnitt.tex
+++ b/buch/chapters/110-elliptisch/images/torusschnitt.tex
@@ -21,7 +21,7 @@
 \begin{tikzpicture}[>=latex,thick]
 
 % Povray Bild
-\node at (0,0) {\includegraphics[width=11.4cm]{torusschnitt.jpg}};
+\node at (0,0) {\includegraphics[width=11.98cm]{torusschnitt.jpg}};
 
 % Gitter
 \ifthenelse{\boolean{showgrid}}{