summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4387 -> 4385 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/lang-hyp.lua7
-rw-r--r--tex/context/base/lang-hyp.mkiv8
-rw-r--r--tex/context/base/status-files.pdfbin24652 -> 24661 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin344593 -> 344596 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
8 files changed, 9 insertions, 12 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 0c4bd8612..f710d16af 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.08 22:14}
+\newcontextversion{2014.12.08 23:47}
%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 44daebfd8..ed72584b7 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 da307b178..ecd372313 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.08 22:14}
+\edef\contextversion{2014.12.08 23:47}
\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 d6217857b..6bbc17fca 100644
--- a/tex/context/base/lang-hyp.lua
+++ b/tex/context/base/lang-hyp.lua
@@ -780,11 +780,8 @@ if context then
}
local function somehyphenchar(c)
- if c == "" or c == "0" then
- return nil
- else
- return type(c) == "string" and utfbyte(c) or tonumber(c)
- end
+ c = tonumber(c)
+ return c ~= 0 and c or nil
end
local function definefeatures(name,featureset)
diff --git a/tex/context/base/lang-hyp.mkiv b/tex/context/base/lang-hyp.mkiv
index 5af47fc26..966b000c6 100644
--- a/tex/context/base/lang-hyp.mkiv
+++ b/tex/context/base/lang-hyp.mkiv
@@ -60,8 +60,8 @@
\setuphyphenation
[\c!method=\s!default,
- \s!righthyphenchar=0,
- \s!lefthyphenchar=0]
+ \s!righthyphenchar=0, % number tzt g: etc
+ \s!lefthyphenchar=0] % number
\appendtoks
\ctxcommand{setuphyphenation{method="\hyphenationparameter\c!method"}}%
@@ -108,8 +108,8 @@
rightwordmin = \number\dummyparameter\c!rightwords,
leftcharmin = \number\dummyparameter\s!lefthyphenmin,
rightcharmin = \number\dummyparameter\s!righthyphenmin,
- leftchar = "\dummyparameter\s!lefthyphenchar",
- rightchar = "\dummyparameter\s!righthyphenchar",
+ leftchar = \number\dummyparameter\s!lefthyphenchar,
+ rightchar = \number\dummyparameter\s!righthyphenchar,
alternative = "\dummyparameter\c!alternative",
rightedge = "\dummyparameter\c!rightedge",
})}%
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index d32c3dc6c..a78f98d80 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 68290ae02..3432e2430 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 c000451c7..5cb4f4890 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/08/14 22:14:53
+-- merge date : 12/08/14 23:47:31
do -- begin closure to overcome local limits and interference