summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2012-06-09 02:40:13 +0300
committerMarius <mariausol@gmail.com>2012-06-09 02:40:13 +0300
commita8d90ec17f9ba850721305edcf360407c3aae5b3 (patch)
tree45f42c4904ea1eca395264d828ab443542d1d95d
parent51cc4a57d6646dcecac5d5281d698a7b741d3b5a (diff)
downloadcontext-a8d90ec17f9ba850721305edcf360407c3aae5b3.tar.gz
beta 2012.06.09 01:22
-rw-r--r--scripts/context/lua/mtx-epub.lua11
-rw-r--r--tex/context/base/back-exp.lua11
-rw-r--r--tex/context/base/back-exp.mkiv26
-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-version.pdfbin4143 -> 4139 bytes
-rw-r--r--tex/context/base/context-version.pngbin106246 -> 104713 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/file-job.mkvi2
-rw-r--r--tex/context/base/m-spreadsheet.mkiv1
-rw-r--r--tex/context/base/mult-de.mkii3
-rw-r--r--tex/context/base/mult-def.lua23
-rw-r--r--tex/context/base/mult-en.mkii3
-rw-r--r--tex/context/base/mult-fr.mkii3
-rw-r--r--tex/context/base/mult-it.mkii3
-rw-r--r--tex/context/base/mult-nl.mkii3
-rw-r--r--tex/context/base/mult-pe.mkii3
-rw-r--r--tex/context/base/mult-ro.mkii3
-rw-r--r--tex/context/base/scrn-ini.mkvi6
-rw-r--r--tex/context/base/status-files.pdfbin24396 -> 24389 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin181146 -> 181135 bytes
-rw-r--r--tex/context/interface/keys-cs.xml3
-rw-r--r--tex/context/interface/keys-de.xml3
-rw-r--r--tex/context/interface/keys-en.xml3
-rw-r--r--tex/context/interface/keys-fr.xml3
-rw-r--r--tex/context/interface/keys-it.xml3
-rw-r--r--tex/context/interface/keys-nl.xml3
-rw-r--r--tex/context/interface/keys-pe.xml3
-rw-r--r--tex/context/interface/keys-ro.xml3
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
31 files changed, 117 insertions, 18 deletions
diff --git a/scripts/context/lua/mtx-epub.lua b/scripts/context/lua/mtx-epub.lua
index 88e31ceee..6b7f7e718 100644
--- a/scripts/context/lua/mtx-epub.lua
+++ b/scripts/context/lua/mtx-epub.lua
@@ -31,7 +31,7 @@ mtxrun --script epub --make mydocument
local application = logs.application {
name = "mtx-epub",
- banner = "ConTeXt EPUB Helpers 0.11",
+ banner = "ConTeXt EPUB Helpers 0.12",
helpinfo = helpinfo,
}
@@ -197,9 +197,18 @@ function scripts.epub.make()
local language = specification.language or "en"
local creator = specification.author or "My Self"
local title = specification.title or "My Title"
+ local firstpage = specification.firstpage or ""
+ local lastpage = specification.lastpage or ""
-- identifier = gsub(identifier,"[^a-zA-z0-9]","")
+ if firstpage == "" then
+ images[firstpage] = firstpage
+ end
+ if lastpage == "" then
+ images[lastpage] = lastpage
+ end
+
identifier = "BookId" -- weird requirement
local epubname = name
diff --git a/tex/context/base/back-exp.lua b/tex/context/base/back-exp.lua
index 818f89e45..98a3bc9a2 100644
--- a/tex/context/base/back-exp.lua
+++ b/tex/context/base/back-exp.lua
@@ -301,7 +301,7 @@ local usedstyles = { }
local documenttemplate = [[
document {
- font-size : %s !important ;
+ font-size : %s !important ;
max-width : %s !important ;
text-align : %s !important ;
hyphens : %s !important ;
@@ -2363,6 +2363,8 @@ local function stopexport(v)
report_export("saving xhtml variant in '%s",xhtmlfile)
local xmltree = cleanxhtmltree(xml.convert(results))
xml.save(xmltree,xhtmlfile)
+ -- looking at identity is somewhat redundant as we also inherit from interaction
+ -- at the tex end
local identity = interactions.general.getidentity()
local specification = {
name = file.removesuffix(v),
@@ -2371,8 +2373,11 @@ local function stopexport(v)
root = xhtmlfile,
files = files,
language = languagenames[tex.count.mainlanguagenumber],
- title = validstring(identity.title),
- author = validstring(identity.author),
+ title = validstring(finetuning.title) or validstring(identity.title),
+ subtitle = validstring(finetuning.subtitle) or validstring(identity.subtitle),
+ author = validstring(finetuning.author) or validstring(identity.author),
+ firstpage = validstring(finetuning.firstpage),
+ lastpage = validstring(finetuning.lastpage),
}
report_export("saving specification in '%s' (mtxrun --script epub --make %s)",specificationfilename,specificationfilename)
io.savedata(specificationfilename,table.serialize(specification,true))
diff --git a/tex/context/base/back-exp.mkiv b/tex/context/base/back-exp.mkiv
index 871d08b19..9e65633d4 100644
--- a/tex/context/base/back-exp.mkiv
+++ b/tex/context/base/back-exp.mkiv
@@ -132,6 +132,11 @@
[\c!align=\number\raggedstatus,
\c!bodyfont=\bodyfontsize,
\c!width=\textwidth,
+ \c!title={\directinteractionparameter\c!title},
+ \c!subtitle={\directinteractionparameter\c!subtitle},
+ \c!author={\directinteractionparameter\c!author},
+ % \c!firstpage=, % imagename
+ % \c!lastpage=, % imagename
\c!hyphen=\v!no]
\def\dosynchronizeexport
@@ -141,13 +146,22 @@
bodyfont = \number\dimexpr\exportparameter\c!bodyfont,
width = \number\dimexpr\exportparameter\c!width,
hyphen = "\exportparameter\c!hyphen",
+ title = \!!bs\exportparameter\c!title\!!es,
+ subtitle = \!!bs\exportparameter\c!subtitle\!!es,
+ author = \!!bs\exportparameter\c!author\!!es,
+ firstpage = "\exportparameter\c!firstpage",
+ lastpage = "\exportparameter\c!lastpage",
}}}
\appendtoks
- \doifsomething{\backendparameter\c!export}{\dosynchronizeexport}%
+ \doifsomething{\backendparameter\c!export}\dosynchronizeexport
\to \everystarttext
\appendtoks
+ \doifsomething{\backendparameter\c!export}\dosynchronizeexport % in case it is done inside \starttext
+\to \everysetupdocument
+
+\appendtoks
\doifsomething{\backendparameter\c!xhtml}
{\enabledirectives[backend.export.xhtml=\backendparameter\c!xhtml]}%
\doifsomething{\backendparameter\c!css}
@@ -155,11 +169,11 @@
\to \everysetupbackend
\appendtoks
- \doifsomething{\backendparameter\c!export}
- {\setuptagging
- [\c!state=\v!start]%
- \enabledirectives
- [backend.export=\backendparameter\c!export]}%
+ \doifelsenothing{\backendparameter\c!export}
+ {\resetsystemmode\v!export}
+ {\setuptagging[\c!state=\v!start]%
+ \enabledirectives[backend.export=\backendparameter\c!export]%
+ \setsystemmode\v!export}%
\to \everysetupbackend
\protect \endinput
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index c36615242..b07d590ba 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.06.08 21:57}
+\newcontextversion{2012.06.09 01:22}
%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 c275202ac..4d313564c 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.06.08 21:57}
+\newcontextversion{2012.06.09 01:22}
%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 32721e9d0..160d6435b 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-version.png b/tex/context/base/context-version.png
index 5f3c1e476..56ad3270f 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 7470347f5..a88a133f3 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.06.08 21:57}
+\edef\contextversion{2012.06.09 01:22}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 3aee4115a..b6d0f54eb 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.06.08 21:57}
+\edef\contextversion{2012.06.09 01:22}
%D For those who want to use this:
diff --git a/tex/context/base/file-job.mkvi b/tex/context/base/file-job.mkvi
index a801f7309..4a54c6b2f 100644
--- a/tex/context/base/file-job.mkvi
+++ b/tex/context/base/file-job.mkvi
@@ -297,6 +297,8 @@
{\setvariables[\s!document][#settings]%
\the\everysetupdocument\relax}
+% metadata:author metadata:title metadata:subject
+
\setvariables
[document]
[\c!before=\directsetup{\s!document:start},
diff --git a/tex/context/base/m-spreadsheet.mkiv b/tex/context/base/m-spreadsheet.mkiv
index d5ea781fd..c0152562d 100644
--- a/tex/context/base/m-spreadsheet.mkiv
+++ b/tex/context/base/m-spreadsheet.mkiv
@@ -165,7 +165,6 @@
\blank
-% \definespreadsheet[test]
\setupspreadsheet[test][period={{\bf\middlered .}},comma={{\bf\middlegreen ,}},split=yes]
\startspreadsheettable[test]
diff --git a/tex/context/base/mult-de.mkii b/tex/context/base/mult-de.mkii
index dee614e5e..2f19a78a1 100644
--- a/tex/context/base/mult-de.mkii
+++ b/tex/context/base/mult-de.mkii
@@ -157,6 +157,7 @@
\setinterfacevariable{enumeration}{nummerierung}
\setinterfacevariable{environment}{umgebung}
\setinterfacevariable{even}{gerade}
+\setinterfacevariable{export}{export}
\setinterfacevariable{external}{extern}
\setinterfacevariable{fact}{gegeben}
\setinterfacevariable{february}{februar}
@@ -684,6 +685,7 @@
\setinterfaceconstant{filtercommand}{filtercommand}
\setinterfaceconstant{finalnamesep}{finalnamesep}
\setinterfaceconstant{firstnamesep}{firstnamesep}
+\setinterfaceconstant{firstpage}{ersteseite}
\setinterfaceconstant{focus}{focus}
\setinterfaceconstant{focusin}{focusin}
\setinterfaceconstant{focusout}{focusout}
@@ -750,6 +752,7 @@
\setinterfaceconstant{label}{label}
\setinterfaceconstant{labeloffset}{labeloffset}
\setinterfaceconstant{lastnamesep}{lastnamesep}
+\setinterfaceconstant{lastpage}{letzteseite}
\setinterfaceconstant{lastpubsep}{lastpubsep}
\setinterfaceconstant{layout}{layout}
\setinterfaceconstant{left}{links}
diff --git a/tex/context/base/mult-def.lua b/tex/context/base/mult-def.lua
index 1a4921a28..b700d2802 100644
--- a/tex/context/base/mult-def.lua
+++ b/tex/context/base/mult-def.lua
@@ -7805,6 +7805,16 @@ return {
["pe"]="تمرکز",
["ro"]="focus",
},
+ ["firstpage"]={
+ ["cs"]="prvnistranka",
+ ["de"]="ersteseite",
+ ["en"]="firstpage",
+ ["fr"]="premierepage",
+ ["it"]="primapagina",
+ ["nl"]="eerstepagina",
+ ["pe"]="صفحه‌اول",
+ ["ro"]="primapagina",
+ },
["focusin"]={
["cs"]="focusin",
["de"]="focusin",
@@ -8362,6 +8372,16 @@ return {
["pe"]="برچسب",
["ro"]="eticheta",
},
+ ["lastpage"]={
+ ["cs"]="poslednistrana",
+ ["de"]="letzteseite",
+ ["en"]="lastpage",
+ ["fr"]="dernierepage",
+ ["it"]="ultimapagina",
+ ["nl"]="laatstepagina",
+ ["pe"]="صفحه‌آخر",
+ ["ro"]="ultimapagina",
+ },
["left"]={
["cs"]="vlevo",
["de"]="links",
@@ -11277,6 +11297,9 @@ return {
["en"]="end",
["nl"]="eind",
},
+ ["export"] = {
+ ["en"]="export",
+ },
["begin"]={
["en"]="begin",
["nl"]="begin",
diff --git a/tex/context/base/mult-en.mkii b/tex/context/base/mult-en.mkii
index b801ebc5f..c156a0fa3 100644
--- a/tex/context/base/mult-en.mkii
+++ b/tex/context/base/mult-en.mkii
@@ -157,6 +157,7 @@
\setinterfacevariable{enumeration}{enumeration}
\setinterfacevariable{environment}{environment}
\setinterfacevariable{even}{even}
+\setinterfacevariable{export}{export}
\setinterfacevariable{external}{external}
\setinterfacevariable{fact}{fact}
\setinterfacevariable{february}{february}
@@ -684,6 +685,7 @@
\setinterfaceconstant{filtercommand}{filtercommand}
\setinterfaceconstant{finalnamesep}{finalnamesep}
\setinterfaceconstant{firstnamesep}{firstnamesep}
+\setinterfaceconstant{firstpage}{firstpage}
\setinterfaceconstant{focus}{focus}
\setinterfaceconstant{focusin}{focusin}
\setinterfaceconstant{focusout}{focusout}
@@ -750,6 +752,7 @@
\setinterfaceconstant{label}{label}
\setinterfaceconstant{labeloffset}{labeloffset}
\setinterfaceconstant{lastnamesep}{lastnamesep}
+\setinterfaceconstant{lastpage}{lastpage}
\setinterfaceconstant{lastpubsep}{lastpubsep}
\setinterfaceconstant{layout}{layout}
\setinterfaceconstant{left}{left}
diff --git a/tex/context/base/mult-fr.mkii b/tex/context/base/mult-fr.mkii
index 5717cf97b..e48e583ea 100644
--- a/tex/context/base/mult-fr.mkii
+++ b/tex/context/base/mult-fr.mkii
@@ -157,6 +157,7 @@
\setinterfacevariable{enumeration}{enumeration}
\setinterfacevariable{environment}{environement}
\setinterfacevariable{even}{paire}
+\setinterfacevariable{export}{export}
\setinterfacevariable{external}{external}
\setinterfacevariable{fact}{fait}
\setinterfacevariable{february}{fevrier}
@@ -684,6 +685,7 @@
\setinterfaceconstant{filtercommand}{filtercommand}
\setinterfaceconstant{finalnamesep}{finalnamesep}
\setinterfaceconstant{firstnamesep}{firstnamesep}
+\setinterfaceconstant{firstpage}{premierepage}
\setinterfaceconstant{focus}{focus}
\setinterfaceconstant{focusin}{focusin}
\setinterfaceconstant{focusout}{focusout}
@@ -750,6 +752,7 @@
\setinterfaceconstant{label}{etiquette}
\setinterfaceconstant{labeloffset}{labeloffset}
\setinterfaceconstant{lastnamesep}{lastnamesep}
+\setinterfaceconstant{lastpage}{dernierepage}
\setinterfaceconstant{lastpubsep}{lastpubsep}
\setinterfaceconstant{layout}{layout}
\setinterfaceconstant{left}{gauche}
diff --git a/tex/context/base/mult-it.mkii b/tex/context/base/mult-it.mkii
index 88a371ac7..0af7edde5 100644
--- a/tex/context/base/mult-it.mkii
+++ b/tex/context/base/mult-it.mkii
@@ -157,6 +157,7 @@
\setinterfacevariable{enumeration}{enumerazione}
\setinterfacevariable{environment}{ambiente}
\setinterfacevariable{even}{pari}
+\setinterfacevariable{export}{export}
\setinterfacevariable{external}{esterno}
\setinterfacevariable{fact}{fatto}
\setinterfacevariable{february}{febbraio}
@@ -684,6 +685,7 @@
\setinterfaceconstant{filtercommand}{filtercommand}
\setinterfaceconstant{finalnamesep}{finalnamesep}
\setinterfaceconstant{firstnamesep}{firstnamesep}
+\setinterfaceconstant{firstpage}{primapagina}
\setinterfaceconstant{focus}{focus}
\setinterfaceconstant{focusin}{focusin}
\setinterfaceconstant{focusout}{focusout}
@@ -750,6 +752,7 @@
\setinterfaceconstant{label}{etichetta}
\setinterfaceconstant{labeloffset}{labeloffset}
\setinterfaceconstant{lastnamesep}{lastnamesep}
+\setinterfaceconstant{lastpage}{ultimapagina}
\setinterfaceconstant{lastpubsep}{lastpubsep}
\setinterfaceconstant{layout}{layout}
\setinterfaceconstant{left}{sinistra}
diff --git a/tex/context/base/mult-nl.mkii b/tex/context/base/mult-nl.mkii
index 01f7fa204..88d3ffe58 100644
--- a/tex/context/base/mult-nl.mkii
+++ b/tex/context/base/mult-nl.mkii
@@ -157,6 +157,7 @@
\setinterfacevariable{enumeration}{doornummering}
\setinterfacevariable{environment}{omgeving}
\setinterfacevariable{even}{even}
+\setinterfacevariable{export}{export}
\setinterfacevariable{external}{extern}
\setinterfacevariable{fact}{gegeven}
\setinterfacevariable{february}{februari}
@@ -684,6 +685,7 @@
\setinterfaceconstant{filtercommand}{filtercommand}
\setinterfaceconstant{finalnamesep}{finalnamesep}
\setinterfaceconstant{firstnamesep}{firstnamesep}
+\setinterfaceconstant{firstpage}{eerstepagina}
\setinterfaceconstant{focus}{focus}
\setinterfaceconstant{focusin}{focusin}
\setinterfaceconstant{focusout}{focusuit}
@@ -750,6 +752,7 @@
\setinterfaceconstant{label}{label}
\setinterfaceconstant{labeloffset}{labeloffset}
\setinterfaceconstant{lastnamesep}{lastnamesep}
+\setinterfaceconstant{lastpage}{laatstepagina}
\setinterfaceconstant{lastpubsep}{lastpubsep}
\setinterfaceconstant{layout}{layout}
\setinterfaceconstant{left}{links}
diff --git a/tex/context/base/mult-pe.mkii b/tex/context/base/mult-pe.mkii
index 6dcd2fef6..8bf67b339 100644
--- a/tex/context/base/mult-pe.mkii
+++ b/tex/context/base/mult-pe.mkii
@@ -157,6 +157,7 @@
\setinterfacevariable{enumeration}{شماره‌بندی}
\setinterfacevariable{environment}{محیط}
\setinterfacevariable{even}{زوج}
+\setinterfacevariable{export}{export}
\setinterfacevariable{external}{خارجی}
\setinterfacevariable{fact}{fact}
\setinterfacevariable{february}{فوریه}
@@ -684,6 +685,7 @@
\setinterfaceconstant{filtercommand}{filtercommand}
\setinterfaceconstant{finalnamesep}{finalnamesep}
\setinterfaceconstant{firstnamesep}{firstnamesep}
+\setinterfaceconstant{firstpage}{صفحه‌اول}
\setinterfaceconstant{focus}{تمرکز}
\setinterfaceconstant{focusin}{تمرکزدرون}
\setinterfaceconstant{focusout}{تمرکزبیرون}
@@ -750,6 +752,7 @@
\setinterfaceconstant{label}{برچسب}
\setinterfaceconstant{labeloffset}{labeloffset}
\setinterfaceconstant{lastnamesep}{lastnamesep}
+\setinterfaceconstant{lastpage}{صفحه‌آخر}
\setinterfaceconstant{lastpubsep}{lastpubsep}
\setinterfaceconstant{layout}{layout}
\setinterfaceconstant{left}{چپ}
diff --git a/tex/context/base/mult-ro.mkii b/tex/context/base/mult-ro.mkii
index 1eef26e0d..8495878cd 100644
--- a/tex/context/base/mult-ro.mkii
+++ b/tex/context/base/mult-ro.mkii
@@ -157,6 +157,7 @@
\setinterfacevariable{enumeration}{enumerare}
\setinterfacevariable{environment}{mediu}
\setinterfacevariable{even}{par}
+\setinterfacevariable{export}{export}
\setinterfacevariable{external}{extern}
\setinterfacevariable{fact}{fapt}
\setinterfacevariable{february}{februarie}
@@ -684,6 +685,7 @@
\setinterfaceconstant{filtercommand}{filtercommand}
\setinterfaceconstant{finalnamesep}{finalnamesep}
\setinterfaceconstant{firstnamesep}{firstnamesep}
+\setinterfaceconstant{firstpage}{primapagina}
\setinterfaceconstant{focus}{focus}
\setinterfaceconstant{focusin}{focusin}
\setinterfaceconstant{focusout}{focusout}
@@ -750,6 +752,7 @@
\setinterfaceconstant{label}{eticheta}
\setinterfaceconstant{labeloffset}{labeloffset}
\setinterfaceconstant{lastnamesep}{lastnamesep}
+\setinterfaceconstant{lastpage}{ultimapagina}
\setinterfaceconstant{lastpubsep}{lastpubsep}
\setinterfaceconstant{layout}{layout}
\setinterfaceconstant{left}{stanga}
diff --git a/tex/context/base/scrn-ini.mkvi b/tex/context/base/scrn-ini.mkvi
index daf0a1b91..27d9e89b2 100644
--- a/tex/context/base/scrn-ini.mkvi
+++ b/tex/context/base/scrn-ini.mkvi
@@ -184,9 +184,11 @@
\scrn_identity_synchronize
\to \everysetupinteraction
+% this comes before starttext
+
\appendtoks % not interfaced i.e. english
- \doifvariable{document}{metadata:author}{\setupinteraction[author=\documentvariable{metadata:author}]}%
- \doifvariable{document}{metadata:title}{\setupinteraction[title=\documentvariable{metadata:title}]}%
+ \doifvariable{document}{metadata:author} {\setupinteraction [author=\documentvariable{metadata:author}]}%
+ \doifvariable{document}{metadata:title} {\setupinteraction [title=\documentvariable{metadata:title}]}%
\doifvariable{document}{metadata:subject}{\setupinteraction[subject=\documentvariable{metadata:subject}]}%
\to \everysetupdocument
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 00adca956..b04ca9be3 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 f732ccfa6..12862163c 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/interface/keys-cs.xml b/tex/context/interface/keys-cs.xml
index cd95319e0..7feb615ef 100644
--- a/tex/context/interface/keys-cs.xml
+++ b/tex/context/interface/keys-cs.xml
@@ -160,6 +160,7 @@
<cd:variable name='enumeration' value='vycet'/>
<cd:variable name='environment' value='prostredi'/>
<cd:variable name='even' value='sude'/>
+ <cd:variable name='export' value='export'/>
<cd:variable name='external' value='externi'/>
<cd:variable name='fact' value='fakt'/>
<cd:variable name='february' value='unor'/>
@@ -690,6 +691,7 @@
<cd:constant name='filtercommand' value='filtercommand'/>
<cd:constant name='finalnamesep' value='finalnamesep'/>
<cd:constant name='firstnamesep' value='firstnamesep'/>
+ <cd:constant name='firstpage' value='prvnistranka'/>
<cd:constant name='focus' value='zaostreni'/>
<cd:constant name='focusin' value='focusin'/>
<cd:constant name='focusout' value='focusout'/>
@@ -756,6 +758,7 @@
<cd:constant name='label' value='popisek'/>
<cd:constant name='labeloffset' value='labeloffset'/>
<cd:constant name='lastnamesep' value='lastnamesep'/>
+ <cd:constant name='lastpage' value='poslednistrana'/>
<cd:constant name='lastpubsep' value='lastpubsep'/>
<cd:constant name='layout' value='layout'/>
<cd:constant name='left' value='vlevo'/>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index a28d23bcf..0c985f851 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/keys-de.xml
@@ -160,6 +160,7 @@
<cd:variable name='enumeration' value='nummerierung'/>
<cd:variable name='environment' value='umgebung'/>
<cd:variable name='even' value='gerade'/>
+ <cd:variable name='export' value='export'/>
<cd:variable name='external' value='extern'/>
<cd:variable name='fact' value='gegeben'/>
<cd:variable name='february' value='februar'/>
@@ -690,6 +691,7 @@
<cd:constant name='filtercommand' value='filtercommand'/>
<cd:constant name='finalnamesep' value='finalnamesep'/>
<cd:constant name='firstnamesep' value='firstnamesep'/>
+ <cd:constant name='firstpage' value='ersteseite'/>
<cd:constant name='focus' value='focus'/>
<cd:constant name='focusin' value='focusin'/>
<cd:constant name='focusout' value='focusout'/>
@@ -756,6 +758,7 @@
<cd:constant name='label' value='label'/>
<cd:constant name='labeloffset' value='labeloffset'/>
<cd:constant name='lastnamesep' value='lastnamesep'/>
+ <cd:constant name='lastpage' value='letzteseite'/>
<cd:constant name='lastpubsep' value='lastpubsep'/>
<cd:constant name='layout' value='layout'/>
<cd:constant name='left' value='links'/>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index 80ff3c2e1..ab43723d1 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/keys-en.xml
@@ -160,6 +160,7 @@
<cd:variable name='enumeration' value='enumeration'/>
<cd:variable name='environment' value='environment'/>
<cd:variable name='even' value='even'/>
+ <cd:variable name='export' value='export'/>
<cd:variable name='external' value='external'/>
<cd:variable name='fact' value='fact'/>
<cd:variable name='february' value='february'/>
@@ -690,6 +691,7 @@
<cd:constant name='filtercommand' value='filtercommand'/>
<cd:constant name='finalnamesep' value='finalnamesep'/>
<cd:constant name='firstnamesep' value='firstnamesep'/>
+ <cd:constant name='firstpage' value='firstpage'/>
<cd:constant name='focus' value='focus'/>
<cd:constant name='focusin' value='focusin'/>
<cd:constant name='focusout' value='focusout'/>
@@ -756,6 +758,7 @@
<cd:constant name='label' value='label'/>
<cd:constant name='labeloffset' value='labeloffset'/>
<cd:constant name='lastnamesep' value='lastnamesep'/>
+ <cd:constant name='lastpage' value='lastpage'/>
<cd:constant name='lastpubsep' value='lastpubsep'/>
<cd:constant name='layout' value='layout'/>
<cd:constant name='left' value='left'/>
diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml
index d97bf932a..c98e6a367 100644
--- a/tex/context/interface/keys-fr.xml
+++ b/tex/context/interface/keys-fr.xml
@@ -160,6 +160,7 @@
<cd:variable name='enumeration' value='enumeration'/>
<cd:variable name='environment' value='environement'/>
<cd:variable name='even' value='paire'/>
+ <cd:variable name='export' value='export'/>
<cd:variable name='external' value='external'/>
<cd:variable name='fact' value='fait'/>
<cd:variable name='february' value='fevrier'/>
@@ -690,6 +691,7 @@
<cd:constant name='filtercommand' value='filtercommand'/>
<cd:constant name='finalnamesep' value='finalnamesep'/>
<cd:constant name='firstnamesep' value='firstnamesep'/>
+ <cd:constant name='firstpage' value='premierepage'/>
<cd:constant name='focus' value='focus'/>
<cd:constant name='focusin' value='focusin'/>
<cd:constant name='focusout' value='focusout'/>
@@ -756,6 +758,7 @@
<cd:constant name='label' value='etiquette'/>
<cd:constant name='labeloffset' value='labeloffset'/>
<cd:constant name='lastnamesep' value='lastnamesep'/>
+ <cd:constant name='lastpage' value='dernierepage'/>
<cd:constant name='lastpubsep' value='lastpubsep'/>
<cd:constant name='layout' value='layout'/>
<cd:constant name='left' value='gauche'/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index a03a88ba3..08a7d7947 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/keys-it.xml
@@ -160,6 +160,7 @@
<cd:variable name='enumeration' value='enumerazione'/>
<cd:variable name='environment' value='ambiente'/>
<cd:variable name='even' value='pari'/>
+ <cd:variable name='export' value='export'/>
<cd:variable name='external' value='esterno'/>
<cd:variable name='fact' value='fatto'/>
<cd:variable name='february' value='febbraio'/>
@@ -690,6 +691,7 @@
<cd:constant name='filtercommand' value='filtercommand'/>
<cd:constant name='finalnamesep' value='finalnamesep'/>
<cd:constant name='firstnamesep' value='firstnamesep'/>
+ <cd:constant name='firstpage' value='primapagina'/>
<cd:constant name='focus' value='focus'/>
<cd:constant name='focusin' value='focusin'/>
<cd:constant name='focusout' value='focusout'/>
@@ -756,6 +758,7 @@
<cd:constant name='label' value='etichetta'/>
<cd:constant name='labeloffset' value='labeloffset'/>
<cd:constant name='lastnamesep' value='lastnamesep'/>
+ <cd:constant name='lastpage' value='ultimapagina'/>
<cd:constant name='lastpubsep' value='lastpubsep'/>
<cd:constant name='layout' value='layout'/>
<cd:constant name='left' value='sinistra'/>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index 2c9113c39..6d9852258 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/keys-nl.xml
@@ -160,6 +160,7 @@
<cd:variable name='enumeration' value='doornummering'/>
<cd:variable name='environment' value='omgeving'/>
<cd:variable name='even' value='even'/>
+ <cd:variable name='export' value='export'/>
<cd:variable name='external' value='extern'/>
<cd:variable name='fact' value='gegeven'/>
<cd:variable name='february' value='februari'/>
@@ -690,6 +691,7 @@
<cd:constant name='filtercommand' value='filtercommand'/>
<cd:constant name='finalnamesep' value='finalnamesep'/>
<cd:constant name='firstnamesep' value='firstnamesep'/>
+ <cd:constant name='firstpage' value='eerstepagina'/>
<cd:constant name='focus' value='focus'/>
<cd:constant name='focusin' value='focusin'/>
<cd:constant name='focusout' value='focusuit'/>
@@ -756,6 +758,7 @@
<cd:constant name='label' value='label'/>
<cd:constant name='labeloffset' value='labeloffset'/>
<cd:constant name='lastnamesep' value='lastnamesep'/>
+ <cd:constant name='lastpage' value='laatstepagina'/>
<cd:constant name='lastpubsep' value='lastpubsep'/>
<cd:constant name='layout' value='layout'/>
<cd:constant name='left' value='links'/>
diff --git a/tex/context/interface/keys-pe.xml b/tex/context/interface/keys-pe.xml
index 5f48acdd0..232f3ce59 100644
--- a/tex/context/interface/keys-pe.xml
+++ b/tex/context/interface/keys-pe.xml
@@ -160,6 +160,7 @@
<cd:variable name='enumeration' value='شماره‌بندی'/>
<cd:variable name='environment' value='محیط'/>
<cd:variable name='even' value='زوج'/>
+ <cd:variable name='export' value='export'/>
<cd:variable name='external' value='خارجی'/>
<cd:variable name='fact' value='fact'/>
<cd:variable name='february' value='فوریه'/>
@@ -690,6 +691,7 @@
<cd:constant name='filtercommand' value='filtercommand'/>
<cd:constant name='finalnamesep' value='finalnamesep'/>
<cd:constant name='firstnamesep' value='firstnamesep'/>
+ <cd:constant name='firstpage' value='صفحه‌اول'/>
<cd:constant name='focus' value='تمرکز'/>
<cd:constant name='focusin' value='تمرکزدرون'/>
<cd:constant name='focusout' value='تمرکزبیرون'/>
@@ -756,6 +758,7 @@
<cd:constant name='label' value='برچسب'/>
<cd:constant name='labeloffset' value='labeloffset'/>
<cd:constant name='lastnamesep' value='lastnamesep'/>
+ <cd:constant name='lastpage' value='صفحه‌آخر'/>
<cd:constant name='lastpubsep' value='lastpubsep'/>
<cd:constant name='layout' value='layout'/>
<cd:constant name='left' value='چپ'/>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index 22ccf09c0..6368aede6 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/keys-ro.xml
@@ -160,6 +160,7 @@
<cd:variable name='enumeration' value='enumerare'/>
<cd:variable name='environment' value='mediu'/>
<cd:variable name='even' value='par'/>
+ <cd:variable name='export' value='export'/>
<cd:variable name='external' value='extern'/>
<cd:variable name='fact' value='fapt'/>
<cd:variable name='february' value='februarie'/>
@@ -690,6 +691,7 @@
<cd:constant name='filtercommand' value='filtercommand'/>
<cd:constant name='finalnamesep' value='finalnamesep'/>
<cd:constant name='firstnamesep' value='firstnamesep'/>
+ <cd:constant name='firstpage' value='primapagina'/>
<cd:constant name='focus' value='focus'/>
<cd:constant name='focusin' value='focusin'/>
<cd:constant name='focusout' value='focusout'/>
@@ -756,6 +758,7 @@
<cd:constant name='label' value='eticheta'/>
<cd:constant name='labeloffset' value='labeloffset'/>
<cd:constant name='lastnamesep' value='lastnamesep'/>
+ <cd:constant name='lastpage' value='ultimapagina'/>
<cd:constant name='lastpubsep' value='lastpubsep'/>
<cd:constant name='layout' value='layout'/>
<cd:constant name='left' value='stanga'/>
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index bc823a1d1..390612836 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 : 06/08/12 21:57:11
+-- merge date : 06/09/12 01:22:26
do -- begin closure to overcome local limits and interference