summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2014-01-26 17:20:15 +0200
committerMarius <mariausol@gmail.com>2014-01-26 17:20:15 +0200
commit01f653d381b0de0377031007071a033cfbad316e (patch)
tree653ce9edc86ea8aece68c657c081ffb1d6eddcb7 /tex
parent8eaeb46048e8d1a3bcfc18d5b87bae71216a3cf7 (diff)
downloadcontext-01f653d381b0de0377031007071a033cfbad316e.tar.gz
beta 2014.01.26 16:07
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4087 -> 4086 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/publ-ini.mkiv17
-rw-r--r--tex/context/base/status-files.pdfbin24862 -> 24867 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin233976 -> 233980 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
7 files changed, 7 insertions, 16 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 30476b17f..3cde8a5fd 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.25 12:20}
+\newcontextversion{2014.01.26 16:07}
%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 e643cabfc..698e5d4eb 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 ca28d483d..0a0da7d93 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.25 12:20}
+\edef\contextversion{2014.01.26 16:07}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv
index 11707bb74..85d70046d 100644
--- a/tex/context/base/publ-ini.mkiv
+++ b/tex/context/base/publ-ini.mkiv
@@ -325,9 +325,6 @@
\newtoks \everysetupbtxlistplacement % name will change
\newtoks \everysetupbtxciteplacement % name will change
-\def\btxlistnumberbox
- {\hbox \ifzeropt\d_publ_number_width\else to \d_publ_number_width\fi}
-
% \def\publ_list_processor % bibref -> btx (old method, keep as reference)
% {\ctxcommand{btxaddtolist("\currentbtxrendering",\currentlistindex,"btxref")}}
@@ -432,9 +429,7 @@
btxdataset = "\currentbtxdataset",
}}%
% next we analyze the width
- \ifx\btx_reference_inject_indeed\relax
- % nothing
- \else
+ \ifx\btx_reference_inject_indeed\relax \else
\edef\p_width{\btxrenderingparameter\c!width}%
\ifx\p_width\v!auto
\scratchcounter\btxcounter
@@ -497,20 +492,16 @@
\par}
\unexpanded\def\btx_reference_inject % we can use a faster \reference
- {\btxlistnumberbox\bgroup
- % \btxlistvariantparameter\c!left
+ {\dontleavehmode\begingroup % no box
\iftrialtypesetting\else
\ctxcommand{btxdestination("\currentbtxdataset","\currentbtxblock","\currentbtxtag","\number\btxcounter")}%
\fi
\btx_reference_inject_indeed
- % \btxlistvariantparameter\c!right
- \egroup}
+ \endgroup}
\unexpanded\def\btx_reference_checked
- {\btxlistnumberbox\bgroup
- % \btxlistvariantparameter\c!left
+ {\dontleavehmode\hbox\bgroup
\btx_reference_inject_indeed
- % \btxlistvariantparameter\c!right
\egroup}
\setuvalue{\??btxnumbering\v!short }{\btxlistvariant{short}} % these will be setups
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 3244dda25..a0a749cf8 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 b157e10b2..d3deb278c 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 669457de7..43116df4a 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/25/14 12:20:02
+-- merge date : 01/26/14 16:07:37
do -- begin closure to overcome local limits and interference