summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/srdp-mathematik/srdp-mathematik.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-14 22:08:11 +0000
committerKarl Berry <karl@freefriends.org>2019-01-14 22:08:11 +0000
commit8af9a4793946fecf843c500b86aff321a0f5f47d (patch)
tree215b0f28fd6fb10756f77bee3edfb07f92947038 /Master/texmf-dist/tex/latex/srdp-mathematik/srdp-mathematik.sty
parent2464f44948bb379ec3bb813d9fa0c937dcb4e6a8 (diff)
srdp-mathematik (14jan19)
git-svn-id: svn://tug.org/texlive/trunk@49706 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/srdp-mathematik/srdp-mathematik.sty')
-rw-r--r--Master/texmf-dist/tex/latex/srdp-mathematik/srdp-mathematik.sty21
1 files changed, 10 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/srdp-mathematik/srdp-mathematik.sty b/Master/texmf-dist/tex/latex/srdp-mathematik/srdp-mathematik.sty
index de2bc0bd598..744e45aa9e5 100644
--- a/Master/texmf-dist/tex/latex/srdp-mathematik/srdp-mathematik.sty
+++ b/Master/texmf-dist/tex/latex/srdp-mathematik/srdp-mathematik.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1996/12/26]
-\ProvidesPackage{srdp-mathematik}[2018/11/10 v1.0 Standard-Schularbeitsformate]
+\ProvidesPackage{srdp-mathematik}[2019/01/14 v1.2 Standard-Schularbeitsformate]
\usepackage{color}
@@ -12,7 +12,6 @@
\usepackage{varwidth}
\usepackage{wasysym}
\usepackage{microtype}
-\usepackage{menukeys}
\usepackage{pstricks-add}
\usepackage{trimspaces}
\usepackage{colortbl}
@@ -52,7 +51,7 @@
\setlength{\headheight}{0.4pt}
\setlength\parindent{0pt}
\newcolumntype{M}{>{\begin{varwidth}{0.8\textwidth}}l<{\end{varwidth}}}
-\newcolumntype{S}{>{\begin{varwidth}{0.73\linewidth}}l<{\end{varwidth}}}
+\newcolumntype{A}{>{\begin{varwidth}{0.73\linewidth}}l<{\end{varwidth}}}
\newcolumntype{N}{>{\begin{varwidth}{0.59\textwidth}}l<{\end{varwidth}}}
\newcolumntype{T}{>{\begin{varwidth}{0.91\linewidth}}l<{\end{varwidth}}}
\newcolumntype{F}{>{\begin{varwidth}{0.8\textwidth}}c<{\end{varwidth}}}
@@ -78,7 +77,7 @@
\DeclareOption{solution_on}{\setcounter{Antworten}{1}}
\DeclareOption{solution_off}{\setcounter{Antworten}{0}}
-\AtBeginDocument{\@ifpackagewith{mathematik}{solution_on}{
+\AtBeginDocument{\@ifpackagewith{srdp-mathematik}{solution_on}{
\AddToShipoutPictureBG{%
\AtPageUpperLeft{\color{red}\raisebox{-1.5cm}{%
\textsc{\forloop{marker}{0}{\themarker<11}{L\"osungen \hfill}L\"osungen}%
@@ -254,14 +253,14 @@
\newcommand{\notenschluessel}[4]{
\vfill
\STautoround{3}\renewcommand{\arraystretch}{0}\tiny
-\begin{spreadtab}[\STsavecell\gutgenau{b2} \STsavecell\befriedigendgenau{c2} \STsavecell\genuegendgenau{d2}
+\begin{spreadtab}[\STsavecell\gutgenau{b2} \STsavecell\befriedigendgenau{c2} \STsavecell\genuegendgenau{d2} \STsavecell\nichtgenuegendgenau{e2}
\STsavecell\gut{b3} \STsavecell\befriedigend{c3} \STsavecell\genuegend{d3} \STsavecell\nichtgenuegend{e3}
-\STsavecell\gutpluseins{b4} \STsavecell\befriedigendpluseins{c4} \STsavecell\genuegendpluseins{d4} \STsavecell\gutminuseins{b5} \STsavecell\befriedigendminuseins{c5} \STsavecell\genuegendminuseins{d5}]{{tabular}{ccccc}}
+\STsavecell\gutpluseins{b4} \STsavecell\befriedigendpluseins{c4} \STsavecell\genuegendpluseins{d4} \STsavecell\nichtgenuegendpluseins{e4} \STsavecell\gutminuseins{b5} \STsavecell\befriedigendminuseins{c5} \STsavecell\genuegendminuseins{d5} \STsavecell\nichtgenuegendminuseins{e5}]{{tabular}{ccccc}}
\SThidecol\thepunkte &\SThidecol 1 &\SThidecol2 &\SThidecol 3 &\SThidecol 4 \\
& a1*#1 &a1*#2 & a1*#3 & a1*#4 \\
&trunc(a1*#1,0) & trunc(a1*#2,0) &trunc(a1*#3,0) &trunc(a1*#4,0) \\
- &b3+1 &c3+1 &d3+1 &\\
- &b3-1 &c3-1 &d3-1 &\\
+ &b3+1 &c3+1 &d3+1 & e3+1\\
+ &b3-1 &c3-1 &d3-1 & e3-1\\
\end{spreadtab}
\footnotesize
\begin{center}\renewcommand{\arraystretch}{1}
@@ -270,7 +269,7 @@ Erreichte Punkte & Prozent & Gesamt & \multicolumn{2}{c|}{Note} \\
&& \multirow{2}{*}{\thepunkte} && \\
&&&& \\ \hline \hline
\scriptsize{Sehr Gut} & \scriptsize{Gut} & \scriptsize{Befriedigend} & \scriptsize{Gen\"ugend} & \scriptsize{Nicht Gen\"ugend} \\
-\scriptsize{\thepunkte ~ - \ifdim\gut pt=\gutgenau pt \gut\else\gutpluseins\fi}& \scriptsize{\ifdim\gut pt=\gutgenau pt \gutminuseins\else\gut\fi ~ - \ifdim\befriedigend pt=\befriedigendgenau pt \befriedigend\else\befriedigendpluseins\fi} & \scriptsize{\ifdim\befriedigend pt=\befriedigendgenau pt \befriedigendminuseins\else\befriedigend\fi ~ - \ifdim\genuegend pt=\genuegendgenau pt \genuegend\else\genuegendpluseins\fi} & \scriptsize{\ifdim\genuegend pt=\genuegendgenau pt \genuegendminuseins\else\genuegend\fi ~ - \nichtgenuegend} & \scriptsize{unter \nichtgenuegend} \\ \hline
+\scriptsize{\thepunkte ~ - \ifdim\gut pt=\gutgenau pt \gut\else\gutpluseins\fi}& \scriptsize{\ifdim\gut pt=\gutgenau pt \gutminuseins\else\gut\fi ~ - \ifdim\befriedigend pt=\befriedigendgenau pt \befriedigend\else\befriedigendpluseins\fi} & \scriptsize{\ifdim\befriedigend pt=\befriedigendgenau pt \befriedigendminuseins\else\befriedigend\fi ~ - \ifdim\genuegend pt=\genuegendgenau pt \genuegend\else\genuegendpluseins\fi} & \scriptsize{\ifdim\genuegend pt=\genuegendgenau pt \genuegendminuseins\else\genuegend\fi ~ - \ifdim\nichtgenuegend pt=\nichtgenuegendgenau pt \nichtgenuegend\else\nichtgenuegendpluseins\fi} & \scriptsize{unter \ifdim\nichtgenuegend pt=\nichtgenuegendgenau pt \nichtgenuegend\else\nichtgenuegendpluseins\fi} \\ \hline
\end{tabular}
\end{center}\STautoround{}\normalsize}
@@ -768,7 +767,7 @@ Complete the following sentence by putting a cross next to one of the given poss
\pgfmathrandomitem\z{group}\setcounter{antworti}{\z}\prunelist{group}
%\begin{minipage}{0.85\linewidth}
-\begin{tabu}{|S|c|c|}%
+\begin{tabu}{|A|c|c|}%
\hline%
\small \textsc{#2} & \small\textsc{Richtig} & \small \textsc{Falsch} \\ \hline
\forloop{ct}{1}{\value{ct}<\numexpr#1}%
@@ -844,7 +843,7 @@ Complete the following sentence by putting a cross next to one of the given poss
\pgfmathrandomitem\z{group}\setcounter{antworti}{\z}\prunelist{group}
%\begin{minipage}{0.85\linewidth}
-\begin{tabu}{|S|c|c|}%
+\begin{tabu}{|A|c|c|}%
\hline%
\small \textsc{#2} & \small\textsc{True} & \small \textsc{False} \\ \hline
\forloop{ct}{1}{\value{ct}<\numexpr#1}%