summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4110 -> 4114 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/lang-def.mkiv14
-rw-r--r--tex/context/base/meta-imp-txt.mkiv2
-rw-r--r--tex/context/base/spac-hor.mkiv12
-rw-r--r--tex/context/base/status-files.pdfbin24526 -> 24511 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin224833 -> 224784 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
9 files changed, 16 insertions, 18 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 979c78db9..5a0616fcf 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{2013.10.13 22:46}
+\newcontextversion{2013.10.13 23:38}
%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 97cca3568..66c5f0491 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 7aa9b1248..5205f78b8 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2013.10.13 22:46}
+\edef\contextversion{2013.10.13 23:38}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/lang-def.mkiv b/tex/context/base/lang-def.mkiv
index 9f84e90f0..ecd5b3c22 100644
--- a/tex/context/base/lang-def.mkiv
+++ b/tex/context/base/lang-def.mkiv
@@ -219,10 +219,9 @@
\c!rightquote=\upperrightsinglesixquote,
\c!leftquotation=\lowerleftdoubleninequote,
\c!rightquotation=\upperrightdoublesixquote,
- \c!date={\v!day,\fourperemspace,\v!month,\space,\v!year}
+ \c!date={\v!day,{.\fourperemspace},\v!month,\space,\v!year},
\s!lefthyphenmin=2,
- \s!righthyphenmin=3
-]
+ \s!righthyphenmin=3]
\installlanguage
[\s!sk]
@@ -235,10 +234,9 @@
\c!rightquote=\upperrightsinglesixquote,
\c!leftquotation=\lowerleftdoubleninequote,
\c!rightquotation=\upperrightdoublesixquote,
- \c!date={\v!day,\fourperemspace,\v!month,\space,\v!year}
+ \c!date={\v!day,{.\fourperemspace},\v!month,\space,\v!year},
\s!lefthyphenmin=2,
- \s!righthyphenmin=3
-]
+ \s!righthyphenmin=3]
\installlanguage
[\s!hr]
@@ -271,7 +269,7 @@
\installlanguage [\s!slovak] [\s!sk]
\installlanguage [\s!croatian] [\s!hr]
\installlanguage [\s!slovenian] [\s!sl]
-\installlanguage [slovene] [\s!sl] % both possible (mojca: still needed?)
+\installlanguage [slovene] [\s!sl] % both possible (mojca: still needed?)
\def\doconvertsloveniancharacters{\dodoconvertcharacters{25}}
@@ -400,7 +398,7 @@
\c!rightquote=\upperrightsingleninequote,
\c!leftquotation=\upperleftdoublesixquote,
\c!rightquotation=\upperrightdoubleninequote,
- \c!date={\v!year,\space,\v!month,\space,\v!day}
+ \c!date={\v!year,\space,\v!month,\space,\v!day},
\s!patterns=\s!tk,
\s!lefthyphenmin=1,
\s!righthyphenmin=2]
diff --git a/tex/context/base/meta-imp-txt.mkiv b/tex/context/base/meta-imp-txt.mkiv
index 3a9ad5927..8c35d966f 100644
--- a/tex/context/base/meta-imp-txt.mkiv
+++ b/tex/context/base/meta-imp-txt.mkiv
@@ -175,7 +175,7 @@
\forgetall
\dontcomplain
\startMPenvironment
- \doifundefined{RotFont}{\definefont[RotFont][RegularBold]}
+ \doifundefined{RotFont}{\definefont[RotFont][RegularBold]}%
\stopMPenvironment
\MPtoks\emptytoks
\resetMPdrawing
diff --git a/tex/context/base/spac-hor.mkiv b/tex/context/base/spac-hor.mkiv
index bd3ef8e82..73e4771fe 100644
--- a/tex/context/base/spac-hor.mkiv
+++ b/tex/context/base/spac-hor.mkiv
@@ -486,17 +486,17 @@
\ifdefined\thinspace \else
- \def\thinspace {\kern .16667\emwidth}
- \def\negthinspace{\kern-.16667\emwidth}
- \def\enspace {\kern .5\emwidth}
+ \unexpanded\def\thinspace {\kern .16667\emwidth}
+ \unexpanded\def\negthinspace{\kern-.16667\emwidth}
+ \unexpanded\def\enspace {\kern .5\emwidth}
\fi
\ifdefined\quad \else
- \def\enskip{\hskip.5\emwidth}
- \def\quad {\hskip \emwidth}
- \def\qquad {\hskip 2\emwidth}
+ \unexpanded\def\enskip{\hskip.5\emwidth}
+ \unexpanded\def\quad {\hskip \emwidth}
+ \unexpanded\def\qquad {\hskip 2\emwidth}
\fi
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index c6a5399e4..d4d4959b2 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 a8352d589..7fcd0f4f0 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 1556b4495..5106d0769 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 : 10/13/13 22:46:23
+-- merge date : 10/13/13 23:38:42
do -- begin closure to overcome local limits and interference