2016-04-12 10:17:00

9 files changed, 32 insertions, 16 deletions

diff --git a/tex/context/base/mkiv/back-pdf.lua b/tex/context/base/mkiv/back-pdf.lua
index 7cc3b9148..0821abb28 100644
--- a/tex/context/base/mkiv/back-pdf.lua
+++ b/tex/context/base/mkiv/back-pdf.lua
@@ -156,7 +156,7 @@ implement {
 }
 
 implement {
-    name      = "setmapfile",
+    name      = "setmapline",
     arguments = "string",
     actions   = pdf.mapline
 }
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 6f33f9d86..52051bd43 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2016.04.12 00:09}
+\newcontextversion{2016.04.12 10:12}
 
 %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/mkiv/context-todo.tex b/tex/context/base/mkiv/context-todo.tex
index b7ff4aeaa..b9591e8e0 100644
--- a/tex/context/base/mkiv/context-todo.tex
+++ b/tex/context/base/mkiv/context-todo.tex
@@ -41,3 +41,17 @@
 \vfill {\em Feel free to suggest additions.}
 
 \stoptext
+
+% new:
+
+<cd:command name="showgrid" file="page-grd.mkiv">
+    ...
+            <cd:constant type="columns" default="yes"/>
+    ...
+</cd:command>
+
+<cd:command name="itemtag" variant="itemgroup" file="strc-itm.mkvi">
+    <cd:arguments>
+        <cd:resolve name="keyword-reference-list-optional"/>
+    </cd:arguments>
+</cd:command>
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 441ee2b17..86bb83f5c 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2016.04.12 00:09}
+\edef\contextversion{2016.04.12 10:12}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/page-grd.mkiv b/tex/context/base/mkiv/page-grd.mkiv
index 546bd4d89..4125eb46a 100644
--- a/tex/context/base/mkiv/page-grd.mkiv
+++ b/tex/context/base/mkiv/page-grd.mkiv
@@ -30,17 +30,19 @@
    \c_page_grids_columns_mode\plusone
    \processallactionsinset
      [#1]%
-     [ \v!reset=>\c_page_grids_location   \zerocount,
-      \v!bottom=>\c_page_grids_location   \plusone,
-         \v!top=>\c_page_grids_location   \plustwo,
-        \v!none=>\c_page_grids_line_mode  \zerocount,
-         \v!all=>\c_page_grids_line_mode  \plusone,
-       \v!lines=>\c_page_grids_line_mode  \plustwo,
-       \v!frame=>\c_page_grids_line_mode  \plusthree,
-    \v!nonumber=>\c_page_grids_lineno_mode\zerocount,
-       \v!right=>\c_page_grids_lineno_mode\plusone,
-        \v!left=>\c_page_grids_lineno_mode\plustwo,
-       \v!outer=>\c_page_grids_lineno_mode\plusthree]%
+     [   \v!reset=>\c_page_grids_location    \zerocount
+                   \c_page_grids_columns_mode\zerocount,
+        \v!bottom=>\c_page_grids_location    \plusone,
+           \v!top=>\c_page_grids_location    \plustwo,
+          \v!none=>\c_page_grids_line_mode   \zerocount,
+           \v!all=>\c_page_grids_line_mode   \plusone,
+         \v!lines=>\c_page_grids_line_mode   \plustwo,
+         \v!frame=>\c_page_grids_line_mode   \plusthree,
+      \v!nonumber=>\c_page_grids_lineno_mode \zerocount,
+         \v!right=>\c_page_grids_lineno_mode \plusone,
+          \v!left=>\c_page_grids_lineno_mode \plustwo,
+         \v!outer=>\c_page_grids_lineno_mode \plusthree,
+       \v!columns=>\c_page_grids_columns_mode\plusone]% new option
    \ifcase\c_page_grids_location
      \let\page_grids_add_to_box\gobbleoneargument
    \else % 1=bottom 2=top
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 90ff15935..1d3ebe8d3 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 57cdeb661..7cc6c115e 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/strc-enu.mkvi b/tex/context/base/mkiv/strc-enu.mkvi
index b76bc0067..832bdaf82 100644
--- a/tex/context/base/mkiv/strc-enu.mkvi
+++ b/tex/context/base/mkiv/strc-enu.mkvi
@@ -285,8 +285,8 @@
 \unexpanded\def\strc_enumerations_inject_extra_text
   {\ifconditional\c_strc_constructions_title_state
      \clf_doifelselisthastitle{\currentconstructionmain}\numexpr\currentconstructionlistentry\relax
-       \donothing
        \strc_enumerations_inject_extra_text_indeed
+       \donothing
    \fi}
 
 \unexpanded\def\strc_enumerations_inject_text
diff --git a/tex/context/base/mkiv/strc-itm.mkvi b/tex/context/base/mkiv/strc-itm.mkvi
index e8a56acf8..48c8e1a30 100644
--- a/tex/context/base/mkiv/strc-itm.mkvi
+++ b/tex/context/base/mkiv/strc-itm.mkvi
@@ -1698,7 +1698,7 @@
 
 %D Something for tables:
 
-\unexpanded\def\itemtag % not yet in interface definitions
+\unexpanded\def\itemtag
   {\dosingleempty\strc_itemgroups_item_tag}
 
 \unexpanded\def\strc_itemgroups_item_tag[#reference]% we can reuse more