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.pdfbin4383 -> 4385 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/mult-fun.lua2
-rw-r--r--tex/context/base/mult-mps.lua14
-rw-r--r--tex/context/base/status-files.pdfbin24909 -> 24885 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin333199 -> 333195 bytes
-rw-r--r--tex/context/base/strc-not.mkvi2
-rw-r--r--tex/context/base/tabl-ntb.mkiv27
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
10 files changed, 35 insertions, 16 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index fe4223739..9e3949b29 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{2015.01.10 00:44}
+\newcontextversion{2015.01.13 11:00}
%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 4f788b0c7..369ef4ac0 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 06dd636bd..7d6225a85 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{2015.01.10 00:44}
+\edef\contextversion{2015.01.13 11:00}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/mult-fun.lua b/tex/context/base/mult-fun.lua
index 60f087d4c..c6f8fee9e 100644
--- a/tex/context/base/mult-fun.lua
+++ b/tex/context/base/mult-fun.lua
@@ -64,7 +64,7 @@ return {
"define_linear_shade", "define_circular_shade",
"define_circular_linear_shade", "define_circular_linear_shade",
"define_sampled_linear_shade", "define_sampled_circular_shade",
- "space", "CRLF",
+ "space", "crlf", "dquote", "SPACE", "CRLF", "DQUOTE",
"grayscale", "greyscale", "withgray", "withgrey",
"colorpart",
"readfile",
diff --git a/tex/context/base/mult-mps.lua b/tex/context/base/mult-mps.lua
index 04776d8bf..0f893f895 100644
--- a/tex/context/base/mult-mps.lua
+++ b/tex/context/base/mult-mps.lua
@@ -54,10 +54,10 @@ return {
--
"redpart", "greenpart", "bluepart",
"cyanpart", "magentapart", "yellowpart",
- "blackpart", "greypart",
+ "blackpart",
"prescriptpart", "postscriptpart",
- "rgbcolor", "cmykcolor", "greycolor", "graycolor",
- "colormodel", "graypart",
+ "rgbcolor", "cmykcolor", -- "greycolor", "graycolor",
+ "colormodel", "graypart", "greypart", "greycolor", "graycolor",
"dashpart", "penpart",
-- "colorpart",
"stroked", "filled", "textual", "clipped", "bounded", "pathpart",
@@ -78,7 +78,8 @@ return {
"defaultfont", "extra_beginfig", "extra_endfig",
"ditto", "EOF", "down",
"evenly", "fullcircle", "halfcircle", "identity", "in", "left",
- "origin", "pensquare", "quartercircle", "right",
+ "pensquare", "penrazor", "penspec",
+ "origin", "quartercircle", "right",
"unitsquare", "up", "withdots",
"abs", "bbox", "ceiling", "center", "cutafter", "cutbefore", "dir",
"directionpoint", "div", "dotprod", "intersectionpoint", "inverse", "mod",
@@ -105,14 +106,13 @@ return {
"counterclockwise", "tensepath", "takepower", "direction",
"softjoin", -- "magstep",
"makelabel", -- "laboff",
- "rotatedabout", "flex", "superellipse", "erase", "image",
+ "rotatedabout", "flex", "superellipse", "image",
"nullpen", "savepen", "clearpen", "penpos", "penlabels", -- "clear_pen_memory",
- "range", "numtok", "thru",
+ "range", "thru",
"z", "laboff",
"bye",
--
"red", "green", "blue", "cyan", "magenta", "yellow", "black", "white", "background",
- "graypart", "graycolor",
--
"mm", "pt", "dd", "bp", "cm", "pc", "cc", "in",
--
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 94c0faf0f..ab52a2f3d 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 2ead08753..1677b60d1 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-not.mkvi b/tex/context/base/strc-not.mkvi
index c1ea37bb5..6d2a04fec 100644
--- a/tex/context/base/strc-not.mkvi
+++ b/tex/context/base/strc-not.mkvi
@@ -1219,7 +1219,7 @@
\strc_references_flush_destination_nodes
\strc_notes_set_destination_attribute_text
\strc_notes_inject_text
- \endstrut
+ \ifvmode\obeydepth\else\endstrut\fi % \obeydepth is new per 2015-01-10
\strc_constructions_stored_stop
% \endgroup
}
diff --git a/tex/context/base/tabl-ntb.mkiv b/tex/context/base/tabl-ntb.mkiv
index 02fa82835..973992ff1 100644
--- a/tex/context/base/tabl-ntb.mkiv
+++ b/tex/context/base/tabl-ntb.mkiv
@@ -1287,14 +1287,30 @@
\the\t_tabl_ntb
\dostoptagged}
+\unexpanded\def\tabl_ntb_span#1%
+ {\dorecurse{#1}
+ {\hskip\tabl_ntb_get_wid\c_tabl_ntb_col\relax
+ \global\advance\c_tabl_ntb_col\plusone}}
+
+\unexpanded\def\tabl_ntb_skip#1%
+ {\global\advance\c_tabl_ntb_col#1\relax}
+
+\unexpanded\def\tabl_ntb_plus
+ {\global\advance\c_tabl_ntb_col\plusone
+ \kern\d_tabl_ntb_columndistance}
+
\setvalue{\??naturaltablecell\the\c_tabl_ntb_none}#1#2%
{\scratchcounter\tabl_ntb_get_col{#1}{#2}\relax
\ifnum\scratchcounter>\zerocount
\normalexpanded
{\t_tabl_ntb_row
{\the\t_tabl_ntb_row
- \global\advance\c_tabl_ntb_col\ifnum\scratchcounter=\plusone\plusone\else\the\scratchcounter\relax\fi
- \kern\d_tabl_ntb_columndistance}}%
+ \ifnum\scratchcounter=\plusone
+ \tabl_ntb_plus
+ \else
+ % span
+ \tabl_ntb_span{\the\scratchcounter}%
+ \fi}}%
\fi}
\setvalue{\??naturaltablecell\the\c_tabl_ntb_cell}#1#2%
@@ -1304,8 +1320,11 @@
\normalexpanded
{\t_tabl_ntb_row
{\the\t_tabl_ntb_row
- \global\advance\c_tabl_ntb_col\ifnum\scratchcounter=\plusone\plusone\else\the\scratchcounter\relax\fi
- \kern\d_tabl_ntb_columndistance}}%
+ \ifnum\scratchcounter=\plusone
+ \tabl_ntb_plus
+ \else
+ \tabl_ntb_skip{\the\scratchcounter}%
+ \fi}}%
\fi}
\unexpanded\def\tabl_ntb_cell#1#2%
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 3fff3ee0b..32ebd2ddf 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/10/15 00:44:31
+-- merge date : 01/13/15 11:00:13
do -- begin closure to overcome local limits and interference