1 files changed, 17 insertions, 7 deletions
diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv
index 7f89e306e..96b5eb422 100644
--- a/tex/context/base/publ-ini.mkiv
+++ b/tex/context/base/publ-ini.mkiv
@@ -313,9 +313,6 @@
 \unexpanded\def\setbtxentry[#1]%
   {\edef\currentbtxtag{\ctxcommand{setbtxentry("\currentbtxdataset","#1")}}}
 
-\setbtxdataset
-  [\v!standard]
-
 % \let\btxsetdataset\setbtxdataset
 % \let\btxsetentry  \setbtxentry
 
@@ -536,8 +533,13 @@
 
 \def\publ_place_list_complete[#1][#2]% title might become obsolete, just headtext
   {\begingroup
-   \edef\currentbtxrendering{#1}%
-   \setupcurrentbtxrendering[#2]%
+   \ifsecondargument
+     \edef\currentbtxrendering{#1}%
+     \setupcurrentbtxrendering[#2]%
+   \else\iffirstargument
+     \let\currentbtxrendering\currentbtxdataset
+     \setupcurrentbtxrendering[#1]%
+   \fi\fi
    \the\everybtxlistrendering
    \edef\currentbtxrenderingtitle{\btxrenderingparameter\c!title}%
    \ifx\currentbtxrenderingtitle\empty
@@ -551,8 +553,13 @@
 
 \def\publ_place_list_standard[#1][#2]%
   {\begingroup
-   \edef\currentbtxrendering{#1}%
-   \setupcurrentbtxrendering[#2]%
+   \ifsecondargument
+     \edef\currentbtxrendering{#1}%
+     \setupcurrentbtxrendering[#2]%
+   \else\iffirstargument
+     \let\currentbtxrendering\currentbtxdataset
+     \setupcurrentbtxrendering[#1]%
+   \fi\fi
    \the\everybtxlistrendering
    \publ_place_list_indeed
    \endgroup}
@@ -1052,6 +1059,9 @@
 
 %D Defaults:
 
+\setbtxdataset
+  [\v!standard]
+
 \setupbtxrendering
   [\c!dataset=\v!standard,
    \c!repeat=\v!no,