summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2011-05-09 21:19:00 +0200
committerHans Hagen <pragma@wxs.nl>2011-05-09 21:19:00 +0200
commit07cf9f9cc7eb42055d4b7c4863dd9a7d4b860fa0 (patch)
tree4a451926764fc8bb4c29b7b54b480de6c8606664
parent37993d791c4bb12149fb198b2c2342fe6e507666 (diff)
downloadcontext-07cf9f9cc7eb42055d4b7c4863dd9a7d4b860fa0.tar.gz
beta 2011.05.09 21:19
-rw-r--r--scripts/context/lua/mtx-epub.lua10
-rw-r--r--tex/context/base/back-exp.lua2
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/s-abr-01.tex1
-rw-r--r--tex/context/base/status-files.pdfbin23535 -> 23557 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin154284 -> 154280 bytes
-rw-r--r--tex/context/fonts/lucida-math.lfg2
-rw-r--r--tex/generic/context/luatex-fonts-merged.lua2
11 files changed, 13 insertions, 12 deletions
diff --git a/scripts/context/lua/mtx-epub.lua b/scripts/context/lua/mtx-epub.lua
index 5239028ba..e345ff9fd 100644
--- a/scripts/context/lua/mtx-epub.lua
+++ b/scripts/context/lua/mtx-epub.lua
@@ -89,7 +89,7 @@ function scripts.epub.make()
local specfile = file.replacesuffix(filename,"specification")
local specification = lfs.isfile(specfile) and dofile(specfile) or { }
- inspect(specification)
+ -- inspect(specification)
local name = specification.name or file.removesuffix(filename)
local identifier = specification.identifier or os.uuid()
@@ -101,6 +101,10 @@ function scripts.epub.make()
local epubfile = file.replacesuffix(name,"epub")
local epubroot = file.replacesuffix(name,"opf")
+ lfs.mkdir(epubpath)
+ lfs.mkdir(file.join(epubpath,"META-INF"))
+ lfs.mkdir(file.join(epubpath,"OPS"))
+
local used = { }
for i=1,#files do
@@ -116,10 +120,6 @@ function scripts.epub.make()
container = format(container,epubroot)
package = format(package,identifier,identifier,concat(used,"\n"),root)
- lfs.mkdir(epubpath)
- lfs.mkdir(file.join(epubpath,"META-INF"))
- lfs.mkdir(file.join(epubpath,"OPS"))
-
io.savedata(file.join(epubpath,"mimetype"),mimetype)
io.savedata(file.join(epubpath,"META-INF","container.xml"),container)
io.savedata(file.join(epubpath,"OPS",epubroot),package)
diff --git a/tex/context/base/back-exp.lua b/tex/context/base/back-exp.lua
index 54e37c259..7f52223a1 100644
--- a/tex/context/base/back-exp.lua
+++ b/tex/context/base/back-exp.lua
@@ -403,7 +403,7 @@ end
evaluators.outer = function(handle,var)
local file, url = references.checkedfileorurl(var.outer,var.outer)
if url then
- handle:write(" url='",file,"'")
+ handle:write(" url='",url,"'")
elseif file then
handle:write(" file='",file,"'")
end
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 182533d76..59035550a 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{2011.05.09 16:28}
+\newcontextversion{2011.05.09 21:19}
%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 a1232732f..246f6f718 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{2011.05.09 16:28}
+\newcontextversion{2011.05.09 21:19}
%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.mkii b/tex/context/base/context.mkii
index b3e49cca4..0a88479a9 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{2011.05.09 16:28}
+\edef\contextversion{2011.05.09 21:19}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index ff6a55323..6ba32def2 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2011.05.09 16:28}
+\edef\contextversion{2011.05.09 21:19}
%D For those who want to use this:
diff --git a/tex/context/base/s-abr-01.tex b/tex/context/base/s-abr-01.tex
index e9d322b2b..e4927814c 100644
--- a/tex/context/base/s-abr-01.tex
+++ b/tex/context/base/s-abr-01.tex
@@ -159,6 +159,7 @@
\logo [MPTOPDF] {mptopdf}
\logo [MPLIB] {mplib}
\logo [MSDOS] {msdos}
+\logo [MICROSOFT] {MicroSoft}
\logo [MSWINDOWS] {MS~Windows}
\logo [MTXRUN] {mtxrun}
\logo [MTXTOOLS] {mtxtools}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 5be810ea7..5a136355c 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 1fe6cbde5..79df508e0 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/fonts/lucida-math.lfg b/tex/context/fonts/lucida-math.lfg
index 603f62050..443f52ace 100644
--- a/tex/context/fonts/lucida-math.lfg
+++ b/tex/context/fonts/lucida-math.lfg
@@ -253,7 +253,7 @@ mathencodings["lbr-mb"] = {
mathencodings["lbr-sy"] = {
- [0x022C5] = 0x01, -- cdot,
+ -- [0x022C5] = 0x01, -- cdot,
[0x0002B] = 0x82, -- plus
[0x0003D] = 0x83, -- equal
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index f6aeb6327..18723ff07 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 05/06/11 16:52:12
+-- merge date : 05/09/11 21:19:11
do -- begin closure to overcome local limits and interference