Martin Thoma 9 лет назад
Родитель
Сommit
e8b15c5d2e

+ 5 - 3
tikz/thales-circle-triangle/Makefile

@@ -1,14 +1,14 @@
 SOURCE = thales-circle-triangle
 DELAY = 80
 DENSITY = 300
-WIDTH = 500
+WIDTH = 512
 
 make:
 	pdflatex $(SOURCE).tex -output-format=pdf
 	make clean
 
 clean:
-	rm -rf  $(TARGET) *.class *.html *.log *.aux
+	rm -rf  $(TARGET) *.class *.html *.log *.aux *.data *.gnuplot
 
 gif:
 	pdfcrop $(SOURCE).pdf
@@ -28,4 +28,6 @@ svg:
 	#inkscape $(SOURCE).pdf --export-plain-svg=$(SOURCE).svg
 	pdf2svg $(SOURCE).pdf $(SOURCE).svg
 	# Necessary, as pdf2svg does not always create valid svgs:
-	inkscape $(SOURCE).svg --export-plain-svg=$(SOURCE).svg
+	inkscape $(SOURCE).svg --export-width=$(WIDTH) --export-plain-svg=$(SOURCE)1.svg
+	rsvg-convert -a -w 720 -f svg $(SOURCE)1.svg -o $(SOURCE).svg
+	rm $(SOURCE)1.svg

BIN
tikz/thales-circle-triangle/thales-circle-triangle.png


+ 10 - 7
tikz/thales-circle-triangle/thales-circle-triangle.tex

@@ -21,23 +21,26 @@
 
     \tkzLabelPoints[above right](C)
 
-    \tkzMarkAngle[fill=blue!30,size=0.6cm,opacity=.5](C,B,A)
+    % Draw polygon
+    \tkzDrawPolygon[rounded corners=0.1mm, fill=gray!2](A,B,C)
+
+    \tkzMarkAngle[arc=l,fill=green!30,size=0.6cm](C,B,A)
     \tkzLabelAngle[pos=0.4](A,B,C){$\beta$}
 
-    \tkzMarkAngle[fill=blue!30,size=0.6cm,opacity=.5](M,C,B)
+    \tkzMarkAngle[fill=green!30,size=0.6cm](M,C,B)
     \tkzLabelAngle[pos=0.4](B,C,M){$\beta$}
 
-    \tkzMarkAngle[fill=blue!30,size=0.6cm,opacity=.5](B,M,C)
+    \tkzMarkAngle[fill=green!30,size=0.6cm](B,M,C)
     \tkzLabelAngle[pos=0.4](B,M,C){$\delta$}
 
-    \tkzMarkAngle[fill=blue!30,size=0.6cm,opacity=.5](M,A,C)
+    \tkzMarkAngle[fill=green!30,size=0.6cm](M,A,C)
     \tkzLabelAngle[pos=0.4](M,A,C){$\alpha$}
 
-    \tkzMarkAngle[fill=blue!30,size=0.6cm,opacity=.5](A,C,M)
+    \tkzMarkAngle[fill=green!30,size=0.6cm](A,C,M)
     \tkzLabelAngle[pos=0.4](A,C,M){$\alpha$}
 
-    \tkzMarkAngle[fill=blue!30,size=0.6cm,opacity=.5](C,M,A)
-    \tkzLabelAngle[pos=0.4](C,M,A){$\gamma$}
+    \tkzMarkAngle[fill=green!30,size=0.6cm](C,M,A)
+    \tkzLabelAngle[pos=0.3](C,M,A){$\gamma$}
 
     \tkzDrawSector[thick](M,B)(A)