diff --git a/documents/GeoTopo/Arbeitszeit.md b/documents/GeoTopo/Arbeitszeit.md index 2851ed7..edd9118 100644 --- a/documents/GeoTopo/Arbeitszeit.md +++ b/documents/GeoTopo/Arbeitszeit.md @@ -29,3 +29,4 @@ in dem Erstellen dieses Skripts steckt: |12.01.2014 | 23:30 - 00:00 | Gruppenaktion -> Gruppenoperation; Projektiver Raum zu Index hinzugefügt |13.01.2014 | 19:00 - 00:00 | TODOs erledigen; Tippfehler korrigieren |14.01.2014 | 11:15 - 12:45 | Digitalisieren der Vorlesung von 14.01.2014 +|14.01.2014 | 12:45 - 12:40 | TikZ'en der Bilder aus Vorlesung von 14.01.2014 diff --git a/documents/GeoTopo/GeoTopo.pdf b/documents/GeoTopo/GeoTopo.pdf index a6bcdad..03a2125 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 2511124..ada1b5f 100644 --- a/documents/GeoTopo/Kapitel4.tex +++ b/documents/GeoTopo/Kapitel4.tex @@ -207,11 +207,11 @@ aufgestellt. Ist $R \in AB$, so enthält $AB$ 2 Fixpunkte von $\varphi$ $\stackrel{Beh.~2'}{\Rightarrow} \varphi(A) = A$. - \begin{figure} + \begin{figure}[H] \centering - \includegraphics[width=0.5\linewidth, keepaspectratio]{figures/todo/bild-1.jpg} - \caption{TODO}. - \label{fig:bild-1} + \input{figures/geometry-1.tex} + \caption{$P, Q, R$ sind Fixpunke, $B \in \overline{PQ} \setminus \Set{P,Q}$, $A \notin PQ \cup PR \cup QR$} + \label{fig:geometry-1} \end{figure} Ist $R \notin AB$, so ist $AB \cap \overline{PR} \neq \emptyset$ @@ -240,9 +240,9 @@ aufgestellt. \begin{figure} \centering - \includegraphics[width=0.5\linewidth, keepaspectratio]{figures/todo/bild-2.jpg} - \caption{Die beiden roten und die beiden blauen Linien sind gleich. Intuitiv weiß man, dass daraus folgt, dass $\varphi_1(R) = \varphi_2(R)$ gilt.}. - \label{fig:bild-1} + \input{figures/geometry-2.tex} + \caption{Die beiden roten und die beiden blauen Linien sind gleich lang. Intuitiv weiß man, dass daraus folgt, dass $\varphi_1(R) = \varphi_2(R)$ gilt.}. + \label{fig:bild-2} \end{figure} \end{beweis} diff --git a/documents/GeoTopo/figures/geometry-1.tex b/documents/GeoTopo/figures/geometry-1.tex new file mode 100644 index 0000000..32a38cf --- /dev/null +++ b/documents/GeoTopo/figures/geometry-1.tex @@ -0,0 +1,20 @@ +\begin{tikzpicture} + \tikzstyle{point}=[circle,thick,draw=black,fill=black,inner sep=0pt,minimum width=4pt,minimum height=4pt] + \node (P)[point,label={[label distance=0cm]210:$P$}] at (0,0) {}; + \node (B)[point,label={[label distance=0cm]-90:$B$}] at (2.5,0) {}; + \node (Q)[point,label={[label distance=0cm]-90:$Q$}] at (4,0) {}; + \node (C)[point,label={[label distance=0cm]90:$C$}] at (1.5,1.5) {}; + \node (R)[point,label={[label distance=0cm]90:$R$}] at (2.5,2.5) {}; + + \node (A)[point,label={[label distance=0cm]0:$A$}] at (0.5,3) {}; + + \draw[very thick] (P) edge node {} (B); + \draw[very thick] (B) edge node {} (Q); + \draw[very thick] (P) edge node {} (C); + \draw[very thick] (C) edge node {} (R); + + \draw[very thick] (B) edge node {} (C); + \draw[very thick] (C) edge node {} (A); + + \draw[very thick] (Q) edge node {} (R); +\end{tikzpicture} diff --git a/documents/GeoTopo/figures/geometry-2.tex b/documents/GeoTopo/figures/geometry-2.tex new file mode 100644 index 0000000..8568591 --- /dev/null +++ b/documents/GeoTopo/figures/geometry-2.tex @@ -0,0 +1,13 @@ +\begin{tikzpicture} + \tikzstyle{point}=[circle,thick,draw=black,fill=black,inner sep=0pt,minimum width=4pt,minimum height=4pt] + \node (P)[point,label={[label distance=0cm]-90:$P$}] at (0,0) {}; + \node (Q)[point,label={[label distance=0cm]-90:$Q$}] at (5,1) {}; + \node (A)[point,label={[label distance=0cm]180:$\varphi_1(R)$}] at (2,2) {}; + \node (B)[point,label={[label distance=0cm]190:$\varphi_2(R)$}] at (1,3) {}; + + \draw[very thick] (P) edge node {} (Q); + \draw[very thick, red] (P) edge node {} (A); + \draw[very thick, red] (P) edge node {} (B); + \draw[very thick, green] (Q) edge node {} (A); + \draw[very thick, green] (Q) edge node {} (B); +\end{tikzpicture} diff --git a/documents/GeoTopo/figures/todo/bild-1.jpg b/documents/GeoTopo/figures/todo/bild-1.jpg deleted file mode 100644 index 759beaa..0000000 Binary files a/documents/GeoTopo/figures/todo/bild-1.jpg and /dev/null differ diff --git a/documents/GeoTopo/figures/todo/bild-2.jpg b/documents/GeoTopo/figures/todo/bild-2.jpg deleted file mode 100644 index eeb85ae..0000000 Binary files a/documents/GeoTopo/figures/todo/bild-2.jpg and /dev/null differ diff --git a/tikz/geometry-1/Makefile b/tikz/geometry-1/Makefile new file mode 100644 index 0000000..2062394 --- /dev/null +++ b/tikz/geometry-1/Makefile @@ -0,0 +1,31 @@ +SOURCE = geometry-1 +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-1/Readme.md b/tikz/geometry-1/Readme.md new file mode 100644 index 0000000..a8a576d --- /dev/null +++ b/tikz/geometry-1/Readme.md @@ -0,0 +1,3 @@ +Compiled example +---------------- +![Example](geometry-1.png) diff --git a/tikz/geometry-1/geometry-1.png b/tikz/geometry-1/geometry-1.png new file mode 100644 index 0000000..0714764 Binary files /dev/null and b/tikz/geometry-1/geometry-1.png differ diff --git a/tikz/geometry-1/geometry-1.tex b/tikz/geometry-1/geometry-1.tex new file mode 100644 index 0000000..fb99a31 --- /dev/null +++ b/tikz/geometry-1/geometry-1.tex @@ -0,0 +1,25 @@ +\documentclass[varwidth=true, border=2pt]{standalone} +\usepackage{tikz} + +\begin{document} +\begin{tikzpicture} + \tikzstyle{point}=[circle,thick,draw=black,fill=black,inner sep=0pt,minimum width=4pt,minimum height=4pt] + \node (P)[point,label={[label distance=0cm]210:$P$}] at (0,0) {}; + \node (B)[point,label={[label distance=0cm]-90:$B$}] at (2.5,0) {}; + \node (Q)[point,label={[label distance=0cm]-90:$Q$}] at (4,0) {}; + \node (C)[point,label={[label distance=0cm]90:$C$}] at (1.5,1.5) {}; + \node (R)[point,label={[label distance=0cm]90:$R$}] at (2.5,2.5) {}; + + \node (A)[point,label={[label distance=0cm]0:$A$}] at (0.5,3) {}; + + \draw[very thick] (P) edge node {} (B); + \draw[very thick] (B) edge node {} (Q); + \draw[very thick] (P) edge node {} (C); + \draw[very thick] (C) edge node {} (R); + + \draw[very thick] (B) edge node {} (C); + \draw[very thick] (C) edge node {} (A); + + \draw[very thick] (Q) edge node {} (R); +\end{tikzpicture} +\end{document} diff --git a/tikz/geometry-2/Makefile b/tikz/geometry-2/Makefile new file mode 100644 index 0000000..6ac7b64 --- /dev/null +++ b/tikz/geometry-2/Makefile @@ -0,0 +1,31 @@ +SOURCE = geometry-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/geometry-2/Readme.md b/tikz/geometry-2/Readme.md new file mode 100644 index 0000000..3689d4f --- /dev/null +++ b/tikz/geometry-2/Readme.md @@ -0,0 +1,3 @@ +Compiled example +---------------- +![Example](geometry-2.png) diff --git a/tikz/geometry-2/geometry-2.png b/tikz/geometry-2/geometry-2.png new file mode 100644 index 0000000..1e015be Binary files /dev/null and b/tikz/geometry-2/geometry-2.png differ diff --git a/tikz/geometry-2/geometry-2.tex b/tikz/geometry-2/geometry-2.tex new file mode 100644 index 0000000..da283ef --- /dev/null +++ b/tikz/geometry-2/geometry-2.tex @@ -0,0 +1,18 @@ +\documentclass[varwidth=true, border=2pt]{standalone} +\usepackage{tikz} + +\begin{document} +\begin{tikzpicture} + \tikzstyle{point}=[circle,thick,draw=black,fill=black,inner sep=0pt,minimum width=4pt,minimum height=4pt] + \node (P)[point,label={[label distance=0cm]-90:$P$}] at (0,0) {}; + \node (Q)[point,label={[label distance=0cm]-90:$Q$}] at (5,1) {}; + \node (A)[point,label={[label distance=0cm]180:$\varphi_1(R)$}] at (2,2) {}; + \node (B)[point,label={[label distance=0cm]190:$\varphi_2(R)$}] at (1,3) {}; + + \draw[very thick] (P) edge node {} (Q); + \draw[very thick, red] (P) edge node {} (A); + \draw[very thick, red] (P) edge node {} (B); + \draw[very thick, green] (Q) edge node {} (A); + \draw[very thick, green] (Q) edge node {} (B); +\end{tikzpicture} +\end{document}