From 1e0c1be960bc3c573f2bcc2dd3d3250bc0998034 Mon Sep 17 00:00:00 2001 From: Marius Date: Thu, 24 May 2012 02:00:14 +0300 Subject: beta 2012.05.24 00:46 --- scripts/context/lua/mtxrun.lua | 16 +++---- scripts/context/stubs/mswin/mtxrun.lua | 16 +++---- scripts/context/stubs/unix/mtxrun | 16 +++---- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4111 -> 4131 bytes tex/context/base/context-version.png | Bin 106155 -> 106074 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/data-res.lua | 16 +++---- tex/context/base/s-inf-04.mkiv | 48 +++++++++++++++++++++ tex/context/base/status-files.pdf | Bin 24381 -> 24431 bytes tex/context/base/status-lua.pdf | Bin 180184 -> 180160 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 14 files changed, 73 insertions(+), 49 deletions(-) create mode 100644 tex/context/base/s-inf-04.mkiv diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 9d0edf689..326feecd1 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -12334,20 +12334,14 @@ resolvers.luacnfstate = "unknown" if environment.default_texmfcnf then -- unfortunately we now have quite some overkill in the spec (not so nice on a network) - local luacnfspec = environment.default_texmfcnf - -- we also want to use this in the minimals / standalone - -- bu tit's too tricky as it can be an expanded spec - -- luacnfspec = gsub(luacnfspec,"%-local","-local,-context") - -- and we also need to support the home dir (for taco) - resolvers.luacnfspec = 'home:texmf/web2c;' .. luacnfspec -elseif this_is_texlive then - -- old, in case default_texmfcnf is not supported yet - resolvers.luacnfspec = 'selfautodir:;selfautoparent:;{selfautodir:,selfautoparent:}{/share,}/texmf{-local,}/web2c' + resolvers.luacnfspec = environment.default_texmfcnf else - -- the best for the minimals / standalone - resolvers.luacnfspec = 'home:texmf/web2c;selfautoparent:texmf{-local,-context,}/web2c' + -- resolvers.luacnfspec = "selfautoparent:texmf{-local,-context,}/web2c" + resolvers.luacnfspec = "{selfautoloc:,selfautodir:,selfautoparent:}{,/texmf{-local,}/web2c}" end +resolvers.luacnfspec = 'home:texmf/web2c;' .. resolvers.luacnfspec + -- which (as we want users to use the web2c path) be can be simplified to this: -- -- if environment and environment.ownpath and string.find(environment.ownpath,"[\\/]texlive[\\/]") then diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 9d0edf689..326feecd1 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -12334,20 +12334,14 @@ resolvers.luacnfstate = "unknown" if environment.default_texmfcnf then -- unfortunately we now have quite some overkill in the spec (not so nice on a network) - local luacnfspec = environment.default_texmfcnf - -- we also want to use this in the minimals / standalone - -- bu tit's too tricky as it can be an expanded spec - -- luacnfspec = gsub(luacnfspec,"%-local","-local,-context") - -- and we also need to support the home dir (for taco) - resolvers.luacnfspec = 'home:texmf/web2c;' .. luacnfspec -elseif this_is_texlive then - -- old, in case default_texmfcnf is not supported yet - resolvers.luacnfspec = 'selfautodir:;selfautoparent:;{selfautodir:,selfautoparent:}{/share,}/texmf{-local,}/web2c' + resolvers.luacnfspec = environment.default_texmfcnf else - -- the best for the minimals / standalone - resolvers.luacnfspec = 'home:texmf/web2c;selfautoparent:texmf{-local,-context,}/web2c' + -- resolvers.luacnfspec = "selfautoparent:texmf{-local,-context,}/web2c" + resolvers.luacnfspec = "{selfautoloc:,selfautodir:,selfautoparent:}{,/texmf{-local,}/web2c}" end +resolvers.luacnfspec = 'home:texmf/web2c;' .. resolvers.luacnfspec + -- which (as we want users to use the web2c path) be can be simplified to this: -- -- if environment and environment.ownpath and string.find(environment.ownpath,"[\\/]texlive[\\/]") then diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 9d0edf689..326feecd1 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -12334,20 +12334,14 @@ resolvers.luacnfstate = "unknown" if environment.default_texmfcnf then -- unfortunately we now have quite some overkill in the spec (not so nice on a network) - local luacnfspec = environment.default_texmfcnf - -- we also want to use this in the minimals / standalone - -- bu tit's too tricky as it can be an expanded spec - -- luacnfspec = gsub(luacnfspec,"%-local","-local,-context") - -- and we also need to support the home dir (for taco) - resolvers.luacnfspec = 'home:texmf/web2c;' .. luacnfspec -elseif this_is_texlive then - -- old, in case default_texmfcnf is not supported yet - resolvers.luacnfspec = 'selfautodir:;selfautoparent:;{selfautodir:,selfautoparent:}{/share,}/texmf{-local,}/web2c' + resolvers.luacnfspec = environment.default_texmfcnf else - -- the best for the minimals / standalone - resolvers.luacnfspec = 'home:texmf/web2c;selfautoparent:texmf{-local,-context,}/web2c' + -- resolvers.luacnfspec = "selfautoparent:texmf{-local,-context,}/web2c" + resolvers.luacnfspec = "{selfautoloc:,selfautodir:,selfautoparent:}{,/texmf{-local,}/web2c}" end +resolvers.luacnfspec = 'home:texmf/web2c;' .. resolvers.luacnfspec + -- which (as we want users to use the web2c path) be can be simplified to this: -- -- if environment and environment.ownpath and string.find(environment.ownpath,"[\\/]texlive[\\/]") then diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 6fec69ba0..9a565cc10 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2012.05.23 23:31} +\newcontextversion{2012.05.24 00:46} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index a1b22eb78..0d6a027e1 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{2012.05.23 23:31} +\newcontextversion{2012.05.24 00:46} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index e9e731e57..7a40e3077 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png index 11ae2e330..ad37d99ec 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png differ diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index e38253f18..d265dfe78 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2012.05.23 23:31} +\edef\contextversion{2012.05.24 00:46} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 28d250791..94d03f969 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -23,7 +23,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2012.05.23 23:31} +\edef\contextversion{2012.05.24 00:46} %D For those who want to use this: diff --git a/tex/context/base/data-res.lua b/tex/context/base/data-res.lua index 335c44dc1..eb642020d 100644 --- a/tex/context/base/data-res.lua +++ b/tex/context/base/data-res.lua @@ -91,20 +91,14 @@ resolvers.luacnfstate = "unknown" if environment.default_texmfcnf then -- unfortunately we now have quite some overkill in the spec (not so nice on a network) - local luacnfspec = environment.default_texmfcnf - -- we also want to use this in the minimals / standalone - -- bu tit's too tricky as it can be an expanded spec - -- luacnfspec = gsub(luacnfspec,"%-local","-local,-context") - -- and we also need to support the home dir (for taco) - resolvers.luacnfspec = 'home:texmf/web2c;' .. luacnfspec -elseif this_is_texlive then - -- old, in case default_texmfcnf is not supported yet - resolvers.luacnfspec = 'selfautodir:;selfautoparent:;{selfautodir:,selfautoparent:}{/share,}/texmf{-local,}/web2c' + resolvers.luacnfspec = environment.default_texmfcnf else - -- the best for the minimals / standalone - resolvers.luacnfspec = 'home:texmf/web2c;selfautoparent:texmf{-local,-context,}/web2c' + -- resolvers.luacnfspec = "selfautoparent:texmf{-local,-context,}/web2c" + resolvers.luacnfspec = "{selfautoloc:,selfautodir:,selfautoparent:}{,/texmf{-local,}/web2c}" end +resolvers.luacnfspec = 'home:texmf/web2c;' .. resolvers.luacnfspec + -- which (as we want users to use the web2c path) be can be simplified to this: -- -- if environment and environment.ownpath and string.find(environment.ownpath,"[\\/]texlive[\\/]") then diff --git a/tex/context/base/s-inf-04.mkiv b/tex/context/base/s-inf-04.mkiv new file mode 100644 index 000000000..862bed72f --- /dev/null +++ b/tex/context/base/s-inf-04.mkiv @@ -0,0 +1,48 @@ +\usemodule[art-01] + +\setupbodyfont[10pt] + +\starttext + + \startluacode + + context.subject("Configuration files") + + local configurations = resolvers.instance.specification + + context.starttabulate { "|Tl|Tl|" } + for i=1,#configurations do + context.NC() + context(i) + context.NC() + context.verbatim(resolvers.resolve(configurations[i])) + context.NC() + context.NR() + end + context.stoptabulate() + + local list = resolvers.expandedpathfromlist(resolvers.splitpath(resolvers.luacnfspec)) + + context.subject("Configuration paths") + + -- context.verbatim(resolvers.luacnfspec) + + context.starttabulate { "|Tl|Tl|" } + for i=1,#list do + local li = resolvers.resolve(list[i]) + context.NC() + if lfs.isdir(li) then + context("-") + else + context("+") + end + context.NC() + context.verbatim(li) + context.NC() + context.NR() + end + context.stoptabulate() + + \stopluacode + +\stoptext diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 2fbed7a15..10305e91e 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index 3eee265ed..bf9144e66 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index b47e3299f..8f6258312 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 : 05/23/12 23:31:34 +-- merge date : 05/24/12 00:46:24 do -- begin closure to overcome local limits and interference -- cgit v1.2.3