summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2018-02-14 23:45:34 +0100
committerContext Git Mirror Bot <phg42.2a@gmail.com>2018-02-14 23:45:34 +0100
commit5321d35d68ce0acb71b46bddac1d8cab8eca3fcc (patch)
tree97196e1912f50b4dc11207a946a7328a50727686 /tex
parent71e0f049996013abcbfd549b516e594e019fb744 (diff)
downloadcontext-5321d35d68ce0acb71b46bddac1d8cab8eca3fcc.tar.gz
2018-02-14 23:04:00
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/mkii/cont-new.mkii2
-rw-r--r--tex/context/base/mkii/context.mkii2
-rw-r--r--tex/context/base/mkii/mult-ro.mkii1
-rw-r--r--tex/context/base/mkiv/cont-new.mkiv2
-rw-r--r--tex/context/base/mkiv/context.mkiv2
-rw-r--r--tex/context/base/mkiv/lpdf-epd.lua47
-rw-r--r--tex/context/base/mkiv/mult-low.lua10
-rw-r--r--tex/context/base/mkiv/status-files.pdfbin25633 -> 25803 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin252479 -> 252372 bytes
-rw-r--r--tex/context/base/mkiv/type-ini.mkvi28
-rw-r--r--tex/context/base/mkiv/typo-dir.mkiv2
-rw-r--r--tex/context/interface/mkii/keys-ro.xml1
-rw-r--r--tex/context/interface/mkiv/i-context.pdfbin847162 -> 848553 bytes
-rw-r--r--tex/context/interface/mkiv/i-readme.pdfbin60775 -> 60776 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
15 files changed, 24 insertions, 75 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 43eb2b440..4d3a3c36f 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2018.02.14 16:18}
+\newcontextversion{2018.02.14 22:56}
%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/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index befa5ec56..57b284852 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2018.02.14 16:18}
+\edef\contextversion{2018.02.14 22:56}
%D For those who want to use this:
diff --git a/tex/context/base/mkii/mult-ro.mkii b/tex/context/base/mkii/mult-ro.mkii
index 80f45102b..0e1efc671 100644
--- a/tex/context/base/mkii/mult-ro.mkii
+++ b/tex/context/base/mkii/mult-ro.mkii
@@ -185,6 +185,7 @@
\setinterfacevariable{extremestretch}{extremestretch}
\setinterfacevariable{fact}{fapt}
\setinterfacevariable{february}{februarie}
+\setinterfacevariable{field}{field}
\setinterfacevariable{figure}{figura}
\setinterfacevariable{figures}{figure}
\setinterfacevariable{file}{fisier}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 0ec2b71d9..aec47b145 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2018.02.14 16:18}
+\newcontextversion{2018.02.14 22:56}
%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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 98b93bd28..ec035b2b2 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -41,7 +41,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2018.02.14 16:18}
+\edef\contextversion{2018.02.14 22:56}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/mkiv/lpdf-epd.lua b/tex/context/base/mkiv/lpdf-epd.lua
index f252e1b0b..48d63bab4 100644
--- a/tex/context/base/mkiv/lpdf-epd.lua
+++ b/tex/context/base/mkiv/lpdf-epd.lua
@@ -53,47 +53,6 @@ lpdf.epdf = lpdf_epdf
-- local dictGetLength, dictGetVal, dictGetValNF, dictGetKey
-- local arrayGetLength, arrayGetNF, arrayGet
-- local streamReset, streamGetDict, streamGetChar
---
--- do
--- local object = epdf.Object()
--- --
--- getDict = object.getDict
--- getArray = object.getArray
--- getInt = object.getInt
--- getReal = object.getReal
--- getNum = object.getNum
--- getString = object.getString
--- getBool = object.getBool
--- getName = object.getName
--- getRef = object.getRef
--- getRefNum = object.getRefNum
--- --
--- getType = object.getType
--- getTypeName = object.getTypeName
--- --
--- streamReset = object.streamReset
--- streamGetDict = object.streamGetDict
--- streamGetChar = object.streamGetChar
--- --
--- end
---
--- local function initialize_methods(xref)
--- local dictionary = epdf.Dict(xref)
--- local array = epdf.Array(xref)
--- --
--- dictGetLength = dictionary.getLength
--- dictGetVal = dictionary.getVal
--- dictGetValNF = dictionary.getValNF
--- dictGetKey = dictionary.getKey
--- --
--- arrayGetLength = array.getLength
--- arrayGetNF = array.getNF
--- arrayGet = array.get
--- --
--- initialize_methods = function()
--- -- already done
--- end
--- end
-- We use as little as possible and also not an object interface. After all, we
-- don't know how the library (and its api) evolves so we better can be prepared
@@ -101,9 +60,9 @@ lpdf.epdf = lpdf_epdf
local registry = debug.getregistry()
-local object = registry["epdf.Object"] -- or epdf.Object()
-local dictionary = registry["epdf.Dict"] -- or epdf.Dict(xref) (possible when document open)
-local array = registry["epdf.Array"] -- or epdf.Array(xref) (possible when document open)
+local object = registry["epdf.Object"]
+local dictionary = registry["epdf.Dict"]
+local array = registry["epdf.Array"]
local xref = registry["epdf.XRef"]
local catalog = registry["epdf.Catalog"]
local pdfdoc = registry["epdf.PDFDoc"]
diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index b875ddd38..1fea62f6a 100644
--- a/tex/context/base/mkiv/mult-low.lua
+++ b/tex/context/base/mkiv/mult-low.lua
@@ -124,7 +124,8 @@ return {
--
"luastringsep", "!!bs", "!!es",
--
- "lefttorightmark", "righttoleftmark",
+ "lefttorightmark", "righttoleftmark", "lrm", "rlm",
+ "bidilre", "bidirle", "bidipop", "bidilro", "bidirlo",
--
"breakablethinspace", "nobreakspace", "nonbreakablespace", "narrownobreakspace", "zerowidthnobreakspace",
"ideographicspace", "ideographichalffillspace",
@@ -415,8 +416,9 @@ return {
"rtlhbox", "ltrhbox", "rtlvbox", "ltrvbox", "rtlvtop", "ltrvtop",
"autodirhbox", "autodirvbox", "autodirvtop",
"leftorrighthbox", "leftorrightvbox", "leftorrightvtop",
- "lefttoright", "righttoleft","synchronizelayoutdirection","synchronizedisplaydirection","synchronizeinlinedirection",
- "checkedlefttoright", "checkedrighttoleft",
+ "lefttoright", "righttoleft", "checkedlefttoright", "checkedrighttoleft",
+ "synchronizelayoutdirection","synchronizedisplaydirection","synchronizeinlinedirection",
+ "dirlre", "dirrle", "dirlro", "dirrlo",
--
"lesshyphens", "morehyphens", "nohyphens", "dohyphens",
--
@@ -426,7 +428,7 @@ return {
--
"nospace", "nospacing", "dospacing",
--
- "naturalhbox", "naturalvbox", "naturalhpack", "naturalvpack",
+ "naturalhbox", "naturalvbox", "naturalvtop", "naturalhpack", "naturalvpack",
--
"frule",
--
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index df2f42745..0cdfcf3a5 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index deb866c10..9725489e4 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/type-ini.mkvi b/tex/context/base/mkiv/type-ini.mkvi
index 0633b828d..2ac3ee207 100644
--- a/tex/context/base/mkiv/type-ini.mkvi
+++ b/tex/context/base/mkiv/type-ini.mkvi
@@ -513,32 +513,18 @@
\setugvalue{#name}{\switchtotypeface[#name][#style]}%
\fi}}
-% \def\font_typefaces_defining_start#name#style#settings%
-% {\let\@@tsrscale \!!plusone % as we push/pop
-% \let\@@tsfeatures \empty
-% \let\@@tsfallbacks \empty
-% \let\@@tsgoodies \empty
-% \let\@@tsdirection \empty
-% \let\@@tsdesignsize\empty
-% \geteparameters[\??ts][#settings]% todo raw
-% \pushmacro\fontclass
-% \pushmacro\fontclassstyle
-% \setcurrentfontclass{#name}%
-% \savefontclassparameters{#style}\@@tsrscale\@@tsfeatures\@@tsfallbacks\@@tsgoodies\@@tsdesignsize\@@tsdirection
-% \the\everybeforedefinetypeface}
-
\def\font_typefaces_defining_start#name#style#settings%
- {\let\p_rscale \!!plusone % as we push/pop
- \let\p_features \empty
- \let\p_fallbacks \empty
- \let\p_goodies \empty
- \let\p_direction \empty
- \let\p_designsize\empty
+ {\let\@@tsrscale \!!plusone % as we push/pop
+ \let\@@tsfeatures \empty
+ \let\@@tsfallbacks \empty
+ \let\@@tsgoodies \empty
+ \let\@@tsdirection \empty
+ \let\@@tsdesignsize\empty
\geteparameters[\??ts][#settings]% todo raw
\pushmacro\fontclass
\pushmacro\fontclassstyle
\setcurrentfontclass{#name}%
- \savefontclassparameters{#style}\p_rscale\p_features\p_fallbacks\p_goodies\p_designsize\p_direction
+ \savefontclassparameters{#style}\@@tsrscale\@@tsfeatures\@@tsfallbacks\@@tsgoodies\@@tsdesignsize\@@tsdirection
\the\everybeforedefinetypeface}
\def\tsvar#key#default% undocumented and unofficial
diff --git a/tex/context/base/mkiv/typo-dir.mkiv b/tex/context/base/mkiv/typo-dir.mkiv
index a574e3c66..d92c93793 100644
--- a/tex/context/base/mkiv/typo-dir.mkiv
+++ b/tex/context/base/mkiv/typo-dir.mkiv
@@ -98,7 +98,7 @@
\c!break=\v!both, % experimental value, maybe \v!no will be default (bad name too)
\c!fences=\v!yes]
-\unexpanded\edef\bidilre{\normalUchar"202A} % maybe \edef's
+\unexpanded\edef\bidilre{\normalUchar"202A}
\unexpanded\edef\bidirle{\normalUchar"202B}
\unexpanded\edef\bidipop{\normalUchar"202C}
\unexpanded\edef\bidilro{\normalUchar"202D}
diff --git a/tex/context/interface/mkii/keys-ro.xml b/tex/context/interface/mkii/keys-ro.xml
index 71f7226cd..97aba8363 100644
--- a/tex/context/interface/mkii/keys-ro.xml
+++ b/tex/context/interface/mkii/keys-ro.xml
@@ -188,6 +188,7 @@
<cd:variable name='extremestretch' value='extremestretch'/>
<cd:variable name='fact' value='fapt'/>
<cd:variable name='february' value='februarie'/>
+ <cd:variable name='field' value='field'/>
<cd:variable name='figure' value='figura'/>
<cd:variable name='figures' value='figure'/>
<cd:variable name='file' value='fisier'/>
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index fac1032e1..7c655f08a 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
Binary files differ
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 348c81d92..7f7f8ea79 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.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 0a24e8319..dabe5c3b9 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date : 02/14/18 16:18:32
+-- merge date : 02/14/18 22:56:43
do -- begin closure to overcome local limits and interference