diff options
| author | Marius <mariausol@gmail.com> | 2014-01-09 20:40:24 +0200 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2014-01-09 20:40:24 +0200 |
| commit | 6785a9819f7f8ee5eb41e0d71bf3abb71659861e (patch) | |
| tree | b54a0045f7ecb01ec20276c98ccd7280faee2a3e | |
| parent | 241b88c2f3f6a0c2479a3cd02552e2bed59a7047 (diff) | |
| download | context-6785a9819f7f8ee5eb41e0d71bf3abb71659861e.tar.gz | |
beta 2014.01.09 19:11
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4082 -> 4089 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/lang-lab.mkiv | 6 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24604 -> 24597 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 228478 -> 228426 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
7 files changed, 7 insertions, 5 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 0f072a1ae..36e17a605 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.01.09 18:27} +\newcontextversion{2014.01.09 19:11} %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 Binary files differindex 6f4f178a5..e0b13305c 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 3996e6269..6063c50b4 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.01.09 18:27} +\edef\contextversion{2014.01.09 19:11} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/lang-lab.mkiv b/tex/context/base/lang-lab.mkiv index 1ddb44cbb..14d9d8594 100644 --- a/tex/context/base/lang-lab.mkiv +++ b/tex/context/base/lang-lab.mkiv @@ -94,8 +94,10 @@ \csname\??label\currentlabelcategory#1:##1:##2\endcsname \else\ifcsname\??label#1:##1:##2\endcsname \csname\??label#1:##1:##2\endcsname - \else\ifcsname\??language#4\s!default\endcsname - \expandafter#5\csname\??language#4\s!default\endcsname{##2}% +% \else\ifcsname\??language#4\s!default\endcsname +% \expandafter#5\csname\??language#4\s!default\endcsname{##2}% + \else\ifcsname\??language##1\s!default\endcsname + \expandafter#5\csname\??language##1\s!default\endcsname{##2}% \else\ifcsname\??label\currentlabelcategory#1:##2\endcsname \csname\??label\currentlabelcategory#1:##2\endcsname \else\ifcsname\??label#1:##2\endcsname diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 33d7d13f2..876d92339 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex 28cd4d7bb..cfd1a015b 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 0b12aadc6..ef94206cc 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 : 01/09/14 18:27:26 +-- merge date : 01/09/14 19:11:57 do -- begin closure to overcome local limits and interference |