summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty')
-rw-r--r--macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty67
1 files changed, 62 insertions, 5 deletions
diff --git a/macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty b/macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty
index a69265b603..0a7b633552 100644
--- a/macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty
+++ b/macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty
@@ -10,7 +10,7 @@
%
\NeedsTeXFormat{LaTeX2e}[1996/12/26]
-\ProvidesPackage{srdp-mathematik}[2019/07/10 v1.3 Standard-Schularbeitsformate]
+\ProvidesPackage{srdp-mathematik}[2019/07/10 v1.4 Standard-Schularbeitsformate]
\usepackage{color}
@@ -53,7 +53,8 @@
\renewcommand{\vec}[1]{\vv{#1}}
\usepackage{graphicx}
\usepackage{setspace}
-\usepackage{enumerate}
+%\usepackage{enumerate}
+\usepackage[inline, shortlabels]{enumitem}
\usepackage{xparse}
\usepackage{eurosym, xspace}
\renewcommand*\euro{\officialeuro\xspace}
@@ -84,9 +85,23 @@
%
%
\newcounter{Antworten}
+\newcounter{Zufall}
+\newcounter{info}
\newcounter{marker}
\DeclareOption{solution_on}{\setcounter{Antworten}{1}}
\DeclareOption{solution_off}{\setcounter{Antworten}{0}}
+\DeclareOption{info_on}{\setcounter{info}{1}}
+\DeclareOption{info_off}{\setcounter{info}{0}}
+\DeclareOption{random=0}{\setcounter{Zufall}{0}}
+\DeclareOption{random=1}{\setcounter{Zufall}{1}}
+\DeclareOption{random=2}{\setcounter{Zufall}{2}}
+\DeclareOption{random=3}{\setcounter{Zufall}{3}}
+\DeclareOption{random=4}{\setcounter{Zufall}{4}}
+\DeclareOption{random=5}{\setcounter{Zufall}{5}}
+\DeclareOption{random=6}{\setcounter{Zufall}{6}}
+\DeclareOption{random=7}{\setcounter{Zufall}{7}}
+\DeclareOption{random=8}{\setcounter{Zufall}{8}}
+\DeclareOption{random=9}{\setcounter{Zufall}{9}}
\AtBeginDocument{\@ifpackagewith{srdp-mathematik}{solution_on}{
\AddToShipoutPictureBG{%
@@ -104,6 +119,16 @@
\newcommand{\antwort}[2][]{\ifthenelse{\theAntworten=1}{\color[rgb]{1,0,0}#2\color[rgb]{0,0,0}}{#1}}
+\newcommand{\info}[2][]{\ifthenelse{\theinfo=1}{
+\color[rgb]{0,0,1}{#2}\color[rgb]{0,0,0}
+}{#1}}
+
+
+%\NewEnviron{antwort}[1][hallo]{\textcolor{red}{\BODY}}
+%\NewEnviron{antwort}[2][]{\ifthenelse{\theAntworten=1}{\color[rgb]{1,0,0}#1\color[rgb]{0,0,0}}{#2}}
+%\newenvironment{antwort}[2][]{\color[rgb]{1,0,0}{#1}}{\color[rgb]{0,0,0}}
+
+
\newcounter{A1}
\newcounter{A2}
@@ -155,7 +180,7 @@
\NewEnviron{beispiel}[2][\unskip]{\begin{minipage}[t]{0.88\textwidth}
\addtocounter{number}{1}
-\begin{enumerate}
+\begin{enumerate}[leftmargin=0pt]
\item[\thenumber.] \BODY
\end{enumerate}
@@ -207,7 +232,8 @@
\renewcommand{\labelenumii}{(\roman{enumii})}
\list
{}
- {%
+ {%
+ \leftmargin.0pt
\rightmargin.12\textwidth
\def\makelabel##1{\stepcounter{number}%
\hss\llap{\thenumber.}%
@@ -216,13 +242,38 @@
\llap{\small\_\_\_/##1}}}}%
}
{\endlist}
+
\makeatother
+
+\newcommand{\typzwei}{}
+\newcounter{subitemcounter}
+\newcommand{\Subitem}[1]{\stepcounter{subitemcounter}\begin{enumerate}[\thesubitemcounter),leftmargin=*]\itemalt{#1}\end{enumerate}}
+\newcommand{\Aitem}{\item \fbox{A} }
+\newcommand{\ASubitem}[1]{\Subitem{\fbox{A} #1}}
+\NewEnviron{aufgabenstellung}[1]{\let\itemalt\item
+\renewcommand*{\item}{\setcounter{subitemcounter}{0}\itemalt}
+\subsubsection{Aufgabenstellung:}%
+\begin{enumerate}[a),leftmargin=*]
+\item \BODY
+\end{enumerate}%
+\let\item\itemalt}
+
+\NewEnviron{loesung}[1]{\let\itemalt\item
+\renewcommand*{\item}{\setcounter{subitemcounter}{0}\itemalt}
+\antwort{%%
+\begin{enumerate}[a),leftmargin=*]
+\item \BODY
+\end{enumerate}}%
+\let\item\itemalt}
+
%
%
%
%
%
%
+
+
%%%%%%%%%%%%%%%%%%%%%%%%% Vektorendefinition
\newcommand{\vek}[1]{\overrightarrow{#1}}%
@@ -246,6 +297,12 @@
%
%
+%%%%%%%%%%%%%%%%%%%% INTEGRAL BEFEHL
+%\newcommand{\dx}{\,\text{d}x}
+\newcommand{\dx}[1][x]{\,\text{d}#1}
+\newcommand{\dint}{\displaystyle\int}
+
+
%%%%%%%%%% HOMEWORK BEFEHL
\newcommand{\hw}[1]{
@@ -461,7 +518,7 @@ Beurteilung: \rule{8cm}{0.4pt}
%%%%%%%%%%%%%%%%
-\newcounter{Zufall}
+
\makeatletter
\def\prunelist#1{%
\expandafter\edef\csname pgfmath@randomlist@#1\endcsname