summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4143 -> 4143 bytes
-rw-r--r--tex/context/base/context-version.pngbin105722 -> 106410 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/math-int.mkiv15
-rw-r--r--tex/context/base/page-mul.mkiv2
-rw-r--r--tex/context/base/status-files.pdfbin24472 -> 24474 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin179535 -> 179540 bytes
-rw-r--r--tex/context/base/status-mkiv.lua5
-rw-r--r--tex/context/base/status-mkiv.tex2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
13 files changed, 23 insertions, 11 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 226a859f2..4ead560b9 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2012.07.10 00:14}
+\newcontextversion{2012.07.10 00:56}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index f4d55037b..57d30209b 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2012.07.10 00:14}
+\newcontextversion{2012.07.10 00:56}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 655d9263c..21be2e324 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 124e0cc4d..66fdaecde 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 2b5608204..a0cbec632 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2012.07.10 00:14}
+\edef\contextversion{2012.07.10 00:56}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index e5e07c4d4..1e718ca1a 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2012.07.10 00:14}
+\edef\contextversion{2012.07.10 00:56}
%D For those who want to use this:
diff --git a/tex/context/base/math-int.mkiv b/tex/context/base/math-int.mkiv
index 84c51cb24..8699cbc1c 100644
--- a/tex/context/base/math-int.mkiv
+++ b/tex/context/base/math-int.mkiv
@@ -38,7 +38,7 @@
\installcorenamespace{mathintegral}
-\newconstant\mathintlimitmode % 0 nolimits 1 displaylimits 2 limits
+\newconstant\mathintlimitmode
\def\intlimits % also used elsewhere
{\ifcase\mathintlimitmode
@@ -47,18 +47,29 @@
\displaylimits
\or
\limits
+ \or
+ % auto
+ \ifcase\normalmathstyle\displaylimits\or\displaylimits\else\limits\fi
+ % \ifnum\attribute\mathmodeattribute=\plusone % we need a proper flag
+ % \displaylimits
+ % \else
+ % \limits
+ % \fi
\fi}
\letvalue{\??mathintegral nolimits}\zerocount
\letvalue{\??mathintegral displaylimits}\plusone
\letvalue{\??mathintegral limits}\plustwo
+\letvalue{\??mathintegral autolimits}\plusthree
+\letvalue{\??mathintegral none}\plusfour
\appendtoks
\mathintlimitmode\executeifdefined{\??mathintegral\mathematicsparameter\s!integral}\zerocount
\to \everyswitchmathematics
\setupmathematics
- [\v!integral=nolimits]
+% [\v!integral=nolimits]
+ [\v!integral=autolimits]
%D The following code is used for fallbacks and might become obsolete once
%D we have enough \OPENTYPE\ math fonts.
diff --git a/tex/context/base/page-mul.mkiv b/tex/context/base/page-mul.mkiv
index 300ab7720..ba6343e6d 100644
--- a/tex/context/base/page-mul.mkiv
+++ b/tex/context/base/page-mul.mkiv
@@ -1441,7 +1441,7 @@
\ifdim\@@kldistance>\zeropoint
\dimen0=\@@kldistance
\else
- \dimen0=\linewidth
+ \dimen0=\linewidth % hm, weird
\fi
\advance\dimen0 -\linewidth
\hskip.5\dimen0
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 4fc22a521..1dc219a93 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index e33c94278..45d076779 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/status-mkiv.lua b/tex/context/base/status-mkiv.lua
index 18b4a78e5..7bd388abd 100644
--- a/tex/context/base/status-mkiv.lua
+++ b/tex/context/base/status-mkiv.lua
@@ -536,7 +536,7 @@ return {
{
filename = "strc-sec",
marktype = "mkiv",
- status = "todo",
+ status = "okay",
comment = "some of the local current and synchronization macros will be renamed",
},
{
@@ -1420,7 +1420,8 @@ return {
{
filename = "strc-lnt",
marktype = "mkiv",
- status = "todo",
+ status = "okay",
+ comment = "will be extended as part of crited"
},
-- {
-- filename = "core-mis",
diff --git a/tex/context/base/status-mkiv.tex b/tex/context/base/status-mkiv.tex
index 36bab777b..f15abc4a9 100644
--- a/tex/context/base/status-mkiv.tex
+++ b/tex/context/base/status-mkiv.tex
@@ -109,7 +109,7 @@
context.starttitle { title = k }
- context.starttabulate { "|Tr|Tlw(12em)|Tl|lw(6em)|l|l|l|p|" }
+ context.starttabulate { "|Tr|Tlw(12em)|Tl|Tlw(6em)|l|l|l|p|" }
context.NC() context.bold("order")
context.NC() context.bold("file")
context.NC() context.bold("mark")
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 80c8be2e0..c69ac8a24 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 07/10/12 00:14:53
+-- merge date : 07/10/12 00:56:44
do -- begin closure to overcome local limits and interference