diff --git a/documents/GeoTopo/GeoTopo.pdf b/documents/GeoTopo/GeoTopo.pdf index 5612df2..ea5418a 100644 Binary files a/documents/GeoTopo/GeoTopo.pdf and b/documents/GeoTopo/GeoTopo.pdf differ diff --git a/documents/GeoTopo/Kapitel4.tex b/documents/GeoTopo/Kapitel4.tex index 8fd4bdb..bc03335 100644 --- a/documents/GeoTopo/Kapitel4.tex +++ b/documents/GeoTopo/Kapitel4.tex @@ -340,7 +340,8 @@ aufgestellt. \begin{figure} \centering - \includegraphics[width=0.5\linewidth, keepaspectratio]{figures/todo/bild-6.jpg} + %\input{figures/geometry-6.tex} + \includegraphics[width=0.5\linewidth, keepaspectratio]{figures/geometry-6.pdf} \caption{TODO} \label{fig:bild-6} \end{figure} @@ -360,7 +361,8 @@ aufgestellt. \begin{figure} \centering - \includegraphics[width=0.5\linewidth, keepaspectratio]{figures/todo/bild-7.jpg} + %\input{figures/geometry-7.tex} + \includegraphics[width=0.5\linewidth, keepaspectratio]{figures/geometry-7.pdf} \caption{TODO} \label{fig:bild-6} \end{figure} diff --git a/documents/GeoTopo/figures/geometry-7.tex b/documents/GeoTopo/figures/geometry-7.tex new file mode 100644 index 0000000..887e53d --- /dev/null +++ b/documents/GeoTopo/figures/geometry-7.tex @@ -0,0 +1,22 @@ +\usetkzobj{all} +\begin{tikzpicture} + \tkzSetUpPoint[shape=circle,size=10,color=black,fill=black] + \tkzSetUpLine[line width=1] + \tkzDefPoints{0/0/Q, 2/0/P, 1/2/R} + + + \pgfmathsetmacro{\firstAngle}{0} + \pgfmathsetmacro{\secondAngle}{-120} + \path[draw,red, fill=red!40] (Q) -- ++(\firstAngle:.4) arc[start angle=\firstAngle, delta angle=\secondAngle,radius=.4]; + + \tkzMarkAngle[arc=l,size=0.8cm,color=green,fill=green!20](Q,R,P) + \path[draw] ++(-50:.2) node[rotate=-50] {$\alpha$}; + \node at (1,1.5) {$\beta$}; + \tkzDrawLine(Q,P) + \tkzDrawLine(Q,R) + \tkzDrawLine(P,R) + \tkzDrawPoints(P,Q,R) + \tkzLabelPoint[below left](P){$P$} + \tkzLabelPoint[above left](Q){$Q$} + \tkzLabelPoint[above=0.2cm](R){$R$} +\end{tikzpicture} diff --git a/documents/GeoTopo/figures/todo/bild-6.jpg b/documents/GeoTopo/figures/todo/bild-6.jpg deleted file mode 100644 index 27ee41d..0000000 Binary files a/documents/GeoTopo/figures/todo/bild-6.jpg and /dev/null differ diff --git a/documents/GeoTopo/figures/todo/bild-7.jpg b/documents/GeoTopo/figures/todo/bild-7.jpg deleted file mode 100644 index 57a8988..0000000 Binary files a/documents/GeoTopo/figures/todo/bild-7.jpg and /dev/null differ diff --git a/tikz/geometry-7/Makefile b/tikz/geometry-7/Makefile new file mode 100644 index 0000000..3636f84 --- /dev/null +++ b/tikz/geometry-7/Makefile @@ -0,0 +1,31 @@ +SOURCE = geometry-7 +DELAY = 80 +DENSITY = 300 +WIDTH = 512 + +make: + pdflatex $(SOURCE).tex -output-format=pdf + make clean + +clean: + 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 + +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/geometry-7/Readme.md b/tikz/geometry-7/Readme.md new file mode 100644 index 0000000..7113d8f --- /dev/null +++ b/tikz/geometry-7/Readme.md @@ -0,0 +1,3 @@ +Compiled example +---------------- +![Example](geometry-7.png) diff --git a/tikz/geometry-7/geometry-7.png b/tikz/geometry-7/geometry-7.png new file mode 100644 index 0000000..8ba0148 Binary files /dev/null and b/tikz/geometry-7/geometry-7.png differ diff --git a/tikz/geometry-7/geometry-7.tex b/tikz/geometry-7/geometry-7.tex new file mode 100644 index 0000000..1519f9d --- /dev/null +++ b/tikz/geometry-7/geometry-7.tex @@ -0,0 +1,27 @@ +\documentclass[varwidth=true, border=2pt]{standalone} +\usepackage{tkz-euclide} + +\begin{document} +\usetkzobj{all} +\begin{tikzpicture} + \tkzSetUpPoint[shape=circle,size=10,color=black,fill=black] + \tkzSetUpLine[line width=1] + \tkzDefPoints{0/0/Q, 2/0/P, 1/2/R} + + + \pgfmathsetmacro{\firstAngle}{0} + \pgfmathsetmacro{\secondAngle}{-120} + \path[draw,red, fill=red!40] (Q) -- ++(\firstAngle:.4) arc[start angle=\firstAngle, delta angle=\secondAngle,radius=.4]; + + \tkzMarkAngle[arc=l,size=0.8cm,color=green,fill=green!20](Q,R,P) + \path[draw] ++(-50:.2) node[rotate=-50] {$\alpha$}; + \node at (1,1.5) {$\beta$}; + \tkzDrawLine(Q,P) + \tkzDrawLine(Q,R) + \tkzDrawLine(P,R) + \tkzDrawPoints(P,Q,R) + \tkzLabelPoint[below left](P){$P$} + \tkzLabelPoint[above left](Q){$Q$} + \tkzLabelPoint[above=0.2cm](R){$R$} +\end{tikzpicture} +\end{document}