diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/spac-ver.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/spac-ver.mkiv | 114 |
1 files changed, 51 insertions, 63 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/spac-ver.mkiv b/Master/texmf-dist/tex/context/base/mkiv/spac-ver.mkiv index 6ed1847c577..3f330a267f4 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/spac-ver.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/spac-ver.mkiv @@ -66,7 +66,7 @@ \def\normalskipamount {\openlineheight - \ifgridsnapping \else \ifblankflexible + \ifgridsnapping \else \ifconditional\c_spac_whitespace_flexible \s!plus \skipgluefactor\openlineheight \s!minus\skipgluefactor\openlineheight \fi \fi @@ -166,17 +166,11 @@ \installmacrostack\currentinterlinespace \unexpanded\def\setupinterlinespace - {\dodoubleempty\spac_linespacing_setup} + {\dosingleempty\spac_linespacing_setup} -\ifdefined\setupinterlinespace_double \else - \let\setupinterlinespace_double\setup_interlinespace % for a while -\fi - -\def\spac_linespacing_setup[#1][#2]% +\def\spac_linespacing_setup[#1]% {\settrue\interlinespaceisset % reset has to be done when needed - \ifsecondargument - \setupinterlinespace_double[#1][#2]% - \else\iffirstargument + \iffirstargument \ifcsname\namedinterlinespacehash{#1}\s!parent\endcsname \edef\currentinterlinespace{#1}% \spac_linespacing_setup_specified_interline_space @@ -187,7 +181,7 @@ \else \let\currentinterlinespace\empty \spac_linespacing_synchronize_local - \fi\fi} + \fi} \def\spac_linespacing_setup_specified_or_relative[#1]% {\doifelseassignment{#1}\setupspecifiedinterlinespace\setuprelativeinterlinespace[#1]% @@ -738,19 +732,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 +\newskip \usedlineskip +\newdimen\usedlineskiplimit \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 +764,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 +812,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}} @@ -1351,11 +1345,6 @@ \let\oninterlineskip\relax -\unexpanded\def\leaveoutervmode - {\ifvmode\ifinner\else - \leavevmode - \fi\fi} - \unexpanded\def\resetpenalties#1% {\ifdefined#1% #1\minusone @@ -1500,14 +1489,14 @@ \newdimen \globalbodyfontstrutheight \newdimen \globalbodyfontstrutdepth -\def\snappedvboxattribute{\ifgridsnapping attr \snapvboxattribute \attribute\snapmethodattribute\fi} -\def\setlocalgridsnapping{\ifgridsnapping \attribute \snapvboxattribute \attribute\snapmethodattribute\fi} +\def\snappedvboxattribute{\ifgridsnapping attr\snapvboxattribute\c_attr_snapmethod\fi} +\def\setlocalgridsnapping{\ifgridsnapping \c_attr_snapvbox \c_attr_snapmethod\fi} \def\spac_grids_set_local_snapping#1% {\ifgridsnapping \doifsomething{#1}% {\spac_grids_snap_value_set{#1}% - \attribute \snapvboxattribute \attribute\snapmethodattribute}% + \c_attr_snapvbox\c_attr_snapmethod}% \fi} % \unexpanded\def\installsnapvalues#1#2% todo: a proper define @@ -1515,7 +1504,7 @@ % \ifcsname\??gridsnapperattributes\currentsnapper\endcsname \else % \setevalue{\??gridsnapperattributes\currentsnapper}{\clf_definesnapmethod{#1}{#2}}% % \fi -% \setevalue{\??gridsnappers#1}{\attribute\snapmethodattribute\csname\??gridsnapperattributes\currentsnapper\endcsname\space}} +% \setevalue{\??gridsnappers#1}{\c_attr_snapmethod\csname\??gridsnapperattributes\currentsnapper\endcsname\space}} \def\spac_grids_expand_snapper#1% {\edef\m_spac_snapper @@ -1534,7 +1523,7 @@ \scratchcounter\clf_definesnapmethod{#1}{\m_spac_snapper}% \setevalue{\??gridsnapperattributes\currentsnapper}{\the\scratchcounter}% \fi - \setevalue{\??gridsnappers#1}{\attribute\snapmethodattribute\the\scratchcounter\relax}% + \setevalue{\??gridsnappers#1}{\c_attr_snapmethod\the\scratchcounter\relax}% \letvalue{\??gridsnappersets#1}\m_spac_snapper} \def\theexpandedsnapperset#1{\begincsname\??gridsnappersets#1\endcsname} % only for manuals @@ -1542,10 +1531,10 @@ \unexpanded\def\usegridparameter#1% no checking here {\edef\m_spac_grid_asked{#1\c!grid}% \ifx\m_spac_grid_asked\empty - \attribute \snapvboxattribute\attributeunsetvalue + \c_attr_snapvbox\attributeunsetvalue \else \spac_grids_snap_value_set\m_spac_grid_asked - \attribute \snapvboxattribute\attribute\snapmethodattribute + \c_attr_snapvbox\c_attr_snapmethod \fi} \unexpanded\def\definegridsnapping @@ -1556,7 +1545,7 @@ \edef\spac_grids_snap_value_reset {%\gridsnappingfalse - \attribute\snapmethodattribute\attributeunsetvalue} + \c_attr_snapmethod\attributeunsetvalue} \def\spac_grids_snap_value_set#1% {%\gridsnappingtrue @@ -1605,9 +1594,9 @@ %D We're not downward compatible with \MKII ! Not yet in interface file: -\definegridsnapping[\v!normal] [\v!maxheight,\v!maxdepth,\v!strut] -\definegridsnapping[\v!standard] [\v!maxheight,\v!maxdepth,\v!strut] -\definegridsnapping[\v!yes] [\v!maxheight,\v!maxdepth,\v!strut] +\definegridsnapping[\v!normal] [\v!maxheight,\v!maxdepth,\v!strut] +\definegridsnapping[\v!standard] [\v!maxheight,\v!maxdepth,\v!strut] +\definegridsnapping[\v!yes] [\v!maxheight,\v!maxdepth,\v!strut] \definegridsnapping[\v!strict] [\v!maxdepth:0.8,\v!maxheight:0.8,\v!strut] \definegridsnapping[\v!tolerant] [\v!maxdepth:1.2,\v!maxheight:1.2,\v!strut] @@ -1717,7 +1706,7 @@ \clf_vspacingcollapse\nextbox\relax % isn't that already done? \fi \doifelsenothing{#1}{\spac_grids_snap_value_set\v!normal}{\spac_grids_snap_value_set{#1}}% - \clf_vspacingsnap\nextbox\attribute\snapmethodattribute\relax + \clf_vspacingsnap\nextbox\c_attr_snapmethod\relax \ifvbox\nextbox\vbox\else\hbox\fi attr \snapmethodattribute \zerocount {\box\nextbox}% no pack (?), we snap \egroup} @@ -1883,11 +1872,8 @@ %D This has become obsolete: -\def\fuzzysnappedbox#1#2% \box<n> \unvbox<n> - {#1#2} - -\def\moveboxontogrid#1#2#3% will become obsolete, but it needs checking - {} +% \def\moveboxontogrid#1#2#3% will become obsolete, but it needs checking +% {} %D Helper: @@ -1948,7 +1934,7 @@ \clf_vspacingsetamount{#1}} \def\spac_vspacing_no_topskip % use grouped - {\attribute\skipcategoryattribute\plusten} + {\c_attr_skipcategory\pluseleven} % \installcorenamespace{vspacingamountnormal} % \installcorenamespace{vspacingamountgrid} @@ -1979,9 +1965,9 @@ \appendtoks \s_spac_vspacing_temp\zeropoint - \attribute\skipcategoryattribute\plusone - \attribute\skippenaltyattribute \attributeunsetvalue - \attribute\skiporderattribute \attributeunsetvalue + \c_attr_skipcategory\plusone + \c_attr_skippenalty \attributeunsetvalue + \c_attr_skiporder \attributeunsetvalue \ifgridsnapping \settrue\c_space_vspacing_fixed \else @@ -2003,10 +1989,10 @@ \unexpanded\def\setblankcategory#1% {\settrue\c_space_vspacing_done - \attribute\skipcategoryattribute#1\relax} + \c_attr_skipcategory#1\relax} \unexpanded\def\setblankorder#1% - {\attribute\skiporderattribute#1\relax} + {\c_attr_skiporder#1\relax} \unexpanded\def\fixedblankskip {\settrue\c_space_vspacing_fixed} @@ -2021,8 +2007,8 @@ \unexpanded\def\setblankpenalty#1% {\flushblankhandling \settrue\c_space_vspacing_done - \attribute\skipcategoryattribute \plusthree - \attribute\skippenaltyattribute #1\relax + \c_attr_skipcategory\plusthree + \c_attr_skippenalty #1\relax \flushblankhandling} \unexpanded\def\startblankhandling % move this to \vspacing @@ -2181,17 +2167,17 @@ \unexpanded\def\directvpenalty#1% {\begingroup - \attribute\skipcategoryattribute \plusthree - \attribute\skippenaltyattribute #1\relax - \attribute\skiporderattribute \attributeunsetvalue + \c_attr_skipcategory\plusthree + \c_attr_skippenalty #1\relax + \c_attr_skiporder \attributeunsetvalue \vskip\zeropoint \endgroup} \unexpanded\def\directvskip#1% {\begingroup - \attribute\skipcategoryattribute \plusone - \attribute\skippenaltyattribute \attributeunsetvalue - \attribute\skiporderattribute \attributeunsetvalue + \c_attr_skipcategory\plusone + \c_attr_skippenalty \attributeunsetvalue + \c_attr_skiporder \attributeunsetvalue \vskip#1\relax \endgroup} @@ -2343,7 +2329,7 @@ \unexpanded\def\inhibitblank {\ifvmode \begingroup - \attribute\skipcategoryattribute\plusfive + \c_attr_skipcategory\plusfive \vskip\zeropoint \endgroup \fi} @@ -2655,6 +2641,8 @@ % test \par % test \par +% only main vertical list + \unexpanded\def\ignoreparskip{\c_spac_vspacing_ignore_parskip\plusone} \protect \endinput |