diff options
author | Norbert Preining <preining@logic.at> | 2019-02-24 15:12:57 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2019-02-24 15:12:57 +0000 |
commit | 1314fbe93790c501dc436a5cf99f106b9e5c0f63 (patch) | |
tree | 04dc7734c8be8ffe385d41f4388826ef5857b6f9 /Master/texmf-dist/tex/context/base/mkiv/font-sty.mkvi | |
parent | eb80ce7b34f59896a1dfee5ca422495394d6677f (diff) |
Revert "ConTeXt version 2019.02.22 19:35"
This reverts commit 5c6357cdb820b4f628d036ba7b2248f221d50c0b.
git-svn-id: svn://tug.org/texlive/trunk@50112 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/font-sty.mkvi')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/font-sty.mkvi | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/font-sty.mkvi b/Master/texmf-dist/tex/context/base/mkiv/font-sty.mkvi index 8200aa95748..2d00c5ec814 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/font-sty.mkvi +++ b/Master/texmf-dist/tex/context/base/mkiv/font-sty.mkvi @@ -59,17 +59,17 @@ \newconstant\c_fonts_basics_alternative_style_method \def\font_basics_define_alternative_style_indeed#variantone#varianttwo#command% - {\setuvalue{\??alternativestyle#command}{\font_helpers_apply_alternative_style{#variantone}{#varianttwo}}% + {\setvalue{\??alternativestyle#command}{\font_helpers_apply_alternative_style{#variantone}{#varianttwo}}% \ifcsname#command\endcsname % no redefinition \else\ifnum\c_fonts_basics_alternative_style_method=\plusone \ifthirdargument - \setuevalue{#command}{\triggergroupedcommandcs\begincsname\??alternativestyle#command\endcsname}% + \setuevalue{#command}{\groupedcommand{\expandafter\noexpand\begincsname\??alternativestyle#command\endcsname}{}}% \else - \setuvalue{#command}{\triggergroupedcommand{#variantone}}% + \setuvalue{#command}{\groupedcommand{#variantone}{}}% \fi \else - \setuvalue{#command}{\triggergroupedcommand{#variantone}}% + \setuvalue{#command}{\groupedcommand{#variantone}{}}% \fi\fi} \def\font_helpers_apply_alternative_style @@ -279,26 +279,17 @@ \fi\fi \endcsname{#name}} -% \setvalue{\??styleargument1}#name% -% {\groupedcommand{\begincsname#name\endcsname}{}} - \setvalue{\??styleargument1}#name% - {\expandafter\triggergroupedcommandcs\begincsname#name\endcsname} - -% \setvalue{\??styleargument2}#name% -% {\groupedcommand{\font_styles_use_defined{#name}}{}} % or {\font_styles_apply_grouped{#name}} + {\groupedcommand{\csname#name\endcsname}{}} \setvalue{\??styleargument2}#name% - {\triggergroupedcommand{\font_styles_use_defined{#name}}} % or {\font_styles_apply_grouped{#name}} + {\groupedcommand{\font_styles_use_defined{#name}}{}} % or {\font_styles_apply_grouped{#name}} \setvalue{\??styleargument3}#specification% {\doifelseassignment{#specification}\font_styles_assignment\font_styles_direct{#specification}} -% \def\font_styles_assignment#specification{\groupedcommand{\font_styles_use_generic{#specification}}{}} -% \def\font_styles_direct #specification{\groupedcommand{\definedfont[#specification]}{}} - -\def\font_styles_assignment#specification{\triggergroupedcommand{\font_styles_use_generic{#specification}}} -\def\font_styles_direct #specification{\triggergroupedcommand{\definedfont[#specification]}} +\def\font_styles_assignment#specification{\groupedcommand{\font_styles_use_generic{#specification}}{}} +\def\font_styles_direct #specification{\groupedcommand{\definedfont[#specification]}{}} % environments |