2018-03-10 15:02:00

1 files changed, 14 insertions, 2 deletions

diff --git a/tex/context/base/mkiv/spac-ver.mkiv b/tex/context/base/mkiv/spac-ver.mkiv
index 98e46fa39..a1bc0559f 100644
--- a/tex/context/base/mkiv/spac-ver.mkiv
+++ b/tex/context/base/mkiv/spac-ver.mkiv
@@ -1956,6 +1956,7 @@
 
 \newconditional\c_space_vspacing_done
 \newconditional\c_space_vspacing_fixed
+\newconditional\c_space_ignore_parskip
 
 \appendtoks
     \s_spac_vspacing_temp\zeropoint
@@ -1978,6 +1979,9 @@
     \relax
 \to \everyafterblankhandling
 
+\unexpanded\def\setblankpacked
+  {\settrue\c_space_ignore_parskip}
+
 \unexpanded\def\setblankcategory#1%
   {\settrue\c_space_vspacing_done
    \attribute\skipcategoryattribute#1\relax}
@@ -2016,6 +2020,7 @@
 \def\dostartblankhandling
   {\begingroup
    \setfalse\c_space_vspacing_done
+   \setfalse\c_space_ignore_parskip
    \the\everybeforeblankhandling}
 
 \unexpanded\def\stopblankhandling
@@ -2023,7 +2028,11 @@
    \ifconditional\c_space_vspacing_done
      \vskip\s_spac_vspacing_temp
    \fi
-   \endgroup}
+   \ifconditional\c_space_ignore_parskip
+     \endgroup\ignoreparskip
+   \else
+     \endgroup
+   \fi}
 
 \unexpanded\def\flushblankhandling
   {\the\everyafterblankhandling
@@ -2210,10 +2219,13 @@
 \definevspacing[\v!disable]   [category:5]
 \definevspacing[\v!nowhite]   [category:6]
 \definevspacing[\v!back]      [category:7]
-%               together      [category:8]
+\definevspacing[\v!packed]    [category:8]  % noparskip (kind of special)
 \definevspacing[\v!overlay]   [category:9]
 \definevspacing[\v!enable]    [category:10]
 
+%definevspacing[\v!noparskip] [category:8]
+%definevspacing[\v!notopskip] [category:11]
+
 \definevspacing[\v!weak]      [order:0]
 \definevspacing[\v!strong]    [order:100]