Neues LRT-Logo

ausarbeitung/inhalt/02_Beispielkapitel.tex

@@ -47,7 +47,7 @@ enthält zusätzlich einen Regler-Anteil, der die Abweichung $\Delta x_k$ zurüc
  Auch andere Darstellungsweisen von \cref{eq:bsp.stellgesetz} sind möglich. Diese werden am LRT untersucht, dessen Logo in \cref{fig:bsp.lrtlogo} dargestellt ist.
  \begin{figure}
  	\centering
-	\includegraphics[width=0.5 \linewidth]{vorlage-ausarbeitung/vorlagen-basis/images/LRT_Logo_XL}
+	\includegraphics[width=0.5 \linewidth]{vorlage-ausarbeitung/vorlagen-basis/images/lrt-logo}
  	\caption{Logo des Lehrstuhls für Regelungstechnik}
  	\label{fig:bsp.lrtlogo}
  \end{figure}

praesentation/vorlage-praesentation/format.tex

 % Formatierung der Beamervorlage LRT
-% Simon Kerschbaum 12/2015
 \beamertemplatenavigationsymbolsempty %damit keine Navigationssymbole
 
 
@@ -53,6 +52,17 @@
 
 \graphicspath{{Grafiken//}}% durchsucht alle Ordner in Grafiken (includegraphics) (WICHTIG: bei Pstool muss der exakte Pfad angegeben werden!!!)
 
+% Höhe des FAU-Logos, wenn es in deutsch \textwidth breit ist:
+\newlength{\fauLogoFullHeight}
+\setlength{\fauLogoFullHeight}{0.2763157894736842\textwidth} % 76/21 (Höhe/Breite-Verhältnis des deutschen FAU TechFak Logos)
+% \fauLogo{Skalierungsfaktor} fügt ein FAU-Logo der richtigen Sprache (deutsch/englisch) ein. Skalierungsfaktor 1 = volle Breite.
+\newcommand{\fauLogo}[1]{\includegraphics[height=#1\fauLogoFullHeight]{\pfadBasis /images/fau-logo\iflanguage{english}{-en}{}}}
+
+% Norm-Höhe des LRT-Logos, genau passend zu FAU-Logo
+\newlength{\lrtLogoFullHeight}
+\setlength{\lrtLogoFullHeight}{1.0\fauLogoFullHeight} % hier geeignetes Verhältnis zu FAU-Logo einstellen, damit Logos nebeneinander gut aussehen.
+% \lrtLogo{Skalierungsfaktor} fügt ein LRT-Logo der richtigen Sprache ein. Skalierungsfaktor 1 = volle Breite.
+\newcommand{\lrtLogo}[1]{\includegraphics[height=#1\lrtLogoFullHeight]{\pfadBasis /images/lrt-logo\iflanguage{english}{-en}{}}}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%   Formatierung fuer Titelseite                                                                    %%%
@@ -190,7 +200,7 @@
 \newlength{\leftBor}
 \newlength{\picShift}
 \newlength{\inSep}
-\newlength{\picWidth}
+\newcommand{\fauLogoScaling}{1}
 \newlength{\footHeight}
 \ifthenelse{\boolean{small_border}}
 {
@@ -198,9 +208,9 @@
 \setlength{\picShift}{0mm}
 \setlength{\inSep}{0mm}
 \ifthenelse{\boolean{shaded_line}}{
-	\setlength{\picWidth}{0.26227\textwidth}
+	\renewcommand{\fauLogoScaling}{0.26227}
 }{
-	\setlength{\picWidth}{0.275\textwidth}
+	\renewcommand{\fauLogoScaling}{0.275}
 }
 \setlength{\footHeight}{1.5em}
 }
@@ -208,7 +218,7 @@
 \setlength{\leftBor}{2.5mm}
 \setlength{\picShift}{0.5mm}
 \setlength{\inSep}{1mm}
-\setlength{\picWidth}{0.2475\textwidth}
+\renewcommand{\fauLogoScaling}{0.2475}
 \setlength{\footHeight}{0em}
 }
 
@@ -224,7 +234,7 @@
 \begin{beamercolorbox}[sep=0cm,ht=1.5mm,dp=0.2mm,wd=0.8\textwidth,leftskip=0mm]{frametitle}
 	\begin{tikzpicture}[overlay, remember picture]
 		\node(top title)[anchor=north west, xshift=\leftBor, yshift=-6mm,inner ysep=-1pt, inner xsep = 0pt] at (current page.north west){\parbox{0.75\textwidth}{\raggedright \normalsize \strut\insertframetitle\strut}}; 
-		\node(bild1)[anchor=north east, yshift=-\picShift, inner sep=\inSep] at (current page.north east){\includegraphics[width=\picWidth]{\pfadBasis /images/Logo_Tech-Fak_DinA4_RGB.png}{}};
+		\node(bild1)[anchor=north east, yshift=-\picShift, inner sep=\inSep] at (current page.north east){\fauLogo{\fauLogoScaling}{}};
 	%\rect[dashed]{top title}
 	\end{tikzpicture}
 %	\vspace*{-1mm}
@@ -249,7 +259,7 @@
 	\begin{tikzpicture}[overlay, remember picture]
 		\node(top title)[anchor=north west, xshift=\leftBor, yshift=-2.2mm,inner sep=0pt,text depth=0.7mm, text height=1.6ex] at (current page.north west){\setlength{\parskip}{0pt}\parbox{0.8\textwidth}{\raggedright 
 		\strut\insertframetitle\strut}};
-		\node(bild1)[anchor=north east] at (current page.north east){\includegraphics[width=0.16\textwidth]{\pfadBasis /images/Logo_Tech-Fak_DinA4_RGB.png}{}};
+		\node(bild1)[anchor=north east] at (current page.north east){\fauLogo{0.16}{}};
 	%\rect[dashed]{top title}
 	\end{tikzpicture}
 \begin{tikzpicture}
@@ -276,6 +286,7 @@
 \setbeamertemplate{footline}[text line]%
 {%
 \ifpdf%
+
 \begin{tikzpicture}[overlay, remember picture]%
 \ifthenelse{\boolean{small_border}}
 {
@@ -289,14 +300,14 @@
 {
 \ifthenelse{\boolean{small_footline}}%
 {%
-\node (bild2)[anchor=south west, xshift=0mm, inner ysep=0pt, yshift=1mm] at (current page.south west){\includegraphics[width=0.15\paperwidth]{\pfadBasis /images/LRT_Logo_XL.pdf}};
+\node (bild2)[anchor=south west, xshift=0mm, inner ysep=0pt, yshift=1mm] at (current page.south west){\lrtLogo{.16}};
 \node(bottom title)[anchor=south west,yshift=-0mm,insn] at ($(bild2.south east)+(0, -0.5mm)$){\parbox{0.75\paperwidth}{\absatz{\mbox{\insertshortauthor:}}{\insertshorttitle}}};
 \node(seitenzahl)[insn,anchor=base east,xshift=-2.5mm] at (bottom title.base -| current page.south east){\scriptsize \insertframenumber};
 \coordinate(linebegin) at ($(bottom title.north west)+(0,1.2mm)$);
 \draw[line width=0.25mm,shorten <=0mm, black](linebegin)--(linebegin-|seitenzahl.north east)node[coordinate](footnotenode){};
 }%
 {%
-\node (bild2)[anchor=south west,xshift=0mm,inner ysep=0pt,yshift=1mm] at (current page.south west){\includegraphics[width=0.15\paperwidth]{\pfadBasis /images/LRT_Logo_XL.pdf}{}};
+\node (bild2)[anchor=south west,xshift=0mm,inner ysep=0pt,yshift=1mm] at (current page.south west){\lrtLogo{.16}};
 \node(bottom title)[anchor=north west,yshift=-1.2mm] at (bild2.north east){\parbox{0.75\paperwidth}{\absatz{\mbox{\insertshortauthor:}}{\insertshorttitle}}};
 \node(seitenzahl)[insn,anchor=base east,xshift=-2.5mm] at (bottom title.base -| current page.south east){\scriptsize \insertframenumber};
 \coordinate(linebegin) at ($(bild2.north east)-(0,0.7mm)$);

vorlagen-basis @ 5c1180ec

-Subproject commit 474c62532b5d5c2e2b92dbc5dbe10a96f225425b
+Subproject commit 5c1180ec62d3b17a6980e8bf4c2be8446a24be4b

praesentation/vortrag.tex

 \documentclass[%
-	ngerman,
+	ngerman, % oder: english,
 	fleqn,
 	t,
 	10pt,