Update triangle

tikz/triangle-pappus/Makefile

@@ -1,14 +1,14 @@
 SOURCE = triangle-pappus
 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

tikz/triangle-pappus/triangle-pappus.tex

@@ -16,12 +16,8 @@
     \tkzDefPoint(3.2,0){B}
     \tkzDefPoint(2.3,2.4){C}
 
-    \tkzLabelPoints[below left,font=\sansmath\sffamily](A)
-    \tkzLabelPoints[below right,font=\sansmath\sffamily](B)
-    \tkzLabelPoints[above,font=\sansmath\sffamily](C)
-
     % Draw polygon
-    \tkzDrawPolygon[thick,fill=gray!10](A,B,C)
+    \tkzDrawPolygon[thick,fill=gray!10,rounded corners=0.1mm](A,B,C)
 
     % Mark angles
     \tkzMarkAngle[arc=l,size=0.6cm,fill=green!30](B,A,C)
@@ -41,7 +37,7 @@
     \tkzInterLC(C,G)(A,C) \tkzGetPoints{C}{C}
 
     \tkzLabelPoints[above,font=\sansmath\sffamily](G)
-    \tkzLabelPoints[left,font=\sansmath\sffamily](F)
+    \tkzLabelPoints[below left,font=\sansmath\sffamily](F)
     \tkzDrawPolygon[thick,fill=red!15!white](A,C,G,F)
 
     % right blue square
@@ -62,14 +58,14 @@
     \tkzDefLine[perpendicular=through B,K=-1](A,B)\tkzGetPoint{X}
     \tkzInterLC(B,X)(B,A) \tkzGetPoints{notNeeded}{E}
 
-    \tkzLabelPoints[below,font=\sansmath\sffamily](D,E)
+    \tkzLabelPoints[below,font=\sansmath\sffamily](E)
+    \tkzLabelPoints[left,font=\sansmath\sffamily](D)
     \tkzDrawPolygon[thick,fill=blue!15!white](B,A,D,E)
 
     % squares below
     \tkzDefLine[perpendicular=through C,K=-1](A,B)\tkzGetPoint{Xtemp}
     \tkzInterLL(C,Xtemp)(D,E)\tkzGetPoint{L}
     \tkzInterLL(C,Xtemp)(A,B)\tkzGetPoint{K}
-    \tkzDrawPoints[size=2,fill=black](L,K)
     \tkzLabelPoints[below right,font=\sansmath\sffamily](L,K)
 
     \tkzDrawLines[dashed](C,L)
@@ -84,7 +80,12 @@
     \tkzDrawLines(C,D B,F)
 
     % Draw polygons
-    \tkzDrawPolygon[thick](A,B,C)
+    \tkzDrawPolygon[thick, rounded corners=0.1mm](A,B,C)
+
+    \tkzLabelPoints[below left,font=\sansmath\sffamily](A)
+    \tkzLabelPoints[below right,font=\sansmath\sffamily](B)
+    \tkzLabelPoints[left,font=\sansmath\sffamily](C)
+    \tkzDrawPoints[size=2,fill=black](L,K)
 \end{tikzpicture}
 \end{preview}
 \end{document}