summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4129 -> 4134 bytes
-rw-r--r--tex/context/base/context-version.pngbin40519 -> 40526 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/core-def.mkiv4
-rw-r--r--tex/context/base/font-pre.mkiv3
-rw-r--r--tex/context/base/spac-par.mkiv4
-rw-r--r--tex/context/base/status-files.pdfbin24742 -> 24753 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin211823 -> 211793 bytes
-rw-r--r--tex/context/base/strc-reg.mkiv2
-rw-r--r--tex/context/base/tabl-ntb.mkiv49
-rw-r--r--tex/context/base/trac-vis.lua14
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
13 files changed, 57 insertions, 25 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 9aff26836..b1753fbab 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{2013.04.11 22:48}
+\newcontextversion{2013.04.12 11:52}
%D This file is loaded at runtime, thereby providing an excellent place for
%D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index ca58c88bb..726be769f 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 47d8ffac2..47a546b6a 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.mkiv b/tex/context/base/context.mkiv
index b51c9a7f2..b5643bf98 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{2013.04.11 22:48}
+\edef\contextversion{2013.04.12 11:52}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/core-def.mkiv b/tex/context/base/core-def.mkiv
index cf1049e58..dc2a30f4e 100644
--- a/tex/context/base/core-def.mkiv
+++ b/tex/context/base/core-def.mkiv
@@ -56,6 +56,10 @@
\to \everydisplay
% \appendtoks
+% \flushpostponednodedata
+% \to \neverypar
+
+% \appendtoks
% \flushsyncpositions
% \to \everyheadstart
diff --git a/tex/context/base/font-pre.mkiv b/tex/context/base/font-pre.mkiv
index 410f2dcef..74c39722f 100644
--- a/tex/context/base/font-pre.mkiv
+++ b/tex/context/base/font-pre.mkiv
@@ -211,6 +211,7 @@
\definecolor[font:mark][r=.75,b=.75] % [m=.75]
\definecolor[font:rest][b=.75,g=.75] % [c=.75]
+\definecolor[trace:w][s=1]
\definecolor[trace:r][r=.75,t=.5,a=1]
\definecolor[trace:g][g=.75,t=.5,a=1]
\definecolor[trace:b][b=.75,t=.5,a=1]
@@ -220,6 +221,7 @@
\definecolor[trace:s][s=.75,t=.5,a=1]
\definecolor[trace:o][r=1,g=.6,b=.1,t=.5,a=1]
+\definecolor[trace:dw][s=1]
\definecolor[trace:dr][r=.75,t=.75,a=1]
\definecolor[trace:dg][g=.75,t=.75,a=1]
\definecolor[trace:db][b=.75,t=.75,a=1]
@@ -229,6 +231,7 @@
\definecolor[trace:ds][s=.75,t=.75,a=1]
\definecolor[trace:do][r=1,g=.6,b=.1,t=.75,a=1]
+\definecolor[font:0] [s=1]
\definecolor[font:1] [r=.75]
\definecolor[font:2] [g=.75]
\definecolor[font:3] [b=.75]
diff --git a/tex/context/base/spac-par.mkiv b/tex/context/base/spac-par.mkiv
index 6b7ed4f7d..b6116eb01 100644
--- a/tex/context/base/spac-par.mkiv
+++ b/tex/context/base/spac-par.mkiv
@@ -193,13 +193,13 @@
\dowithnextboxcs\spac_postponed_finish\hbox}
\def\spac_postponed_finish
- {\global\setbox\b_spac_postponed_data\hbox
+ {\global\setbox\b_spac_postponed_data\hbox % to\zeropoint
{\box\b_spac_postponed_data\box\nextbox}%
\endgroup}
\def\spac_postponed_flush
{\ifvoid\b_spac_postponed_data\else
- \hbox{\smashedbox\b_spac_postponed_data}%
+ \hbox{\smashedbox\b_spac_postponed_data}% \box\b_spac_postponed_data
\fi
\glet\flushpostponednodedata\relax}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 90065874a..b3790649c 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 228f8726e..b475896a3 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/strc-reg.mkiv b/tex/context/base/strc-reg.mkiv
index 558f266c8..8c9f040f0 100644
--- a/tex/context/base/strc-reg.mkiv
+++ b/tex/context/base/strc-reg.mkiv
@@ -120,7 +120,7 @@
\ifdefined\Word \else \unexpanded\def\Word#1{#1} \fi
\appendtoks
- \ifconditional\c_strc_registers_defining \else
+ \ifconditional\c_strc_registers_defining \else % todo: dosingle ...
\settrue\c_strc_registers_defining
\ctxlua{structures.registers.define('\currentregister')}%
\normalexpanded{\presetheadtext[\currentregister=\Word{\currentregister}]}%
diff --git a/tex/context/base/tabl-ntb.mkiv b/tex/context/base/tabl-ntb.mkiv
index 9927256b1..ec1b78b13 100644
--- a/tex/context/base/tabl-ntb.mkiv
+++ b/tex/context/base/tabl-ntb.mkiv
@@ -77,19 +77,36 @@
\ifdefined\dotagTABLEcell \else \let\dotagTABLEcell \relax \fi % todo: namespace
\ifdefined\dotagTABLEsignal \else \let\dotagTABLEsignal\relax \fi % todo: namespace
-\let\tabl_tnb_next_level\relax
+\let\tabl_ntb_next_level\relax
-\unexpanded\def\tabl_tnb_cell_start
+\newtoks\t_tabl_ntb_cell_start
+\newtoks\t_tabl_ntb_cell_stop
+
+\appendtoks
+ \naturaltablelocalparameter\c!left
+ \delayedbegstrut
+\to \t_tabl_ntb_cell_start
+
+\appendtoks
+ \delayedendstrut
+ \naturaltablelocalparameter\c!right
+\to \t_tabl_ntb_cell_stop
+
+\appendtoks
+ \flushpostponednodedata
+ % maybe: \the\neverypar
+\to \t_tabl_ntb_cell_start
+
+\unexpanded\def\tabl_ntb_cell_start
{\inhibitblank
\dotagTABLEcell
-% \tabl_tnb_next_level
+ %\tabl_ntb_next_level
\usenaturaltablelocalstyleandcolor\c!style\c!color
- \everypar{\naturaltablelocalparameter\c!left\delayedbegstrut}}
+ \everypar\t_tabl_ntb_cell_start}
-\unexpanded\def\tabl_tnb_cell_stop
+\unexpanded\def\tabl_ntb_cell_stop
{\ifhmode
- \delayedendstrut
- \naturaltablelocalparameter\c!right
+ \the\t_tabl_ntb_cell_stop
\par % added 13/4/2006
\else
% not sure yet:\naturaltablelocalparameter\c!right
@@ -175,15 +192,15 @@
\global\intablefalse
\fi}
-\unexpanded\def\tabl_tnb_next_level
+\unexpanded\def\tabl_ntb_next_level
{\advance\c_tabl_level\plusone
\edef\m_tabl_tbl_level{\the\c_tabl_level}}
-\unexpanded\def\tabl_tnb_prev_level
+\unexpanded\def\tabl_ntb_prev_level
{\advance\c_tabl_level\minusone
\edef\m_tabl_tbl_level{\the\c_tabl_level}}
-\tabl_tnb_next_level % go to level 1
+\tabl_ntb_next_level % go to level 1
\installcorenamespace{naturaltable} % was tbl
\installcorenamespace{naturaltablelocal} % was tbltbl
@@ -282,7 +299,7 @@
\unexpanded\def\tabl_ntb_set_txt_process#1#2#3#4#5#6%
{\expandafter\def\csname\??naturaltabletxt\m_tabl_tbl_level:\number#1:\number#2\endcsname
- {\tabl_ntb_cell_process{#3}{#4}[#5]{\tabl_tnb_next_level#6\tabl_tnb_prev_level}}}
+ {\tabl_ntb_cell_process{#3}{#4}[#5]{\tabl_ntb_next_level#6\tabl_ntb_prev_level}}}
\def\tabl_ntb_get_txt#1#2%
{\csname\??naturaltabletxt\m_tabl_tbl_level:\number#1:\number#2\endcsname}
@@ -1236,7 +1253,7 @@
\fi
\dostoptagged} % right spot
-\def\tabl_tnb_cell_finalize
+\def\tabl_ntb_cell_finalize
{\doifnotinset\localwidth{\v!fit,\v!broad}% user set
{\scratchdimen\tabl_ntb_get_aut\c_tabl_ntb_col\relax
\ifdim\localwidth>\scratchdimen
@@ -1522,7 +1539,7 @@
\tabl_ntb_set_dis{#2}{\the\scratchdimen}%
\fi
\setupcurrentnaturaltablelocal[#3,\c!background=,\c!frame=\v!off]% 25% faster
- \inheritednaturaltablelocalframed{\tabl_tnb_cell_start\tabl_ntb_char_align{#2}{#4}\tabl_tnb_cell_stop\tabl_tnb_cell_finalize}}%
+ \inheritednaturaltablelocalframed{\tabl_ntb_cell_start\tabl_ntb_char_align{#2}{#4}\tabl_ntb_cell_stop\tabl_ntb_cell_finalize}}%
\scratchdimen\tabl_ntb_get_wid\c_tabl_ntb_col\relax
\ifdim\wd\scratchbox>\scratchdimen
\ifsqueezeTBLspan
@@ -1578,7 +1595,7 @@
{\setbox\scratchbox\hbox
{\tabl_ntb_setup_cell{#2}{#3}%
\setupcurrentnaturaltablelocal[#4,#1,\c!frame=\v!off,\c!background=]%
- \inheritednaturaltablelocalframed{\tabl_tnb_cell_start#5\tabl_tnb_cell_stop}}%
+ \inheritednaturaltablelocalframed{\tabl_ntb_cell_start#5\tabl_ntb_cell_stop}}%
\setbox2\emptyhbox
\wd2\wd\scratchbox
\ht2\ht\scratchbox
@@ -1617,7 +1634,7 @@
{\tabl_ntb_setup_cell{#1}{#2}%
\bgroup
\setupcurrentnaturaltablelocal[#3,\c!width=\d_tabl_ntb_width,\c!background=,\c!frame=\v!off]% 25% faster
- \inheritednaturaltablelocalframed{\tabl_tnb_cell_start\tabl_ntb_char_align{#2}{#4}\tabl_tnb_cell_stop}%
+ \inheritednaturaltablelocalframed{\tabl_ntb_cell_start\tabl_ntb_char_align{#2}{#4}\tabl_ntb_cell_stop}%
\egroup}
\unexpanded\def\tabl_ntb_cell_process_e#1#2[#3]#4%
@@ -1630,7 +1647,7 @@
\else
\setupcurrentnaturaltablelocal[\c!color=,\c!width=\d_tabl_ntb_width,\c!height=\d_tabl_ntb_height]%
\fi
- \inheritednaturaltablelocalframed{\tabl_tnb_cell_start\tabl_ntb_char_align{#2}{#4}\tabl_tnb_cell_stop}}%
+ \inheritednaturaltablelocalframed{\tabl_ntb_cell_start\tabl_ntb_char_align{#2}{#4}\tabl_ntb_cell_stop}}%
\hskip\tabl_ntb_get_dis{#2}}
\setupTABLE
diff --git a/tex/context/base/trac-vis.lua b/tex/context/base/trac-vis.lua
index f68da632f..1138bacc8 100644
--- a/tex/context/base/trac-vis.lua
+++ b/tex/context/base/trac-vis.lua
@@ -290,6 +290,7 @@ local c_space = "trace:y"
local c_skip_a = "trace:c"
local c_skip_b = "trace:m"
local c_glyph = "trace:o"
+local c_white = "trace:w"
local c_positive_d = "trace:db"
local c_negative_d = "trace:dr"
@@ -299,13 +300,19 @@ local c_space_d = "trace:dy"
local c_skip_a_d = "trace:dc"
local c_skip_b_d = "trace:dm"
local c_glyph_d = "trace:do"
+local c_white_d = "trace:dw"
-local function sometext(str,layer,color) -- we can just paste verbatim together .. no typesteting needed
+local function sometext(str,layer,color,textcolor) -- we can just paste verbatim together .. no typesteting needed
local text = fast_hpack_string(str,usedfont)
local size = text.width
local rule = new_rule(size,2*exheight,exheight/2)
local kern = new_kern(-size)
- setcolor(rule,color)
+ if color then
+ setcolor(rule,color)
+ end
+ if textcolor then
+ setlistcolor(text.list,textcolor)
+ end
local info = concat_nodes {
rule,
kern,
@@ -399,7 +406,8 @@ local function whatsit(head,current)
-- print("hit whatsit")
else
local tag = whatsitcodes[what]
- info = sometext(formatters["W:%s"](tag and tags[tag] or what),usedfont)
+ -- maybe different text colors per tag
+ info = sometext(formatters["W:%s"](tag and tags[tag] or what),usedfont,nil,c_white)
info[a_layer] = l_whatsit
w_cache[what] = info
end
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index e5a74d747..3a3a914bd 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 : 04/11/13 22:48:32
+-- merge date : 04/12/13 11:52:01
do -- begin closure to overcome local limits and interference