diff options
author | Karl Berry <karl@freefriends.org> | 2021-08-10 21:12:46 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-08-10 21:12:46 +0000 |
commit | c8bd4c1c3adabafbf923c2b113765baf5db7a317 (patch) | |
tree | 94624e250c63044d2fd3508321b2823883abc0f5 /Master/texmf-dist/tex/latex/schule | |
parent | e5c044eb7fea1c5f1d66a2df08491ddf9571684c (diff) |
schule (10aug21)
git-svn-id: svn://tug.org/texlive/trunk@60210 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/schule')
16 files changed, 153 insertions, 195 deletions
diff --git a/Master/texmf-dist/tex/latex/schule/Lizenzen/lizenz-cc-by-4.xmp b/Master/texmf-dist/tex/latex/schule/Lizenzen/lizenz-cc-by-4.xmp deleted file mode 100644 index 6a39d22c3e2..00000000000 --- a/Master/texmf-dist/tex/latex/schule/Lizenzen/lizenz-cc-by-4.xmp +++ /dev/null @@ -1,25 +0,0 @@ -<?xpacket begin='' id=''?> -<x:xmpmeta xmlns:x='adobe:ns:meta/'> - <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'> - <rdf:Description rdf:about='' - xmlns:xapRights='http://ns.adobe.com/xap/1.0/rights/'> - <xapRights:Marked>True</xapRights:Marked> - </rdf:Description> - <rdf:Description rdf:about='' - xmlns:xapRights='http://ns.adobe.com/xap/1.0/rights/' - > - <xapRights:UsageTerms> - <rdf:Alt> - <rdf:li xml:lang='x-default' >This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.</rdf:li> - <rdf:li xml:lang='en' >This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.</rdf:li> - </rdf:Alt> - </xapRights:UsageTerms> - </rdf:Description> - <rdf:Description rdf:about='' - xmlns:cc='http://creativecommons.org/ns#'> - <cc:license rdf:resource='http://creativecommons.org/licenses/by/4.0/'/> - </rdf:Description> - - </rdf:RDF> -</x:xmpmeta> -<?xpacket end='r'?>
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/schule/Lizenzen/lizenz-cc-by-nc-sa-4.xmp b/Master/texmf-dist/tex/latex/schule/Lizenzen/lizenz-cc-by-nc-sa-4.xmp deleted file mode 100644 index 6d6924cc5f2..00000000000 --- a/Master/texmf-dist/tex/latex/schule/Lizenzen/lizenz-cc-by-nc-sa-4.xmp +++ /dev/null @@ -1,25 +0,0 @@ -<?xpacket begin='' id=''?> -<x:xmpmeta xmlns:x='adobe:ns:meta/'> - <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'> - <rdf:Description rdf:about='' - xmlns:xapRights='http://ns.adobe.com/xap/1.0/rights/'> - <xapRights:Marked>True</xapRights:Marked> - </rdf:Description> - <rdf:Description rdf:about='' - xmlns:xapRights='http://ns.adobe.com/xap/1.0/rights/' - > - <xapRights:UsageTerms> - <rdf:Alt> - <rdf:li xml:lang='x-default' >This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.</rdf:li> - <rdf:li xml:lang='en' >This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.</rdf:li> - </rdf:Alt> - </xapRights:UsageTerms> - </rdf:Description> - <rdf:Description rdf:about='' - xmlns:cc='http://creativecommons.org/ns#'> - <cc:license rdf:resource='http://creativecommons.org/licenses/by-nc-sa/4.0/'/> - </rdf:Description> - - </rdf:RDF> -</x:xmpmeta> -<?xpacket end='r'?>
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/schule/Lizenzen/lizenz-cc-by-nc-sa-eu-4.xmp b/Master/texmf-dist/tex/latex/schule/Lizenzen/lizenz-cc-by-nc-sa-eu-4.xmp deleted file mode 100644 index 063216c2409..00000000000 --- a/Master/texmf-dist/tex/latex/schule/Lizenzen/lizenz-cc-by-nc-sa-eu-4.xmp +++ /dev/null @@ -1,25 +0,0 @@ -<?xpacket begin='' id=''?> -<x:xmpmeta xmlns:x='adobe:ns:meta/'> - <rdf:RDF xmlns:rdf='https://www.w3.org/1999/02/22-rdf-syntax-ns#'> - <rdf:Description rdf:about='' - xmlns:xapRights='https://ns.adobe.com/xap/1.0/rights/'> - <xapRights:Marked>True</xapRights:Marked> - </rdf:Description> - <rdf:Description rdf:about='' - xmlns:xapRights='https://ns.adobe.com/xap/1.0/rights/' - > - <xapRights:UsageTerms> - <rdf:Alt> - <rdf:li xml:lang='x-default' >This work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.</rdf:li> - <rdf:li xml:lang='en' >This work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.</rdf:li> - </rdf:Alt> - </xapRights:UsageTerms> - </rdf:Description> - <rdf:Description rdf:about='' - xmlns:cc='https://creativecommons.org/ns#'> - <cc:license rdf:resource='https://creativecommons.org/licenses/by-nc-sa/4.0/'/> - </rdf:Description> - - </rdf:RDF> -</x:xmpmeta> -<?xpacket end='r'?> diff --git a/Master/texmf-dist/tex/latex/schule/Lizenzen/lizenz-cc-by-sa-4.xmp b/Master/texmf-dist/tex/latex/schule/Lizenzen/lizenz-cc-by-sa-4.xmp deleted file mode 100644 index 6f5724a4667..00000000000 --- a/Master/texmf-dist/tex/latex/schule/Lizenzen/lizenz-cc-by-sa-4.xmp +++ /dev/null @@ -1,25 +0,0 @@ -<?xpacket begin='' id=''?> -<x:xmpmeta xmlns:x='adobe:ns:meta/'> - <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'> - <rdf:Description rdf:about='' - xmlns:xapRights='http://ns.adobe.com/xap/1.0/rights/'> - <xapRights:Marked>True</xapRights:Marked> - </rdf:Description> - <rdf:Description rdf:about='' - xmlns:xapRights='http://ns.adobe.com/xap/1.0/rights/' - > - <xapRights:UsageTerms> - <rdf:Alt> - <rdf:li xml:lang='x-default' >This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.</rdf:li> - <rdf:li xml:lang='en' >This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.</rdf:li> - </rdf:Alt> - </xapRights:UsageTerms> - </rdf:Description> - <rdf:Description rdf:about='' - xmlns:cc='http://creativecommons.org/ns#'> - <cc:license rdf:resource='http://creativecommons.org/licenses/by-sa/4.0/'/> - </rdf:Description> - - </rdf:RDF> -</x:xmpmeta> -<?xpacket end='r'?>
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/schule/relaycircuit.sty b/Master/texmf-dist/tex/latex/schule/relaycircuit.sty index 991e80800d3..7976d64fd92 100644 --- a/Master/texmf-dist/tex/latex/schule/relaycircuit.sty +++ b/Master/texmf-dist/tex/latex/schule/relaycircuit.sty @@ -12,7 +12,7 @@ % Einbinden der geforderten Pakete % \begin{macrocode} \RequirePackage{tikz} -\RequirePackage[siunitx,european]{circuitikz} +\RequirePackage[siunitx,european,nooldvoltagedirection]{circuitikz} \usetikzlibrary{arrows,shadows,shapes.misc,scopes} % \end{macrocode} % @@ -46,11 +46,11 @@ \anchor{center}{ \northwest \pgf@y=0pt - \pgf@x=-.8\pgf@x + \pgf@x=-.8\pgf@x } \anchor{east}{ \left - \pgf@x=-.8\pgf@x + \pgf@x=-.8\pgf@x } \anchor{west}{ \left @@ -100,12 +100,12 @@ \pgfusepath{stroke} - \pgfsetdash{{2pt}{2pt}}{1pt} + \pgfsetdash{{2pt}{2pt}}{1pt} \pgfpathmoveto{\pgfpoint{-0.7cm}{0cm}} \pgfpathlineto{\pgfpoint{0.65cm}{0cm}} \pgfusepath{stroke} - \pgfsetdash{}{0pt} + \pgfsetdash{}{0pt} \pgfusepath{draw} @@ -113,7 +113,7 @@ \pgfsetlinewidth{2\pgflinewidth} \pgfpathrectanglecorners{\pgfpoint{1cm}{0.5cm}% }{\pgfpoint{-1cm}{-0.5cm}} - + \pgfusepath{draw} \pgftext[base,y=-0.4cm]{RK} @@ -121,7 +121,7 @@ } \pgfdeclareshape{arbeits relais}{ - \inheritsavedanchors[from=ruhe relais] + \inheritsavedanchors[from=ruhe relais] \inheritanchor[from=ruhe relais]{center} \inheritanchor[from=ruhe relais]{north} \inheritanchor[from=ruhe relais]{south} @@ -154,12 +154,12 @@ \pgfusepath{stroke} - \pgfsetdash{{2pt}{2pt}}{1pt} + \pgfsetdash{{2pt}{2pt}}{1pt} \pgfpathmoveto{\pgfpoint{-0.7cm}{0cm}} \pgfpathlineto{\pgfpoint{0.825cm}{0cm}} \pgfusepath{stroke} - \pgfsetdash{}{0pt} + \pgfsetdash{}{0pt} \pgfusepath{draw} @@ -167,7 +167,7 @@ \pgfsetlinewidth{2\pgflinewidth} \pgfpathrectanglecorners{\pgfpoint{1cm}{0.5cm}}% {\pgfpoint{-1cm}{-0.5cm}} - + \pgfusepath{draw} \pgftext[base,y=-0.4cm]{AK} diff --git a/Master/texmf-dist/tex/latex/schule/schule.fach.Physik.code.tex b/Master/texmf-dist/tex/latex/schule/schule.fach.Physik.code.tex new file mode 100644 index 00000000000..ce7e487a624 --- /dev/null +++ b/Master/texmf-dist/tex/latex/schule/schule.fach.Physik.code.tex @@ -0,0 +1,12 @@ +% ******************************************************************** +% Physik * +% ******************************************************************** + +% Konstanten +% ******************************************************************** + +\newcommand{\elementarladung}{\unit[1,602 \cdot 10^{-19}]{C}} +\newcommand{\plankscheEV}{\unit[4,1357 \cdot 10^{-15}]{eVs}} +\newcommand{\plankscheJ}{\unit[6,626 \cdot 10^{-34}]{Js}} +\newcommand{\elektronenmasse}{\unit[9,109 \cdot 10^{-31}]{kg}} +\newcommand{\protonenmasse}{\unit[1,673 \cdot 10^{-27}]{kg}}
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/schule/schule.fach.Physik.pakete.tex b/Master/texmf-dist/tex/latex/schule/schule.fach.Physik.pakete.tex index b7dd4ce4d40..bfd8b93c50c 100644 --- a/Master/texmf-dist/tex/latex/schule/schule.fach.Physik.pakete.tex +++ b/Master/texmf-dist/tex/latex/schule/schule.fach.Physik.pakete.tex @@ -1,6 +1,7 @@ % ******************************************************************** % Physik * % ******************************************************************** +\RequirePackage[siunitx,european,nooldvoltagedirection]{circuitikz} \RequirePackage{units} -\RequirePackage{circuitikz} -\RequirePackage[version=3]{mhchem}
\ No newline at end of file +\RequirePackage[version=3]{mhchem} +\RequirePackage{ziffer}
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/schule/schule.mod.Aufgaben.pakete.tex b/Master/texmf-dist/tex/latex/schule/schule.mod.Aufgaben.pakete.tex index 23601ca2af7..ffcbf5678ab 100644 --- a/Master/texmf-dist/tex/latex/schule/schule.mod.Aufgaben.pakete.tex +++ b/Master/texmf-dist/tex/latex/schule/schule.mod.Aufgaben.pakete.tex @@ -1,5 +1,5 @@ % Aufgaben -\RequirePackage[verbose,clear-aux]{xsim}%verbose für entwicklung, %final,clear-aux +\RequirePackage[verbose,clear-aux,use-files]{xsim}%verbose für entwicklung, %final,clear-aux \RequirePackage{tcolorbox} % Symbole \RequirePackage{utfsym}
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/schule/schule.mod.Bewertung.code.tex b/Master/texmf-dist/tex/latex/schule/schule.mod.Bewertung.code.tex index 89524767863..ef906573a31 100644 --- a/Master/texmf-dist/tex/latex/schule/schule.mod.Bewertung.code.tex +++ b/Master/texmf-dist/tex/latex/schule/schule.mod.Bewertung.code.tex @@ -138,8 +138,8 @@ \begin{longtable}{|p{.65\linewidth}|r|r|}\hline % Kopfzeile \rowcolor{black!20} - \textbf{Die Schülerin/der Schüler\dots} & - \textbf{max. Punkte} & + \textbf{Die~Schülerin/der~Schüler\dots} & + \textbf{max.~Punkte} & \textbf{erreicht}% %% \tabularnewline\specialrule{.1em}{0em}{0em} % % Erwartungen @@ -409,63 +409,87 @@ \end{tabular} } }{ - % Ohne Notenpunkte - % ---------------------------------------------------------------- - \parbox{.24\linewidth}{ - \tiny - \begin{tabular}{|p{0.6\linewidth}|r|r|}\hline - \rowcolor{black!20}\textbf{Note} & - \textbf{$\ge$ P.} - \\\hline - sehr gut plus & $\schule@punkteZuNote{15}$\\\hline - \rowcolor{black!10} - sehr gut & $\schule@punkteZuNote{14}$\\\hline - sehr gut minus & $\schule@punkteZuNote{13}$\\\hline - \rowcolor{black!10} - gut plus & $\schule@punkteZuNote{12}$\\\hline - \end{tabular} - } - \parbox{.24\linewidth}{ - \tiny - \begin{tabular}{|p{0.6\linewidth}|r|r|}\hline - \rowcolor{black!20}\textbf{Note} & - \textbf{$\ge$ P.} - \\\hline - gut & $\schule@punkteZuNote{11}$\\\hline - \rowcolor{black!10} - gut minus & $\schule@punkteZuNote{10}$ \\\hline - befriedigend plus & $\schule@punkteZuNote{9}$\\\hline - \rowcolor{black!10} - befriedigend & $\schule@punkteZuNote{8}$\\\hline - \end{tabular} - } - \parbox{.24\linewidth}{ - \tiny - \begin{tabular}{|p{0.6\linewidth}|r|r|}\hline - \rowcolor{black!20}\textbf{Note} & - \textbf{$\ge$ P.} - \\\hline - befriedigend minus & $\schule@punkteZuNote{7}$\\\hline - \rowcolor{black!10} - ausreichend plus & $\schule@punkteZuNote{6}$\\\hline - ausreichend & $\schule@punkteZuNote{5}$\\\hline - \rowcolor{black!10} - ausreichend minus & $\schule@punkteZuNote{4}$\\\hline - \end{tabular} - } - \parbox{.24\linewidth}{ - \tiny - \begin{tabular}{|p{0.6\linewidth}|r|r|}\hline - \rowcolor{black!20}\textbf{Note} & - \textbf{$\ge$ P.} - \\\hline - mangelhaft plus & $\schule@punkteZuNote{3}$\\\hline - \rowcolor{black!10} - mangelhaft & $\schule@punkteZuNote{2}$\\\hline - mangelhaft minus & $\schule@punkteZuNote{1}$\\\hline - \rowcolor{black!10} - ungenügend & $0$ \\\hline - \end{tabular} + % Ohne Notenpunkte + % ---------------------------------------------------------------- + \ifthenelse{\boolean{schule@notenOhneTendenz}}{ + % Ohne Tendenz + % ---------------------------------------------------------------- + \parbox{.40\linewidth}{ + \tiny + \begin{tabular}{|p{0.6\linewidth}|r|r|}\hline + \rowcolor{black!20}\textbf{Note} & + \textbf{$\ge$ P.} + \\\hline + sehr gut & $\schule@punkteZuNote{13}$\\\hline + \rowcolor{black!10} + gut & $\schule@punkteZuNote{10}$\\\hline + befriedigend & $\schule@punkteZuNote{7}$\\\hline + \rowcolor{black!10} + ausreichend & $\schule@punkteZuNote{4}$\\\hline + mangelhaft & $\schule@punkteZuNote{1}$ \\\hline + \rowcolor{black!10} + ungenügend & $0$ \\\hline + \end{tabular} + } + }{ + % Mit Tendenz + % ---------------------------------------------------------------- + \parbox{.24\linewidth}{ + \tiny + \begin{tabular}{|p{0.6\linewidth}|r|r|}\hline + \rowcolor{black!20}\textbf{Note} & + \textbf{$\ge$ P.} + \\\hline + sehr gut plus & $\schule@punkteZuNote{15}$\\\hline + \rowcolor{black!10} + sehr gut & $\schule@punkteZuNote{14}$\\\hline + sehr gut minus & $\schule@punkteZuNote{13}$\\\hline + \rowcolor{black!10} + gut plus & $\schule@punkteZuNote{12}$\\\hline + \end{tabular} + } + \parbox{.24\linewidth}{ + \tiny + \begin{tabular}{|p{0.6\linewidth}|r|r|}\hline + \rowcolor{black!20}\textbf{Note} & + \textbf{$\ge$ P.} + \\\hline + gut & $\schule@punkteZuNote{11}$\\\hline + \rowcolor{black!10} + gut minus & $\schule@punkteZuNote{10}$ \\\hline + befriedigend plus & $\schule@punkteZuNote{9}$\\\hline + \rowcolor{black!10} + befriedigend & $\schule@punkteZuNote{8}$\\\hline + \end{tabular} + } + \parbox{.24\linewidth}{ + \tiny + \begin{tabular}{|p{0.6\linewidth}|r|r|}\hline + \rowcolor{black!20}\textbf{Note} & + \textbf{$\ge$ P.} + \\\hline + befriedigend minus & $\schule@punkteZuNote{7}$\\\hline + \rowcolor{black!10} + ausreichend plus & $\schule@punkteZuNote{6}$\\\hline + ausreichend & $\schule@punkteZuNote{5}$\\\hline + \rowcolor{black!10} + ausreichend minus & $\schule@punkteZuNote{4}$\\\hline + \end{tabular} + } + \parbox{.24\linewidth}{ + \tiny + \begin{tabular}{|p{0.6\linewidth}|r|r|}\hline + \rowcolor{black!20}\textbf{Note} & + \textbf{$\ge$ P.} + \\\hline + mangelhaft plus & $\schule@punkteZuNote{3}$\\\hline + \rowcolor{black!10} + mangelhaft & $\schule@punkteZuNote{2}$\\\hline + mangelhaft minus & $\schule@punkteZuNote{1}$\\\hline + \rowcolor{black!10} + ungenügend & $0$ \\\hline + \end{tabular} + } } } } diff --git a/Master/texmf-dist/tex/latex/schule/schule.mod.Bewertung.optionen.tex b/Master/texmf-dist/tex/latex/schule/schule.mod.Bewertung.optionen.tex index 7f677862a05..d658947fc21 100644 --- a/Master/texmf-dist/tex/latex/schule/schule.mod.Bewertung.optionen.tex +++ b/Master/texmf-dist/tex/latex/schule/schule.mod.Bewertung.optionen.tex @@ -7,6 +7,8 @@ \newboolean{schule@erwartungshorizontAnzeigen} \newboolean{schule@erwartungshorizontKeineSeiten} \newboolean{schule@kmkPunkte} +\newboolean{schule@notenOhneTendenz} + % Standardwerte % ******************************************************************** @@ -44,4 +46,7 @@ erwartungshorizontStil/.store in=\schule@erwartungshorizontStil, kmkPunkte/.value forbidden, kmkPunkte/.code=\setboolean{schule@kmkPunkte}{true}, - notenschema/.store in=\schule@notenschema,} + notenschema/.store in=\schule@notenschema, + notenOhneTendenz/.value forbidden, + notenOhneTendenz/.code=\setboolean{schule@notenOhneTendenz}{true} +} diff --git a/Master/texmf-dist/tex/latex/schule/schule.mod.Format.code.tex b/Master/texmf-dist/tex/latex/schule/schule.mod.Format.code.tex index 6d6f50191e5..9ecffef8aaf 100644 --- a/Master/texmf-dist/tex/latex/schule/schule.mod.Format.code.tex +++ b/Master/texmf-dist/tex/latex/schule/schule.mod.Format.code.tex @@ -172,7 +172,7 @@ % Datumsfeld anzeigen? \ifthenelse{\boolean{schule@datumAnzeigen}}{% % Mit Datumsfeld - \linebreak\Datum% + \linebreak\@date% }{% % Ohne Datumsfeld \schule@kopfUmbruch% diff --git a/Master/texmf-dist/tex/latex/schule/schule.mod.Lizenzen.code.tex b/Master/texmf-dist/tex/latex/schule/schule.mod.Lizenzen.code.tex index c059b106309..56d4e61952d 100644 --- a/Master/texmf-dist/tex/latex/schule/schule.mod.Lizenzen.code.tex +++ b/Master/texmf-dist/tex/latex/schule/schule.mod.Lizenzen.code.tex @@ -2,10 +2,6 @@ % Lizenz des Dokuments * % ******************************************************************** -% Metadaten inkludieren -% ******************************************************************** -\includexmp{lizenz-\schule@lizenz} - % Lizenzname % ******************************************************************** % Kurz @@ -82,4 +78,4 @@ % Sonstiges ] -}
\ No newline at end of file +} diff --git a/Master/texmf-dist/tex/latex/schule/schule.mod.Lizenzen.pakete.tex b/Master/texmf-dist/tex/latex/schule/schule.mod.Lizenzen.pakete.tex index 8a590052831..d69284161ac 100644 --- a/Master/texmf-dist/tex/latex/schule/schule.mod.Lizenzen.pakete.tex +++ b/Master/texmf-dist/tex/latex/schule/schule.mod.Lizenzen.pakete.tex @@ -3,6 +3,23 @@ % ******************************************************************** % Lizenz -\RequirePackage{xmpincl} +\IfEqCase{\schule@lizenz}{ % + % Lizenz: CC-BY-NC-SA-EU 4.0 + {cc-by-nc-sa-eu-4}{ % + \RequirePackage[type={CC},modifier={by-nc-sa},version={4.0}]{doclicense} + }% + % Lizenz: CC-BY-NC-SA 4.0 + {cc-by-nc-sa-4}{ % + \RequirePackage[type={CC},modifier={by-nc-sa},version={4.0}]{doclicense} + }% + % Lizenz: CC-BY-SA 4.0 + {cc-by-sa-4}{ % + \RequirePackage[type={CC},modifier={by-sa},version={4.0}]{doclicense} + }% + {cc-by-4}{ % + \RequirePackage[type={CC},modifier={by},version={4.0}]{doclicense} + }% +}[% + % Sonstiges +] \RequirePackage{ccicons} - diff --git a/Master/texmf-dist/tex/latex/schule/schule.sty b/Master/texmf-dist/tex/latex/schule/schule.sty index 6addd288f7e..68c1bdf4be1 100644 --- a/Master/texmf-dist/tex/latex/schule/schule.sty +++ b/Master/texmf-dist/tex/latex/schule/schule.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{LaTeX2e}[2011/11/11] -\ProvidesPackage{schule}[2018/08/22 v0.8.1 % +\ProvidesPackage{schule}[2021/08/09 v0.8.3 % Kommandos fuer die Schule] % ******************************************************************** @@ -10,6 +10,7 @@ % ******************************************************************** \RequirePackage{pgfopts} \RequirePackage{xifthen} +\RequirePackage{xstring} % Boolesche Optionen % ******************************************************************** @@ -74,10 +75,12 @@ % unschädliche Warnungen im Normalbetrieb unterdrücken \ifthenelse{\boolean{schule@debug}}{}{ + \IfSubStr{\schule@module}{Lizenzen}{}{ \usepackage{silence} % Kompatiblität von ctable zu TikZ \WarningFilter{ctable}{Transp} + } } % Laden von Dokumenttypen @@ -245,7 +248,6 @@ % Makros \RequirePackage{xparse} -\RequirePackage{xstring} \RequirePackage{environ} % Referenzen diff --git a/Master/texmf-dist/tex/latex/schule/schulphy.sty b/Master/texmf-dist/tex/latex/schule/schulphy.sty index 691fa4110c7..ff478368837 100644 --- a/Master/texmf-dist/tex/latex/schule/schulphy.sty +++ b/Master/texmf-dist/tex/latex/schule/schulphy.sty @@ -12,8 +12,8 @@ %% Daniel Spittank (kontakt@daniel.spittank.net) %% André Hilbig (mail@andrehilbig.de) %% Adrian Salamon (adriansalamon@gmail.com) -%% -%% +%% +%% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 %% of this license or (at your option) any later version. @@ -21,23 +21,23 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This work has the LPPL maintenance status `maintained'. -%% +%% %% The Current Maintainer of this work is Johannes Pieper. -%% +%% %% This work consists of the files schule.dtx and schule.ins, readme %% and the derived files schule.sty, schulinf.sty, syntaxdi.sty, %% relaycircuit.sty, schulphy.sty, schulekl.cls, schuleub.cls, %% schullzk.cls, schuleab.cls, schulein.cls, schuleue.cls, %% schullsg.cls, schulit.cls, schulekl.sty, schulelzk.sty. -%% +%% %% Dies ist der dokumentierte Makrocode zur Erzeugung und Dokumentation %% des LaTeX-Paket `schule'. -%% +%% %% This is the documented Macrocode to build the LaTeX-Package `schule' %% and its documentation. -%% +%% %% Some of the examples in the documentation have different copyright %% notes. %% \CharacterTable @@ -120,10 +120,10 @@ \usepackage{warning} \addglobalwarning{% \PackageWarningNoLine{schulphy}{Dieses Subpaket stammt aus dem Paket 'schule' in der Version 0.6, die nicht weiterentwickelt wird. Bitte aktualisieren Sie Ihr Dokument.}} - + \RequirePackage{schulealt} -\RequirePackage{units} \RequirePackage{circuitikz} +\RequirePackage{units} \RequirePackage[version=3]{mhchem} \def\@fach{Physik} \endinput diff --git a/Master/texmf-dist/tex/latex/schule/xsim-style/xsim.style.schule-tcolorbox.code.tex b/Master/texmf-dist/tex/latex/schule/xsim-style/xsim.style.schule-tcolorbox.code.tex index 899754470c9..0b10de64f7d 100644 --- a/Master/texmf-dist/tex/latex/schule/xsim-style/xsim.style.schule-tcolorbox.code.tex +++ b/Master/texmf-dist/tex/latex/schule/xsim-style/xsim.style.schule-tcolorbox.code.tex @@ -7,7 +7,8 @@ \lstset{basicstyle=\ttfamily, numbersep=0.5em,numbers=left,numberstyle=\color{black!55}} % Quellcode passend formatieren \tcolorbox[ colback = white, - title = + halign title=flush left, + title = \sffamily \textbf{\ifthenelse{\equal{\ExerciseType}{zusatzaufgabe}}{\llap{\GetExerciseProperty{symbol}$\bigstar$}}{\llap{\GetExerciseProperty{symbol}}} \GetExerciseName~\GetExerciseProperty{counter}}\xspace% @@ -23,7 +24,7 @@ \IfExerciseGoalSingularTF{points} {\XSIMtranslate{point}} {\XSIMtranslate{points}}% -% \nobreakspace\XSIMtranslate{point-abbr} +% \nobreakspace\XSIMtranslate{point-abbr} % ohne ) }% }% |