diff options
| author | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-09-23 11:04:57 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-09-23 11:04:57 +0200 |
| commit | 9858ddd23d54c56b2ce9e1f5580190d3210d18ed (patch) | |
| tree | a73afdfc043fae5b69367c89ec2d7f3fa56a870f /tex/context/base/mkiv/font-fil.mkvi | |
| parent | e713d5aa882024dc438506c2f75eae6c5021a237 (diff) | |
| download | context-9858ddd23d54c56b2ce9e1f5580190d3210d18ed.tar.gz | |
2016-09-23 10:19:00
Diffstat (limited to 'tex/context/base/mkiv/font-fil.mkvi')
| -rw-r--r-- | tex/context/base/mkiv/font-fil.mkvi | 97 |
1 files changed, 56 insertions, 41 deletions
diff --git a/tex/context/base/mkiv/font-fil.mkvi b/tex/context/base/mkiv/font-fil.mkvi index 0bfc07b6c..26751531b 100644 --- a/tex/context/base/mkiv/font-fil.mkvi +++ b/tex/context/base/mkiv/font-fil.mkvi @@ -185,53 +185,68 @@ % todo: replace * by ... less messy with features -\def\truefontname#name% - {\expandafter\font_helpers_true_fontname#name*\empty*\relax} - -\def\font_helpers_true_fontname#name*#first#rest*#crap\relax - {\ifcsname\??fontfile\fontclass#name\endcsname - \ifx#first\empty - %\expandafter\truefontname\csname\??fontfile\fontclass#name\endcsname - \expandafter\truefontname\lastnamedcs - \else - %\expandafter\font_helpers_true_fontname_check\csname\??fontfile\fontclass#name\endcsname*#first#rest% - \expandafter\font_helpers_true_fontname_check\lastnamedcs*#first#rest% - \fi - \else\ifcsname\??fontfile\defaultfontclass#name\endcsname - \ifx#first\empty - %\expandafter\truefontname\csname\??fontfile\defaultfontclass#name\endcsname - \expandafter\truefontname\lastnamedcs - \else - %\expandafter\font_helpers_true_fontname_check\csname\??fontfile\defaultfontclass#name\endcsname*#first#rest% - \expandafter\font_helpers_true_fontname_check\lastnamedcs*#first#rest% - \fi - \else\ifcsname\??fontfile#name\endcsname - \ifx#first\empty - %\expandafter\truefontname\csname\??fontfile#name\endcsname - \expandafter\truefontname\lastnamedcs - \else - %\expandafter\font_helpers_true_fontname_check\csname\??fontfile#name\endcsname*#first#rest% - \expandafter\font_helpers_true_fontname_check\lastnamedcs*#first#rest% - \fi - \else - #name\ifx#first\empty\else*#first#rest\fi - \fi\fi\fi} +% \def\truefontname#name% +% {\expandafter\font_helpers_true_fontname#name*\empty*\relax} +% +% \def\font_helpers_true_fontname#name*#first#rest*#crap\relax +% {\ifcsname\??fontfile\fontclass#name\endcsname +% \ifx#first\empty +% %\expandafter\truefontname\csname\??fontfile\fontclass#name\endcsname +% \expandafter\truefontname\lastnamedcs +% \else +% %\expandafter\font_helpers_true_fontname_check\csname\??fontfile\fontclass#name\endcsname*#first#rest% +% \expandafter\font_helpers_true_fontname_check\lastnamedcs*#first#rest% +% \fi +% \else\ifcsname\??fontfile\defaultfontclass#name\endcsname +% \ifx#first\empty +% %\expandafter\truefontname\csname\??fontfile\defaultfontclass#name\endcsname +% \expandafter\truefontname\lastnamedcs +% \else +% %\expandafter\font_helpers_true_fontname_check\csname\??fontfile\defaultfontclass#name\endcsname*#first#rest% +% \expandafter\font_helpers_true_fontname_check\lastnamedcs*#first#rest% +% \fi +% \else\ifcsname\??fontfile#name\endcsname +% \ifx#first\empty +% %\expandafter\truefontname\csname\??fontfile#name\endcsname +% \expandafter\truefontname\lastnamedcs +% \else +% %\expandafter\font_helpers_true_fontname_check\csname\??fontfile#name\endcsname*#first#rest% +% \expandafter\font_helpers_true_fontname_check\lastnamedcs*#first#rest% +% \fi +% \else +% #name\ifx#first\empty\else*#first#rest\fi +% \fi\fi\fi} +% +% \def\font_helpers_true_fontname_check#name% +% {\expandafter\font_helpers_true_fontname_check_indeed#name*\relax} +% +% \def\font_helpers_true_fontname_check_indeed#name*#crap\relax +% {\ifcsname\??fontfile\fontclass#name\endcsname +% %\expandafter\font_helpers_true_fontname_check\csname\??fontfile\fontclass#name\endcsname +% \expandafter\font_helpers_true_fontname_check\lastnamedcs +% \else\ifcsname\??fontfile\defaultfontclass#name\endcsname +% %\expandafter\font_helpers_true_fontname_check\csname\??fontfile\defaultfontclass#name\endcsname +% \expandafter\font_helpers_true_fontname_check\lastnamedcs +% \else\ifcsname\??fontfile#name\endcsname +% %\expandafter\font_helpers_true_fontname_check\csname\??fontfile#name\endcsname +% \expandafter\font_helpers_true_fontname_check\lastnamedcs +% \else +% #name% +% \fi\fi\fi} -\def\font_helpers_true_fontname_check#name% - {\expandafter\font_helpers_true_fontname_check_indeed#name*\relax} +\def\truefontname#name% + %{\normalexpanded{\noexpand\font_helpers_true_fontname{\clf_truefontname{#name}}}} + {\expandafter\expandafter\expandafter\font_helpers_true_fontname\expandafter\expandafter\expandafter{\clf_truefontname{#name}}} -\def\font_helpers_true_fontname_check_indeed#name*#crap\relax +\def\font_helpers_true_fontname#name% {\ifcsname\??fontfile\fontclass#name\endcsname - %\expandafter\font_helpers_true_fontname_check\csname\??fontfile\fontclass#name\endcsname - \expandafter\font_helpers_true_fontname_check\lastnamedcs + \expandafter\font_helpers_true_fontname\expandafter{\lastnamedcs}% \else\ifcsname\??fontfile\defaultfontclass#name\endcsname - %\expandafter\font_helpers_true_fontname_check\csname\??fontfile\defaultfontclass#name\endcsname - \expandafter\font_helpers_true_fontname_check\lastnamedcs + \expandafter\font_helpers_true_fontname\expandafter{\lastnamedcs}% \else\ifcsname\??fontfile#name\endcsname - %\expandafter\font_helpers_true_fontname_check\csname\??fontfile#name\endcsname - \expandafter\font_helpers_true_fontname_check\lastnamedcs + \expandafter\font_helpers_true_fontname\expandafter{\lastnamedcs}% \else - #name% + \clf_truefontname{#name}% \fi\fi\fi} \def\expandfontsynonym#command#name% one level expansion |