summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorContext Git Mirror Bot <phg42.2a@gmail.com>2014-08-27 14:15:04 +0200
committerContext Git Mirror Bot <phg42.2a@gmail.com>2014-08-27 14:15:04 +0200
commit171a90ff5403948b634effbed21082daf92d37e6 (patch)
tree4075b6ee521e133aeaf3467f535ac7d55e6293d7 /tex
parentcd0cb59de49408633f5c06fea35b94f3cf558170 (diff)
downloadcontext-171a90ff5403948b634effbed21082daf92d37e6.tar.gz
2014-08-27 12:36:00
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/back-exp.lua14
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4438 -> 4435 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/export-example.css7
-rw-r--r--tex/context/base/status-files.pdfbin25013 -> 25005 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin327110 -> 327110 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
8 files changed, 19 insertions, 8 deletions
diff --git a/tex/context/base/back-exp.lua b/tex/context/base/back-exp.lua
index 00184dad8..8c102c20a 100644
--- a/tex/context/base/back-exp.lua
+++ b/tex/context/base/back-exp.lua
@@ -140,7 +140,7 @@ local stoptiming = statistics.stoptiming
-- todo: more locals (and optimize)
-local exportversion = "0.31"
+local exportversion = "0.32"
local mathmlns = "http://www.w3.org/1998/Math/MathML"
local nofcurrentcontent = 0 -- so we don't free (less garbage collection)
@@ -2453,8 +2453,9 @@ local htmltemplate = [[
%preamble%
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd" >
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
<title>%title%</title>
@@ -2615,7 +2616,8 @@ local htmltemplate = [[
local tg = c.tg
local ns = c.ns
if ns == "m" then
- -- math
+ c.ns = ""
+ c.at["xmlns:m"] = nil
elseif tg == "a" then
c.ns = ""
else
@@ -2633,8 +2635,10 @@ local htmltemplate = [[
-- end
local at = c.at
local class = { tg }
- for k, v in next, at do
- class[#class+1] = k .. "-" .. v
+ if tg ~= "document" then
+ for k, v in next, at do
+ class[#class+1] = k .. "-" .. v
+ end
end
c.at = { class = concat(class," ") }
c.tg = "div"
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index c43cd5123..3e511f65a 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.08.27 11:51}
+\newcontextversion{2014.08.27 12:34}
%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
index b9df67e43..3355cc71c 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index b49c065ae..ec540ee32 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.08.27 11:51}
+\edef\contextversion{2014.08.27 12:34}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/export-example.css b/tex/context/base/export-example.css
index a00b28c8f..41b262ac4 100644
--- a/tex/context/base/export-example.css
+++ b/tex/context/base/export-example.css
@@ -7,6 +7,13 @@
*/
+/*
+
+ Because empty div elements are not seen we put a comment in them
+ so that empty table cells etc work ok.
+
+*/
+
/* ignore : mixed */
/* metadata: display */
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index dae353858..cc2a125a9 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 0f831cc0a..2f19ea76a 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index e78753aa8..8f6709c1d 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 : 08/27/14 11:51:05
+-- merge date : 08/27/14 12:34:38
do -- begin closure to overcome local limits and interference