diff --git a/documents/GeoTopo/GeoTopo.pdf b/documents/GeoTopo/GeoTopo.pdf index e7f5daa..5612df2 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 6be4071..8fd4bdb 100644 --- a/documents/GeoTopo/Kapitel4.tex +++ b/documents/GeoTopo/Kapitel4.tex @@ -264,7 +264,7 @@ aufgestellt. \begin{figure} \centering \input{figures/geometry-3.tex} - \caption{TODO} + \caption{1. Fall} \label{fig:bild-3} \end{figure} @@ -290,8 +290,8 @@ aufgestellt. \begin{figure} \centering - \includegraphics[width=0.5\linewidth, keepaspectratio]{figures/todo/bild-4.jpg} - \caption{TODO}. + \input{figures/geometry-4.tex} + \caption{2. Fall} \label{fig:bild-4} \end{figure} @@ -303,8 +303,8 @@ aufgestellt. \begin{beweis}[Beweis 3] \begin{figure} \centering - \includegraphics[width=0.5\linewidth, keepaspectratio]{figures/todo/bild-5.jpg} - \caption{TODO}. + \input{figures/geometry-5.tex} + \caption{TODO} \label{fig:bild-5} \end{figure} @@ -341,7 +341,7 @@ aufgestellt. \begin{figure} \centering \includegraphics[width=0.5\linewidth, keepaspectratio]{figures/todo/bild-6.jpg} - \caption{TODO}. + \caption{TODO} \label{fig:bild-6} \end{figure} @@ -361,7 +361,7 @@ aufgestellt. \begin{figure} \centering \includegraphics[width=0.5\linewidth, keepaspectratio]{figures/todo/bild-7.jpg} - \caption{TODO}. + \caption{TODO} \label{fig:bild-6} \end{figure} \end{beweis} diff --git a/documents/GeoTopo/figures/geometry-4.tex b/documents/GeoTopo/figures/geometry-4.tex new file mode 100644 index 0000000..bd35066 --- /dev/null +++ b/documents/GeoTopo/figures/geometry-4.tex @@ -0,0 +1,15 @@ +\begin{tikzpicture} + \tkzSetUpPoint[shape=circle,size=10,color=black,fill=black] + \tkzSetUpLine[line width=1] + \tkzDefPoints{0/0/P, 4/1/Q, 2/3/A, 0/3/B} + + \tkzDrawSegments(P,Q Q,A A,P) + \tkzDrawSegments[dashed](P,B B,Q) + \tkzDrawLine(P,Q) + + \tkzDrawPoints(P,Q,A,B) + \tkzLabelPoint[below](P){$P$} + \tkzLabelPoint[below](Q){$Q$} + \tkzLabelPoint[above](A){$A$} + \tkzLabelPoint[above](B){$B$} +\end{tikzpicture} diff --git a/documents/GeoTopo/figures/geometry-5.tex b/documents/GeoTopo/figures/geometry-5.tex new file mode 100644 index 0000000..64b6558 --- /dev/null +++ b/documents/GeoTopo/figures/geometry-5.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/P, 4/1/Q, 2/3/A, 5/3/B} + \tkzInterLL(P,B)(A,Q) \tkzGetPoint{C} + \tkzDrawPoints(P,Q,A,B,C) + + %\tkzDrawSegments(P,Q Q,A A,P) + %\tkzDrawSegments[dashed](P,B B,Q) + \tkzDrawLine(P,Q) + \tkzDrawLine(P,A) + \tkzDrawLine(A,Q) + \tkzDrawLine(P,B) + + + \tkzLabelPoint[below](P){$P$} + \tkzLabelPoint[below](Q){$Q$} + \tkzLabelPoint[below](A){$A$} + \tkzLabelPoint[below](B){$B$} + \tkzLabelPoint[above](C){$C$} +\end{tikzpicture} diff --git a/documents/GeoTopo/figures/geometry-6.tex b/documents/GeoTopo/figures/geometry-6.tex new file mode 100644 index 0000000..43729e8 --- /dev/null +++ b/documents/GeoTopo/figures/geometry-6.tex @@ -0,0 +1,20 @@ +\usetkzobj{all} +\begin{tikzpicture} + \tkzSetUpPoint[shape=circle,size=10,color=black,fill=black] + \tkzSetUpLine[line width=1] + \tkzDefPoints{0/0/Q, 4/1/H1, 1/2/P} + \tkzDefPoint(1.5,3){Phelper} + \tkzMarkAngle[arc=l,size=1cm,color=green,fill=green!20](H1,Q,P) + \tkzDrawLine(Q,H1) + + \tkzLabelPoint[above left](Q){$Q$} + \tkzDefLine[parallel=through P](Q,H1) \tkzGetPoint{b} + \tkzMarkAngle[arc=l,size=1cm,color=green,fill=green!20](b,P,Phelper) + \tkzDrawLine[dashed](P,b) + \tkzLabelLine[pos=0.8,below](P,b){$f$} + \tkzLabelLine[pos=0.8,below](Q,H1){$g$} + \tkzLabelPoint[above left](P){$P$} + \tkzDrawLine[add=0.2 and 0.7](Q,P) + \tkzDrawPoints(P,Q) + \tkzMarkSegments[mark=||](Q,H1 P,b) +\end{tikzpicture} diff --git a/documents/GeoTopo/figures/todo/bild-3.jpg b/documents/GeoTopo/figures/todo/bild-3.jpg deleted file mode 100644 index 80b9bfa..0000000 Binary files a/documents/GeoTopo/figures/todo/bild-3.jpg and /dev/null differ diff --git a/documents/GeoTopo/figures/todo/bild-4.jpg b/documents/GeoTopo/figures/todo/bild-4.jpg deleted file mode 100644 index 7091af1..0000000 Binary files a/documents/GeoTopo/figures/todo/bild-4.jpg and /dev/null differ diff --git a/documents/GeoTopo/figures/todo/bild-5.jpg b/documents/GeoTopo/figures/todo/bild-5.jpg deleted file mode 100644 index ef20a06..0000000 Binary files a/documents/GeoTopo/figures/todo/bild-5.jpg and /dev/null differ diff --git a/tikz/geometry-4/Makefile b/tikz/geometry-4/Makefile new file mode 100644 index 0000000..18e3377 --- /dev/null +++ b/tikz/geometry-4/Makefile @@ -0,0 +1,31 @@ +SOURCE = geometry-4 +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-4/Readme.md b/tikz/geometry-4/Readme.md new file mode 100644 index 0000000..29feaf5 --- /dev/null +++ b/tikz/geometry-4/Readme.md @@ -0,0 +1,3 @@ +Compiled example +---------------- +![Example](geometry-4.png) diff --git a/tikz/geometry-4/geometry-4.png b/tikz/geometry-4/geometry-4.png new file mode 100644 index 0000000..75b5299 Binary files /dev/null and b/tikz/geometry-4/geometry-4.png differ diff --git a/tikz/geometry-4/geometry-4.tex b/tikz/geometry-4/geometry-4.tex new file mode 100644 index 0000000..375b159 --- /dev/null +++ b/tikz/geometry-4/geometry-4.tex @@ -0,0 +1,21 @@ +\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/P, 4/1/Q, 2/3/A, 0/3/B} + + \tkzDrawSegments(P,Q Q,A A,P) + \tkzDrawSegments[dashed](P,B B,Q) + \tkzDrawLine(P,Q) + + \tkzDrawPoints(P,Q,A,B) + \tkzLabelPoint[below](P){$P$} + \tkzLabelPoint[below](Q){$Q$} + \tkzLabelPoint[above](A){$A$} + \tkzLabelPoint[above](B){$B$} +\end{tikzpicture} +\end{document} diff --git a/tikz/geometry-5/Makefile b/tikz/geometry-5/Makefile new file mode 100644 index 0000000..14ca2ab --- /dev/null +++ b/tikz/geometry-5/Makefile @@ -0,0 +1,31 @@ +SOURCE = geometry-5 +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-5/Readme.md b/tikz/geometry-5/Readme.md new file mode 100644 index 0000000..47c864b --- /dev/null +++ b/tikz/geometry-5/Readme.md @@ -0,0 +1,3 @@ +Compiled example +---------------- +![Example](geometry-5.png) diff --git a/tikz/geometry-5/geometry-5.png b/tikz/geometry-5/geometry-5.png new file mode 100644 index 0000000..7c5e47c Binary files /dev/null and b/tikz/geometry-5/geometry-5.png differ diff --git a/tikz/geometry-5/geometry-5.tex b/tikz/geometry-5/geometry-5.tex new file mode 100644 index 0000000..e029a8f --- /dev/null +++ b/tikz/geometry-5/geometry-5.tex @@ -0,0 +1,24 @@ +\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/P, 4/1/Q, 2/3/A, 5/3/B} + \tkzInterLL(P,B)(A,Q) \tkzGetPoint{C} + \tkzDrawPoints(P,Q,A,B,C) + + \tkzDrawLine(P,Q) + \tkzDrawLine(P,A) + \tkzDrawLine(A,Q) + \tkzDrawLine(P,B) + + \tkzLabelPoint[below](P){$P$} + \tkzLabelPoint[below](Q){$Q$} + \tkzLabelPoint[below](A){$A$} + \tkzLabelPoint[below](B){$B$} + \tkzLabelPoint[above](C){$C$} +\end{tikzpicture} +\end{document} diff --git a/tikz/geometry-6/Makefile b/tikz/geometry-6/Makefile new file mode 100644 index 0000000..43c7431 --- /dev/null +++ b/tikz/geometry-6/Makefile @@ -0,0 +1,31 @@ +SOURCE = geometry-6 +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-6/Readme.md b/tikz/geometry-6/Readme.md new file mode 100644 index 0000000..62dc29f --- /dev/null +++ b/tikz/geometry-6/Readme.md @@ -0,0 +1,3 @@ +Compiled example +---------------- +![Example](geometry-6.png) diff --git a/tikz/geometry-6/geometry-6.png b/tikz/geometry-6/geometry-6.png new file mode 100644 index 0000000..48ee8cc Binary files /dev/null and b/tikz/geometry-6/geometry-6.png differ diff --git a/tikz/geometry-6/geometry-6.tex b/tikz/geometry-6/geometry-6.tex new file mode 100644 index 0000000..70da043 --- /dev/null +++ b/tikz/geometry-6/geometry-6.tex @@ -0,0 +1,25 @@ +\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, 4/1/H1, 1/2/P} + \tkzDefPoint(1.5,3){Phelper} + \tkzMarkAngle[arc=l,size=1cm,color=green,fill=green!20](H1,Q,P) + \tkzDrawLine(Q,H1) + + \tkzLabelPoint[above left](Q){$Q$} + \tkzDefLine[parallel=through P](Q,H1) \tkzGetPoint{b} + \tkzMarkAngle[arc=l,size=1cm,color=green,fill=green!20](b,P,Phelper) + \tkzDrawLine[dashed](P,b) + \tkzLabelLine[pos=0.8,below](P,b){$f$} + \tkzLabelLine[pos=0.8,below](Q,H1){$g$} + \tkzLabelPoint[above left](P){$P$} + \tkzDrawLine[add=0.2 and 0.7](Q,P) + \tkzDrawPoints(P,Q) + \tkzMarkSegments[mark=||](Q,H1 P,b) +\end{tikzpicture} +\end{document}