summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/attr-ini.mkiv2
-rw-r--r--tex/context/base/cont-new.mkiv12
-rw-r--r--tex/context/base/context-version.pdfbin4088 -> 4086 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/publ-ini.lua1
-rw-r--r--tex/context/base/publ-ini.mkiv18
-rw-r--r--tex/context/base/status-files.pdfbin24851 -> 24856 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin233980 -> 233977 bytes
-rw-r--r--tex/context/base/tabl-ntb.mkiv4
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
10 files changed, 25 insertions, 16 deletions
diff --git a/tex/context/base/attr-ini.mkiv b/tex/context/base/attr-ini.mkiv
index 9dfa7baae..3f49e67a9 100644
--- a/tex/context/base/attr-ini.mkiv
+++ b/tex/context/base/attr-ini.mkiv
@@ -85,7 +85,7 @@
%D For the moment we put this here (later it will move to where it's used):
\definesystemattribute [state]
-\definesystemattribute [color] [public]
+\definesystemattribute [color] [public] % global
\definesystemattribute [colormodel] [public,global]
\definesystemattribute [skip]
\definesystemattribute [penalty]
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 9c0dec7f5..8a1c0f6c1 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{2014.01.27 11:35}
+\newcontextversion{2014.01.27 14:25}
%D This file is loaded at runtime, thereby providing an excellent place for
%D hacks, patches, extensions and new features.
@@ -24,6 +24,16 @@
%D Maybe:
+% \appendtoks
+% \inheritmaintextcolor
+% \to \everybeforenoteinsert
+
+% \appendtoks
+% \inheritmaintextcolor
+% \to \everymargindatacontent
+
+%D Maybe:
+
\unexpanded\def\tightvbox{\dowithnextbox{\dp\nextbox\zeropoint\box\nextbox}\vbox}
\unexpanded\def\tightvtop{\dowithnextbox{\ht\nextbox\zeropoint\box\nextbox}\vtop}
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 169b231c0..701e88482 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.mkiv b/tex/context/base/context.mkiv
index 34150d388..484c7f32c 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2014.01.27 11:35}
+\edef\contextversion{2014.01.27 14:25}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/publ-ini.lua b/tex/context/base/publ-ini.lua
index 9cb5fe0f4..13177b299 100644
--- a/tex/context/base/publ-ini.lua
+++ b/tex/context/base/publ-ini.lua
@@ -691,6 +691,7 @@ function lists.collectentries(specification)
end
-- method=v_local --------------------
local result = structures.lists.filter(specification)
+-- inspect(result)
lists.result = result
local section = sections.currentid()
local list = rendering.list
diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv
index 85d70046d..6d3d09696 100644
--- a/tex/context/base/publ-ini.mkiv
+++ b/tex/context/base/publ-ini.mkiv
@@ -361,13 +361,11 @@
\let\placelistofpublications \placebtxrendering
\def\publ_place_list_check_criterium
- {\edef\p_criterium{\btxrenderingparameter\c!criterium} % \v!cite will become \s!cite
- \ifx\p_criterium\empty
- \letlistparameter\c!criterium\v!previous
- \else\ifx\p_criterium\v_cite
- \letlistparameter\c!criterium\v!here
- \else
- \letlistparameter\c!criterium\v_cite
+ {\edef\currentbtxcriterium{\btxrenderingparameter\c!criterium}% \v!cite will become \s!cite
+ \ifx\currentbtxcriterium\empty
+ \let\currentbtxcriterium\v!previous
+ \else\ifx\currentbtxcriterium\v!cite
+ \let\currentbtxcriterium\v!here
\fi\fi}
\def\publ_place_list_complete[#1][#2]% title might become obsolete, just headtext
@@ -526,9 +524,9 @@
\fi
\to \everysetupbtxlistplacement
-\appendtoks
- \edef\currentbtxcriterium{\btxrenderingparameter\c!criterium}%
-\to \everysetupbtxlistplacement
+% \appendtoks
+% \edef\currentbtxcriterium{\btxrenderingparameter\c!criterium}%
+% \to \everysetupbtxlistplacement
\unexpanded\def\btxflushauthor
{\doifnextoptionalelse\btx_flush_author_yes\btx_flush_author_nop}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index f6101779a..15f809651 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 04f7dc5d5..290657b7d 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/tabl-ntb.mkiv b/tex/context/base/tabl-ntb.mkiv
index a1ae94712..42c61f16c 100644
--- a/tex/context/base/tabl-ntb.mkiv
+++ b/tex/context/base/tabl-ntb.mkiv
@@ -1667,7 +1667,7 @@
\setupTABLE
[\c!frameoffset=.5\linewidth,
\c!backgroundoffset=\v!frame,
- \c!framecolor=\s!black,
+ % \c!framecolor=\s!black,
\c!width=\v!fit,
\c!height=\v!fit,
\c!autowidth=\v!yes,
@@ -1719,7 +1719,7 @@
\setupTABLE
[\c!frameoffset=.5\linewidth,
\c!backgroundoffset=\v!frame,
- \c!framecolor=\s!black,
+ % \c!framecolor=\s!black,
\c!width=\v!fit,
\c!height=\v!fit,
\c!autowidth=\v!yes,
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 5e8032bce..d9bc04aa7 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 : 01/27/14 11:35:33
+-- merge date : 01/27/14 14:25:59
do -- begin closure to overcome local limits and interference