Merge branch 'master' into master

6 files changed, 89 insertions, 20 deletions

diff --git a/buch/common/lststyles.tex b/buch/common/lststyles.tex
index b1105ed..15ac379 100644
--- a/buch/common/lststyles.tex
+++ b/buch/common/lststyles.tex
@@ -12,6 +12,29 @@
 \definecolor{mygreen}{RGB}{28,172,0} % color values Red, Green, Blue
 \definecolor{mylilas}{RGB}{170,55,241}
 
+\lstset{
+  extendedchars=true,
+  basicstyle=\ttfamily,
+  literate=%
+  {€}{\euro}1%
+  {§}{\S}1%
+  {°}{\textdegree{}}1%
+  {ä}{{\"a}}1%
+  {ö}{{\"o}}1%
+  {ü}{{\"u}}1%
+  {ß}{{\ss}}1%
+  {Ä}{{\"A}}1%
+  {Ö}{{\"O}}1%
+  {Ü}{{\"U}}1%
+  {µ}{\textmu}1%
+  {¹}{{\textsuperscript{1}}}1%
+  {²}{{\textsuperscript{2}}}1%
+  {³}{{\textsuperscript{3}}}1%
+  {¼}{\textonequarter}1%
+  {½}{\textonehalf}1%
+  {¢}{\textcent}1%
+}
+
 \lstdefinestyle{Matlab}{
   numbers=left,
   belowcaptionskip=1\baselineskip,
diff --git a/buch/common/macros.tex b/buch/common/macros.tex
index 2c6eea2..5783122 100644
--- a/buch/common/macros.tex
+++ b/buch/common/macros.tex
@@ -108,6 +108,7 @@
 \newtheorem{forderung}{Forderung}[chapter]
 \newtheorem{konsequenz}[satz]{Konsequenz}
 \newtheorem{algorithmus}[satz]{Algorithmus}
+\newtheorem{ziel}[satz]{Ziel}
 \renewcommand{\floatpagefraction}{0.7}
 
 \definecolor{darkgreen}{rgb}{0,0.6,0}
diff --git a/buch/test3.tex b/buch/common/test-common.tex
index 71b1529..289e59c 100644
--- a/buch/test3.tex
+++ b/buch/common/test-common.tex
@@ -1,9 +1,8 @@
 %
-% test3.tex -- Test 3
+% test.tex -- Gemeinsamer Rahmen für Kurztests
 %
-% (c) 2021 Prof. Dr. Andreas Mueller, OST
+% (c) 2021 Prof. Dr. Andreas Mueller, OST Ostschweizer Fachhochschule
 %
-%\documentclass[a4paper,12pt]{book}
 \documentclass[a4paper,12pt]{article}
 \usepackage{geometry}
 \geometry{papersize={210mm,297mm},total={165mm,260mm}}
@@ -72,20 +71,3 @@
 \renewcommand{\qedsymbol}{}
 \begin{proof}[Hinweis]}{\end{proof}}
 
-\begin{document}
-{\parindent0pt\hbox to\hsize{%
-Name: \hbox to7cm{\dotfill} Vorname: \dotfill}}
-\vspace{0.5cm}
-
-\section*{Kurztest 3}
-
-\begin{uebungsaufgaben}
-
-\item
-\input chapters/60-gruppen/uebungsaufgaben/6001.tex
-%\item
-%\input chapters/60-gruppen/uebungsaufgaben/6002.tex
-
-\end{uebungsaufgaben}
-
-\end{document}
diff --git a/buch/common/test1.tex b/buch/common/test1.tex
new file mode 100644
index 0000000..1f5a155
--- /dev/null
+++ b/buch/common/test1.tex
@@ -0,0 +1,21 @@
+%
+% test1.tex -- Test 1
+%
+% (c) 2021 Prof. Dr. Andreas Mueller, OST
+%
+\input{common/test-common.tex}
+
+\begin{document}
+{\parindent0pt\hbox to\hsize{%
+Name: \hbox to7cm{\dotfill} Vorname: \dotfill}}
+\vspace{0.5cm}
+
+\section*{Kurztest 1}
+
+\begin{uebungsaufgaben}
+
+\input{aufgaben1.tex}
+
+\end{uebungsaufgaben}
+
+\end{document}
diff --git a/buch/common/test2.tex b/buch/common/test2.tex
new file mode 100644
index 0000000..0980e44
--- /dev/null
+++ b/buch/common/test2.tex
@@ -0,0 +1,21 @@
+%
+% test2.tex -- Test 2
+%
+% (c) 2012 Prof. Dr. Andreas Mueller, OST
+%
+\input{common/test-common.tex}
+
+\begin{document}
+{\parindent0pt\hbox to\hsize{%
+Name: \hbox to7cm{\dotfill} Vorname: \dotfill}}
+\vspace{0.5cm}
+
+\section*{Kurztest 2}
+
+\begin{uebungsaufgaben}
+
+\input{aufgaben2.tex}
+
+\end{uebungsaufgaben}
+
+\end{document}
diff --git a/buch/common/test3.tex b/buch/common/test3.tex
new file mode 100644
index 0000000..8b24262
--- /dev/null
+++ b/buch/common/test3.tex
@@ -0,0 +1,21 @@
+%
+% test3.tex -- Test 3
+%
+% (c) 2021 Prof. Dr. Andreas Mueller, OST
+%
+\input{common/test-common.tex}
+
+\begin{document}
+{\parindent0pt\hbox to\hsize{%
+Name: \hbox to7cm{\dotfill} Vorname: \dotfill}}
+\vspace{0.5cm}
+
+\section*{Kurztest 3}
+
+\begin{uebungsaufgaben}
+
+\input{aufgaben3.tex}
+
+\end{uebungsaufgaben}
+
+\end{document}