diff options
| -rw-r--r-- | scripts/context/lua/mtx-plain.lua | 36 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4137 -> 4134 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 40421 -> 40110 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24732 -> 24736 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 211422 -> 211419 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
8 files changed, 20 insertions, 22 deletions
diff --git a/scripts/context/lua/mtx-plain.lua b/scripts/context/lua/mtx-plain.lua index 663664bae..f7fe60483 100644 --- a/scripts/context/lua/mtx-plain.lua +++ b/scripts/context/lua/mtx-plain.lua @@ -6,16 +6,11 @@ if not modules then modules = { } end modules ['mtx-plain'] = { license = "see context related readme files" } --- something fishy ... different than the texmf.cnf suggests .. hardcoded ? - --- table={ --- ".", --- "c:/data/develop/tex-context/tex/texmf-local/web2c/luatex", --- "c:/data/develop/tex-context/tex/texmf-local/web2c", --- "c:/data/develop/tex-context/tex/texmf-context/web2c", --- "c:/data/develop/tex-context/tex/texmf-mswin/web2c", --- "c:/data/develop/tex-context/tex/texmf/web2c", --- } +-- future version will use the texmf-cache/generic/formats/<engine> path +-- instead because then we can use some more of the generic context +-- initializers ... in that case we will also use the regular database +-- instead of kpse here, just like with the font database code (as that +-- one also works with kpse runtime) local helpinfo = [[ <?xml version="1.0"?> @@ -70,7 +65,7 @@ function scripts.plain.make(texengine,texformat) local fmtpathspec = resultof("kpsewhich --var-value=TEXFORMATS --engine=%s",texengine) if fmtpathspec ~= "" then report("using path specification %a",fmtpathspec) - fmtpathspec = resultof('kpsewhich -expand-path="%s"',fmtpathspec) + fmtpathspec = resultof('kpsewhich -expand-braces="%s"',fmtpathspec) end if fmtpathspec ~= "" then report("using path expansion %a",fmtpathspec) @@ -89,19 +84,22 @@ function scripts.plain.make(texengine,texformat) local fmtpath = nil for i=1,#fmtpathspec do local path = fmtpathspec[i] - if path ~= "." and lfs.isdir(path) and file.is_writable(path) then - fmtpath = path - break + if path ~= "." then + dir.makedirs(path) + if lfs.isdir(path) and file.is_writable(path) then + fmtpath = path + break + end end end - if not fmtpath then - -- message + if not fmtpath or fmtpath == "" then + fmtpath = "." else lfs.chdir(fmtpath) - execute('%s --ini %s',texengine,file.addsuffix(texformat,"tex")) - report("generating kpse file database") - execute("mktexlsr") end + execute('%s --ini %s',texengine,file.addsuffix(texformat,"tex")) + report("generating kpse file database") + execute("mktexlsr") report("format saved on path %a",fmtpath) end diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index a127ceefd..6049086f0 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{2013.04.28 18:31} +\newcontextversion{2013.04.28 19: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 63096df22..e8644fe66 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png Binary files differindex 559bcba87..7f6f184d4 100644 --- a/tex/context/base/context-version.png +++ b/tex/context/base/context-version.png diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index f5130a2f6..576284e4d 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -25,7 +25,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2013.04.28 18:31} +\edef\contextversion{2013.04.28 19:05} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 0ca67ef87..6c7209d4c 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 f43f97a10..9ef35c271 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 1d37c791d..040571f6b 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 : 04/28/13 18:31:01 +-- merge date : 04/28/13 19:05:28 do -- begin closure to overcome local limits and interference |
