diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/font-run.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/font-run.mkiv | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/context/base/font-run.mkiv b/Master/texmf-dist/tex/context/base/font-run.mkiv index 7a6764ac8a0..b346de5e1c6 100644 --- a/Master/texmf-dist/tex/context/base/font-run.mkiv +++ b/Master/texmf-dist/tex/context/base/font-run.mkiv @@ -6,7 +6,7 @@ %D subtitle=Runtime Macros, %D author=Hans Hagen, %D date=\currentdate, -%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] %C %C This module is part of the \CONTEXT\ macro||package and is %C therefore copyrighted by \PRAGMA. See mreadme.pdf for @@ -77,14 +77,15 @@ \vbox {\dosetshowfonttitle{#1}% \def\next##1% - {&&\getvalue{\bodyfontvariable{##1\s!text}}% - &&\getvalue{\bodyfontvariable{##1\s!script}}% - &&\getvalue{\bodyfontvariable{##1\s!scriptscript}}% - &&\getvalue{\bodyfontvariable{##1\c!x}}% - &&\getvalue{\bodyfontvariable{##1\c!xx}}% - &&\getvalue{\bodyfontvariable{##1\interfaced\v!small}}% - &&\getvalue{\bodyfontvariable{##1\interfaced\v!big}}% - &&\edef\next{\getvalue{\bodyfontvariable{##1\c!interlinespace}}}\ifx\next\empty not set\else\next\fi&\cr + {&&\bodyfontsizevariable{##1}\s!text + &&\bodyfontsizevariable{##1}\s!script + &&\bodyfontsizevariable{##1}\s!scriptscript + &&\bodyfontsizevariable{##1}\s!x + &&\bodyfontsizevariable{##1}\s!xx + &&\bodyfontsizevariable{##1}\v!small + &&\bodyfontsizevariable{##1}\v!big + &&\bodyfontsizevariable{##1}\c!interlinespace + &\cr \noalign{\hrule}} \halign to \localhsize {##&\vrule##\strut @@ -97,7 +98,7 @@ &\multispan{17}{\vrule\hfil\tttf\strut\title\hfil}\vrule\cr \noalign{\hrule} &&\tttf\tx\s!text&&\tttf\tx\s!script&&\tttf\tx\s!scriptscript - &&\tttf\tx\c!x&&\tttf\tx\c!xx&&\tttf\tx\v!small&&\tttf\tx\v!big + &&\tttf\tx\s!x&&\tttf\tx\s!xx&&\tttf\tx\v!small&&\tttf\tx\v!big &&\tttf\tx\c!interlinespace&\cr \noalign{\hrule} \@EA\globalprocesscommalist\@EA[\bodyfontenvironmentlist]\next}} @@ -209,24 +210,22 @@ \gdef\redoshowfontstyle {\dotripleempty \dododoshowfontstyle} \gdef\redodoshowfontstyle{\doquadrupleempty\dodododoshowfontstyle} +% no lists any more, so no 'all' any longer + \gdef\dodoshowfontstyle[#1][#2]% - {\doifelse{#2}\v!all - {\dodoshowfontstyle[#1][\c!rm,\c!ss,\c!tt,\c!mm]} - {\doifelsenothing{#2} - {\redoshowfontstyle[#1][\c!rm,\c!ss,\c!tt,\c!mm]} - {\redoshowfontstyle[#1][#2]}}} + {\doifelsenothing{#2} + {\redoshowfontstyle[#1][\s!rm,\s!ss,\s!tt,\s!mm]} + {\redoshowfontstyle[#1][#2]}} \gdef\dododoshowfontstyle[#1][#2][#3]% - {\doifelse{#3}\v!all - {\redodoshowfontstyle[#1][#2][\fontalternativelist]} - {\doifelsenothing{#3} - {\redodoshowfontstyle[#1][#2][\fontalternativelist]} - {\redodoshowfontstyle[#1][#2][#3]}}} + {\doifelsenothing{#3} + {\redodoshowfontstyle[#1][#2][\s!tf,\s!bf,\s!it,\s!sl,\s!bs,\s!bi]} + {\redodoshowfontstyle[#1][#2][#3]}} \gdef\dodododoshowfontstyle[#1][#2][#3][#4]% - {\doifelsenothing{#4} - {\doshowfontstyleindeed[#1][#2][#3][\v!all]} - {\doshowfontstyleindeed[#1][#2][#3][#4]}} + {\doshowfontstyleindeed[#1][#2][#3][#4]} + +% so far \gdef\doshowfontstyleindeed[#1][#2][#3][#4]% {\bgroup |