beta 2014.01.25 02:31

7 files changed, 47 insertions, 6 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 7cd5791f9..11682f175 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 01:44}
+\newcontextversion{2014.01.25 02:31}
 
 %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 6fe52c591..ce794cc6d 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 3177cd70f..ae6b43418 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 01:44}
+\edef\contextversion{2014.01.25 02:31}
 \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 ee544ad9b..11707bb74 100644
--- a/tex/context/base/publ-ini.mkiv
+++ b/tex/context/base/publ-ini.mkiv
@@ -112,7 +112,7 @@
     \ifx\currentbtxlistparent\empty
         \letvalue{\??constructionmain\currentbtxlist}\currentbtxlist
     \else
-        \letvalue{\??constructionmain\currentbtxlist}\currentbtxparent
+        \letvalue{\??constructionmain\currentbtxlist}\currentbtxlistparent
     \fi
     \setevalue{\??constructionlevel\currentbtxlist}{\number\btxlistparameter\c!level}%
     \setevalue{\??constructionclass\currentbtxlist}{\btxlistparameter\s!handler}%
@@ -122,6 +122,41 @@
   [\s!handler=\v!btxlist,
    \c!level=1]
 
+\setupbtxlist
+  [\c!alternative=\v!left,
+   \c!headstyle=,
+   \c!titlestyle=,
+  %\c!style=,
+  %\c!color=,
+  %\c!headcolor=,
+  %\c!titlecolor=,
+   \c!width=4\emwidth,
+   \c!distance=\emwidth,
+  %\c!titledistance=.5\emwidth,
+  %\c!hang=,
+  %\c!sample=,
+  %\c!align=,
+  %\c!headalign=,
+   \c!margin=\v!no,
+   \c!before=\blank,
+   \c!inbetween=\blank,
+   \c!after=\blank,
+   \c!indentnext=\v!yes,
+   \c!indenting=\v!never,
+  %\c!titleleft=(,
+  %\c!titleright=),
+  %\c!closesymbol=,
+  %\c!closecommand=\wordright,
+   \c!display=\v!yes,
+  %\c!command=,
+   \c!titlecommand=,
+  %\c!expansion=\v!no,
+  %\c!xmlsetup=,
+  %\s!catcodes=,
+  %\c!title=\v!yes,
+  %\c!text=,
+  ]
+
 % here starts the bib stuff
 
 \installcorenamespace {btxdataset}
@@ -304,8 +339,14 @@
   [\c!state=\v!start]%
 
 \appendtoks
-    \definebtxlist
-      [\currentbtxrendering]%
+    \ifx\currentbtxrenderingparent\empty
+        \definebtxlist
+          [\currentbtxrendering]%
+    \else
+        \definebtxlist
+          [\currentbtxrendering]%
+          [\currentbtxrenderingparent]%
+    \fi
 \to \everydefinebtxrendering
 
 \unexpanded\def\btx_entry_inject
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 61b38c046..888715735 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
index fa11c6428..31722b134 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 e90447c18..40e25a6c4 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 01:44:16
+-- merge date  : 01/25/14 02:31:45
 
 do -- begin closure to overcome local limits and interference