1 files changed, 15 insertions, 13 deletions
diff --git a/tex/context/base/pack-com.mkiv b/tex/context/base/pack-com.mkiv
index 2c28d6b20..b734d6028 100644
--- a/tex/context/base/pack-com.mkiv
+++ b/tex/context/base/pack-com.mkiv
@@ -178,7 +178,7 @@
 \unexpanded\def\pack_common_caption_stop {\removeunwantedspaces\egroup}
 
 \unexpanded\def\stopcombination
-  {\bgroup\normalexpanded{\egroup{}\ctxcommand{ntimes("{}{}",\number\c_pack_combinations_n)}}% brr
+  {\bgroup\normalexpanded{\egroup{}\ntimes{{}{}}\c_pack_combinations_n}% brr
    \dostoptagged
    \egroup
    \egroup}
@@ -191,19 +191,19 @@
    \edef\currentcombination{#1}%
    \edef\currentcombinationspec{#2}%
    \ifx\currentcombinationspec\empty
-     \doifassignmentelse{#1}%
+     \doifelseassignment{#1}%
        {\let\currentcombination\empty
         \setupcurrentcombination[#1]%
         \edef\currentcombinationspec{\combinationparameter\c!nx*\combinationparameter\c!ny*}}
-       {\doifinstringelse{*}\currentcombination
+       {\doifelseinstring{*}\currentcombination
           {\edef\currentcombinationspec{\currentcombination*\plusone*}%
            \let\currentcombination\empty}
-          {\doifnumberelse\currentcombination
+          {\doifelsenumber\currentcombination
              {\edef\currentcombinationspec{\currentcombination*\plusone*}%
               \let\currentcombination\empty}
              {\edef\currentcombinationspec{\combinationparameter\c!nx*\combinationparameter\c!ny*}}}}%
    \else
-     \doifassignmentelse{#2}%
+     \doifelseassignment{#2}%
        {\setupcurrentcombination[#2]%
         \edef\currentcombinationspec{\combinationparameter\c!nx*\combinationparameter\c!ny*}}
        {\edef\currentcombinationspec{\currentcombinationspec*\plusone*}}%
@@ -221,13 +221,12 @@
    \edef\p_height  {\combinationparameter\c!height}%
    \edef\p_width   {\combinationparameter\c!width}%
    \edef\p_location{\combinationparameter\c!location}%
-   \edef\p_align   {\combinationparameter\c!align}%
    \edef\p_distance{\combinationparameter\c!distance}%
    %
    \pack_combinations_location_reset
    \rawprocesscommacommand[\p_location]\pack_combinations_location_step
    %
-   \dostarttagged\t!combination\currentcombination
+   \dostarttaggedchained\t!combination\currentcombination\??combination
    \vbox \ifx\p_height\v!fit\else to \p_height \fi \bgroup
    \let\combination\empty % permits \combination{}{} handy for cld
    \normalexpanded{\pack_combinations_start_indeed[\currentcombinationspec]}}
@@ -295,7 +294,7 @@
 \def\pack_combinations_alternative_label_indeed
   {\dowithnextboxcs\pack_combinations_pickup_caption\vtop\bgroup
      \hsize\wd\b_pack_combinations_content
-     \ifx\p_align\empty\else\setupalign[\p_align]\fi
+     \usealignparameter\combinationparameter
      \usecombinationstyleandcolor\c!style\c!color
      \begstrut
        \normalexpanded{\strc_labels_command{\v!combination\ifx\currentcombination\empty\else:\currentcombination\fi}}%
@@ -324,15 +323,18 @@
 \def\pack_combinations_caption_second
   {\ifx\nexttoken\egroup
      % the caption is empty
+   \else\ifx\nexttoken\stopcaption
+     % the caption is empty (new per 2014-05-24)
    \else
+     % todo: \p_pack_combinations_alternative\v!none: no style, strut etc
      \hsize\wd\b_pack_combinations_content
-     \ifx\p_align\empty\else\setupalign[\p_align]\fi
+     \usealignparameter\combinationparameter
      \usecombinationstyleandcolor\c!style\c!color
      \bgroup
      \aftergroup\endstrut
      \aftergroup\egroup
      \begstrut
-   \fi}
+   \fi\fi}
 
 \def\pack_combinations_pickup_package_pair % we need to store the caption row
   {\vbox
@@ -626,12 +628,12 @@
 \unexpanded\def\placepairedbox[#1]%
   {\bgroup
    \edef\currentpairedbox{#1}%
-   \doifnextoptionalelse\pack_pairedboxes_place\pack_pairedboxes_place_indeed}
+   \doifelsenextoptionalcs\pack_pairedboxes_place\pack_pairedboxes_place_indeed}
 
 \unexpanded\def\startplacepairedbox[#1]%
   {\bgroup
    \edef\currentpairedbox{#1}%
-   \doifnextoptionalelse\pack_pairedboxes_place\pack_pairedboxes_place_indeed}
+   \doifelsenextoptionalcs\pack_pairedboxes_place\pack_pairedboxes_place_indeed}
 
 \unexpanded\def\stopplacepairedbox
   {}
@@ -780,7 +782,7 @@
    \fi}
 
 \def\pack_pairedboxes_between
-  {\switchtobodyfont[\pairedboxparameter\c!bodyfont]% split under same regime
+  {\usebodyfontparameter\pairedboxparameter
    \setbox\b_pack_pairedboxes_first\box\nextbox
    \ifconditional\c_pack_pairedboxes_horizontal
      \pack_pairedboxes_between_horizontal