2015-04-29 19:33:00

1 files changed, 17 insertions, 25 deletions

diff --git a/tex/context/base/publ-imp-list.mkvi b/tex/context/base/publ-imp-list.mkvi
index e13294f6f..61432486b 100644
--- a/tex/context/base/publ-imp-list.mkvi
+++ b/tex/context/base/publ-imp-list.mkvi
@@ -30,17 +30,10 @@
 \stoptexdefinition
 
 \starttexdefinition btx:list:helpers:concat
-  % \ifcase\currentbtxconcat \or \or
-  %     \btxparameter\c!pubsep
-  % \or
-  %     \btxparameter\c!finalpubsep
-  % \or
-  %     \btxparameter\c!lastpubsep
-  % \fi
     \space
 \stoptexdefinition
 
-\startsetups \s!btx:\s!list:page
+\startsetups[\s!btx:\s!list:\s!page]
     \texdefinition{\s!btx:\s!list:concat}
     \texdefinition{\s!btx:\s!list:inject} {
         % real pagenumber: todo, userpage
@@ -50,39 +43,38 @@
     }
 \stopsetups
 
-\startsetups \s!btx:\s!list:numbering
-    \btxparameter\c!left
+\startsetups[\s!btx:\s!list:\s!numbering]
     \texdefinition {\s!btx:\s!list:inject} {
         \currentbtxfirst
         \btxparameter\c!stopper
     }
-    \btxparameter\c!right
 \stopsetups
 
-\startsetups \s!btx:\s!list:num
-    \btxstartstyleandcolor [\currentbtxspecification:list:num]
-        \btxusecommand[\currentbtxspecification:list:num] {
-            \fastsetup{\s!btx:\s!list:numbering}
+\startsetups[\s!btx:\s!list:\s!numbering:num]
+    \btxstartstyleandcolor [\currentbtxspecification:\s!list:\s!numbering:num]
+        \btxusecommand[\currentbtxspecification:\s!list:\s!numbering:num] {
+            \fastsetup{\s!btx:\s!list:\s!numbering}
         }
     \btxstopstyleandcolor
 \stopsetups
 
-\startsetups \s!btx:\s!list:yes
-    \fastsetup{\s!btx:\s!list:num}
+\startsetups[\s!btx:\s!list:\s!numbering:\v!yes]
+    \fastsetup{\s!btx:\s!list:\s!numbering:num}
 \stopsetups
 
-\startsetups \s!btx:\s!list:short
-    \btxstartstyleandcolor [\currentbtxspecification:list:short]
-        \btxusecommand[\currentbtxspecification:list:short] {
-            \fastsetup{\s!btx:\s!list:numbering}
+\startsetups[\s!btx:\s!list:\s!numbering:short]
+    \btxstartstyleandcolor [\currentbtxspecification:\s!list:\s!numbering:short]
+        \btxusecommand [\currentbtxspecification:\s!list:\s!numbering:short] {
+            \fastsetup{\s!btx:\s!list:\s!numbering}
+            \btxflushsuffix
         }
     \btxstopstyleandcolor
 \stopsetups
 
-\startsetups \s!btx:\s!list:bib
-    \btxstartstyleandcolor [\currentbtxspecification:list:bib]
-        \btxusecommand[\currentbtxspecification:list:bib] {
-            \fastsetup{\s!btx:\s!list:numbering}
+\startsetups[\s!btx:\s!list:\s!numbering:bib]
+    \btxstartstyleandcolor [\currentbtxspecification:\s!list:\s!numbering:bib]
+        \btxusecommand [\currentbtxspecification:\s!list:\s!numbering:bib] {
+            \fastsetup{\s!btx:\s!list:\s!numbering}
         }
     \btxstopstyleandcolor
 \stopsetups