summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/back-exp.lua4
-rw-r--r--tex/context/base/back-exp.mkiv3
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4431 -> 4435 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/export-example.css29
-rw-r--r--tex/context/base/status-files.pdfbin25034 -> 25024 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin327163 -> 327163 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
9 files changed, 26 insertions, 16 deletions
diff --git a/tex/context/base/back-exp.lua b/tex/context/base/back-exp.lua
index 85d6c5ef3..364949a1a 100644
--- a/tex/context/base/back-exp.lua
+++ b/tex/context/base/back-exp.lua
@@ -2875,7 +2875,7 @@ local htmltemplate = [[
firstpage = validstring(finetuning.firstpage),
lastpage = validstring(finetuning.lastpage),
}
- report_export("saving specification in %a (mtxrun --script epub --make %s)",specificationfilename,specificationfilename)
+ report_export("saving specification in %a",specificationfilename,specificationfilename)
io.savedata(specificationfilename,table.serialize(specification,true))
-- bonus
local resultfile = file.replacesuffix(xmlfile,"html")
@@ -2889,7 +2889,7 @@ local htmltemplate = [[
}
io.savedata(resultfile,utilities.templates.replace(htmltemplate,variables,"xml"))
report_export("")
- report_export("create epub with: mtxrun --script epub --make %a",file.basename(resultfile))
+ report_export([[create epub with: mtxrun --script epub --make "%s"]],file.nameonly(resultfile))
report_export("")
end
stoptiming(treehash)
diff --git a/tex/context/base/back-exp.mkiv b/tex/context/base/back-exp.mkiv
index a7f8e0040..7cae68f0e 100644
--- a/tex/context/base/back-exp.mkiv
+++ b/tex/context/base/back-exp.mkiv
@@ -166,6 +166,9 @@
\c!properties=\v!no, % no: ignore, yes: as attribute, otherwise: use as prefix
\c!hyphen=\v!no]
+\setupbackend
+ [css=export-example.css]
+
\def\dosynchronizeexport
{\let\currentexport\empty
\ctxcommand{setupexport{
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 3a91d18a9..4e786749f 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.09.06 13:38}
+\newcontextversion{2014.09.06 15:41}
%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 76ffe4c7f..b6841d7f4 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 f8a7f3db4..878d9d2a7 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.09.06 13:38}
+\edef\contextversion{2014.09.06 15:41}
\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 41b262ac4..2dfadb701 100644
--- a/tex/context/base/export-example.css
+++ b/tex/context/base/export-example.css
@@ -120,26 +120,31 @@ sectioncontent, div.sectioncontent {
section[detail="chapter"], section[detail="title"],
div.section.detail-chapter, div.section.detail-title {
- margin-top : 3em ;
- margin-bottom : 2em ;
+ page-break-before : always ;
+ page-break-after : avoid ;
+ margin-top : 3em ;
+ margin-bottom : 2em ;
}
section[detail="section"], section[detail="subject"],
div.section.detail-section, div.section.detail-subject {
- margin-top : 2.5em ;
- margin-bottom : 2.5em ;
+ page-break-after : avoid ;
+ margin-top : 2.5em ;
+ margin-bottom : 2.5em ;
}
section[detail="subsection"], section[detail="subsubject"],
div.section.detail-subsection, div.section.detail-subsubject {
- margin-top : 2em ;
- margin-bottom : 2em ;
+ page-break-after : avoid ;
+ margin-top : 2em ;
+ margin-bottom : 2em ;
}
section[detail="subsubsection"], section[detail="subsubsubject"],
div.section.detail-subsubsection, div.section.detail-subsubsubject {
- margin-top : 1em ;
- margin-bottom : 0em ;
+ page-break-after : avoid ;
+ margin-top : 1em ;
+ margin-bottom : 0em ;
}
section[detail="summary"], section[detail="subsummary"],
@@ -725,16 +730,18 @@ quantity>number, div.quantity div.number {
/* subsup : inline */
sup, div.sup {
- display : inline ;
+ display : inline-block ;
font-size : xx-small ;
line-height : 0 ;
+ padding-top : 0.5ex ;
vertical-align : top ;
}
sub, div.sub {
- display : inline ;
+ display : inline-block ;
font-size : xx-small ;
line-height : 0 ;
+ padding-bottom : 0.5ex ;
vertical-align : bottom ;
}
@@ -748,7 +755,7 @@ subsup>sub, div.subsup div.sub {
vertical-align : bottom ;
}
-/* xhtml */
+/* xhtml ... not used any more */
a[href] {
text-decoration : none ;
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 13f8e3462..78277fcf4 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 3487a0b94..e49b9a37d 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 523febd78..c3863daf3 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 : 09/06/14 13:38:59
+-- merge date : 09/06/14 15:41:01
do -- begin closure to overcome local limits and interference