diff --git a/documents/GeoTopo/Arbeitszeit.md b/documents/GeoTopo/Arbeitszeit.md index dbc6c22..f6c2e16 100644 --- a/documents/GeoTopo/Arbeitszeit.md +++ b/documents/GeoTopo/Arbeitszeit.md @@ -38,3 +38,4 @@ in dem Erstellen dieses Skripts steckt: |18.01.2014 | 14:15 - 14:30 | Neuer Korollar; Tippfehler verbessert |20.01.2014 | 20:00 - 20:15 | TikZ'en eines Bildes |21.01.2014 | 19:30 - 21:30 | Digitalisieren der Vorlesung von 21.01.2014 +|22.01.2014 | 06:00 - 06:30 | TikZ'en eines Bildes diff --git a/documents/GeoTopo/GeoTopo.pdf b/documents/GeoTopo/GeoTopo.pdf index 795fdbf..8a149c7 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 7b420eb..20459bb 100644 --- a/documents/GeoTopo/Kapitel4.tex +++ b/documents/GeoTopo/Kapitel4.tex @@ -568,11 +568,18 @@ Sei im Folgenden \enquote{IWS} die \enquote{Innenwinkelsumme}. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Mitschrieb vom 21.01.2014 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{bemerkung}%In Vorlesung: Bemerkung 14.12 +\begin{bemerkung}\label{bem:14.12}%In Vorlesung: Bemerkung 14.12 In einer euklidischen Ebene ist in jedem Dreieck die Innenwinkelsumme gleich $\pi$. \end{bemerkung} -\todo[inline]{Bild 1} + +\begin{figure} + \centering + \input{figures/triangle-2.tex} + \caption{Situation aus \cref{bem:14.12}} + \label{fig:14.12} +\end{figure} + \begin{beweis} Sei $g$ eine Parallele von $AB$ durch $C$. diff --git a/documents/GeoTopo/figures/triangle-2.tex b/documents/GeoTopo/figures/triangle-2.tex new file mode 100644 index 0000000..e5cb0cf --- /dev/null +++ b/documents/GeoTopo/figures/triangle-2.tex @@ -0,0 +1,32 @@ +\begin{tikzpicture} + \tkzSetUpPoint[shape=circle,size=10,color=black,fill=black] + \tkzSetUpLine[line width=1] + \tkzDefPoints{0/0/A, 3/0/B, 2/2/C} + \tkzDefPoints{0/2/Phelper, 1.75/2.5/PaboveLeft, 2.5/2.5/PaboveRight} + \tkzMarkAngle[arc=l,size=0.7cm,color=red,fill=red!20](B,A,C) + \tkzMarkAngle[arc=ll,size=0.7cm,color=orange,fill=orange!20](C,B,A) + \tkzMarkAngle[arc=lll,size=0.7cm,color=green,fill=green!20](A,C,B) + \tkzMarkAngle[arc=l,size=0.7cm,color=red,fill=red!20](Phelper,C,A) + \tkzMarkAngle[arc=ll,size=0.7cm,color=orange,fill=orange!20](PaboveLeft,C,Phelper) + \tkzDefLine[parallel=through C](A,B) \tkzGetPoint{Phelper2} + \tkzMarkAngle[arc=l,size=0.7cm,color=red,fill=red!20](Phelper2,C,PaboveRight) + \tkzLabelAngle[pos=0.4](Phelper2,C,PaboveRight){$\alpha$} + \tkzLabelAngle[pos=-0.4](Phelper,C,A){$\alpha''$} + \tkzLabelAngle[pos=0.4](B,A,C){$\alpha$} + \tkzLabelAngle[pos=0.4](C,B,A){$\beta$} + \tkzLabelAngle[pos=0.4](PaboveLeft,C,Phelper){$\beta$} + \tkzLabelAngle[pos=0.4](A,C,B){$\gamma$} + \tkzDrawLine(A,B) + \tkzDrawLine[add=0.2 and 0.4](A,C) + \tkzDrawLine[add=0.2 and 0.4](B,C) + + \node at ($(A)+(-0.47,-0.2)$) {$A$}; + \node at ($(B)+(0.35,-0.2)$) {$B$}; % \tkzLabelPoint[below](B){$B$} is not accurate enough + \node at ($(C)+(0.05,0.3)$) {$C$}; + \tkzDrawLine[add=0.6 and -0.1](C, Phelper2) + %\tkzMark[mark=||](C, PaboveRight) + %\tkzLabelLine[pos=0.8,below](A,B){$c$} + \tkzDrawPoints(A,B,C) + \tkzLabelSegment[pos=0.7,below](C,Phelper2){$g$} + \tkzMarkSegments[mark=||](A,B C,Phelper2) +\end{tikzpicture} diff --git a/tikz/triangle-2/Makefile b/tikz/triangle-2/Makefile new file mode 100644 index 0000000..af5c5b7 --- /dev/null +++ b/tikz/triangle-2/Makefile @@ -0,0 +1,31 @@ +SOURCE = triangle-2 +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/triangle-2/Readme.md b/tikz/triangle-2/Readme.md new file mode 100644 index 0000000..650989c --- /dev/null +++ b/tikz/triangle-2/Readme.md @@ -0,0 +1,3 @@ +Compiled example +---------------- +![Example](triangle-2.png) diff --git a/tikz/triangle-2/triangle-2.png b/tikz/triangle-2/triangle-2.png new file mode 100644 index 0000000..8feb724 Binary files /dev/null and b/tikz/triangle-2/triangle-2.png differ diff --git a/tikz/triangle-2/triangle-2.tex b/tikz/triangle-2/triangle-2.tex new file mode 100644 index 0000000..65f7cbc --- /dev/null +++ b/tikz/triangle-2/triangle-2.tex @@ -0,0 +1,38 @@ +\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/A, 3/0/B, 2/2/C} + \tkzDefPoints{0/2/Phelper, 1.75/2.5/PaboveLeft, 2.5/2.5/PaboveRight} + \tkzMarkAngle[arc=l,size=0.7cm,color=red,fill=red!20](B,A,C) + \tkzMarkAngle[arc=ll,size=0.7cm,color=orange,fill=orange!20](C,B,A) + \tkzMarkAngle[arc=lll,size=0.7cm,color=green,fill=green!20](A,C,B) + \tkzMarkAngle[arc=l,size=0.7cm,color=red,fill=red!20](Phelper,C,A) + \tkzMarkAngle[arc=ll,size=0.7cm,color=orange,fill=orange!20](PaboveLeft,C,Phelper) + \tkzDefLine[parallel=through C](A,B) \tkzGetPoint{Phelper2} + \tkzMarkAngle[arc=l,size=0.7cm,color=red,fill=red!20](Phelper2,C,PaboveRight) + \tkzLabelAngle[pos=0.4](Phelper2,C,PaboveRight){$\alpha$} + \tkzLabelAngle[pos=-0.4](Phelper,C,A){$\alpha''$} + \tkzLabelAngle[pos=0.4](B,A,C){$\alpha$} + \tkzLabelAngle[pos=0.4](C,B,A){$\beta$} + \tkzLabelAngle[pos=0.4](PaboveLeft,C,Phelper){$\beta$} + \tkzLabelAngle[pos=0.4](A,C,B){$\gamma$} + \tkzDrawLine(A,B) + \tkzDrawLine[add=0.2 and 0.4](A,C) + \tkzDrawLine[add=0.2 and 0.4](B,C) + + \node at ($(A)+(-0.47,-0.2)$) {$A$}; + \node at ($(B)+(0.35,-0.2)$) {$B$}; % \tkzLabelPoint[below](B){$B$} is not accurate enough + \node at ($(C)+(0.05,0.3)$) {$C$}; + \tkzDrawLine[add=0.6 and -0.1](C, Phelper2) + %\tkzMark[mark=||](C, PaboveRight) + %\tkzLabelLine[pos=0.8,below](A,B){$c$} + \tkzDrawPoints(A,B,C) + \tkzLabelSegment[pos=0.7,below](C,Phelper2){$g$} + \tkzMarkSegments[mark=||](A,B C,Phelper2) +\end{tikzpicture} +\end{document}