summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorContext Git Mirror Bot <phg42.2a@gmail.com>2014-11-26 22:15:03 +0100
committerContext Git Mirror Bot <phg42.2a@gmail.com>2014-11-26 22:15:03 +0100
commit8fa06810ed0fdc14d3c45eefff9a41800a84150b (patch)
treec0ad0adc7ad286f364b2763b7d90023504f9be76 /tex
parentb8da8b42eae284f045e32aedf2a564f1c3588584 (diff)
downloadcontext-8fa06810ed0fdc14d3c45eefff9a41800a84150b.tar.gz
2014-11-26 21:46:00
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4386 -> 4383 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/lang-hyp.mkiv2
-rw-r--r--tex/context/base/status-files.pdfbin24700 -> 24708 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin344497 -> 344500 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
7 files changed, 4 insertions, 4 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 49e49777f..8b9cc0a93 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.11.26 20:03}
+\newcontextversion{2014.11.26 21:43}
%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 2576ac50c..c11445498 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 fc91abb81..196f20623 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.11.26 20:03}
+\edef\contextversion{2014.11.26 21:43}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/lang-hyp.mkiv b/tex/context/base/lang-hyp.mkiv
index aef57be4c..e2c18ac14 100644
--- a/tex/context/base/lang-hyp.mkiv
+++ b/tex/context/base/lang-hyp.mkiv
@@ -198,7 +198,7 @@
% \sethyphenationfeatures
% [default,fences]
-\unprotect \endinput
+\protect \endinput
% \starttext
%
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 37f29f9a4..327d429ed 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 de451d454..eb13c54a9 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 7a840991a..db3512e7e 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 : 11/26/14 20:03:34
+-- merge date : 11/26/14 21:43:54
do -- begin closure to overcome local limits and interference