summaryrefslogtreecommitdiff
path: root/tex/context/modules
diff options
context:
space:
mode:
Diffstat (limited to 'tex/context/modules')
-rw-r--r--tex/context/modules/mkiv/m-tikz.mkiv8
-rw-r--r--tex/context/modules/mkiv/s-fonts-tables.lua4
-rw-r--r--tex/context/modules/mkxl/m-tikz-pgfplots.tex2
-rw-r--r--tex/context/modules/mkxl/m-tikz.mkxl9
-rw-r--r--tex/context/modules/mkxl/s-math-atoms.mkxl2
-rw-r--r--tex/context/modules/mkxl/s-math-tests.mkxl112
6 files changed, 127 insertions, 10 deletions
diff --git a/tex/context/modules/mkiv/m-tikz.mkiv b/tex/context/modules/mkiv/m-tikz.mkiv
index ef1b6b7e3..61df89cfd 100644
--- a/tex/context/modules/mkiv/m-tikz.mkiv
+++ b/tex/context/modules/mkiv/m-tikz.mkiv
@@ -39,10 +39,10 @@
\permanent\protected\def\starttikzinput
{\pushcatcodetable
\setcatcodetable\texcatcodes
- \catcode`\@=11
- \catcode`\|=12
- \catcode`\!=12
- \catcode`\~=12
+ \catcode`\@=11\relax
+ \catcode`\|=12\relax
+ \catcode`\!=12\relax
+ \catcode`\~=13\relax
\relax}
\permanent\protected\def\stoptikzinput
diff --git a/tex/context/modules/mkiv/s-fonts-tables.lua b/tex/context/modules/mkiv/s-fonts-tables.lua
index 65725594b..ed034b882 100644
--- a/tex/context/modules/mkiv/s-fonts-tables.lua
+++ b/tex/context/modules/mkiv/s-fonts-tables.lua
@@ -6,6 +6,8 @@ if not modules then modules = { } end modules ['s-fonts-tables'] = {
license = "see context related readme files"
}
+-- Thsi file needs to be updated to LMTX!
+
moduledata.fonts = moduledata.fonts or { }
moduledata.fonts.tables = moduledata.fonts.tables or { }
@@ -29,7 +31,7 @@ local setlink = nodes.setlink
local hpack = nodes.hpack
local applyvisuals = nodes.applyvisuals
-local lefttoright_code = nodes.dirvalues.lefttoright
+local lefttoright_code = (tex.directioncodes and tex.directioncodes.lefttoright) or nodes.dirvalues.lefttoright -- LMTX
local handle_positions = fonts.handlers.otf.datasetpositionprocessor
local handle_injections = nodes.injections.handler
diff --git a/tex/context/modules/mkxl/m-tikz-pgfplots.tex b/tex/context/modules/mkxl/m-tikz-pgfplots.tex
index 1dd06b8b2..666f6b00b 100644
--- a/tex/context/modules/mkxl/m-tikz-pgfplots.tex
+++ b/tex/context/modules/mkxl/m-tikz-pgfplots.tex
@@ -4,6 +4,8 @@
\writestatus{loading}{ConTeXt User Module / Pgfplots}
+\usemodule[tikz]
+
\tikzinputfile{pgfplots.revision.tex}
\usetikzlibrary[plotmarks]
diff --git a/tex/context/modules/mkxl/m-tikz.mkxl b/tex/context/modules/mkxl/m-tikz.mkxl
index 6b173227c..e79806ca9 100644
--- a/tex/context/modules/mkxl/m-tikz.mkxl
+++ b/tex/context/modules/mkxl/m-tikz.mkxl
@@ -42,10 +42,11 @@
\setcatcodetable\texcatcodes
\pushmacro\meaning
\let\meaning\meaningless
- \catcode`\@=11
- \catcode`\|=12
- \catcode`\!=12
- \catcode`\~=13
+ \catcode`\@=11\relax
+ \catcode`\|=13\relax % was 12 < texlive 2023
+ \catcode`\!=12\relax
+ \catcode`\~=13\relax % needed >= texlive 2023
+ % \catcode`\$= 3\relax
\autoparagraphmode\zerocount}
\permanent\protected\def\stoptikzinput
diff --git a/tex/context/modules/mkxl/s-math-atoms.mkxl b/tex/context/modules/mkxl/s-math-atoms.mkxl
index 1b5ebed41..ab54dd291 100644
--- a/tex/context/modules/mkxl/s-math-atoms.mkxl
+++ b/tex/context/modules/mkxl/s-math-atoms.mkxl
@@ -1,5 +1,5 @@
%D \module
-%D [ file=s-math-atoms.mksl,
+%D [ file=s-math-atoms.mkxl,
%D version=2022.02.13,
%D title=\CONTEXT\ Style File,
%D subtitle=Show Math Atom Spacing,
diff --git a/tex/context/modules/mkxl/s-math-tests.mkxl b/tex/context/modules/mkxl/s-math-tests.mkxl
new file mode 100644
index 000000000..35f2a6248
--- /dev/null
+++ b/tex/context/modules/mkxl/s-math-tests.mkxl
@@ -0,0 +1,112 @@
+%D \module
+%D [ file=s-math-tests.mkxl,
+%D version=2023.04.03,
+%D title=\CONTEXT\ Style File,
+%D subtitle=Some Math Tests,
+%D author=Hans Hagen,
+%D date=\currentdate,
+%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\continueifinputfile{s-math-tests.mkxl}
+
+%D Here we collect some tests that later will become proper macros.
+
+\starttext
+
+\startbuffer
+ \ruledhbox \bgroup \im {
+ \dostepwiserecurse{`A}{`Z}{1}{
+ \blackrule[color=darkgray,height=\the\Umathflattenedaccentbaseheight\textstyle,depth=0pt,width=0.05ts]
+ \hat{\char#1}
+ }
+ }\egroup
+\stopbuffer
+
+\startTEXpage[offset=1ts]
+ \showglyphs
+% \switchtobodyfont[modern] \getbuffer\par
+% \blank
+% \switchtobodyfont[pagella] \getbuffer\par
+% \switchtobodyfont[termes] \getbuffer\par
+% \switchtobodyfont[schola] \getbuffer\par
+% \blank
+% \switchtobodyfont[ebgaramon-nt]\getbuffer\par
+% \switchtobodyfont[ebgaramond] \getbuffer\par
+% \blank
+% \switchtobodyfont[erewhon] \getbuffer\par
+% \switchtobodyfont[kpfonts] \getbuffer\par
+% \switchtobodyfont[xcharter] \getbuffer\par
+% \switchtobodyfont[concrete] \getbuffer\par
+% \switchtobodyfont[libertinus] \getbuffer\par
+% \switchtobodyfont[stixtwo] \getbuffer\par
+% \switchtobodyfont[lucida-nt] \getbuffer\par
+ \switchtobodyfont[lucida]
+ % 8.67123pt default
+ \bgroup
+ \bitwiseflip\mathfontcontrol\ignoreflataccentsmathcontrolcode
+ \appendtoks
+ \Umathflattenedaccentbaseheight\textstyle8.67123pt
+ \to\everymathematics
+ \getbuffer\par
+ \egroup
+ \bgroup
+ \appendtoks
+ \Umathflattenedaccentbaseheight\textstyle8.67123pt
+ \to\everymathematics
+ \getbuffer\par
+ \egroup
+ % 8.51532pt fixed
+ \bgroup
+ \appendtoks
+ \Umathflattenedaccentbaseheight\textstyle8.51532pt
+ \to\everymathematics
+ \getbuffer\par
+ \egroup
+% \switchtobodyfont[libertinus] \getbuffer\par
+\stopTEXpage
+
+\startTEXpage[offset=1ts]
+
+ \definefontfeature[mathextra][]
+% \definefontfeature[mathextra][ss10=yes,ss06=yes]
+
+ \setupbodyfont[ebgaramond]
+
+ \bgroup
+ \setupmathematics[stylealternative=]
+ \im{\hbar^{\hbar^{\hbar}}}
+ \egroup
+ \bgroup
+ \setupmathematics[stylealternative={hbar}]
+ \im{\hbar^{\hbar^{\hbar}}}
+ \egroup
+ \bgroup
+ \setupmathematics[stylealternative={hbar,outbendingh}]
+ \im{\hbar^{\hbar^{\hbar}}}
+ \egroup
+ \bgroup
+ \setupmathematics[stylealternative={outbendingh}]
+ \im{\hbar^{\hbar^{\hbar}}}
+ \egroup
+
+ \definefontfeature[mathextra][]
+% \definefontfeature[mathextra][cv03=yes]
+
+ \setupbodyfont[stixtwo]
+
+ \bgroup
+ \setupmathematics[stylealternative=]
+ \im{\emptyset^{\emptyset^{\emptyset}}}
+ \egroup
+ \bgroup
+ \setupmathematics[stylealternative={emptyset}]
+ \im{\emptyset^{\emptyset^{\emptyset}}}
+ \egroup
+
+\stopTEXpage
+
+\stoptext