summaryrefslogtreecommitdiff
path: root/tex/context/base/mkiv/font-sty.mkvi
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2018-05-17 19:01:59 +0200
committerContext Git Mirror Bot <phg42.2a@gmail.com>2018-05-17 19:01:59 +0200
commit2e8819dad63db17febca68fd6b7ba9a06f9c50b5 (patch)
treef5aa568ff0149001855d6899a91ab3f9984b2dd7 /tex/context/base/mkiv/font-sty.mkvi
parent77e216e323271fb85d508b7206b13c980540b74b (diff)
downloadcontext-2e8819dad63db17febca68fd6b7ba9a06f9c50b5.tar.gz
2018-05-17 18:39:00
Diffstat (limited to 'tex/context/base/mkiv/font-sty.mkvi')
-rw-r--r--tex/context/base/mkiv/font-sty.mkvi25
1 files changed, 17 insertions, 8 deletions
diff --git a/tex/context/base/mkiv/font-sty.mkvi b/tex/context/base/mkiv/font-sty.mkvi
index 2d00c5ec8..8200aa957 100644
--- a/tex/context/base/mkiv/font-sty.mkvi
+++ b/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%
- {\setvalue{\??alternativestyle#command}{\font_helpers_apply_alternative_style{#variantone}{#varianttwo}}%
+ {\setuvalue{\??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}{\groupedcommand{\expandafter\noexpand\begincsname\??alternativestyle#command\endcsname}{}}%
+ \setuevalue{#command}{\triggergroupedcommandcs\begincsname\??alternativestyle#command\endcsname}%
\else
- \setuvalue{#command}{\groupedcommand{#variantone}{}}%
+ \setuvalue{#command}{\triggergroupedcommand{#variantone}}%
\fi
\else
- \setuvalue{#command}{\groupedcommand{#variantone}{}}%
+ \setuvalue{#command}{\triggergroupedcommand{#variantone}}%
\fi\fi}
\def\font_helpers_apply_alternative_style
@@ -279,17 +279,26 @@
\fi\fi
\endcsname{#name}}
+% \setvalue{\??styleargument1}#name%
+% {\groupedcommand{\begincsname#name\endcsname}{}}
+
\setvalue{\??styleargument1}#name%
- {\groupedcommand{\csname#name\endcsname}{}}
+ {\expandafter\triggergroupedcommandcs\begincsname#name\endcsname}
+
+% \setvalue{\??styleargument2}#name%
+% {\groupedcommand{\font_styles_use_defined{#name}}{}} % or {\font_styles_apply_grouped{#name}}
\setvalue{\??styleargument2}#name%
- {\groupedcommand{\font_styles_use_defined{#name}}{}} % or {\font_styles_apply_grouped{#name}}
+ {\triggergroupedcommand{\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{\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]}}
% environments