diff options
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/context/base/cont-new.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-help.lmx | 5 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4141 -> 4149 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 40469 -> 40722 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/data-res.lua | 2 | ||||
| -rw-r--r-- | tex/context/base/file-res.lua | 4 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24552 -> 24572 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 196572 -> 198628 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
12 files changed, 12 insertions, 9 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index f0b978ef6..cc16d60da 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.11.21 16:11} +\newcontextversion{2012.11.21 17:53} %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 bd96b176f..1bfc68380 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.11.21 16:11} +\newcontextversion{2012.11.21 17:53} %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-help.lmx b/tex/context/base/context-help.lmx index 939b70cb6..140493915 100644 --- a/tex/context/base/context-help.lmx +++ b/tex/context/base/context-help.lmx @@ -21,9 +21,10 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <!-- <base target="context-help" /> --> <style type="text/css"> + <?lmx-include context.css ?> + </style> + <style type="text/css"> <!-- -<?lmx-include context.css ?> - #main-left { position: absolute; left: 0% ; diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex c5d60e273..567137b85 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 069af3728..c6f3eb0db 100644 --- a/tex/context/base/context-version.png +++ b/tex/context/base/context-version.png diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index e6a8308aa..92fe8d69f 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.11.21 16:11} +\edef\contextversion{2012.11.21 17:53} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 2941e38d9..d8bb4fbe6 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{2012.11.21 16:11} +\edef\contextversion{2012.11.21 17:53} %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 9236cbe02..25aaa6c35 100644 --- a/tex/context/base/data-res.lua +++ b/tex/context/base/data-res.lua @@ -862,7 +862,7 @@ local function collect_files(names) if dname == "" or find(dname,"^%.") then dname = false else -dname = gsub(dname,"*","%.*") + dname = gsub(dname,"*","%.*") dname = "/" .. dname .. "$" end local hashes = instance.hashes diff --git a/tex/context/base/file-res.lua b/tex/context/base/file-res.lua index 6726f71ee..84c32b02f 100644 --- a/tex/context/base/file-res.lua +++ b/tex/context/base/file-res.lua @@ -8,6 +8,8 @@ if not modules then modules = { } end modules ['file-res'] = { local format = string.format local isfile = lfs.isfile +local is_qualified_path = file.is_qualified_path +local hasscheme = url.hasscheme local trace_files = false trackers.register("resolvers.readfile", function(v) trace_files = v end) local report_files = logs.reporter("files","readfile") @@ -127,7 +129,7 @@ openers.any = openers.file loaders.any = loaders.file function getreadfilename(scheme,path,name) -- better do a split and then pass table local fullname - if url.hasscheme(name) then + if hasscheme(name) or is_qualified_path(name) then fullname = name else fullname = ((path == "") and format("%s:///%s",scheme,name)) or format("%s:///%s/%s",scheme,path,name) diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 2dafcdf66..25b8f0bbd 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 94b67d7d3..23891ed39 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 7708247c8..652d6fa92 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 : 11/21/12 16:11:14 +-- merge date : 11/21/12 17:53:22 do -- begin closure to overcome local limits and interference |
