diff options
| author | Hans Hagen <pragma@wxs.nl> | 2020-11-13 19:32:53 +0100 |
|---|---|---|
| committer | Context Git Mirror Bot <phg@phi-gamma.net> | 2020-11-13 19:32:53 +0100 |
| commit | 87bd04a46f60bb925f6c98b7977f30441f5e8944 (patch) | |
| tree | 04ec7563791138d0cb3663eeeaa6db33631139ac /tex/context/base/mkiv/spac-ver.mkxl | |
| parent | 2f803b924ffdfc6ecedd2cce775c05d7d0d3acfd (diff) | |
| download | context-87bd04a46f60bb925f6c98b7977f30441f5e8944.tar.gz | |
2020-11-13 19:11:00
Diffstat (limited to 'tex/context/base/mkiv/spac-ver.mkxl')
| -rw-r--r-- | tex/context/base/mkiv/spac-ver.mkxl | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/tex/context/base/mkiv/spac-ver.mkxl b/tex/context/base/mkiv/spac-ver.mkxl index 7a4688791..fd9b5d7dd 100644 --- a/tex/context/base/mkiv/spac-ver.mkxl +++ b/tex/context/base/mkiv/spac-ver.mkxl @@ -2581,7 +2581,7 @@ % experimental (for the moment only for hh and ws) %def\vspacingfromscratchtoks {\scratchdimen\dimexpr\csname\??vspacingamount\the\scratchtoks\endcsname\relax} -\def\vspacingpredefinedvalue#1{\scratchdimen\dimexpr\csname\??vspacingamount#1\endcsname\relax} +\def\vspacingpredefinedvalue#1{\scratchskip\glueexpr\csname\??vspacingamount#1\endcsname\relax} %def\vspacingfromtempstring {\scratchdimen\dimexpr\csname\??vspacingamount\tempstring\endcsname\relax} \let\spac_vspacing_yes_indeed_old\spac_vspacing_yes_indeed @@ -2606,21 +2606,29 @@ \protected\def\directvskip_new #1{\ifmmode\else\par\ifvmode\clf_injectvskip #1\relax\fi\fi} \protected\def\inhibitblank_new {\ifmmode\else\par\ifvmode\clf_injectdisable \fi\fi} -\installtexdirective - {vspacing.experimental} +% we need to ensure \enforced + +\def\spac_vspacing_temp_yes {\writestatus{vspacing}{enabling experimental handler}% - \let\spac_vspacing_yes_indeed\spac_vspacing_yes_indeed_new - \let\spac_vspacing_nop_indeed\spac_vspacing_nop_indeed_new + \enforced\let\spac_vspacing_yes_indeed\spac_vspacing_yes_indeed_new + \enforced\let\spac_vspacing_nop_indeed\spac_vspacing_nop_indeed_new \enforced\let\directvspacing\directvspacing_new \enforced\let\directvpenalty\directvpenalty_new \enforced\let\directvskip\directvskip_new \enforced\let\inhibitblank\inhibitblank_new} + +\def\spac_vspacing_temp_nop {\writestatus{vspacing}{disabling experimental handler}% - \let\spac_vspacing_yes_indeed\spac_vspacing_yes_indeed_old - \let\spac_vspacing_nop_indeed\spac_vspacing_nop_indeed_old + \enforced\let\spac_vspacing_yes_indeed\spac_vspacing_yes_indeed_old + \enforced\let\spac_vspacing_nop_indeed\spac_vspacing_nop_indeed_old \enforced\let\directvspacing\directvspacing_old \enforced\let\directvpenalty\directvpenalty_old \enforced\let\directvskip\directvskip_old \enforced\let\inhibitblank\inhibitblank_old} +\installtexdirective + {vspacing.experimental} + {\spac_vspacing_temp_yes} + {\spac_vspacing_temp_nop} + \protect \endinput |