summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4384 -> 4382 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/lang-hyp.lua28
-rw-r--r--tex/context/base/status-files.pdfbin24648 -> 24649 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin344691 -> 344691 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
7 files changed, 21 insertions, 13 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 2bd2b8693..6cfda56fe 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.12.10 20:13}
+\newcontextversion{2014.12.10 22:40}
%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 c992bb951..ff58c610c 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 e2908d511..45a1ee1ba 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.12.10 20:13}
+\edef\contextversion{2014.12.10 22:40}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/lang-hyp.lua b/tex/context/base/lang-hyp.lua
index 6bbc17fca..2ab966fe6 100644
--- a/tex/context/base/lang-hyp.lua
+++ b/tex/context/base/lang-hyp.lua
@@ -1188,14 +1188,17 @@ if context then
end
language = lang
if language > 0 then
+ --
dictionary = dictionaries[language]
- -- we could postpone these
instance = dictionary.instance
characters = dictionary.characters
unicodes = dictionary.unicodes
- leftchar = leftchar or (instance and posthyphenchar(instance))
- rightchar = rightchar or (instance and prehyphenchar (instance))
- leftmin = leftcharmin or getfield(current,"left")
+ --
+ local a = getattr(current,a_hyphenation)
+ attr = synchronizefeatureset(a)
+ leftchar = leftchar or (instance and posthyphenchar(instance))
+ rightchar = rightchar or (instance and prehyphenchar (instance))
+ leftmin = leftcharmin or getfield(current,"left")
rightmin = rightcharmin or getfield(current,"right")
if not leftchar or leftchar < 0 then
leftchar = false
@@ -1204,11 +1207,6 @@ if context then
rightchar = false
end
--
- local a = getattr(current,a_hyphenation)
- if a ~= attr then
- attr = synchronizefeatureset(a) -- influences extrachars
- end
- --
local char = unicodes[code] or (extrachars and extrachars[code])
if char then
word[1] = char
@@ -1246,7 +1244,17 @@ if context then
else
local a = getattr(current,a_hyphenation)
if a ~= attr then
- attr = synchronizefeatureset(a) -- influences extrachars
+ attr = synchronizefeatureset(a) -- influences extrachars
+ leftchar = leftchar or (instance and posthyphenchar(instance))
+ rightchar = rightchar or (instance and prehyphenchar (instance))
+ leftmin = leftcharmin or getfield(current,"left")
+ rightmin = rightcharmin or getfield(current,"right")
+ if not leftchar or leftchar < 0 then
+ leftchar = false
+ end
+ if not rightchar or rightchar < 0 then
+ rightchar = false
+ end
end
--
local char = unicodes[code] or (extrachars and extrachars[code])
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index cbbbf6d10..be673253e 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 d9ff62899..23ff2dbab 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 5b218c6d7..6d0e5218f 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 : 12/10/14 20:13:09
+-- merge date : 12/10/14 22:40:17
do -- begin closure to overcome local limits and interference