beta 2014.01.17 12:19

9 files changed, 38 insertions, 32 deletions

diff --git a/metapost/context/base/mp-base.mpiv b/metapost/context/base/mp-base.mpiv
index 2887cc462..4d2e522a1 100644
--- a/metapost/context/base/mp-base.mpiv
+++ b/metapost/context/base/mp-base.mpiv
@@ -594,9 +594,22 @@ def filldraw expr c =
     addto currentpicture contour c withpen currentpen _op_
 enddef ;
 
-def drawdot expr z =
-    addto currentpicture contour makepath currentpen shifted z _op_
-enddef ;
+% def drawdot expr z =
+%     addto currentpicture contour makepath currentpen shifted z _op_
+% enddef ;
+%
+% testcase DEK:
+%
+% for j=1 upto 9 :
+%     pickup pencircle xscaled .4 yscaled .2 ;
+%     drawdot (10j,0) withpen pencircle xscaled .5j yscaled .25j rotated 45 ;
+%     pickup pencircle xscaled .5j yscaled .25j rotated 45 ;
+%     drawdot (10j,10);
+% endfor ;
+%
+% so ...
+
+let drawdot = draw ;
 
 def unfill     expr c = fill     c withcolor background enddef ;
 def undraw     expr p = draw     p withcolor background enddef ;
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index bc6dbb8f5..b2f56e628 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.16 22:46}
+\newcontextversion{2014.01.17 12:19}
 
 %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 505c00786..574fdfcb0 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index c03272aca..7902a604a 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.16 22:46}
+\edef\contextversion{2014.01.17 12:19}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/node-aux.lua b/tex/context/base/node-aux.lua
index 7eb51e5b4..1f9b50c57 100644
--- a/tex/context/base/node-aux.lua
+++ b/tex/context/base/node-aux.lua
@@ -50,6 +50,9 @@ local slide_nodes        = nuts.slide
 local insert_node_after  = nuts.insert_after
 local isnode             = nuts.is_node
 
+local nodes_traverse_id  = nodes.traverse_id
+local nodes_first_glyph  = nodes.first_glyph
+
 local nodepool           = nuts.pool
 local new_glue           = nodepool.glue
 local new_glyph          = nodepool.glyph
@@ -232,7 +235,7 @@ nuts.unsetattributes     = unset_attributes                  nodes.unsetattribut
 --
 -- nodes.firstline = firstline
 
-local function firstcharacter(n,untagged) -- tagged == subtype > 255
+function nuts.firstcharacter(n,untagged) -- tagged == subtype > 255
     if untagged then
         return first_glyph(n)
     else
@@ -242,7 +245,17 @@ local function firstcharacter(n,untagged) -- tagged == subtype > 255
     end
 end
 
-local function firstcharinbox(n)
+-- function nodes.firstcharacter(n,untagged) -- tagged == subtype > 255
+--     if untagged then
+--         return nodes_first_glyph(n)
+--     else
+--         for g in nodes_traverse_id(glyph_code,n) do
+--             return g
+--         end
+--     end
+-- end
+
+function nuts.firstcharinbox(n)
     local l = getlist(getbox(n))
     if l then
         for g in traverse_id(glyph_code,l) do
@@ -252,8 +265,8 @@ local function firstcharinbox(n)
     return 0
 end
 
-nuts.firstcharacter = firstcharacter  nodes.firstcharacter = vianuts(firstcharacter)
-nuts.firstcharinbox = firstcharinbox  nodes.firstcharinbox = vianuts(firstcharinbox)
+nodes.firstcharinbox = nuts.firstcharinbox
+nodes.firstcharacter = vianuts(firstcharacter)
 
 -- this depends on fonts, so we have a funny dependency ... will be
 -- sorted out .. we could make tonodes a plugin into this
diff --git a/tex/context/base/publ-aut.lua b/tex/context/base/publ-aut.lua
index fa747bfff..46597edf0 100644
--- a/tex/context/base/publ-aut.lua
+++ b/tex/context/base/publ-aut.lua
@@ -437,26 +437,6 @@ end
 -- We can consider creating a hashtable key -> entry but I wonder if
 -- pays off.
 
--- local function test(sample)
---     local authors = splitauthors(sample)
---     print(table.serialize(authors))
---     for i=1,#authors do
---         local author = authors[i]
---         print(normalauthor       (author,settings))
---         print(normalshortauthor  (author,settings))
---         print(invertedauthor     (author,settings))
---         print(invertedshortauthor(author,settings))
---     end
---     print(concatauthors(sample,settings,normalauthor))
---     print(concatauthors(sample,settings,normalshortauthor))
---     print(concatauthors(sample,settings,invertedauthor))
---     print(concatauthors(sample,settings,invertedshortauthor))
--- end
-
--- local sample_a = "Hagen, Hans and Hoekwater, Taco Whoever T. Ex. and Henkel Hut, Hartmut Harald von der"
--- local sample_b = "Hans Hagen  and Taco Whoever T. Ex. Hoekwater  and Hartmut Harald von der Henkel Hut"
-
--- test(sample_a)
--- test(sample_b)
-
+-- inspect(splitauthorstring("Hagen, Hans and Hoekwater, Taco Whoever T. Ex. and Henkel Hut, Hartmut Harald von der"))
+-- inspect(splitauthorstring("Hans Hagen  and Taco Whoever T. Ex. Hoekwater  and Hartmut Harald von der Henkel Hut"))
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index dda297e6b..4d3431786 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 535bd87f9..cd1db80d0 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 4ab512308..f9ee8f3ba 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/16/14 22:46:19
+-- merge date  : 01/17/14 12:19:08
 
 do -- begin closure to overcome local limits and interference