2015-03-28 00:08:00

10 files changed, 41 insertions, 24 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index d5d8dae02..43843f0d6 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.03.27 21:39}
+\newcontextversion{2015.03.28 00:06}
 
 %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
new file mode 100644
index 000000000..b48b327a5
--- /dev/null
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 5f7b96523..8782f1062 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.03.27 21:39}
+\edef\contextversion{2015.03.28 00:06}
 \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 ea6f22e0d..137a56e48 100644
--- a/tex/context/base/publ-ini.lua
+++ b/tex/context/base/publ-ini.lua
@@ -1,4 +1,4 @@
-7if not modules then modules = { } end modules ['publ-ini'] = {
+if not modules then modules = { } end modules ['publ-ini'] = {
     version   = 1.001,
     comment   = "this module part of publication support",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
new file mode 100644
index 000000000..a4ee09313
--- /dev/null
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
new file mode 100644
index 000000000..f6bf197a4
--- /dev/null
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-tag.mkiv b/tex/context/base/strc-tag.mkiv
index 95a776e35..d114c15b5 100644
--- a/tex/context/base/strc-tag.mkiv
+++ b/tex/context/base/strc-tag.mkiv
@@ -194,14 +194,6 @@
      \expandafter\strc_tags_element_stop_yes
    \fi}
 
-% if mainlanguage == en we can even omit the label (default to tag) which is faster
-%
-% \unexpanded\def\strc_tags_element_start_yes_indeed_yes[#1][#2]%
-%   {\ctxcommand{starttag("#1",{label="#1",userdata=\!!bs#2\!!es})}}
-
-% \unexpanded\def\strc_tags_element_start_yes_indeed_yes[#1][#2]%
-%   {\ctxcommand{starttag("#1",{label="\dogetupsometaglabeltext{#1}",userdata=\!!bs#2\!!es})}}
-%
 % it makes no sense to have labels ... maybe some day as a last 'replace' in the export
 % which might be more efficient then ... okay, we now cannot overload but who cares
 
diff --git a/tex/context/base/typo-itc.lua b/tex/context/base/typo-itc.lua
index 1de481a49..f37549dc8 100644
--- a/tex/context/base/typo-itc.lua
+++ b/tex/context/base/typo-itc.lua
@@ -58,6 +58,8 @@ local fontdata            = fonthashes.identifiers
 local italicsdata         = fonthashes.italics
 local exheights           = fonthashes.exheights
 
+local implement           = interfaces.implement
+
 local forcedvariant       = false
 
 function typesetters.italics.forcevariant(variant)
@@ -464,10 +466,21 @@ function italics.reset()
     texsetattribute(a_italics,unsetvalue)
 end
 
+implement {
+    name      = "setitaliccorrection",
+    actions   = italics.set,
+    arguments = "string"
+}
+
+implement {
+    name      = "resetitaliccorrection",
+    actions   = italics.reset,
+}
+
 local variables        = interfaces.variables
 local settings_to_hash = utilities.parsers.settings_to_hash
 
-function commands.setupitaliccorrection(option) -- no grouping !
+local function setupitaliccorrection(option) -- no grouping !
     if enable then
         enable()
     end
@@ -491,16 +504,28 @@ function commands.setupitaliccorrection(option) -- no grouping !
     end
 end
 
+implement {
+    name      = "setupitaliccorrection",
+    actions   = setupitaliccorrection,
+    arguments = "string"
+}
+
 -- for manuals:
 
 local stack = { }
 
-function commands.pushitaliccorrection()
-    table.insert(stack,{forcedvariant, texgetattribute(a_italics) })
-end
+implement {
+    name    = "pushitaliccorrection",
+    actions = function()
+        table.insert(stack,{forcedvariant, texgetattribute(a_italics) })
+    end
+}
 
-function commands.popitaliccorrection()
-    local top = table.remove(stack)
-    forcedvariant = top[1]
-    texsetattribute(a_italics,top[2])
-end
+implement {
+    name    = "popitaliccorrection",
+    actions = function()
+        local top = table.remove(stack)
+        forcedvariant = top[1]
+        texsetattribute(a_italics,top[2])
+    end
+}
diff --git a/tex/context/base/typo-itc.mkvi b/tex/context/base/typo-itc.mkvi
index 4a3bba518..c0aa8e2f6 100644
--- a/tex/context/base/typo-itc.mkvi
+++ b/tex/context/base/typo-itc.mkvi
@@ -42,10 +42,10 @@
 % 2 = end of word and end of a list
 
 \unexpanded\def\setitaliccorrection[#code]% rather low level (might go away)
-  {\ctxlua{typesetters.italics.set(\number#code)}}
+  {\clf_setitaliccorrection#code\relax}
 
 \unexpanded\def\resetitaliccorrection% rather low level (might go away)
-  {\ctxlua{typesetters.italics.reset()}}
+  {\clf_resetitaliccorrection}
 
 % global : no attributes, just always (faster and less memory)
 % text   : only text
@@ -53,7 +53,7 @@
 % none   : -
 
 \unexpanded\def\setupitaliccorrection[#settings]%
-  {\ctxcommand{setupitaliccorrection("#settings")}}
+  {\clf_setupitaliccorrection{#settings}}
 
 \appendtoks
     \attribute\italicsattribute\attributeunsetvalue
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 1ae47cf63..97f3c207c 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  : 03/27/15 21:39:51
+-- merge date  : 03/28/15 00:06:08
 
 do -- begin closure to overcome local limits and interference