diff options
| author | Context Git Mirror Bot <phg42.2a@gmail.com> | 2014-09-04 15:15:04 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2014-09-04 15:15:04 +0200 |
| commit | 7ffc9d0f34adcd853be064c098eadc53930b5f27 (patch) | |
| tree | e4194ead67ef187d357e694271a1dbaf1833d3a1 /tex | |
| parent | 527def59ba2f2c402a650da0465f2c4359212601 (diff) | |
| download | context-7ffc9d0f34adcd853be064c098eadc53930b5f27.tar.gz | |
2014-09-03 22:07:00
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4433 -> 4427 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/data-exp.lua | 1 | ||||
| -rw-r--r-- | tex/context/base/grph-inc.mkiv | 3 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24991 -> 24982 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 327141 -> 327139 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
8 files changed, 6 insertions, 4 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 44dccad02..deaf90116 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.09.03 19:11} +\newcontextversion{2014.09.03 22:05} %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 ece0c8b6b..e804806be 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 e8dd763ae..a0a38b843 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.09.03 19:11} +\edef\contextversion{2014.09.03 22:05} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/data-exp.lua b/tex/context/base/data-exp.lua index 1e1866f0f..0a7396171 100644 --- a/tex/context/base/data-exp.lua +++ b/tex/context/base/data-exp.lua @@ -402,7 +402,6 @@ local function scan(files,remap,spec,path,n,m,r,onlyone,tolerant) end function resolvers.scanfiles(path,branch,usecache,onlyonce,tolerant) -tolerant = false local realpath = resolveprefix(path) if usecache then local content = fullcache[realpath] diff --git a/tex/context/base/grph-inc.mkiv b/tex/context/base/grph-inc.mkiv index 9774320d6..ca5fbc8c6 100644 --- a/tex/context/base/grph-inc.mkiv +++ b/tex/context/base/grph-inc.mkiv @@ -13,6 +13,9 @@ % \enabledirectives[graphics.conversion.eps.cleanup.ai] +% \setupexternalfigures[directory=dirfile://./test/**] +% \externalfigure[crappname(2).eps][frame=on] + % todo: messages \writestatus{loading}{ConTeXt Graphic Macros / Figure Inclusion} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 5eae10e8b..69f385a5b 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 a8ed9a150..86c7ece91 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 cb2a98f42..9d3fbbdc5 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 : 09/03/14 19:11:48 +-- merge date : 09/03/14 22:05:34 do -- begin closure to overcome local limits and interference |