diff --git a/tikz/equilateral-triangle-heights/Makefile b/tikz/equilateral-triangle-heights/Makefile index b10fbd9..b2aefcf 100644 --- a/tikz/equilateral-triangle-heights/Makefile +++ b/tikz/equilateral-triangle-heights/Makefile @@ -1,19 +1,25 @@ SOURCE = equilateral-triangle-heights DELAY = 80 DENSITY = 300 +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 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 @@ -22,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 diff --git a/tikz/equilateral-triangle-heights/equilateral-triangle-heights.png b/tikz/equilateral-triangle-heights/equilateral-triangle-heights.png new file mode 100644 index 0000000..4597ebf Binary files /dev/null and b/tikz/equilateral-triangle-heights/equilateral-triangle-heights.png differ diff --git a/tikz/equilateral-triangle-heights/equilateral-triangle-heights.tex b/tikz/equilateral-triangle-heights/equilateral-triangle-heights.tex index af96dbb..172f1b6 100644 --- a/tikz/equilateral-triangle-heights/equilateral-triangle-heights.tex +++ b/tikz/equilateral-triangle-heights/equilateral-triangle-heights.tex @@ -23,13 +23,11 @@ % angle alpha \draw[fill=green!30] (0,0) -- (0:0.75cm) arc (0:60:.75cm); - \draw (0.35cm,0.25cm) node {$\alpha$}; % angle beta \begin{scope}[shift={(4cm,0cm)}] \draw[fill=green!30] (0,0) -- (-180:0.75cm) arc (180:120:0.75cm); \draw[color=gray, dashed] (0,0) -- node[sloped, above=-0.1cm] {$\scriptstyle h_b$} (150:3.464cm); - \draw (150:0.5cm) node {$\beta$}; \end{scope} % angle gamma @@ -60,6 +58,14 @@ % Height with label \draw[color=gray, dashed] (0,0) -- node[sloped, above=-0.1cm] {$\scriptstyle h_a$} (30:3.464cm); + \draw (0.35cm,0.25cm) node {$\alpha$}; + \begin{scope}[shift={(4cm,0cm)}] + \draw (150:0.5cm) node {$\beta$}; + \end{scope} + \begin{scope}[shift={(60:4)}] + \draw (-90:0.5cm) node {$\gamma$}; + \end{scope} + % The triangle \draw [line width=1.5pt] (0,0) -- (60:4) -- (4,0) -- cycle; \end{tikzpicture}