1.1 --- a/00_vorstellung.tex	Thu Jun 21 11:36:57 2007 +0200
     1.2 +++ b/00_vorstellung.tex	Thu Jun 21 17:53:50 2007 +0200
     1.3 @@ -20,11 +20,9 @@
     1.4  
     1.5  
     1.6  \title{Design Patterns}
     1.7 -\author{Markus Rundel,\\ Julian Haug,\\ Markus Schnalke,\\ Dimitar Dimitrov}
     1.8 +\author{Markus Rundel \\ Julian Haug \\ Markus Schnalke \\ Dimitar Dimitrov}
     1.9  \date{\today}
    1.10  
    1.11 -%\titlegraphic{\includegraphics[width=3cm]{Pics/Maka-Logo.png}}
    1.12 -
    1.13  \frame{
    1.14    \titlepage
    1.15  }
    1.16 @@ -34,27 +32,33 @@
    1.17  
    1.18  
    1.19  \section[Outline]{}
    1.20 +
    1.21  \frame{
    1.22 -   \begin{block}{Einführung in Design Patterns}
    1.23 -   \end{block}
    1.24 +  \tableofcontents
    1.25 +}
    1.26  
    1.27 -   \begin{block}{Weitere Patterns}
    1.28 -   \end{block}
    1.29  
    1.30 -   \begin{block}{Design Pattern ``Observer''}
    1.31 -   \end{block}
    1.32 +% the following content gets removed by `make merge'
    1.33  
    1.34 -   \begin{block}{Design Pattern ``Composite''}
    1.35 -   \end{block}
    1.36 +\section{Einführung in Design Patterns}
    1.37 +  \subsubsection{Markus Rundel}
    1.38  
    1.39 -   \begin{block}{Exkurs: Anti-Patterns}
    1.40 -   \end{block}
    1.41 +\section{Andere Patterns}
    1.42 +  \subsubsection{Julian Haug}
    1.43  
    1.44 -   \begin{block}{Zusammenfassung}
    1.45 -   \end{block}
    1.46 +\section{Observer-Pattern}
    1.47 +  \subsubsection{Markus Schnalke}
    1.48  
    1.49 -%  \tableofcontents
    1.50 -}
    1.51 +\section{Composite-Pattern}
    1.52 +  \subsubsection{Dimitar Dimitriv}
    1.53 +
    1.54 +\section{Anti-Patterns}
    1.55 +  \subsubsection{Julian Haug}
    1.56 +
    1.57 +\section{Zusammenfassung}
    1.58 +  \subsubsection{gemeinsam}
    1.59 +
    1.60 +  .  % this dot is needed to have the sections displayed
    1.61  
    1.62  \end{document}
    1.63  

     2.1 --- a/Makefile	Thu Jun 21 11:36:57 2007 +0200
     2.2 +++ b/Makefile	Thu Jun 21 17:53:50 2007 +0200
     2.3 @@ -15,6 +15,7 @@
     2.4  
     2.5  merge:
     2.6  	rm all.pdf
     2.7 +	pdftk A=00_vorstellung.pdf cat A1-2 output 00_vorstellung-mod.pdf && rm 00_vorstellung.pdf
     2.8  	pdftk *.pdf cat output all.pdf
     2.9  
    2.10