beta 2010.08.10 17:14

1 files changed, 11 insertions, 9 deletions

diff --git a/tex/context/base/strc-des.mkiv b/tex/context/base/strc-des.mkiv
index 42ea701f0..d528ffae9 100644
--- a/tex/context/base/strc-des.mkiv
+++ b/tex/context/base/strc-des.mkiv
@@ -374,13 +374,14 @@
 
 \def\@@stopdescription
   {\@@placedescriptionclosesymbol
-   \par % else we loose
-\dostoptagged
-\dostoptagged
+   \doifnot{\descriptionparameter\c!display}\v!no\par
+   \dostoptagged
+   \dostoptagged
    \endgroup
    \descriptionparameter\c!after % which currentdescription is taken here?
-   \egroup % temporary hack
-   \checknextindentation[\descriptionparameter\c!indentnext]
+   \normalexpanded
+     {\egroup % temporary hack
+      \noexpand\checknextindentation[\descriptionparameter\c!indentnext]}%
    \dorechecknextindentation}
 
 \def\@@dodescription
@@ -422,12 +423,12 @@
    \ifcsname @@description\currentdescriptionlocation\endcsname \else
      \let\currentdescriptionlocation\v!left
    \fi
-\dostarttagged\t!description\currentdescription
-\dostarttagged\t!descriptiontag\empty
+   \dostarttagged\t!description\currentdescription
+   \dostarttagged\t!descriptiontag\empty
    \@@dostartdescription
    \csname @@description\currentdescriptionlocation\endcsname
-\dostoptagged
-\dostarttagged\t!descriptioncontent\empty} % args not needed
+   \dostoptagged
+   \dostarttagged\t!descriptioncontent\empty} % args not needed
 
 \def\@@makedescription[#1]#2%
   {\postponenotes % new, assumes grouping
@@ -1048,6 +1049,7 @@
    \c!titleright=),
    \c!closesymbol=,
    \c!closecommand=\wordright,
+   \c!display=\v!yes,
    \c!command=,
    \c!titlecommand=]