1 files changed, 10 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/typo-del.mkiv b/Master/texmf-dist/tex/context/base/mkiv/typo-del.mkiv
index 9320c37ee6f..9720326be14 100644
--- a/Master/texmf-dist/tex/context/base/mkiv/typo-del.mkiv
+++ b/Master/texmf-dist/tex/context/base/mkiv/typo-del.mkiv
@@ -142,8 +142,8 @@
   [\c!rightsubsentence]
   [\rightboundarycharacter\c!rightsubsentence{sentence}]
 
-\newsignal \d_typo_subsentence_signal
-\newcount  \c_typo_subsentence_nesting
+\newsignal\d_typo_subsentence_signal
+\newcount \c_typo_subsentence_nesting
 
 \let\beforesubsentence\donothing
 \let\aftersubsentence \donothing
@@ -179,7 +179,7 @@
    \fi
    \global\advance\c_typo_subsentence_nesting\plusone
    \ifnum\c_typo_subsentence_nesting=\plusone
-     \dontleavehmode % was \leaveoutervmode
+     \dontleavehmode
    \fi
    \dostarttagged\t!subsentence\empty % no chain
    \dostarttagged\t!subsentencesymbol\empty
@@ -420,7 +420,7 @@
    \typo_delimited_push{#1}{#2}%
    \dostarttaggedchained\t!delimitedblock\currentdelimitedtext\??delimitedtext
    \edef\p_delimited_method{\delimitedtextparameter\c!method}%
-   \ifx\p_delimited_method\s!font
+   \ifx\p_delimited_method\v!font
      \expandafter\typo_delimited_start_font
    \else
      \expandafter\typo_delimited_start_other
@@ -524,6 +524,7 @@
    \begingroup
    \usedelimitedtextstyleandcolor\c!style\c!color
    %
+   \begingroup
    \edef\p_delimited_left     {\delimitedtextparameter{\c!left}}%
    \edef\p_delimited_right    {\delimitedtextparameter{\c!right}}%
    \edef\p_delimited_nextleft {\delimitedtextparameter{\c!nextleft}}%
@@ -539,7 +540,10 @@
 \def\typo_delimited_stop_par
   {\typo_delimited_stop_content
    \rightdelimitedtextmark
-   \carryoverpar\endgroup % new per 2013-01-21 ... please left floats
+   \rightdelimitedtextmark
+   \carryoverpar\endgroup
+   \endgraf
+   \endgroup
    \pop_macro_checkindentation
    \typo_delimited_stop_par_indeed
    \delimitedtextparameter\c!after
@@ -575,7 +579,7 @@
   {\dontleavehmode % following ones can be omited
    \typo_delimited_push{#1}{#2}%
    \edef\p_delimited_method{\delimitedtextparameter\c!method}%
-   \ifx\p_delimited_method\s!font
+   \ifx\p_delimited_method\v!font
      \expandafter\typo_delimited_fontdriven
    \else
      \expandafter\typo_delimited_other