diff options
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/context/base/cont-log.mkiv | 12 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4378 -> 4380 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/mlib-pdf.lua | 12 | ||||
| -rw-r--r-- | tex/context/base/mlib-pps.lua | 1 | ||||
| -rw-r--r-- | tex/context/base/mult-fun.lua | 2 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24712 -> 24705 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 333934 -> 333939 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
10 files changed, 19 insertions, 14 deletions
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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 |