diff options
author | Hans Hagen <pragma@wxs.nl> | 2020-07-05 23:34:31 +0200 |
---|---|---|
committer | Context Git Mirror Bot <phg@phi-gamma.net> | 2020-07-05 23:34:31 +0200 |
commit | f6e05e8759bcf6db94d40b9d9ee0beb268f0347c (patch) | |
tree | 960cfdb3fffa4a80816f91b396f1e00b5782d757 /tex/context/base/mkiv/spac-ver.mkxl | |
parent | 6034a3118b282600abea776e41df31ed2b91c686 (diff) | |
download | context-f6e05e8759bcf6db94d40b9d9ee0beb268f0347c.tar.gz |
2020-07-05 23:03:00
Diffstat (limited to 'tex/context/base/mkiv/spac-ver.mkxl')
-rw-r--r-- | tex/context/base/mkiv/spac-ver.mkxl | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tex/context/base/mkiv/spac-ver.mkxl b/tex/context/base/mkiv/spac-ver.mkxl index b69c1d33c..d5f85569a 100644 --- a/tex/context/base/mkiv/spac-ver.mkxl +++ b/tex/context/base/mkiv/spac-ver.mkxl @@ -738,19 +738,19 @@ \unexpanded\def\setmaxdepth {\maxdepth\systemmaxdepthfactor\globalbodyfontsize} -\let\normalbaselineskip \relax \newskip \normalbaselineskip % these got lost in the transition to mkiv due -\let\normallineskip \relax \newskip \normallineskip % to auto-\normal* definitions and registers -\let\normallineskiplimit\relax \newdimen\normallineskiplimit % being protected +\newskip \usedbaselineskip % These used to be \normal... but that isn't pretty +\newskip \usedlineskip % in the token interface, so thes few now have new +\newdimen\usedlineskiplimit % names. They are public but not really user commands. \unexpanded\def\normalbaselines - {\baselineskip \normalbaselineskip - \lineskip \normallineskip - \lineskiplimit\normallineskiplimit} + {\baselineskip \usedbaselineskip + \lineskip \usedlineskip + \lineskiplimit\usedlineskiplimit} \unexpanded\def\flexiblebaselines - {\baselineskip \normalbaselineskip - \lineskip 1\normallineskip \s!plus 1\s!fill - \lineskiplimit\normallineskiplimit} + {\baselineskip \usedbaselineskip + \lineskip 1\usedlineskip \s!plus 1\s!fill + \lineskiplimit\usedlineskiplimit} \unexpanded\def\setnormalbaselines {\ifdim\normallineheight>\zeropoint @@ -770,13 +770,13 @@ \ifdim\dimexpr\minimumstrutdepth+\minimumstrutheight\relax>\zeropoint \openlineheight\dimexpr\openstrutheight+\openstrutdepth\relax % new \fi - \normalbaselineskip\openlineheight + \usedbaselineskip\openlineheight \ifgridsnapping\else \s!plus \m_spac_vertical_baseline_stretch_factor\openlineheight \s!minus\m_spac_vertical_baseline_shrink_factor \openlineheight \fi - \normallineskip\minimumlinedistance\relax % \onepoint\relax - \normallineskiplimit\zeropoint\relax + \usedlineskip\minimumlinedistance\relax % \onepoint\relax + \usedlineskiplimit\zeropoint\relax \normalbaselines} \unexpanded\def\spacing#1% vertical @@ -818,9 +818,9 @@ \openstrutheight \the\openstrutheight \openstrutdepth \the\openstrutdepth \openlineheight \the\openlineheight - \normalbaselineskip \the\normalbaselineskip - \normallineskip \the\normallineskip - \normallineskiplimit\the\normallineskiplimit + \usedbaselineskip \the\usedbaselineskip + \usedlineskip \the\usedlineskip + \usedlineskiplimit \the\usedlineskiplimit \noexpand\def\noexpand\normallineheight{\the\dimexpr\normallineheight}% \noexpand\normalbaselines}} |