summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-06-22 03:01:06 +0000
committerNorbert Preining <norbert@preining.info>2023-06-22 03:01:06 +0000
commitac667b3d60d89dfd061e15583ed0062204ec705c (patch)
tree2a22ace0947c6691f783ba4a418000310d911817 /macros
parent16d6a70c44a97b15c195cf6b10f59f3deadd0e66 (diff)
CTAN sync 202306220301
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/javascripthttp/README.md60
-rw-r--r--macros/latex/contrib/javascripthttp/javascripthttp-doc.pdfbin0 -> 177033 bytes
-rw-r--r--macros/latex/contrib/javascripthttp/javascripthttp-doc.tex171
-rw-r--r--macros/latex/contrib/javascripthttp/javascripthttp.sty312
-rw-r--r--macros/latex/contrib/schulmathematik/README4
-rw-r--r--macros/latex/contrib/schulmathematik/schulma-ab.cls6
-rw-r--r--macros/latex/contrib/schulmathematik/schulma-gutachten.cls11
-rw-r--r--macros/latex/contrib/schulmathematik/schulma-klausur.cls6
-rw-r--r--macros/latex/contrib/schulmathematik/schulma-komp.cls6
-rw-r--r--macros/latex/contrib/schulmathematik/schulma-mdlprf.cls6
-rw-r--r--macros/latex/contrib/schulmathematik/schulma-physik.sty68
-rw-r--r--macros/latex/contrib/schulmathematik/schulma-praes.cls6
-rw-r--r--macros/latex/contrib/schulmathematik/schulma.sty11
-rw-r--r--macros/latex/contrib/schulmathematik/schulmathematik.pdfbin209102 -> 288357 bytes
-rw-r--r--macros/latex/contrib/schulmathematik/schulmathematik.tex80
-rw-r--r--macros/luatex/generic/luavlna/README.md2
-rw-r--r--macros/luatex/generic/luavlna/luavlna-doc.pdfbin92324 -> 92180 bytes
-rw-r--r--macros/luatex/generic/luavlna/luavlna.lua2
-rw-r--r--macros/luatex/generic/luavlna/luavlna.sty6
-rw-r--r--macros/luatex/generic/luavlna/luavlna.tex4
20 files changed, 714 insertions, 47 deletions
diff --git a/macros/latex/contrib/javascripthttp/README.md b/macros/latex/contrib/javascripthttp/README.md
new file mode 100644
index 0000000000..4fac3528a3
--- /dev/null
+++ b/macros/latex/contrib/javascripthttp/README.md
@@ -0,0 +1,60 @@
+# README for JAVASCRIPTHTTP
+Version v1.1
+
+## INTRODUCTION
+This small package adds commands for LaTeX to create buttons with which to fetch content from the internet. The content can be transformed and displayed in textfields. For these interactive elements to work, a PDF using the commands provided by this package must be opened in Acrobat Pro.
+
+This packages requires the acrotex macro.
+
+## PREREQUISITES
+
+To install acrotex, you need to add the tlcontrib repository to your installation:
+
+```
+tlmgr repository add https://mirror.ctan.org/systems/texlive/tlcontrib tlcontrib
+
+tlmgr pinning add tlcontrib "*"
+
+# Then install the package
+tlmgr install acrotex
+```
+
+## USAGE
+
+Here is a quick overview of the commands and their parameters. For further details and examples please read the package documentation.
+
+* SimpleGET, send a GET request:
+ ```tex
+ \SimpleGET{unique identifier}{label}{URL}{keypath}[target]
+ ```
+
+* SimplePOST, send a POST request:
+ ```tex
+ \SimplePOST{id}{label}{URL}{keypath}{factory}{errors}[target]
+ ```
+
+* SimpleTextField, adds a writeable textfield to your document:
+ ```tex
+ \SimpleTextfield{unique identifier}
+ ```
+
+* SimpleTextFieldReadoly, adds a readonly textfield that can be updated through javascript:
+ ```tex
+ \SimpleTextfieldReadonly{unique identifier}
+ ```
+
+* Errorfield, adds a field to your document that displays any errors that occur:
+ ```tex
+ \Errorfield
+ ```
+
+
+## AUTHOR
+
+* Cedric V. Zwahlen (cedric-vince@gmx.ch)
+
+## LICENSE
+
+LATEX Project Public License, version 1.3c or later.
+
+
diff --git a/macros/latex/contrib/javascripthttp/javascripthttp-doc.pdf b/macros/latex/contrib/javascripthttp/javascripthttp-doc.pdf
new file mode 100644
index 0000000000..850638ab7f
--- /dev/null
+++ b/macros/latex/contrib/javascripthttp/javascripthttp-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/javascripthttp/javascripthttp-doc.tex b/macros/latex/contrib/javascripthttp/javascripthttp-doc.tex
new file mode 100644
index 0000000000..b836692eee
--- /dev/null
+++ b/macros/latex/contrib/javascripthttp/javascripthttp-doc.tex
@@ -0,0 +1,171 @@
+\documentclass[a4paper]{article}
+\usepackage[english]{babel}
+\usepackage{listings}
+\usepackage{javascripthttp}
+\usepackage{hyperref}
+
+\begin{document}
+
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{5pt plus 2pt minus 1pt}
+
+\title{JavascriptHttp Documentation \& Manual}
+\author{Cedric Zwahlen \\ \texttt{cedric-vince@gmx.ch}}
+
+
+\maketitle
+
+\tableofcontents
+
+\newpage
+
+\section{Introduction}
+
+{\noindent The aim of this package is to make it as easy as possible to \textit{get} or \textit{post} data from or to REST-API's from within a PDF document.
+Specifically, this package adds LaTeX commands to create highly customisable buttons with which to fetch, transform and display data from a remote location. \\
+These features make use of Javascript, which means a PDF using them \textbf{only works with Adobe Acrobat Pro}.
+Other PDF viewers (including Acrobat Reader) may still display the interactive elements, but will not be able to run Javascript or access the internet. }
+
+\section{Prerequisites}
+
+{\noindent Acrobat Pro blocks Networking code by default. Because this package requires it, you must first change some settings.\\
+Navigate to \textbf{Preferences\textgreater Security (Enhanced)}. Then, add the path to your PDF via the 'Add Folder Path' button. The javascripthttp package depends on the acrotex macro. More information about acrotex can be found here: \url{https://www.ctan.org/pkg/acrotex} }
+
+\section{Textfields}
+
+\begin{description}
+ \item[\textbackslash SimpleTextField] { \sffamily
+ \{$\langle$unique identifier$\rangle$\}
+ }
+\end{description}
+
+{\noindent Adds a writable textfield to the document. $\langle$unique identifier$\rangle$ should not be reused by other Simple elements. It must not contain an underscore '\_'. Use this specifier to obtain a reference to the textfield in Javascript or as a $\langle$target$\rangle$ in other Simple elements. }
+
+\subsection{Readonly}
+
+\begin{description}
+ \item[\textbackslash SimpleTextFieldReadonly] { \sffamily
+ \{$\langle$unique identifier$\rangle$\}
+ }
+\end{description}
+
+\begin{description}
+ \item[\textbackslash SimpleTextFieldShortReadonly] { \sffamily
+ \{$\langle$unique identifier$\rangle$\}
+ }
+\end{description}
+
+\begin{description}
+ \item[\textbackslash SimpleTextFieldMultilineReadonly] { \sffamily
+ \{$\langle$unique identifier$\rangle$\}
+ }
+\end{description}
+
+{\noindent A readonly textfield does not accept user input. It's content can only be changed through Javascript code. }
+
+\newpage
+
+\section{GET Requests}
+
+\hypertarget{get_1}{\subsection{The Simple Way}}
+
+\begin{description}
+ \item[\textbackslash SimpleGET] { \sffamily
+ \{$\langle$unique identifier$\rangle$\}
+ \{$\langle$label$\rangle$\}
+ \{$\langle$URL$\rangle$\}
+ \{$\langle$keypath$\rangle$\}
+ \lbrack$\langle$target$\rangle$\rbrack
+ }
+\end{description}
+
+{\noindent If you want to get information from the internet, use this command.\\ This command adds a button that contains the text specified in $\langle$label$\rangle$.\\
+The $\langle$unique identifier$\rangle$ should not be reused by other Simple elements. It must not contain an underscore '\_'. This identifier can be used to obtain a reference to the button in Javascript.\\ $\langle$URL$\rangle$ refers to the address of the REST API endpoint. Note that if you pass a string, you must surround it with either ' or ", just like you would with Javascript strings.\\
+If the endpoint in question returns a json file, use $\langle$keypath$\rangle$ to refer to the property you would like to display in a textfield.
+As an example, consider the following JSON object:
+\begin{lstlisting}
+{
+ "abc" :
+ [
+ {
+ "xyz" : "Starfruit"
+ },
+ {
+ "xyz" : "Mango"
+ }
+ ]
+}
+\end{lstlisting}
+To display the value "Mango", pass 'abc.1.xyz' (including ') as the keypath.\\
+Finally, $\langle$target$\rangle$ specifies the name of the textfield, in which to display the value of the property specified in $\langle$keypath$\rangle$. If no such textfield exists, then nothing is displayed. This parameter is optional.\\
+}
+
+\subsection{URL Interpolation}
+
+{\noindent You can use URL interpolation to insert contents of a textfield into your URL. To do this, wrap the $\langle$unique identifier$\rangle$ of a textfield in curly braces where you want to insert its content in the URL. An example:
+\begin{lstlisting}
+https://api.datamuse.com/words?rel_rhy={textfield1}
+\end{lstlisting}
+
+\subsection{Using Lambdas}
+
+\subsubsection{URL Argument}
+
+{\noindent In some cases, $\langle$URL$\rangle$ interpolation might not be enough to produce the URL that you need. If this is the case, you can also pass a Javascript lambda (a.k.a arrow function) as the parameter. This enables a great deal of freedom, but might present a security risk if you do not know the origin of a document.\\
+If you pass a lambda as the $\langle$URL$\rangle$ parameter, the function must return the final URL as a string. The lambda does not take any arguments.\\ You can obtain a valid reference to 'this' in the lambdas context. Refer to \url{https://opensource.adobe.com/dc-acrobat-sdk-docs/library/jsapiref/index.html} for the Acrobat Javascript API Reference.\\
+}
+
+\subsubsection{Keypath Argument}
+
+{\noindent If you need to perform additional operations on received data, you can pass a Javascript lambda as the $\langle$keypath$\rangle$ parameter instead of a string. Allowing anyone to execute arbitrary code might introduce a security risk, so documents from unknown origins should not be trusted. The lambda takes two arguments; the data received from remote as a Javascript object, and a reference to 'this'. If your lambda returns a string, it will be displayed in the field specified by $\langle$target$\rangle$.\\
+Consider the below example. A lambda is used to get a list of holidays from \url{https://date.nager.at/api/v3/publicholidays/2023/CH}, and then pick one at random.\\}
+
+\begin{lstlisting}
+(json,doc) => {
+ // json is a top level array
+ const x = Math.floor(Math.random() * json.length);
+ // get localName from element x
+ const h = doc.extractKeypath(json,x + '.localName',doc);
+ return h;
+}
+\end{lstlisting}
+
+\section{POST Requests}
+
+\begin{description}
+ \item[\textbackslash SimplePOST] { \sffamily
+ \{$\langle$id$\rangle$\}
+ \{$\langle$label$\rangle$\}
+ \{$\langle$URL$\rangle$\}
+ \{$\langle$keypath$\rangle$\}
+ \{$\langle$factory$\rangle$\}
+ \{$\langle$errors$\rangle$\}
+ \lbrack$\langle$target$\rangle$\rbrack
+ }
+\end{description}
+
+{\noindent If you need to post information to the internet, then use this command. The first four parameters of the \textbf{\textbackslash SimplePOST} command work identically to the \textbf{\textbackslash SimpleGET} command. Refer to \hyperlink{get_1}{GET Requests} for more information.\\
+The $\langle$factory$\rangle$ parameter takes a lambda with no arguments to construct the body of your post request. It must return a Javascript object.\\
+If you want to display custom error messages in case an operation fails, you can pass a Javascript object specifying an error message for a given HTML error code, an example:
+\begin{lstlisting}
+{ "400": "error 400", "300": "error 300" , "500" : "error 500"}
+\end{lstlisting}
+If you do not want to display any custom error messages, simply pass \{\} – an empty object.\\}
+
+\section{Generic Button}
+
+\begin{description}
+ \item[\textbackslash SimpleClosure] { \sffamily
+ \{$\langle$id$\rangle$\}
+ \{$\langle$label$\rangle$\}
+ \{$\langle$closure$\rangle$\}
+ }
+\end{description}
+
+{\noindent Also provided as part of this package is a button, that simply takes a lambda. This button can be used to provide other functionality to tie various components together.}
+
+\section{Error Handling}
+
+{\noindent Any errors that occur while posting or getting will be displayed in an alert box by default. If you do not want this, you can use the command \textbf{\textbackslash ErrorField\{\}}.\\ This command adds a Readonly Textfield with the $\langle$unique identifier$\rangle$ 'errorField'. If an error field exists in your document, any HTTP errors that occur will be silenced, and their error message displayed in the error field.}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/javascripthttp/javascripthttp.sty b/macros/latex/contrib/javascripthttp/javascripthttp.sty
new file mode 100644
index 0000000000..68a89a830a
--- /dev/null
+++ b/macros/latex/contrib/javascripthttp/javascripthttp.sty
@@ -0,0 +1,312 @@
+%% javascripthttp.sty
+%% Copyright 2023 Cedric V. Zwahlen
+%
+% 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.
+% The latest version of this license is in
+% https://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Cedric V. Zwahlen
+%
+% This work consists of the files javascripthttp.sty and javascripthttp-doc.tex
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{javascripthttp}[JavascriptHTTP Package, Version 1.1]
+
+\RequirePackage{setspace}
+\RequirePackage{insdljs}
+\RequirePackage{xparse}
+
+\newcommand{\SimpleButtonPOST}[7][\{\}] {
+\PushButton[name=#2, onclick={ processSimpleButton(#4,'POST',#5,#7,#6,#1); }]{\sffamily \large #3}
+}
+
+\newcommand{\SimpleTextFieldReadonly}[1] {
+\TextField[name=#1,width=29em,height=2em,bordercolor={0.5 .5 .5},readonly=true]{}
+}
+
+\newcommand{\SimpleTextFieldShortReadonly}[1] {
+\TextField[name=#1,width=9em,height=2em,bordercolor={0.5 .5 .5},readonly=true]{}
+}
+
+\newcommand{\SimpleTextFieldMultilineReadonly}[1] {
+\TextField[name=#1,width=29em,height=4em,bordercolor={0.5 .5 .5},readonly=true,multiline=true]{}
+}
+
+\newcommand{\SimpleTextField}[1] {
+\TextField[name=#1,width=29em,height=2em,bordercolor={0.5 .5 .5}]{}
+}
+
+\newcommand{\ErrorField} {
+\TextField[name=errorField,width=29em,height=2em,bordercolor={0.0 .0 .0},readonly=true]{}
+}
+
+% new
+
+\NewDocumentCommand{\SimpleGET}{v v +v +v o}{
+
+ \IfNoValueTF{#5}
+ { \PushButton[name=#1, onclick={ processSimpleButton(#3,'GET','','',#4,{}); }]{\sffamily \large #2} }
+ { \PushButton[name=#1, onclick={ processSimpleButton(#3,'GET','#5','',#4,{}); }]{\sffamily \large #2} }
+
+
+}
+
+\NewDocumentCommand{\SimpleClosure}{v v +v}{
+
+ \PushButton[name=#1, onclick={ this["simpleClosure"] = #3; this["simpleClosure"](this); }]{\sffamily \large #2}
+
+}
+
+\NewDocumentCommand{\SimplePOST}{v v +v +v +v +v o}{
+
+ \IfNoValueTF{#7}
+ { \PushButton[name=#1, onclick={ processSimpleButton(#3,'POST','#6',#5,#4,{}); }]{\sffamily \large #2} }
+ { \PushButton[name=#1, onclick={ processSimpleButton(#3,'POST','#7',#5,#4,#6); }]{\sffamily \large #2} }
+
+}
+
+
+
+
+\begin{insDLJS}{test}{JavaScript}
+
+/*
+Displays a message e in a textfield named 'errorField'. If no such textfield exists and sentiment is 0, an alert is displayed instead.
+The parameter sentiment indicates the nature of the message e. If sentiment is:
+
+ 0 => e is an error message
+ 1 => e indicates success
+ 2 => e is neutral
+
+*/
+function state(e, sentiment) {
+ var f = this.getField("errorField")
+
+ if (f != null) {
+
+ f.value = e;
+
+ if (sentiment == 0) { f.borderColor = ["RGB",0.8,0,0]; f.lineWidth = 1; }
+ if (sentiment == 1) { f.borderColor = ["RGB",0,0.6,0]; f.lineWidth = 1; }
+ if (sentiment == 2) { f.borderColor = ["RGB",1,1,1]; f.lineWidth = 0; }
+
+ } else {
+ if (sentiment == 0) {
+ app.alert(e);
+ }
+ }
+}
+
+/*
+Attempts to retrieve a JSON object from a REST API endpoint.
+
+ url => the endpoint to contact
+ closure => is called with the received javascript object
+ keypath => the keypath of a property in the javascript object received that should be displayed in a textfield
+ payload => a javascript object to send in the body, as part of the request
+ name => the name of the textfield, where the property defined by keypath should be displayed
+ func => GET or POST
+ errors => a javascript object that defines error messages
+ example: { "404" : "The requested resource does not exist." }
+ doc => a reference to this
+
+ requires adobe acrobat pro, and the pdf needs to exist in a trusted folder
+
+*/
+function getJSONFrom(url,closure,keypath,payload,name,func,errors,doc)
+{
+
+ doc["httpjavascripts_speedTest_t0"] = new Date();
+
+ var o = {};
+
+ if (payload != '') {
+ o = payload();
+ }
+
+ var params =
+ {
+ cVerb: func,
+ cURL: url,
+ oRequest: util.streamFromString(JSON.stringify(o), "utf-8"),
+ oHandler:
+ {
+ response: function(resp,uri,e)
+ {
+
+ if (e != undefined) {
+
+ const known = errors[e.error];
+
+ if (known != undefined) {
+ state(known,0);
+ } else {
+
+ // still perform some basic checks
+
+ state(e.text,0);
+
+ }
+
+ } else {
+
+ const raw = util.stringFromStream(resp);
+
+ const json = JSON.parse(raw);
+
+ state("",2);
+ const toDisplay = closure(json,keypath,doc);
+
+ if (toDisplay != undefined) {
+ doc.display(toDisplay,name,doc);
+ }
+ }
+ }
+ }
+ }
+
+
+ Net.HTTP.request(params);
+}
+/*
+Preprocesses the URL, and then passes the data to getJSONFrom function.
+
+if the URL is a function, then that function is executed. This could be a security concern if the origin of the document is not known.
+if the URL contains an interpolated link, the interpolated elements are resolved.
+ example for an interpolated link:
+
+ "https://api.datamuse.com/words?rel_rhy={xyz}"
+
+ where xyz is the name of a textfield.
+
+otherwise, a string is expected.
+
+*/
+function processSimpleButton(url, method, name, payload, keypath, errors)
+{
+
+ var resolved = url;
+
+ if (typeof url != 'string') {
+ resolved = url(); // may be a security concern
+ } else if ( url.indexOf('{') >= 0 && url.indexOf('}') >= 0 ) {
+
+ const re = /[^{}]*({(\w*)})+/g;
+
+ var m;
+
+ var stitch = 0;
+ var res = '';
+
+ do {
+ m = re.exec(resolved);
+ if (m) {
+
+ const f = this.getField(m[2]);
+
+ if (f != null) {
+ stitch += m[0].length;
+ res += m[0].substring(0, m[0].length - m[1].length) + f.value;
+ } else {
+ console.println("DEBUG HINT: The textfield used for the interpolation of the URL string could not be found.");
+ }
+
+ }
+
+ } while (m);
+
+ const appendix = url.substring(stitch);
+ resolved = res;
+
+ }
+
+ getJSONFrom(resolved, extractKeypath, keypath, payload, name, method, errors, this);
+}
+
+function removeHTML(str) {
+
+ const re = /(.*?)(&.*?;)/g;
+
+ var m;
+
+ var stitch = 0;
+ var res = '';
+
+ do {
+ m = re.exec(str);
+ if (m) {
+
+ console.println(m[0]);
+ console.println(m[1]);
+
+ stitch += m[0].length;
+ res += m[1];
+
+ }
+
+ } while (m);
+
+ return res + str.substring(stitch);
+}
+
+/*
+Extracts a property of a javascript object based on the provided keypath.
+
+ Example: the keypath 'rst.xyz' extracts the value of the property xyz from the object abc:
+
+ const abc = { rst : { xyz = 123 } };
+
+ elements of an array can be accessed via ascending numbers, for example the keypath '0.xyz' would access the first element of an array, an then extract the value of xyz of that first object.
+
+*/
+function extractKeypath(json,keypath,doc) {
+
+ if (typeof keypath == 'function') {
+ return keypath(json,doc);
+ }
+
+ if (typeof keypath == 'string') {
+
+ const fun = doc[keypath];
+
+ if (typeof fun == 'function') {
+ return fun(); // may be a security concern
+ } else {
+
+ return keypath.split('.').reduce((previous, current) => {
+ const parsed = parseInt(current);
+
+ if (previous == undefined) {
+ console.println("DEBUG HINT: Keypath may not match the json object, or a referenced textfield is empty.");
+ return '';
+ }
+
+ if (isNaN(parsed)) {
+ return previous[current];
+ } else {
+ return previous[parsed];
+ }
+
+ }, json);
+ }
+ }
+}
+
+/*
+Displays a text in a textfield, provided the textfield exists.
+*/
+function display(text,name,doc) {
+
+ var f = doc.getField(name);
+
+ if (f != undefined) {
+ f.value = text;
+ }
+}
+
+\end{insDLJS} \ No newline at end of file
diff --git a/macros/latex/contrib/schulmathematik/README b/macros/latex/contrib/schulmathematik/README
index d585dab53a..7a9604603f 100644
--- a/macros/latex/contrib/schulmathematik/README
+++ b/macros/latex/contrib/schulmathematik/README
@@ -2,8 +2,8 @@ The schulmathematik bundle provides LaTeX commands and document classes for
German-speaking teachers of mathematics and physics.
Package author: K. Wehr
-Version: 1.4
-Date: 13 March 2023
+Version: 1.5
+Date: 21 June 2023
The schulmathematik bundle is subject to the LaTeX Project Public License,
version 1.3 or later.
diff --git a/macros/latex/contrib/schulmathematik/schulma-ab.cls b/macros/latex/contrib/schulmathematik/schulma-ab.cls
index 67e62262e8..6417bb86ee 100644
--- a/macros/latex/contrib/schulmathematik/schulma-ab.cls
+++ b/macros/latex/contrib/schulmathematik/schulma-ab.cls
@@ -1,8 +1,8 @@
% schulmathematik bundle: document class schulma-ab
-% Version 1.4
-% 13. März 2023
+% Version 1.5
+% 21. Juni 2023
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplClass{schulma-ab}{2023-03-13}{1.4}{Dokumentenklasse fuer Arbeitsblaetter}
+\ProvidesExplClass{schulma-ab}{2023-06-21}{1.5}{Dokumentenklasse fuer Arbeitsblaetter}
\tl_new:N \g_schulma_ab_kurs_tl
\tl_new:N \g_schulma_ab_thema_tl
diff --git a/macros/latex/contrib/schulmathematik/schulma-gutachten.cls b/macros/latex/contrib/schulmathematik/schulma-gutachten.cls
index cc0ae472a0..5c3dd770d8 100644
--- a/macros/latex/contrib/schulmathematik/schulma-gutachten.cls
+++ b/macros/latex/contrib/schulmathematik/schulma-gutachten.cls
@@ -1,8 +1,8 @@
% schulmathematik bundle: document class schulma-gutachten
-% Version 1.4
-% 13. März 2023
+% Version 1.5
+% 21. Juni 2023
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplClass{schulma-gutachten}{2023-03-13}{1.4}{Dokumentenklasse fuer Gutachten ueber schriftliche Abiturklausuren}
+\ProvidesExplClass{schulma-gutachten}{2023-06-21}{1.5}{Dokumentenklasse fuer Gutachten ueber schriftliche Abiturklausuren}
\bool_new:N \g_schulma_gutachten_bell_bool
\bool_new:N \g_schulma_gutachten_oesterreich_bool
@@ -194,7 +194,7 @@
\msg_warning:nn {schulma-gutachten} {Schule fehlt}
}
{
- \g_schulma_gutachten_schulname_tl
+ \parbox [t] {8cm} {\g_schulma_gutachten_schulname_tl}
\hfill
}
Abiturpr\"ufung~
@@ -362,8 +362,9 @@
}
\RequirePackage [useregional=text] {datetime2}
-\RequirePackage [locale=DE] {siunitx}
+\RequirePackage {siunitx}
+\sisetup { locale = DE , mode = match }
\KOMAoption {DIV} {13}
\pagestyle {empty}
diff --git a/macros/latex/contrib/schulmathematik/schulma-klausur.cls b/macros/latex/contrib/schulmathematik/schulma-klausur.cls
index 87c1411af6..24499bd1cc 100644
--- a/macros/latex/contrib/schulmathematik/schulma-klausur.cls
+++ b/macros/latex/contrib/schulmathematik/schulma-klausur.cls
@@ -1,8 +1,8 @@
% schulmathematik bundle: document class schulma-klausur
-% Version 1.4
-% 13. März 2023
+% Version 1.5
+% 21. Juni 2023
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplClass{schulma-klausur}{2023-03-13}{1.4}{Dokumentenklasse fuer Klausuren}
+\ProvidesExplClass{schulma-klausur}{2023-06-21}{1.5}{Dokumentenklasse fuer Klausuren}
\RequirePackage {etoolbox}
diff --git a/macros/latex/contrib/schulmathematik/schulma-komp.cls b/macros/latex/contrib/schulmathematik/schulma-komp.cls
index 994235e93a..9d650b51ae 100644
--- a/macros/latex/contrib/schulmathematik/schulma-komp.cls
+++ b/macros/latex/contrib/schulmathematik/schulma-komp.cls
@@ -1,8 +1,8 @@
% schulmathematik bundle: document class schulma-komp
-% Version 1.4
-% 13. März 2023
+% Version 1.5
+% 21. Juni 2023
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplClass{schulma-komp}{2023-03-13}{1.4}{Dokumentenklasse fuer Kompetenzlisten}
+\ProvidesExplClass{schulma-komp}{2023-06-21}{1.5}{Dokumentenklasse fuer Kompetenzlisten}
\ProcessOptions \relax
diff --git a/macros/latex/contrib/schulmathematik/schulma-mdlprf.cls b/macros/latex/contrib/schulmathematik/schulma-mdlprf.cls
index 75e3a27fbc..4f45f3a469 100644
--- a/macros/latex/contrib/schulmathematik/schulma-mdlprf.cls
+++ b/macros/latex/contrib/schulmathematik/schulma-mdlprf.cls
@@ -1,8 +1,8 @@
% schulmathematik bundle: document class schulma-mdlprf
-% Version 1.4
-% 13. März 2023
+% Version 1.5
+% 21. Juni 2023
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplClass{schulma-mdlprf}{2023-03-13}{1.4}{Dokumentenklasse fuer muendliche Abiturpruefungen}
+\ProvidesExplClass{schulma-mdlprf}{2023-06-21}{1.5}{Dokumentenklasse fuer muendliche Abiturpruefungen}
\bool_new:N \g_schulma_mdlprf_oesterreich_bool
\bool_new:N \g_schulma_mdlprf_pruefer_weiblich_bool
diff --git a/macros/latex/contrib/schulmathematik/schulma-physik.sty b/macros/latex/contrib/schulmathematik/schulma-physik.sty
index 975093e906..92b5a45d23 100644
--- a/macros/latex/contrib/schulmathematik/schulma-physik.sty
+++ b/macros/latex/contrib/schulmathematik/schulma-physik.sty
@@ -1,7 +1,7 @@
% schulmathematik bundle: package schulma-physik
-% Version 1.4
-% 13. März 2023
-\ProvidesExplPackage{schulma-physik}{2023-03-13}{1.4}{Befehle für die Schulphysik}
+% Version 1.5
+% 21. Juni 2023
+\ProvidesExplPackage{schulma-physik}{2023-06-21}{1.5}{Befehle für die Schulphysik}
\newif \ifschulma@physik@circuitikz % keine expl3-Syntax möglich, da von circuits.ee.IEC nicht unterstützt
@@ -428,6 +428,68 @@
}
+\dim_const:Nn \c_schulma_physik_multimeter_zeigerlaenge_dim {3.4cm}
+\dim_const:Nn \c_schulma_physik_multimeter_skalenradius_dim {2.9cm}
+\dim_const:Nn \c_schulma_physik_multimeter_breite_dim {5cm}
+\dim_const:Nn \c_schulma_physik_multimeter_hoehe_dim {4cm}
+\dim_new:N \l_schulma_physik_multimeter_skalenbeschriftung_dim
+\fp_const:Nn \c_schulma_physik_multimeter_sektorwinkel_fp {80}
+
+\NewDocumentCommand \Multimeter {mmm}
+ {
+ \begin {tikzpicture} [ font = { \sffamily \footnotesize } ]
+ % äußere Skala bis 10
+ \dim_set:Nn \l_tmpa_dim { \c_schulma_physik_multimeter_skalenradius_dim + 1mm }
+ \dim_set:Nn \l_schulma_physik_multimeter_skalenbeschriftung_dim { \c_schulma_physik_multimeter_skalenradius_dim + 5mm }
+ \int_step_inline:nnn {0} {50}
+ {
+ \fp_set:Nn \l_tmpa_fp { 90 + (0.5 - ##1/50) * \c_schulma_physik_multimeter_sektorwinkel_fp }
+ \int_compare:nNnTF { \int_mod:nn {##1} {5} } = {0}
+ {
+ \dim_set:Nn \l_tmpb_dim { \c_schulma_physik_multimeter_skalenradius_dim + 3mm }
+ \draw ( \fp_use:N \l_tmpa_fp \c_colon_str \l_tmpa_dim ) -- ( \fp_use:N \l_tmpa_fp \c_colon_str \l_tmpb_dim ) ;
+ \int_compare:nNnT { \int_mod:nn {##1} {10} } = {0}
+ {
+ \node at ( \fp_use:N \l_tmpa_fp \c_colon_str \l_schulma_physik_multimeter_skalenbeschriftung_dim ) { \int_eval:n {2*##1/10} } ;
+ }
+ }
+ {
+ \dim_set:Nn \l_tmpb_dim { \c_schulma_physik_multimeter_skalenradius_dim + 2mm }
+ \draw ( \fp_use:N \l_tmpa_fp \c_colon_str \l_tmpa_dim ) -- ( \fp_use:N \l_tmpa_fp \c_colon_str \l_tmpb_dim ) ;
+ }
+ }
+ % innere Skala bis 3
+ \dim_set:Nn \l_tmpa_dim { \c_schulma_physik_multimeter_skalenradius_dim - 1mm }
+ \dim_set:Nn \l_schulma_physik_multimeter_skalenbeschriftung_dim { \c_schulma_physik_multimeter_skalenradius_dim - 5mm }
+ \int_step_inline:nnn {0} {30}
+ {
+ \fp_set:Nn \l_tmpa_fp { 90 + (0.5 - ##1/30) * \c_schulma_physik_multimeter_sektorwinkel_fp }
+ \int_compare:nNnTF { \int_mod:nn {##1} {5} } = {0}
+ {
+ \dim_set:Nn \l_tmpb_dim { \c_schulma_physik_multimeter_skalenradius_dim - 3mm }
+ \draw ( \fp_use:N \l_tmpa_fp \c_colon_str \l_tmpa_dim ) -- ( \fp_use:N \l_tmpa_fp \c_colon_str \l_tmpb_dim ) ;
+ \int_compare:nNnT { \int_mod:nn {##1} {10} } = {0}
+ {
+ \node at ( \fp_use:N \l_tmpa_fp \c_colon_str \l_schulma_physik_multimeter_skalenbeschriftung_dim ) { \int_eval:n {##1/10} } ;
+ }
+ }
+ {
+ \dim_set:Nn \l_tmpb_dim { \c_schulma_physik_multimeter_skalenradius_dim - 2mm }
+ \draw ( \fp_use:N \l_tmpa_fp \c_colon_str \l_tmpa_dim ) -- ( \fp_use:N \l_tmpa_fp \c_colon_str \l_tmpb_dim ) ;
+ }
+ }
+ % Zeiger
+ \fp_set:Nn \l_tmpa_fp { 90 + (0.5 - #1/#2) * \c_schulma_physik_multimeter_sektorwinkel_fp }
+ \fill (0,0) circle [ radius = 2.5pt ] ;
+ \draw [semithick] (0,0) -- ( \fp_use:N \l_tmpa_fp \c_colon_str \dim_use:N \c_schulma_physik_multimeter_zeigerlaenge_dim ) ;
+ % Rahmen
+ \draw ( -0.5 * \c_schulma_physik_multimeter_breite_dim , -3mm ) -- ++ ( \c_schulma_physik_multimeter_breite_dim , 0 )
+ node [above~left] { \normalsize \qty [ mode = text , reset-text-family = false ] {#2} {#3} }
+ -- ++ ( 0 , \c_schulma_physik_multimeter_hoehe_dim ) -- ++ ( - \c_schulma_physik_multimeter_breite_dim , 0 )
+ -- ++ ( 0 , - \c_schulma_physik_multimeter_hoehe_dim ) ;
+ \end{tikzpicture}
+ }
+
\ExplSyntaxOff
\ifschulma@physik@circuitikz
diff --git a/macros/latex/contrib/schulmathematik/schulma-praes.cls b/macros/latex/contrib/schulmathematik/schulma-praes.cls
index 718cfad904..f3c7f6b77b 100644
--- a/macros/latex/contrib/schulmathematik/schulma-praes.cls
+++ b/macros/latex/contrib/schulmathematik/schulma-praes.cls
@@ -1,8 +1,8 @@
% schulmathematik bundle: document class schulma-praes
-% Version 1.4
-% 13. März 2023
+% Version 1.5
+% 21. Juni 2023
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplClass{schulma-praes}{2023-03-13}{1.4}{Dokumentenklasse fuer Bildschirmpraesentationen}
+\ProvidesExplClass{schulma-praes}{2023-06-21}{1.5}{Dokumentenklasse fuer Bildschirmpraesentationen}
\bool_new:N \g_schulma_praes_seitenzahlen_bool
\bool_new:N \g_schulma_praes_druck_bool
diff --git a/macros/latex/contrib/schulmathematik/schulma.sty b/macros/latex/contrib/schulmathematik/schulma.sty
index b11db88d5e..b33a24f861 100644
--- a/macros/latex/contrib/schulmathematik/schulma.sty
+++ b/macros/latex/contrib/schulmathematik/schulma.sty
@@ -1,7 +1,7 @@
% schulmathematik bundle: package schulma
-% Version 1.4
-% 13. März 2023
-\ProvidesExplPackage{schulma}{2023-03-13}{1.4}{Befehle für die Schulmathematik}
+% Version 1.5
+% 21. Juni 2023
+\ProvidesExplPackage{schulma}{2023-06-21}{1.5}{Befehle für die Schulmathematik}
\bool_new:N \g_schulma_icomma_bool
\bool_gset_true:N \g_schulma_icomma_bool
@@ -30,7 +30,7 @@
{
compat = newest ,
axis~lines = middle ,
- label~style =
+ every~axis/.append~style =
{
font = \small
},
@@ -38,7 +38,8 @@
{
font = \footnotesize ,
/pgf/number~format/use~comma ,
- /pgf/number~format/fixed
+ /pgf/number~format/fixed ,
+ /pgf/number~format/set~thousands~separator = {\,}
},
tick~style = {thick} ,
scaled~ticks = false ,
diff --git a/macros/latex/contrib/schulmathematik/schulmathematik.pdf b/macros/latex/contrib/schulmathematik/schulmathematik.pdf
index 0ec8ca5e2c..9c60983c63 100644
--- a/macros/latex/contrib/schulmathematik/schulmathematik.pdf
+++ b/macros/latex/contrib/schulmathematik/schulmathematik.pdf
Binary files differ
diff --git a/macros/latex/contrib/schulmathematik/schulmathematik.tex b/macros/latex/contrib/schulmathematik/schulmathematik.tex
index b23f955927..bb647163e7 100644
--- a/macros/latex/contrib/schulmathematik/schulmathematik.tex
+++ b/macros/latex/contrib/schulmathematik/schulmathematik.tex
@@ -1,6 +1,6 @@
% Manual of the schulmathematik bundle
-% Version 1.4
-% 13. März 2023
+% Version 1.5
+% 21. Juni 2023
\documentclass{scrartcl}
\usepackage[babelshorthands]{polyglossia}
\usepackage{longtable}
@@ -11,6 +11,7 @@
\usepackage{beamerarticle}
\usepackage{unicode-math}
\usepackage{icomma}
+\usepackage{hvextern}
\makeatletter
\let\example\@undefined
@@ -31,6 +32,8 @@
\setmainlanguage{german}
\pghyphenation{german}{Pa-ket-op-tion}
+\setkeys{hv}{force=true}
+
\makeatletter
% tasks: j überspringen
\newcommand*\@schulmaalph[1]{\ifnum #1>9 \@alph{\numexpr #1+1}\else \@alph{#1}\fi}
@@ -367,7 +370,7 @@ Schulmathematik
\medskip
\large
-Version 1.4
+Version 1.5
\medskip
\normalsize
@@ -433,9 +436,9 @@ Für \Paket{pgfplots} werden einige Voreinstellungen vorgenommen:
\begin{itemize}
\item \verb:compat=newest:, um unter Verzicht auf Abwärtskompatibilität die neueste Variante des Pakets zu verwenden
\item \verb:axis lines=middle:, um durch den Ursprung verlaufende Koordinatenachsen anstelle eines Kastens um das ganze Koordinatensystem zu verwenden
-\item \verb:label style={font=\small}:, um die Beschriftung der Koordinatenachsen in leicht verkleinerter Schrift anzuzeigen
+\item \verb:every axis/.append style={font=\small}:, um alle Beschriftungen, insbesondere die Beschriftung der Koordinatenachsen, in leicht verkleinerter Schrift anzuzeigen
\item \verb:ticklabel style={font=\footnotesize,/pgf/number format/use comma,:\\
-\verb:/pgf/number format/fixed}:, um die Skalen der Koordinatenachsen mit Zahlen in kleiner Schrift unter Verwendung eines Dezimalkommas anstelle eines Dezimalpunkts und möglichst ohne wissenschaftliche Zahlschreibweise zu beschriften
+\verb:/pgf/number format/fixed,/pgf/number format/set thousands separator={\,}}:, um die Skalen der Koordinatenachsen mit Zahlen in kleiner Schrift unter Verwendung eines Dezimalkommas anstelle eines Dezimalpunkts, möglichst ohne wissenschaftliche Zahlschreibweise und mit einem kleinen Leerzeichen als Tausendertrennzeichen zu beschriften
\item \verb:tick style={thick}:, um deutlich sichtbare Skalenstriche zu erhalten
\item \verb:scaled ticks=false:, um alle Skalenstriche -- ohne eine Zehnerpotenz auszulagern -- mit der vollständigen Zahl zu beschriften
\item \verb:every axis plot/.append style={semithick}:, um Funktionsgraphen etwas dicker darzustellen
@@ -565,6 +568,12 @@ Gibt einen Federkraftmesser mit dem angegebenen \meta{Messwert} (einzugeben mit
\Kraftmesser{3.4}{10}
\Kraftmesser{2.4}{5}
\end{sidebyside}
+\Befehlsbeschreibung{Multimeter}[\marg{Messwert}\marg{Maximalausschlag}\marg{Maßeinheit}]
+Gibt die Skala eines Drehspulinstruments zur Spannungs- und Stromstärkemessung aus. Der \meta{Messwert} und der \meta{Maximalausschlag} sind mit Dezimalpunkt einzugeben. Für die \meta{Maßeinheit} gilt die \Paket{siunitx}-Syntax.
+\begin{sidebyside}
+ \Multimeter{3.75}{10}{V}
+ \Multimeter{243}{300}{\uA}
+\end{sidebyside}
\Befehlsbeschreibung{Massstab}[\marg{Zahl 1}\marg{Einheit 1}\marg{Zahl 2}\marg{Einheit 2}]
Dient zur Definition eines Maßstabs. Für Zahlenwerte und Einheiten gilt die Syntax des \Paket{siunitx}-Pakets.
\begin{sidebyside}
@@ -634,7 +643,6 @@ Schaltzeichen werden durch die TikZ-Bibliothek \Paket{circuits.ee.IEC} in Form v
Für die Schulphysik wichtige Schaltsymbole zeigt die folgende Übersicht. Weitere sind der \Paket{tikz}-Anleitung zu entnehmen.
Mit \dag{} markierte Knotentypen wurden gegenüber der TikZ-Bibliothek \Paket{circuits.ee.IEC} modifiziert, mit \ddag{} markierte neu hinzugefügt.
-\newpage
\begin{longtable}{l>{\begin{minipage}[c][8mm][c]{3cm}}l<{\end{minipage}}l}
\emph{Bauteil} & \emph{Symbol} & \emph{Knotentyp} \\
Glühlampe & \Schaltbeispiel{bulb} & \texttt{bulb}\textsuperscript{\dag} \\
@@ -685,7 +693,53 @@ Da die Nuklidschreibweise eher selten benötigt wird, wird dieses Paket nicht au
\section{Dokumentenklassen}
\subsection{Arbeitsblätter mit der Klasse \Klasse{schulma-ab}}
-Die Dokumentenklasse für Arbeitsblatter basiert auf der KOMA-Script-Klasse \Klasse{scrartcl}. Diese wird mit der Option \Option{DIV=14} geladen, d.\,h. der linke und rechte Rand sind im Hochformat A\,4 je \qty{2,25}{cm} breit.
+Die Dokumentenklasse für Arbeitsblätter basiert auf der KOMA-Script-Klasse \Klasse{scrartcl}. Diese wird mit der Option \Option{DIV=14} geladen, d.\,h. der linke und rechte Rand sind im Hochformat A\,4 je \qty{2,25}{cm} breit.
+
+\begin{externalDocument}[frame,framesep=0pt,grfOptions={width=0.5\textwidth}]{schulma}
+\documentclass{schulma-ab}
+\usepackage{multicol}
+\Kurs{Mathematik\\Klasse 8\,a}
+\Datum{2023-6-21}
+\Thema{Ausklammern}
+\begin{document}
+\emph{Klammere aus.}
+
+\medskip
+Beispiele: $\begin{aligned}[t]
+& 3\,a+6 = 3\cdot a+3\cdot 2=3\cdot(a+2) \\
+&a\,x+4\,x = (a+4)\cdot x
+\end{aligned}$
+
+\begin{multicols}{2}
+\begin{Kreisliste}
+\item $12\,x-8$
+\item $35\,u-20\,v$
+\item $4\,r+2\,k$
+\item $7\,a+7\,x$
+\item $5\,x+5$
+\item $4\,x+4\,y+4\,z$
+\item $2\,p+6\,b-12\,c$
+\item $9\,t^2+6\,a\,t-12\,t\,g$
+\item $8\,s\,a\,g-12\,k\,a^2g$
+\item $5\,c\,u+10\,u-5\,u\,g$
+\item $4\,t^2d+8\,b\,d\,t-6\,d\,t\,s$
+\item $3\,x^2+6\,x+9$
+\item $24\,a^2+32\,a-60$
+\item $a^2+a\,b+a\,c$
+\item $68\,x^2+34\,x+102$
+\item $x^3y+x^2y+x\,y$
+\item $a^3b^2+a^2b+a\,b^3$
+\item $4\,x^3-6\,x^2+8\,x$
+\item $36\,a^2b-45\,a\,b^2-9\,a\,b$
+\item $x^2y\,z-x\,y^2z+x\,y\,z^2$
+\item $3\,a\,c^2+9\,a^2c^3-3\,a\,c^4$
+\item $25\,a^2b^3c^3+75\,a^4b^2c^2$
+\item $(a+b)\cdot x+(a+b)\cdot y$
+\item $(u+3)\cdot(2\,a+4)+(u+3)\cdot 7$
+\end{Kreisliste}
+\end{multicols}
+\end{document}
+\end{externalDocument}
\subsubsection*{Klassenoptionen}
\begin{Liste}
@@ -1078,13 +1132,13 @@ Diese Option ist anzugeben, falls der Korreferent weiblich ist. Dies wirkt sich
\emph{Siehe S. \pageref{babel}.}
\Paketbeschreibung{datetime2}[mit der Option \Option{useregional=text}]
Gibt das Datum des Gutachtens in der Langform »1. März 2021« aus. Österreichische Benutzer verwenden die Klassenoption \Option{AT}, um »Jänner« statt »Januar« zu erhalten.
-\Paketbeschreibung{siunitx}[mit der Option \Option{locale=DE}]
+\Paketbeschreibung{siunitx}[mit den Optionen \Option{locale=DE} und \Option{mode=match}]
\emph{Siehe S. \pageref{siunitx}.} Das Paket wird hier zur Formatierung von Punktzahlen und Prozentsätzen benötigt.
\end{Liste}
\subsubsection*{Befehle in der Präambel}
\begin{Liste}
\Befehlsbeschreibung{Schule}[\marg{Schulname}]
-Gibt den Namen der Schule an. Dieser erscheint in der linken oberen Ecke des Gutachtens.
+Gibt den Namen der Schule an. Dieser erscheint in der linken oberen Ecke des Gutachtens. Zeilenumbrüche mit \verb:\\: sind möglich.
\Befehlsbeschreibung{Ort}[\marg{Schulort}]
Gibt den Ort der Schule an. Dieser erscheint mit dem Datum vor dem Unterschriftsfeld.
\Befehlsbeschreibung{Datum}[\marg{Datum}]
@@ -1206,7 +1260,7 @@ Für die Musterlösung wird bei Verwendung der Umgebung \Umgebung{Teilaufgaben}
\item \textbf{\Klasse{schulma-ab}:} Anpassung der vertikalen Abstände innerhalb der \verb:tasks:"=Umgebung an die Umgebung \Umgebung{Teilaufgaben}
\item \textbf{\Klasse{schulma-klausur}:} Anpassung der vertikalen Abstände innerhalb der \verb:tasks:-Umgebung an die Umgebung \Umgebung{Teilaufgaben}; neues optionales Argument des Befehls \Befehl{Aufgabe} für die Bearbeitungszeit; Ausgabe von Informationen zu den Aufgaben auf dem Terminal
\end{itemize}
-\item[1.4] \today
+\item[1.4] 13. März 2023
\begin{itemize}
\item \textbf{\Paket{schulma}:} neue Paketoption \Option{ohne-icomma}
\item \textbf{\Paket{schulma-physik}:} neue Paketoption \Option{circuitikz}; neue Optionen \Option{cm}, \Option{inch} und \Option{cm+inch} für den Befehl \Befehl{Messschieber}, um eine Zollskala alternativ oder zusätzlich zur Zentimeterskala auszugeben; neuer Befehl \Befehl{Kraftmesser}
@@ -1214,6 +1268,12 @@ Für die Musterlösung wird bei Verwendung der Umgebung \Umgebung{Teilaufgaben}
Das Verhalten des Befehls \Befehl{Gruppen} wurde für den Fall geändert, dass keine der Klassenoptionen \Option{GruppeA} und \Option{GruppeB} gewählt wurde: In der Musterlösung werden die Texte für beide Gruppen ausgegeben; in der Klausur wird weiterhin der Text für Gruppe A abgedruckt, aber eine Warnung ausgegeben. Damit verbunden ist die Einführung einer Sternversion des Befehls \Befehl{Gruppen}.
\end{itemize}
+\item[1.5] \today
+\begin{itemize}
+\item \textbf{\Paket{schulma}:} Verwendung des Schriftbefehls \verb:\small: für alle Beschriftungen innerhalb der Umgebung \texttt{axis} und des Befehls \verb:\,: als Tausendertrennzeichen für die Skalenbeschriftung innerhalb der gleichen Umgebung
+\item \textbf{\Paket{schulma-physik}:} neuer Befehl \Befehl{Multimeter}
+\item \textbf{\Klasse{schulma-gutachten}:} Ermöglichung mehrzeiliger Schulnamen; Anpassung der Schriftart des erreichten Prozentsatzes an die umgebende Schrift
+\end{itemize}
\end{description}
\end{document}
diff --git a/macros/luatex/generic/luavlna/README.md b/macros/luatex/generic/luavlna/README.md
index 870552cd0f..1fe76754d5 100644
--- a/macros/luatex/generic/luavlna/README.md
+++ b/macros/luatex/generic/luavlna/README.md
@@ -1,4 +1,4 @@
-# Luavlna, version 0.1k, 2023-03-28
+# Luavlna, version 0.1l, 2023-06-21
# Introduction
diff --git a/macros/luatex/generic/luavlna/luavlna-doc.pdf b/macros/luatex/generic/luavlna/luavlna-doc.pdf
index 900d6c3714..a75499a3c9 100644
--- a/macros/luatex/generic/luavlna/luavlna-doc.pdf
+++ b/macros/luatex/generic/luavlna/luavlna-doc.pdf
Binary files differ
diff --git a/macros/luatex/generic/luavlna/luavlna.lua b/macros/luatex/generic/luavlna/luavlna.lua
index 5bbe2c060b..416ecc5841 100644
--- a/macros/luatex/generic/luavlna/luavlna.lua
+++ b/macros/luatex/generic/luavlna/luavlna.lua
@@ -31,7 +31,7 @@ for k,v in pairs(glue_subtypes) do
end
end
-local unicode_alphas = "0041-005A0061-007A00AA00B500BA00C0-00D600D8-00F600F8-02C102C6-02D102E0-02E402EC02EE0370-037403760377037A-037D03860388-038A038C038E-03A103A3-03F503F7-0481048A-05270531-055605590561-058705D0-05EA05F0-05F20620-064A066E066F0671-06D306D506E506E606EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA07F407F507FA0800-0815081A082408280840-085808A008A2-08AC0904-0939093D09500958-09610971-09770979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10CF10CF20D05-0D0C0D0E-0D100D12-0D3A0D3D0D4E0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E460E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EC60EDC-0EDF0F000F40-0F470F49-0F6C0F88-0F8C1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10A0-10C510C710CD10D0-10FA10FC-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317D717DC1820-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541AA71B05-1B331B45-1B4B1B83-1BA01BAE1BAF1BBA-1BE51C00-1C231C4D-1C4F1C5A-1C7D1CE9-1CEC1CEE-1CF11CF51CF61D00-1DBF1E00-1F151F18-1F1D1F20-1F451F48-1F4D1F50-1F571F591F5B1F5D1F5F-1F7D1F80-1FB41FB6-1FBC1FBE1FC2-1FC41FC6-1FCC1FD0-1FD31FD6-1FDB1FE0-1FEC1FF2-1FF41FF6-1FFC2071207F2090-209C21022107210A-211321152119-211D212421262128212A-212D212F-2139213C-213F2145-2149214E218321842C00-2C2E2C30-2C5E2C60-2CE42CEB-2CEE2CF22CF32D00-2D252D272D2D2D30-2D672D6F2D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE2E2F300530063031-3035303B303C3041-3096309D-309F30A1-30FA30FC-30FF3105-312D3131-318E31A0-31BA31F0-31FF3400-4DB54E00-9FCCA000-A48CA4D0-A4FDA500-A60CA610-A61FA62AA62BA640-A66EA67F-A697A6A0-A6E5A717-A71FA722-A788A78B-A78EA790-A793A7A0-A7AAA7F8-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2A9CFAA00-AA28AA40-AA42AA44-AA4BAA60-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADB-AADDAAE0-AAEAAAF2-AAF4AB01-AB06AB09-AB0EAB11-AB16AB20-AB26AB28-AB2EABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA6DFA70-FAD9FB00-FB06FB13-FB17FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF21-FF3AFF41-FF5AFF66-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC0030-0039"
+local unicode_alphas = "0041-005A0061-007A00AA00B500BA00C0-00D600D8-00F600F8-02C102C6-02D102E0-02E402EC02EE0370-037403760377037A-037D03860388-038A038C038E-03A103A3-03F503F7-0481048A-05270531-055605590561-058705D0-05EA05F0-05F20620-064A066E066F0671-06D306D506E506E606EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA07F407F507FA0800-0815081A082408280840-085808A008A2-08AC0904-0939093D09500958-09610971-09770979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10CF10CF20D05-0D0C0D0E-0D100D12-0D3A0D3D0D4E0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E460E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EC60EDC-0EDF0F000F40-0F470F49-0F6C0F88-0F8C1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10A0-10C510C710CD10D0-10FA10FC-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317D717DC1820-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541AA71B05-1B331B45-1B4B1B83-1BA01BAE1BAF1BBA-1BE51C00-1C231C4D-1C4F1C5A-1C7D1CE9-1CEC1CEE-1CF11CF51CF61D00-1DBF1E00-1F151F18-1F1D1F20-1F451F48-1F4D1F50-1F571F591F5B1F5D1F5F-1F7D1F80-1FB41FB6-1FBC1FBE1FC2-1FC41FC6-1FCC1FD0-1FD31FD6-1FDB1FE0-1FEC1FF2-1FF41FF6-1FFC2071207F2090-209C21022107210A-211321152119-211D212421262128212A-212D212F-2139213C-213F2145-2149214E218321842C00-2C2E2C30-2C5E2C60-2CE42CEB-2CEE2CF22CF32D00-2D252D272D2D2D30-2D672D6F2D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE2E2F300530063031-3035303B303C3041-3096309D-309F30A1-30FA30FC-30FF3105-312D3131-318E31A0-31BA31F0-31FF3400-4DB54E00-9FCCA000-A48CA4D0-A4FDA500-A60CA610-A61FA62AA62BA640-A66EA67F-A697A6A0-A6E5A717-A71FA722-A788A78B-A78EA790-A793A7A0-A7AAA7F8-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2A9CFAA00-AA28AA40-AA42AA44-AA4BAA60-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADB-AADDAAE0-AAEAAAF2-AAF4AB01-AB06AB09-AB0EAB11-AB16AB20-AB26AB28-AB2EABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA6DFA70-FAD9FB00-FB06FB13-FB17FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF21-FF3AFF41-FF5AFF66-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC"
-- construct table with unicode alphas for later testing
diff --git a/macros/luatex/generic/luavlna/luavlna.sty b/macros/luatex/generic/luavlna/luavlna.sty
index f8af19876c..9f411c5f9f 100644
--- a/macros/luatex/generic/luavlna/luavlna.sty
+++ b/macros/luatex/generic/luavlna/luavlna.sty
@@ -1,4 +1,4 @@
-\ProvidesPackage{luavlna}[2023-03-28 luavlna]
+\ProvidesPackage{luavlna}[2023-06-21 luavlna]
\ifdefined\directlua\else
\PackageWarning{luavlna}{Luavlna needs LuaLaTeX, aborting}
@@ -50,8 +50,8 @@
\ifluavlna@defaults
\AtBeginDocument{%
- \singlechars{czech}{AIiVvOoUuSsZzKk}
- \singlechars{slovak}{AIiVvOoUuSsZzKk}
+ \singlechars{czech}{AaIiVvOoUuSsZzKk}
+ \singlechars{slovak}{AaIiVvOoUuSsZzKk}
\compoundinitials{czech}{Ch,CH}
\enablesplithyphens{czech}
\enablesplithyphens{slovak}
diff --git a/macros/luatex/generic/luavlna/luavlna.tex b/macros/luatex/generic/luavlna/luavlna.tex
index e86df0f325..d678854e9a 100644
--- a/macros/luatex/generic/luavlna/luavlna.tex
+++ b/macros/luatex/generic/luavlna/luavlna.tex
@@ -125,8 +125,8 @@ end
\def\noinitials{\directlua{luavlna.no_initials = true}}
\ifdefined\nosingledefaults\else
- \singlechars{czech}{AIiVvOoUuSsZzKk}
- \singlechars{slovak}{AIiVvOoUuSsZzKk}
+ \singlechars{czech}{AaIiVvOoUuSsZzKk}
+ \singlechars{slovak}{AaIiVvOoUuSsZzKk}
\compoundinitials{czech}{Ch,CH}
\enablesplithyphens{czech}
\enablesplithyphens{slovak}