beta 2013.10.13 22:46

1 files changed, 13 insertions, 4 deletions

diff --git a/tex/context/base/pack-com.mkiv b/tex/context/base/pack-com.mkiv
index c913b1ca8..bb6e268bc 100644
--- a/tex/context/base/pack-com.mkiv
+++ b/tex/context/base/pack-com.mkiv
@@ -267,10 +267,13 @@
     \edef\p_pack_combinations_alternative{\combinationparameter\c!alternative}%
 \to \everydefinecombination
 
-\def\pack_combinations_pickup % we want to add struts but still ignore an empty box
+\def\pack_combinations_pickup
   {\dostarttagged\t!combinationpair\empty
    \dostarttagged\t!combinationcontent\empty
-   \dowithnextboxcs\pack_combinations_pickup_content\hbox}
+   \assumelongusagecs\pack_combinations_pickup_content_indeed}
+
+\def\pack_combinations_pickup_content_indeed
+  {\dowithnextboxcs\pack_combinations_pickup_content\hbox}
 
 \def\pack_combinations_pickup_content % we want to add struts but still ignore an empty box
   {\dostoptagged
@@ -279,15 +282,21 @@
    \expandnamespacemacro\??combinationalternative\p_pack_combinations_alternative\v!text}
 
 \setvalue{\??combinationalternative\v!text}%
+  {\assumelongusagecs\pack_combinations_alternative_text_indeed}
+
+\setvalue{\??combinationalternative\v!label}%
+  {\assumelongusagecs\pack_combinations_alternative_label_indeed}
+
+\def\pack_combinations_alternative_text_indeed
   {\dowithnextboxcs\pack_combinations_pickup_caption\vtop\bgroup
      \afterassignment\pack_combinations_caption_first
      \let\nexttoken=}
 
-\setvalue{\??combinationalternative\v!label}%
+\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
-     \usecombinationstyleandcolor\c!style\c!color % but label style wins, so independent configuration
+     \usecombinationstyleandcolor\c!style\c!color
      \begstrut
        \normalexpanded{\strc_labels_command{\v!combination\ifx\currentcombination\empty\else:\currentcombination\fi}}%
      \endstrut