diff options
| -rw-r--r-- | zeitung/main.tex | 7 | ||||
| -rw-r--r-- | zeitung/parts/studenttemplate.tex | 52 |
2 files changed, 23 insertions, 36 deletions
diff --git a/zeitung/main.tex b/zeitung/main.tex index f447f3f..3afc3b2 100644 --- a/zeitung/main.tex +++ b/zeitung/main.tex @@ -8,9 +8,10 @@ \usepackage{fontspec,xunicode,xltxtra} \usepackage{afterpage} \usepackage{sectsty} -\usepackage{tikz,float} +\usepackage{float} \usepackage{kantlipsum,lipsum} \usepackage{eso-pic} +\usepackage{ragged2e} \usepackage{fancyhdr} \usepackage{background} \usepackage{changepage} @@ -43,7 +44,7 @@ \fancyheadoffset{2.5cm} \fancyfootoffset{2.5cm} \fancyhf{} -\fancyhead[L]{\hspace*{1cm}\vspace*{0.3cm}\Huge{\rightmark}} +\fancyhead[L]{\hspace*{1cm}\vspace*{0.7cm}\Huge{\rightmark}} \fancyfoot[R]{\vspace*{-15pt}\oddflip[keepaspectratio=true, width=\paperwidth]{welle.png}} \fancyfoot[L]{\checkoddpage\vspace*{-1.3cm}\hspace*{\ifoddpage 3cm \else 17.5cm \fi}\Huge{\thepage}} @@ -75,7 +76,7 @@ \backgroundsetup{contents={}} \part{titlepage} -\backgroundsetup{contents={\oddflip[keepaspectratio=true, width=\paperwidth]{kordel.png}},scale=1.1,placement=top,opacity=1,position=current page.north} +\backgroundsetup{contents={\oddflip[keepaspectratio=true, width=\paperwidth]{kordel.png}},scale=1.1,placement=top,opacity=1,position={0.5\textwidth, 3.3cm}} \part{tableofcontents} \part{introduction} \part{classphoto} diff --git a/zeitung/parts/studenttemplate.tex b/zeitung/parts/studenttemplate.tex index 9d9d036..0fb3dfc 100644 --- a/zeitung/parts/studenttemplate.tex +++ b/zeitung/parts/studenttemplate.tex @@ -38,7 +38,7 @@ % Frame \def\framex{130pt} -\def\framey{40pt} +\def\framey{20pt} \def\framewidth{180pt} \def\frameimgwidth{160pt} \def\frameoffset{(\framewidth - \frameimgwidth) / 2} @@ -58,41 +58,27 @@ % Steckbrief Tabelle \ifoddpage - \def\tablex{12} + \def\tablex{0.5\linewidth} \else - \def\tablex{3} + \def\tablex{-1cm} \fi -\def\tabley{-5} -\def\tablewidth{6cm} -\begin{tikzpicture}[overlay] - \node[text width=250pt, align=left] at (\tablex, \tabley) { - \Large{\begin{tabular}{@{}ll@{}} - \textbf{Name:} & \stdname \\ - \textbf{Geburtstag:} & \multicolumn{1}{p{\tablewidth}}{\stdbirthday} \\ - \textbf{Lieblingsfach:} & \multicolumn{1}{p{\tablewidth}}{\stdfavsub} \\ - \textbf{Hassfach:} & \multicolumn{1}{p{\tablewidth}}{\stdhatesub} \\ - \textbf{Hobbies:} & \multicolumn{1}{p{\tablewidth}}{\stdhobbies} \\ - \textbf{Musik:} & \multicolumn{1}{p{\tablewidth}}{\stdmusic} \\ - \end{tabular}}\\~\\ - \textbf{Das werde ich am meisten vermissen:}\\\stdmissing\\~\\ - \textbf{Ohne das hätte ich die Oberstufe nicht geschafft:}\\\stdmotivation\\~\\ - \textbf{Lebensmotto:}\\\stdquote\\~\\ - }; -\end{tikzpicture} +\def\tablewidth{0.6\linewidth} -\ifoddpage - \def\tablex{-1.25cm} -\else - \def\tablex{5cm} -\fi -\def\tablewidth{\textwidth} - -\vskip 10cm -\hspace*{\tablex} -\Large{\begin{tabular}{@{}ll@{}} - %\textbf{Erkennungsmerkmale:} & \multicolumn{1}{p{\tablewidth}}{\stdidk} \\ - \textbf{Zukunftspläne:} & \multicolumn{1}{p{\tablewidth}}{\stdfuture} \\ - \end{tabular}} +\hspace*{\tablex}\Large\begin{minipage}{\tablewidth} + \begin{tabular}{@{}ll@{}} + \textbf{Name:} & \stdname \\ + \textbf{Geburtstag:} & \multicolumn{1}{p{\tablewidth}}{\RaggedRight\stdbirthday} \\ + \textbf{Lieblingsfach:} & \multicolumn{1}{p{\tablewidth}}{\RaggedRight\stdfavsub} \\ + \textbf{Hassfach:} & \multicolumn{1}{p{\tablewidth}}{\RaggedRight\stdhatesub} \\ + \textbf{Hobbies:} & \multicolumn{1}{p{\tablewidth}}{\RaggedRight\stdhobbies} \\ + \textbf{Musik:} & \multicolumn{1}{p{\tablewidth}}{\RaggedRight\stdmusic} \\ + \end{tabular}\\~\\ + \textbf{Das werde ich am meisten vermissen:}\\\stdmissing\\~\\ + \textbf{Ohne das hätte ich die Oberstufe nicht geschafft:}\\\stdmotivation\\~\\ + \textbf{Lebensmotto:}\\\stdquote\\~\\ + \textbf{Zukunftspläne:}\\\stdfuture\\~\\ + %\textbf{Erkennungsmerkmale:}\\\stdidk\\~\\ +\end{minipage} \begin{figure}[H] \hspace*{-2.5cm}\includegraphics[keepaspectratio=true, width=\paperwidth]{mittelwelle.png} |