diff --git a/tikz/triangle-angles/triangle-angles.svg b/tikz/triangle-angles/triangle-angles.svg deleted file mode 100644 index dd02c80..0000000 --- a/tikz/triangle-angles/triangle-angles.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikz/triangle-heron-tricky/Makefile b/tikz/triangle-heron-tricky/Makefile new file mode 100644 index 0000000..65cdb04 --- /dev/null +++ b/tikz/triangle-heron-tricky/Makefile @@ -0,0 +1,31 @@ +SOURCE = triangle-heron-tricky +DELAY = 80 +DENSITY = 300 +WIDTH = 512 + +make: + pdflatex $(SOURCE).tex -output-format=pdf + make clean + +clean: + rm -rf $(TARGET) *.class *.html *.log *.aux + +gif: + pdfcrop $(SOURCE).pdf + convert -verbose -delay $(DELAY) -loop 0 -density $(DENSITY) $(SOURCE)-crop.pdf $(SOURCE).gif + make clean + +png: + make + make svg + inkscape $(SOURCE).svg -w $(WIDTH) --export-png=$(SOURCE).png + +transparentGif: + convert $(SOURCE).pdf -transparent white result.gif + make clean + +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 diff --git a/tikz/triangle-heron-tricky/triangle-heron-tricky.png b/tikz/triangle-heron-tricky/triangle-heron-tricky.png new file mode 100644 index 0000000..7d644e2 Binary files /dev/null and b/tikz/triangle-heron-tricky/triangle-heron-tricky.png differ diff --git a/tikz/triangle-heron-tricky/triangle-heron-tricky.tex b/tikz/triangle-heron-tricky/triangle-heron-tricky.tex new file mode 100644 index 0000000..5f17a0c --- /dev/null +++ b/tikz/triangle-heron-tricky/triangle-heron-tricky.tex @@ -0,0 +1,53 @@ +\documentclass{article} +\usepackage[pdftex,active,tightpage]{preview} +\setlength\PreviewBorder{2mm} +\usepackage{tikz} +\usetikzlibrary{shapes, calc, shapes,snakes} +\usepackage{amsmath,amssymb} + +\begin{document} +\begin{preview} +\begin{tikzpicture}[dot/.style={ thick, + %draw=gray, + %cross out, + fill, + shape=circle, + inner sep=3pt, + minimum width=4pt, + minimum height=4pt}] + % Draw the triangle + \draw[fill=green!10] (0, 0) coordinate (a) + -- (5cm,0) coordinate (b) + -- (3.6cm, 4.8cm) coordinate (c) + -- (0, 0) -- cycle; + + \draw[fill=blue!10] (a) + -- (b) + -- (6.4cm, 4.8cm) coordinate (d) + -- (0, 0) -- cycle; + + \draw[fill=red!10] (a) + -- (b) + -- (4.1cm,3.07cm) coordinate (e) + -- (0, 0) -- cycle; + + %\node (a) [dot] at (0,0) {}; + %\node (b) [dot] at (5cm,0) {}; + %\node (c) [dot] at (3.6cm,4.8cm) {}; + + \draw[thick] (a) -- (b) node [black,midway,yshift=-0.2cm,sloped] {5cm}; + \draw[thick] (b) -- (c) node [black,midway,yshift=+0.2cm,sloped] {5cm}; + \draw[thick] (a) -- (c) node [black,midway,yshift=+0.2cm,sloped] {7cm}; + + \draw[thick] (a) -- (d) node [black,midway,yshift=+0.2cm,sloped] {8cm}; + \draw[thick] (b) -- (d) node [black,midway,yshift=-0.2cm,sloped] {5cm}; + +% \draw[dashed,thick,lime] (a) circle(8cm); +% \draw[dashed,thick,red] (a) circle(6cm); +% \draw[dashed,thick,lime] (b) circle(5cm); +% \draw[dashed,thick,red] (b) circle(6cm); +% \draw[dashed,thick,lime] (c) circle(5cm); +% \draw[dashed,thick,red] (c) circle(6cm); +\end{tikzpicture} +\end{preview} +\end{document} diff --git a/tikz/triangle/triangle.png b/tikz/triangle/triangle.png new file mode 100644 index 0000000..dc011d9 Binary files /dev/null and b/tikz/triangle/triangle.png differ