2014-10-18 11:17:00

13 files changed, 31 insertions, 16 deletions

diff --git a/context/data/scite/context/lexers/data/scite-context-data-metafun.lua b/context/data/scite/context/lexers/data/scite-context-data-metafun.lua
index f1d6e9949..1b2fda799 100644
--- a/context/data/scite/context/lexers/data/scite-context-data-metafun.lua
+++ b/context/data/scite/context/lexers/data/scite-context-data-metafun.lua
@@ -1,4 +1,4 @@
 return {
- ["commands"]={ "transparency", "sqr", "log", "ln", "exp", "inv", "pow", "pi", "radian", "tand", "cotd", "sin", "cos", "tan", "cot", "atan", "asin", "acos", "invsin", "invcos", "invtan", "acosh", "asinh", "sinh", "cosh", "paired", "tripled", "unitcircle", "fulldiamond", "unitdiamond", "fullsquare", "llcircle", "lrcircle", "urcircle", "ulcircle", "tcircle", "bcircle", "lcircle", "rcircle", "lltriangle", "lrtriangle", "urtriangle", "ultriangle", "uptriangle", "downtriangle", "lefttriangle", "righttriangle", "triangle", "smoothed", "cornered", "superellipsed", "randomized", "squeezed", "enlonged", "shortened", "punked", "curved", "unspiked", "simplified", "blownup", "stretched", "enlarged", "leftenlarged", "topenlarged", "rightenlarged", "bottomenlarged", "crossed", "laddered", "randomshifted", "interpolated", "paralleled", "cutends", "peepholed", "llenlarged", "lrenlarged", "urenlarged", "ulenlarged", "llmoved", "lrmoved", "urmoved", "ulmoved", "rightarrow", "leftarrow", "centerarrow", "boundingbox", "innerboundingbox", "outerboundingbox", "pushboundingbox", "popboundingbox", "bottomboundary", "leftboundary", "topboundary", "rightboundary", "xsized", "ysized", "xysized", "sized", "xyscaled", "intersection_point", "intersection_found", "penpoint", "bbwidth", "bbheight", "withshade", "withlinearshading", "withcircularshading", "withfromshadecolor", "withtoshadecolor", "withshading", "shadedinto", "withcircularshade", "withlinearshade", "cmyk", "spotcolor", "multitonecolor", "namedcolor", "drawfill", "undrawfill", "inverted", "uncolored", "softened", "grayed", "greyed", "onlayer", "along", "graphictext", "loadfigure", "externalfigure", "withmask", "figure", "register", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "textext", "thetextext", "rawtextext", "textextoffset", "verbatim", "thelabel", "label", "autoalign", "transparent", "withtransparency", "property", "properties", "withproperties", "asgroup", "infont", "set_linear_vector", "linear_shade", "define_linear_shade", "define_circular_linear_shade", "define_sampled_linear_shade", "set_circular_vector", "circular_shade", "define_circular_shade", "define_circular_linear_shade", "define_sampled_circular_shade", "space", "CRLF", "grayscale", "greyscale", "withgray", "withgrey", "colorpart", "readfile", "clearxy", "unitvector", "center", "epsed", "anchored", "originpath", "infinite", "break", "xstretched", "ystretched", "snapped", "pathconnectors", "function", "constructedpath", "constructedpairs", "punkedfunction", "curvedfunction", "tightfunction", "punkedpath", "curvedpath", "tightpath", "punkedpairs", "curvedpairs", "tightpairs", "evenly", "oddly", "condition", "pushcurrentpicture", "popcurrentpicture", "arrowpath", "tensecircle", "roundedsquare", "colortype", "whitecolor", "blackcolor", "normalfill", "normaldraw", "visualizepaths", "naturalizepaths", "drawboundary", "drawwholepath", "visualizeddraw", "visualizedfill", "draworigin", "drawboundingbox", "drawpath", "drawpoint", "drawpoints", "drawcontrolpoints", "drawcontrollines", "drawpointlabels", "drawlineoptions", "drawpointoptions", "drawcontroloptions", "drawlabeloptions", "draworiginoptions", "drawboundoptions", "drawpathoptions", "resetdrawoptions", "undashed", "decorated", "redecorated", "undecorated", "passvariable", "passarrayvariable", "tostring", "format", "formatted", "startpassingvariable", "stoppassingvariable" },
+ ["commands"]={ "transparency", "sqr", "log", "ln", "exp", "inv", "pow", "pi", "radian", "tand", "cotd", "sin", "cos", "tan", "cot", "atan", "asin", "acos", "invsin", "invcos", "invtan", "acosh", "asinh", "sinh", "cosh", "paired", "tripled", "unitcircle", "fulldiamond", "unitdiamond", "fullsquare", "llcircle", "lrcircle", "urcircle", "ulcircle", "tcircle", "bcircle", "lcircle", "rcircle", "lltriangle", "lrtriangle", "urtriangle", "ultriangle", "uptriangle", "downtriangle", "lefttriangle", "righttriangle", "triangle", "smoothed", "cornered", "superellipsed", "randomized", "squeezed", "enlonged", "shortened", "punked", "curved", "unspiked", "simplified", "blownup", "stretched", "enlarged", "leftenlarged", "topenlarged", "rightenlarged", "bottomenlarged", "crossed", "laddered", "randomshifted", "interpolated", "paralleled", "cutends", "peepholed", "llenlarged", "lrenlarged", "urenlarged", "ulenlarged", "llmoved", "lrmoved", "urmoved", "ulmoved", "rightarrow", "leftarrow", "centerarrow", "boundingbox", "innerboundingbox", "outerboundingbox", "pushboundingbox", "popboundingbox", "bottomboundary", "leftboundary", "topboundary", "rightboundary", "xsized", "ysized", "xysized", "sized", "xyscaled", "intersection_point", "intersection_found", "penpoint", "bbwidth", "bbheight", "withshade", "withlinearshading", "withcircularshading", "withfromshadecolor", "withtoshadecolor", "withshading", "shadedinto", "withcircularshade", "withlinearshade", "cmyk", "spotcolor", "multitonecolor", "namedcolor", "drawfill", "undrawfill", "inverted", "uncolored", "softened", "grayed", "greyed", "onlayer", "along", "graphictext", "loadfigure", "externalfigure", "withmask", "figure", "register", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "textext", "thetextext", "rawtextext", "textextoffset", "verbatim", "thelabel", "label", "autoalign", "transparent", "withtransparency", "property", "properties", "withproperties", "asgroup", "infont", "set_linear_vector", "linear_shade", "define_linear_shade", "define_circular_linear_shade", "define_sampled_linear_shade", "set_circular_vector", "circular_shade", "define_circular_shade", "define_circular_linear_shade", "define_sampled_circular_shade", "space", "CRLF", "grayscale", "greyscale", "withgray", "withgrey", "colorpart", "readfile", "clearxy", "unitvector", "center", "epsed", "anchored", "originpath", "infinite", "break", "xstretched", "ystretched", "snapped", "pathconnectors", "function", "constructedpath", "constructedpairs", "punkedfunction", "curvedfunction", "tightfunction", "punkedpath", "curvedpath", "tightpath", "punkedpairs", "curvedpairs", "tightpairs", "evenly", "oddly", "condition", "pushcurrentpicture", "popcurrentpicture", "arrowpath", "tensecircle", "roundedsquare", "colortype", "whitecolor", "blackcolor", "normalfill", "normaldraw", "visualizepaths", "naturalizepaths", "drawboundary", "drawwholepath", "visualizeddraw", "visualizedfill", "draworigin", "drawboundingbox", "drawpath", "drawpoint", "drawpoints", "drawcontrolpoints", "drawcontrollines", "drawpointlabels", "drawlineoptions", "drawpointoptions", "drawcontroloptions", "drawlabeloptions", "draworiginoptions", "drawboundoptions", "drawpathoptions", "resetdrawoptions", "undashed", "decorated", "redecorated", "undecorated", "passvariable", "passarrayvariable", "tostring", "format", "formatted", "startpassingvariable", "stoppassingvariable", "eofill", "eoclip" },
  ["internals"]={ "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel", "shadefactor", "textextoffset", "normaltransparent", "multiplytransparent", "screentransparent", "overlaytransparent", "softlighttransparent", "hardlighttransparent", "colordodgetransparent", "colorburntransparent", "darkentransparent", "lightentransparent", "differencetransparent", "exclusiontransparent", "huetransparent", "saturationtransparent", "colortransparent", "luminositytransparent", "metapostversion", "maxdimensions" },
 }
\ No newline at end of file
diff --git a/context/data/scite/context/scite-context-data-metafun.properties b/context/data/scite/context/scite-context-data-metafun.properties
index 249ad272d..237b24249 100644
--- a/context/data/scite/context/scite-context-data-metafun.properties
+++ b/context/data/scite/context/scite-context-data-metafun.properties
@@ -46,7 +46,8 @@ drawpath drawpoint drawpoints drawcontrolpoints drawcontrollines \
 drawpointlabels drawlineoptions drawpointoptions drawcontroloptions drawlabeloptions \
 draworiginoptions drawboundoptions drawpathoptions resetdrawoptions undashed \
 decorated redecorated undecorated passvariable passarrayvariable \
-tostring format formatted startpassingvariable stoppassingvariable 
+tostring format formatted startpassingvariable stoppassingvariable \
+eofill eoclip 
 
 keywordclass.metafun.internals=\
 nocolormodel greycolormodel graycolormodel rgbcolormodel \
diff --git a/metapost/context/base/mp-mlib.mpiv b/metapost/context/base/mp-mlib.mpiv
index 157e2d0b1..11bf9b8d0 100644
--- a/metapost/context/base/mp-mlib.mpiv
+++ b/metapost/context/base/mp-mlib.mpiv
@@ -1074,3 +1074,12 @@ enddef ;
 
 vardef format   (expr f, x) = textext(strfmt(f, x)) enddef ;
 vardef formatted(expr f, x) = textext(varfmt(f, x)) enddef ;
+
+% new
+
+def eofill expr p = fill p withpostscript "evenodd" enddef ;
+def eoclip expr p = clip p withpostscript "evenodd" enddef ;
+
+% def withrule expr r =
+%     if (t = "even-odd") or (t = "evenodd") : withpostscript "evenodd" fi
+% enddef ;
diff --git a/tex/context/base/cont-log.mkiv b/tex/context/base/cont-log.mkiv
index 1c159a019..ee0dbb09d 100644
--- a/tex/context/base/cont-log.mkiv
+++ b/tex/context/base/cont-log.mkiv
@@ -75,12 +75,12 @@
    \kern-.1\emwidth{\syst_logos_ams_script S}%
    -\TeX}
 
-\unexpanded\def\AmSLaTeX
-  {\dontleavehmode
-   \syst_logos_ams_script A%
-   \kern-.1667\emwidth\lower.5\exheight\hbox{\syst_logos_ams_script M}%
-   \kern-.125\emwidth{\syst_logos_ams_script S}%
-   -\LaTeX}
+% \unexpanded\def\AmSLaTeX
+%   {\dontleavehmode
+%    \syst_logos_ams_script A%
+%    \kern-.1667\emwidth\lower.5\exheight\hbox{\syst_logos_ams_script M}%
+%    \kern-.125\emwidth{\syst_logos_ams_script S}%
+%    -\LaTeX}
 
 %D Alternative \CONTEXT\ logo, first Idris S.~Hamid's version:
 %D
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 6b7edc7ec..9e49a242d 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.10.17 20:10}
+\newcontextversion{2014.10.18 11:15}
 
 %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 871391193..79e12938b 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 59d83eb58..3e7ea5c56 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.10.17 20:10}
+\edef\contextversion{2014.10.18 11:15}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mlib-pdf.lua b/tex/context/base/mlib-pdf.lua
index 80c554de1..1699e8fc5 100644
--- a/tex/context/base/mlib-pdf.lua
+++ b/tex/context/base/mlib-pdf.lua
@@ -439,9 +439,10 @@ function metapost.flush(result,flusher,askedfig)
                                         processspecial(object.prescript)
                                     end
                                 elseif objecttype == "start_clip" then
+                                    local evenodd = not object.istext and object.postscript == "evenodd"
                                     result[#result+1] = "q"
                                     flushnormalpath(object.path,result,false)
-                                    result[#result+1] = "W n"
+                                    result[#result+1] = evenodd and "W* n" or "W n"
                                 elseif objecttype == "stop_clip" then
                                     result[#result+1] = "Q"
                                     miterlimit, linecap, linejoin, dashed = -1, -1, -1, false
@@ -514,6 +515,7 @@ function metapost.flush(result,flusher,askedfig)
                                     if transformed then
                                         result[#result+1] = "q"
                                     end
+                                    local evenodd = not object.istext and object.postscript == "evenodd"
                                     if path then
                                         if transformed then
                                             flushconcatpath(path,result,open)
@@ -521,11 +523,11 @@ function metapost.flush(result,flusher,askedfig)
                                             flushnormalpath(path,result,open)
                                         end
                                         if objecttype == "fill" then
-                                            result[#result+1] = "h f"
+                                            result[#result+1] = evenodd and "h f*" or "h f" -- f* = eo
                                         elseif objecttype == "outline" then
                                             result[#result+1] = open and "S" or "h S"
                                         elseif objecttype == "both" then
-                                            result[#result+1] = "h B"
+                                            result[#result+1] = evenodd and "h B*" or "h B"-- B* = eo -- b includes closepath
                                         end
                                     end
                                     if transformed then
@@ -542,11 +544,11 @@ function metapost.flush(result,flusher,askedfig)
                                             flushnormalpath(path,result,open)
                                         end
                                         if objecttype == "fill" then
-                                            result[#result+1] = "h f"
+                                            result[#result+1] = evenodd and "h f*" or "h f" -- f* = eo
                                         elseif objecttype == "outline" then
                                             result[#result+1] = open and "S" or "h S"
                                         elseif objecttype == "both" then
-                                            result[#result+1] = "h B"
+                                            result[#result+1] = evenodd and "h B*" or "h B"-- B* = eo -- b includes closepath
                                         end
                                         if transformed then
                                             result[#result+1] = "Q"
diff --git a/tex/context/base/mlib-pps.lua b/tex/context/base/mlib-pps.lua
index a0a1a07c9..3f41b1bc9 100644
--- a/tex/context/base/mlib-pps.lua
+++ b/tex/context/base/mlib-pps.lua
@@ -997,6 +997,7 @@ local function tx_process(object,prescript,before,after)
             end
             object.color   = false
             object.grouped = true
+            object.istext  = true
         end
     end
 end
diff --git a/tex/context/base/mult-fun.lua b/tex/context/base/mult-fun.lua
index 3d511b18d..dc76c3e0d 100644
--- a/tex/context/base/mult-fun.lua
+++ b/tex/context/base/mult-fun.lua
@@ -104,5 +104,7 @@ return {
         --
         "passvariable", "passarrayvariable", "tostring", "format", "formatted",
         "startpassingvariable", "stoppassingvariable",
+        --
+        "eofill", "eoclip",
     },
 }
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index a2de04db8..980b88c81 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 2dc325d92..ab5f755b2 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 7592a0908..14b9aa419 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  : 10/17/14 20:10:26
+-- merge date  : 10/18/14 11:15:15
 
 do -- begin closure to overcome local limits and interference