summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/stex/tex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/stex/tex')
-rw-r--r--macros/latex/contrib/stex/tex/etc/hwexam-default.header6
-rw-r--r--macros/latex/contrib/stex/tex/etc/lststex.sty21
-rw-r--r--macros/latex/contrib/stex/tex/etc/stex-highlighting.sty59
-rw-r--r--macros/latex/contrib/stex/tex/etc/stex-logo.sty6
-rw-r--r--macros/latex/contrib/stex/tex/etc/stex.cls.ltxml10
-rw-r--r--macros/latex/contrib/stex/tex/etc/stex.sty.ltxml23
-rw-r--r--macros/latex/contrib/stex/tex/etc/stexthm.sty2
-rw-r--r--macros/latex/contrib/stex/tex/ldf/problem-english.ldf6
-rw-r--r--macros/latex/contrib/stex/tex/ldf/problem-finnish.ldf4
-rw-r--r--macros/latex/contrib/stex/tex/ldf/problem-french.ldf4
-rw-r--r--macros/latex/contrib/stex/tex/ldf/problem-ngerman.ldf5
-rw-r--r--macros/latex/contrib/stex/tex/ldf/problem-russian.ldf6
-rw-r--r--macros/latex/contrib/stex/tex/ldf/stex-en.ldf5
13 files changed, 90 insertions, 67 deletions
diff --git a/macros/latex/contrib/stex/tex/etc/hwexam-default.header b/macros/latex/contrib/stex/tex/etc/hwexam-default.header
index d36a97c718..fa70218e14 100644
--- a/macros/latex/contrib/stex/tex/etc/hwexam-default.header
+++ b/macros/latex/contrib/stex/tex/etc/hwexam-default.header
@@ -3,7 +3,7 @@ Matriculation Number:\hspace*{2cm}\strut\\[1ex]
\begin{center}
\Large\textbf{\@title}\\[1ex]
- \large\@date\\[3ex]
+ \large\@date\strut\\[3ex]
\end{center}
\textbf{You have {\hwexamminutes} (sharp) for the test};\\
@@ -22,11 +22,9 @@ You will only need {\hwexam@reqpts} points for a perfect score, i.e.
\vfill
\begin{center}
{
- \Large\em You have ample time, so take it slow and avoid rushing
- to mistakes!\\[2ex]
Different problems test different skills and knowledge, so do not
get stuck on one problem.
}\vfill
\correction@table\\[3ex]
-\end{center} \ No newline at end of file
+\end{center}
diff --git a/macros/latex/contrib/stex/tex/etc/lststex.sty b/macros/latex/contrib/stex/tex/etc/lststex.sty
index 423e0b4a20..7d127fddc5 100644
--- a/macros/latex/contrib/stex/tex/etc/lststex.sty
+++ b/macros/latex/contrib/stex/tex/etc/lststex.sty
@@ -15,6 +15,7 @@
symdef,symdecl,notation,sref},
morekeywords={smodule,sdefinition,sassertion,sparagraph,
inputref,
+ sproblem,hint,exnote,solution,gnote,
sproof,spfstep,spfcases,spfcase,justification,premise}}
\definecolor{backcolor}{gray}{.96}
@@ -71,8 +72,10 @@
classoffset=5,keywordstyle=\color{magenta},morekeywords={
smodule,sdefinition,sassertion,sparagraph,sexample,
sproof,subproof,spfcases,spfcase,spfstep,spfcomment,spfblock,
+ sproblem,subproblem,solution,hint,exnote,mcb,scb,
\\spfidea,\\spfsketch,\\spfcasesketch,\\sproofend,
\\spfjust,\\premise,\\justarg,\\inlinedef,\\inlineex,\\inlineass,
+ \\scc,\\mcc,\\objective,
\\varbind,
copymodule,interpretmodule,mathstructure,sexample,extstructure,
extstructure*,realization
@@ -125,11 +128,21 @@
}
},
unknown .code:n = {
- \tl_if_empty:nTF{#1}{
- \exp_args:NNo \clist_put_right:Nn \l_lststex_pass_on_args_clist \l_keys_key_str
+ \str_if_empty:NTF \l_keys_key_str {
+ \tl_if_empty:nTF{#1}{
+ \exp_args:NNo \clist_put_right:Nn \l_lststex_pass_on_args_clist \l_keys_key_tl
+ }{
+ \exp_args:NNx \clist_put_right:Nn \l_lststex_pass_on_args_clist {
+ \l_keys_key_tl = \exp_not:n{{#1}}
+ }
+ }
}{
- \exp_args:NNx \clist_put_right:Nn \l_lststex_pass_on_args_clist {
- \l_keys_key_str = \exp_not:n{{#1}}
+ \tl_if_empty:nTF{#1}{
+ \exp_args:NNo \clist_put_right:Nn \l_lststex_pass_on_args_clist \l_keys_key_str
+ }{
+ \exp_args:NNx \clist_put_right:Nn \l_lststex_pass_on_args_clist {
+ \l_keys_key_str = \exp_not:n{{#1}}
+ }
}
}
}
diff --git a/macros/latex/contrib/stex/tex/etc/stex-highlighting.sty b/macros/latex/contrib/stex/tex/etc/stex-highlighting.sty
index 0cd04872a1..ec0058d519 100644
--- a/macros/latex/contrib/stex/tex/etc/stex-highlighting.sty
+++ b/macros/latex/contrib/stex/tex/etc/stex-highlighting.sty
@@ -1,5 +1,16 @@
%\RequirePackage{xcolor}
\RequirePackage{pdfcomment}
+\RequirePackage{l3keys2e}
+\ExplSyntaxOn
+
+\keys_define:nn { stexhighlighting / pkg}{
+ boxes .default:n = {true},
+ boxes .bool_set:N = \c_stexhighlighting_boxes_bool,
+}
+
+\ProcessKeysOptions{ stexhighlighting / pkg}
+
+\ExplSyntaxOff
\def\compemph#1{%
\ifcsname textcolor\endcsname
@@ -28,20 +39,40 @@
}
\def\varemph#1{\ifcsname textcolor\endcsname\textcolor{gray}{#1}\else#1\fi}
-\protected\def\compemph@uri#1#2{%
- \pdftooltip{%
- \srefsymuri{#2}{\compemph{#1}}%
- }{%
- URI:~\detokenize{#2}%
- }%
+\ExplSyntaxOn
+
+\bool_if:NTF\c_stexhighlighting_boxes_bool{
+ \protected\def\compemph@uri#1#2{
+ \pdftooltip{
+ \srefsymuri{#2}{\compemph{#1}}
+ }{
+ URI:~\detokenize{#2}
+ }
+ }
+ \protected\def\symrefemph@uri#1#2{
+ \pdftooltip{
+ \srefsymuri{#2}{\symrefemph{#1}}
+ }{
+ URI:~\detokenize{#2}
+ }
+ }
+}{
+ \protected\def\compemph@uri#1#2{
+ \pdftooltip{{\hypersetup{pdfborder={0~0~0}}
+ \srefsymuri{#2}{\compemph{#1}}
+ }}{
+ URI:~\detokenize{#2}
+ }
+ }
+ \protected\def\symrefemph@uri#1#2{
+ \pdftooltip{{\hypersetup{pdfborder={0~0~0}}
+ \srefsymuri{#2}{\symrefemph{#1}}
+ }}{
+ URI:~\detokenize{#2}
+ }
+ }
}
-\protected\def\symrefemph@uri#1#2{%
- \pdftooltip{%
- \srefsymuri{#2}{\symrefemph{#1}}%
- }{%
- URI:~\detokenize{#2}%
- }%
- }
+
\protected\def\defemph@uri#1#2{%
\pdftooltip{%
\defemph{#1}%
@@ -56,3 +87,5 @@
Variable~\detokenize{#2}%
}%
}
+
+\ExplSyntaxOff \ No newline at end of file
diff --git a/macros/latex/contrib/stex/tex/etc/stex-logo.sty b/macros/latex/contrib/stex/tex/etc/stex-logo.sty
index 1bcb487aba..cc4c6154ac 100644
--- a/macros/latex/contrib/stex/tex/etc/stex-logo.sty
+++ b/macros/latex/contrib/stex/tex/etc/stex-logo.sty
@@ -1,7 +1,7 @@
\RequirePackage{xspace}
\protected\def\stex{%
\@ifundefined{texorpdfstring}{\raisebox{-.5ex}S\kern-.5ex\TeX}{%
- \texorpdfstring{\raisebox{-.5ex}S\kern-.5ex\TeX}{sTeX}\xspace%
- }%
+ \texorpdfstring{\raisebox{-.5ex}S\kern-.5ex\TeX}{sTeX}%
+ }\xspace%
}
-\let\sTeX\stex \ No newline at end of file
+\let\sTeX\stex
diff --git a/macros/latex/contrib/stex/tex/etc/stex.cls.ltxml b/macros/latex/contrib/stex/tex/etc/stex.cls.ltxml
deleted file mode 100644
index 6915d0db92..0000000000
--- a/macros/latex/contrib/stex/tex/etc/stex.cls.ltxml
+++ /dev/null
@@ -1,10 +0,0 @@
-package LaTeXML::Package::Pool;
-use strict;
-use warnings;
-use LaTeXML::Package;
-
-RequirePackage('xparse');
-
-InputDefinitions('stex', type => 'cls', noltxml => 1);
-
-1; \ No newline at end of file
diff --git a/macros/latex/contrib/stex/tex/etc/stex.sty.ltxml b/macros/latex/contrib/stex/tex/etc/stex.sty.ltxml
deleted file mode 100644
index 44e30b44c5..0000000000
--- a/macros/latex/contrib/stex/tex/etc/stex.sty.ltxml
+++ /dev/null
@@ -1,23 +0,0 @@
-package LaTeXML::Package::Pool;
-use strict;
-use warnings;
-use LaTeXML::Package;
-
-RequirePackage('xparse');
-
-DefPrimitive('\csname stex_kpsewhich:Nn\endcsname Token {}',sub {
- my ($stomach, $target, $value) = @_;
- $value = ToString(Expand($value));
- my $out = ToString(`kpsewhich $value`);
- $out =~ s/^\s+//;
- $out =~ s/\s+$//;
- Note("Here: $value => $out");
- my @ret = Explode($out);
- DefMacroI($target, undef, Tokens(@ret));
-},locked=>1);
-
-\DefMacroI('\stex@backend',undef,Explode("latexml"));
-
-InputDefinitions('stex', type => 'sty', noltxml => 1);
-
-1; \ No newline at end of file
diff --git a/macros/latex/contrib/stex/tex/etc/stexthm.sty b/macros/latex/contrib/stex/tex/etc/stexthm.sty
index 4b89af5b39..7c37c2678a 100644
--- a/macros/latex/contrib/stex/tex/etc/stexthm.sty
+++ b/macros/latex/contrib/stex/tex/etc/stexthm.sty
@@ -1,4 +1,4 @@
-\ProvidesExplPackage{stexthm}{2023/03/19}{3.3.0}{Default Typesetting for sTeX Statements}
+\ProvidesExplPackage{stexthm}{2023/10/13}{3.4.0}{Default Typesetting for sTeX Statements}
\RequirePackage{stex}
\RequirePackage{amsthm}
diff --git a/macros/latex/contrib/stex/tex/ldf/problem-english.ldf b/macros/latex/contrib/stex/tex/ldf/problem-english.ldf
index bd202814e6..137b9cbe9e 100644
--- a/macros/latex/contrib/stex/tex/ldf/problem-english.ldf
+++ b/macros/latex/contrib/stex/tex/ldf/problem-english.ldf
@@ -3,7 +3,9 @@
\tl_set:Nn \problem@kw@hint{Hint}
\tl_set:Nn \problem@kw@note{Note}
\tl_set:Nn \problem@kw@grading{Grading}
-\tl_set:Nn \problem@kw@points{pt}
+\tl_set:Nn \problem@kw@pts{pt}
\tl_set:Nn \problem@kw@minutes{min}
\tl_set:Nn \problem@kw@correct{Correct}
-\tl_set:Nn \problem@kw@wrong{Wrong} \ No newline at end of file
+\tl_set:Nn \problem@kw@wrong{Wrong}
+\tl_set:Nn \problem@kw@feedback{Feedback}
+\tl_set:Nn \problem@kw@points{Points}
diff --git a/macros/latex/contrib/stex/tex/ldf/problem-finnish.ldf b/macros/latex/contrib/stex/tex/ldf/problem-finnish.ldf
index 11fc490c4a..63718739b0 100644
--- a/macros/latex/contrib/stex/tex/ldf/problem-finnish.ldf
+++ b/macros/latex/contrib/stex/tex/ldf/problem-finnish.ldf
@@ -12,7 +12,9 @@
\tl_set:Nn \problem@kw@hint{Hint}
\tl_set:Nn \problem@kw@note{Note}
\tl_set:Nn \problem@kw@grading{Grading}
-\tl_set:Nn \problem@kw@points{pt}
+\tl_set:Nn \problem@kw@pts{pt}
\tl_set:Nn \problem@kw@minutes{min}
\tl_set:Nn \problem@kw@correct{Correct}
\tl_set:Nn \problem@kw@wrong{Wrong}
+\tl_set:Nn \problem@kw@schema{Schema}
+\tl_set:Nn \problem@kw@points{Points}
diff --git a/macros/latex/contrib/stex/tex/ldf/problem-french.ldf b/macros/latex/contrib/stex/tex/ldf/problem-french.ldf
index bdcae874b2..53004d1f39 100644
--- a/macros/latex/contrib/stex/tex/ldf/problem-french.ldf
+++ b/macros/latex/contrib/stex/tex/ldf/problem-french.ldf
@@ -12,7 +12,9 @@
\tl_set:Nn \problem@kw@hint{Hint}
\tl_set:Nn \problem@kw@note{Note}
\tl_set:Nn \problem@kw@grading{Grading}
-\tl_set:Nn \problem@kw@points{pt}
+\tl_set:Nn \problem@kw@pts{pt}
\tl_set:Nn \problem@kw@minutes{min}
\tl_set:Nn \problem@kw@correct{Correct}
\tl_set:Nn \problem@kw@wrong{Wrong}
+\tl_set:Nn \problem@kw@schema{Schema}
+\tl_set:Nn \problem@kw@points{Points}
diff --git a/macros/latex/contrib/stex/tex/ldf/problem-ngerman.ldf b/macros/latex/contrib/stex/tex/ldf/problem-ngerman.ldf
index 0747555783..beea10724a 100644
--- a/macros/latex/contrib/stex/tex/ldf/problem-ngerman.ldf
+++ b/macros/latex/contrib/stex/tex/ldf/problem-ngerman.ldf
@@ -11,8 +11,9 @@
\tl_set:Nn \problem@kw@hint{Hinweis}
\tl_set:Nn \problem@kw@note{Bemerkung}
\tl_set:Nn \problem@kw@grading{Bewertung}
-\tl_set:Nn \problem@kw@points{Pkt}
+\tl_set:Nn \problem@kw@pts{Pkt}
\tl_set:Nn \problem@kw@minutes{Min}
\tl_set:Nn \problem@kw@correct{Korrekt}
\tl_set:Nn \problem@kw@wrong{Falsch}
-
+\tl_set:Nn \problem@kw@feedback{Rückmeldung}
+\tl_set:Nn \problem@kw@points{Punkte}
diff --git a/macros/latex/contrib/stex/tex/ldf/problem-russian.ldf b/macros/latex/contrib/stex/tex/ldf/problem-russian.ldf
index f0a08c7761..7aa362391c 100644
--- a/macros/latex/contrib/stex/tex/ldf/problem-russian.ldf
+++ b/macros/latex/contrib/stex/tex/ldf/problem-russian.ldf
@@ -11,7 +11,9 @@
\tl_set:Nn \problem@kw@hint{Подсказка}
\tl_set:Nn \problem@kw@note{Примечание}
\tl_set:Nn \problem@kw@grading{Grading}
-\tl_set:Nn \problem@kw@points{бл}
+\tl_set:Nn \problem@kw@pts{бл}
\tl_set:Nn \problem@kw@minutes{мин}
\tl_set:Nn \problem@kw@correct{Correct}
-\tl_set:Nn \problem@kw@wrong{Wrong} \ No newline at end of file
+\tl_set:Nn \problem@kw@wrong{Wrong}
+\tl_set:Nn \problem@kw@schema{Schema}
+\tl_set:Nn \problem@kw@points{Points}
diff --git a/macros/latex/contrib/stex/tex/ldf/stex-en.ldf b/macros/latex/contrib/stex/tex/ldf/stex-en.ldf
index 1501a92c82..04a11c6208 100644
--- a/macros/latex/contrib/stex/tex/ldf/stex-en.ldf
+++ b/macros/latex/contrib/stex/tex/ldf/stex-en.ldf
@@ -3,7 +3,7 @@
}
\msg_set:nnn{stex}{warning/nomathhub}{
MATHHUB~system~variable~not~found~and~no~
- \tl_to_str:n{\mathhub}-value~set!
+ \tl_to_str:n{\mathhub}-value~set!^^JUsing~HOME/MathHub.
}
\msg_set:nnn{stex}{error/deactivated-macro}{
The~\tl_to_str:n{#1}~command~is~only~allowed~in~#2!
@@ -129,6 +129,9 @@
\msg_set:nnn{stex}{error/nomorphism}{
No~morphism~#1~found~in~domain~of~morphism
}
+\msg_set:nnn{stex}{error/nestedproblem}{
+ Nested~problem;~sproblem~not~allowed~in~another~sproblem
+}
\str_set:Nn \spfsketchenvautorefname {Proof~sketch}
\str_set:Nn \sproofautorefname {Proof}
\str_set:Nn \spfstepautorefname {Proof~step} \ No newline at end of file