diff options
author | Karl Berry <karl@freefriends.org> | 2021-03-06 21:58:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-03-06 21:58:15 +0000 |
commit | 974640d66e61e81cb197ad96fdff7b08343e4c5a (patch) | |
tree | 2e1f75f32f312b7f24ba82b4590ae230bcd6f399 /Master/texmf-dist/tex/context/base/mkiv/spac-ali.mkiv | |
parent | b4fa72e61230aca75f7f6fbf988821f71edfb6b2 (diff) |
context
git-svn-id: svn://tug.org/texlive/trunk@58167 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/spac-ali.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/spac-ali.mkiv | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/spac-ali.mkiv b/Master/texmf-dist/tex/context/base/mkiv/spac-ali.mkiv index 8451e2494f9..2467f83525b 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/spac-ali.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/spac-ali.mkiv @@ -33,11 +33,11 @@ \definesystemattribute[alignstate][public] % will make a single attributes for several states \appendtoks - \attribute\realignattribute \attributeunsetvalue - \attribute\alignstateattribute\attributeunsetvalue + \c_attr_realign \attributeunsetvalue + \c_attr_alignstate\attributeunsetvalue \to \everyforgetall -\unexpanded\def\resetrealignsignal{\attribute\realignattribute\attributeunsetvalue} +\unexpanded\def\resetrealignsignal{\c_attr_realign\attributeunsetvalue} \unexpanded\def\signalinnerrealign{\clf_setrealign\plustwo} \unexpanded\def\signalouterrealign{\clf_setrealign\plusone} @@ -293,7 +293,7 @@ \unexpanded\def\spac_align_set_horizontal_none % should also relax \updateraggedskips {\raggedstatus\zerocount - \attribute\alignstateattribute\attributeunsetvalue + \c_attr_alignstate\attributeunsetvalue \leftskip \plusone\leftskip \rightskip \plusone\rightskip \spaceskip \zeropoint @@ -305,7 +305,7 @@ \unexpanded\def\spac_align_set_horizontal_left {\setraggedness\spac_align_set_raggedness_left \raggedstatus\plusone - \attribute\alignstateattribute\plusone + \c_attr_alignstate\plusone \leftskip \plusone\leftskip \s!plus\spac_align_set_raggedness_left \rightskip \plusone\rightskip\s!plus\zeropoint \spaceskip \v_spac_align_space_amount @@ -317,7 +317,7 @@ \unexpanded\def\spac_align_set_horizontal_center {\setraggedness\spac_align_set_raggedness_middle \raggedstatus\plustwo - \attribute\alignstateattribute\plustwo + \c_attr_alignstate\plustwo \leftskip \plusone\leftskip \s!plus\spac_align_set_raggedness_middle \rightskip \plusone\rightskip\s!plus\spac_align_set_raggedness_middle \spaceskip \v_spac_align_space_amount @@ -329,7 +329,7 @@ \unexpanded\def\spac_align_set_horizontal_right {\setraggedness\spac_align_set_raggedness_right \raggedstatus\plusthree - \attribute\alignstateattribute\plusthree + \c_attr_alignstate\plusthree \leftskip \plusone\leftskip \s!plus\zeropoint \rightskip \plusone\rightskip\s!plus\spac_align_set_raggedness_right \spaceskip \v_spac_align_space_amount @@ -340,7 +340,7 @@ \unexpanded\def\spac_align_set_horizontal_very_left {\raggedstatus\plusone - \attribute\alignstateattribute\plusone + \c_attr_alignstate\plusone \leftskip \plusone\leftskip \s!plus\v_spac_align_fill_amount \rightskip \plusone\rightskip\s!plus\zeropoint \spaceskip \v_spac_align_space_amount @@ -351,7 +351,7 @@ \unexpanded\def\spac_align_set_horizontal_very_center {\raggedstatus\plustwo - \attribute\alignstateattribute\plustwo + \c_attr_alignstate\plustwo \leftskip \plusone\leftskip \s!plus\v_spac_align_fill_amount \rightskip \plusone\rightskip\s!plus\v_spac_align_fill_amount \spaceskip \v_spac_align_space_amount @@ -362,7 +362,7 @@ \unexpanded\def\spac_align_set_horizontal_very_right {\raggedstatus\plusthree - \attribute\alignstateattribute\plusthree + \c_attr_alignstate\plusthree \leftskip \plusone\leftskip \s!plus\zeropoint \rightskip \plusone\rightskip\s!plus\v_spac_align_fill_amount \spaceskip \v_spac_align_space_amount @@ -374,7 +374,7 @@ \unexpanded\def\spac_align_set_horizontal_wide_center {\setraggedness\spac_align_set_raggedness_middle \raggedstatus\plustwo - \attribute\alignstateattribute\plustwo + \c_attr_alignstate\plustwo \leftskip \plusone\leftskip \s!plus\v_spac_align_fill_amount_half \rightskip \plusone\rightskip\s!plus\v_spac_align_fill_amount_half \spaceskip \v_spac_align_space_amount @@ -385,7 +385,7 @@ \unexpanded\def\spac_align_set_horizontal_centered_last_line {\raggedstatus\zerocount - \attribute\alignstateattribute\attributeunsetvalue + \c_attr_alignstate\attributeunsetvalue \leftskip \plusone\leftskip \s!plus\v_spac_align_fill_amount\relax \rightskip \plusone\rightskip\s!plus\v_spac_align_fill_amount_negative\relax \spaceskip \zeropoint\relax @@ -396,7 +396,7 @@ \unexpanded\def\spac_align_set_horizontal_flushedright_last_line {\raggedstatus\zerocount - \attribute\alignstateattribute\attributeunsetvalue + \c_attr_alignstate\attributeunsetvalue \leftskip \plusone\leftskip \s!plus\v_spac_align_fill_amount\relax \rightskip \plusone\rightskip\s!plus\v_spac_align_fill_amount_negative\relax \spaceskip \zeropoint\relax @@ -410,7 +410,7 @@ \unexpanded\def\spac_align_set_horizontal_right_tt % a plain command {\tttf % brrr \raggedstatus\plusthree - \attribute\alignstateattribute\plusthree + \c_attr_alignstate\plusthree \leftskip \plusone\leftskip \s!plus\zeropoint\relax \rightskip \plusone\rightskip\s!plus\spac_align_set_raggedness_right\relax \spaceskip \zeropoint\relax @@ -797,7 +797,7 @@ \unexpanded\def\ibox {\vbox\bgroup \forgetall - \let\\=\endgraf + \let\\\endgraf \ifdoublesided\signalinnerrealign\fi \doifelserightpage\spac_align_set_horizontal_right\spac_align_set_horizontal_left \let\next} @@ -805,9 +805,9 @@ \unexpanded\def\obox {\vbox\bgroup \forgetall - \let\\=\endgraf + \let\\\endgraf \ifdoublesided\signalouterrealign\fi - \doifelserightpage\c_spac_align_state_horizontal_left\spac_align_set_horizontal_right + \doifelserightpage\spac_align_set_horizontal_left\spac_align_set_horizontal_right \let\next} \let\raggedbox\relax @@ -882,7 +882,7 @@ \xspaceskip #5\relax \parfillskip \zeropoint\s!plus#6\relax \parindent #7\relax - \attribute\alignstateattribute\ifcase\raggedstatus\attributeunsetvalue\else\raggedstatus\fi} + \c_attr_alignstate\ifcase\raggedstatus\attributeunsetvalue\else\raggedstatus\fi} % older (context) names: @@ -956,7 +956,7 @@ \dontleavehmode % added in marrakesch at TUG 2006\begingroup \begingroup \setlocalhsize % new - \def\\{\egroup\par\doalignline{#1}{#2}\bgroup}% + \protected\def\\{\egroup\par\doalignline{#1}{#2}\bgroup}% \dowithnextbox {\hbox to \localhsize {\ifcase\alignstrutmode\or\strut\fi @@ -1036,7 +1036,7 @@ \dontleavehmode % added in marrakesch at TUG 2006\begingroup \begingroup \setlocalhsize - \def\\{\egroup\par\doxalignline#1#2#3#4#5#6\bgroup}% inefficient + \protected\def\\{\egroup\par\doxalignline#1#2#3#4#5#6\bgroup}% inefficient \dowithnextbox {\hbox to \localhsize {#1\hskip\ifdone#2\else#3\fi#4% @@ -1230,10 +1230,6 @@ \setvalue{\??reverse\v!normal }{\ifconditional\inlinelefttoright\else\s!reverse\fi} \setvalue{\??reverse\v!reverse}{\ifconditional\inlinelefttoright \s!reverse\fi} -\ifcase\contextlmtxmode - \let\usedirectionparameterreverse\gobbleoneargument -\else - \def\usedirectionparameterreverse#1{\begincsname\??reverse#1\c!direction\endcsname} -\fi +\let\usedirectionparameterreverse\gobbleoneargument \protect \endinput |