diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/core-ver.tex')
-rw-r--r-- | Master/texmf-dist/tex/context/base/core-ver.tex | 48 |
1 files changed, 31 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/context/base/core-ver.tex b/Master/texmf-dist/tex/context/base/core-ver.tex index 8623dffef51..93fa96944c4 100644 --- a/Master/texmf-dist/tex/context/base/core-ver.tex +++ b/Master/texmf-dist/tex/context/base/core-ver.tex @@ -293,7 +293,7 @@ \def\obeyhyphens {\def\obeyedspace {\hskip\interwordspace}% better than spaceskip - \def\controlspace{\hskip\zeropoint\hbox{\char32}\hskip\zeropoint}% + \def\controlspace{\hskip\zeropoint\hbox{\normalcontrolspace}\hskip\zeropoint}% \spaceskip.25em\relax} % hm a bit of stretch ! \def\obeybreakpoints @@ -302,7 +302,7 @@ \def\ignorehyphens {\def\obeyedspace {\null\hskip\interwordspace\null}% better than spaceskip - \def\controlspace{\null\hskip\zeropoint\hbox{\char32}\hskip\zeropoint\null}% + \def\controlspace{\null\hskip\zeropoint\hbox{\normalcontrolspace}\hskip\zeropoint\null}% \spaceskip.5em\relax} \unexpanded\def\typ @@ -558,18 +558,32 @@ %D Since we support a global color too, the folowing %D definition is better: -\def\setupverbatimcolor% fast and local versus slow and global - {\doifelsenothing{\typingparameter\c!color} - {\def\beginofpretty[##1]{\startcolormode{\prettypalet:##1}}% - \let\endofpretty \restorecolormode % \stopcolormode - \let\startverbatimcolor \relax - \let\stopverbatimcolor \relax - \let\verbatimcolor \relax} - {\def\beginofpretty[##1]{\startcolor[\prettypalet:##1]}% - \let\endofpretty \stopcolor - \def\startverbatimcolor{\startcolor[\typingparameter\c!color]}% - \let\stopverbatimcolor \stopcolor - \def\verbatimcolor {\getvalue{\typingparameter\c!color}}}% command ! +% \def\setupverbatimcolor% fast and local versus slow and global +% {\doifelsenothing{\typingparameter\c!color} +% {\def\beginofpretty[##1]{\startcolormode{\prettypalet:##1}}% +% \let\endofpretty \restorecolormode % \stopcolormode +% \let\startverbatimcolor \relax +% \let\stopverbatimcolor \relax +% \let\verbatimcolor \relax} +% {\def\beginofpretty[##1]{\startcolor[\prettypalet:##1]}% +% \let\endofpretty \stopcolor +% \def\startverbatimcolor{\startcolor[\typingparameter\c!color]}% +% \let\stopverbatimcolor \stopcolor +% \def\verbatimcolor {\getvalue{\typingparameter\c!color}}}% command ! +% \doifelsenothing{\typingparameter\c!palet} +% {\let\prettypalet\empty +% \let\endofpretty\relax +% \def\beginofpretty[##1]{}} +% {\edef\prettypalet{\prettyidentifier\typingparameter\c!palet}}} +% +% let's forget about this optimization not that we have mkiv + +\def\setupverbatimcolor + {\def\beginofpretty[##1]{\startcolor[\prettypalet:##1]}% + \let\endofpretty \stopcolor + \def\startverbatimcolor{\startcolor[\typingparameter\c!color]}% + \let\stopverbatimcolor \stopcolor + \def\verbatimcolor {\getvalue{\typingparameter\c!color}}% command ! \doifelsenothing{\typingparameter\c!palet} {\let\prettypalet\empty \let\endofpretty\relax @@ -747,7 +761,7 @@ \def\reporttypingerror#1% temp hack {\blank \dontleavehmode\hbox\bgroup - \expanded{\convertargument#1}\to\ascii + \expanded{\defconvertedargument\noexpand\ascii{#1}}% \tttf[\makemessage\m!verbatims1\ascii]% \showmessage\m!verbatims1\ascii \egroup @@ -812,7 +826,7 @@ %D %D The definition is not that spectacular. -\unexpanded\def\filename#1{{\tttf\hyphenatedfile{#1}}} +\unexpanded\def\filename#1{{\tttf\hyphenatedfilename{#1}}} %D This leaves some settings: @@ -821,7 +835,7 @@ %D And a bonus macro: -\def\verbatim#1{\convertargument#1\to\ascii\ascii} +\def\verbatim#1{\defconvertedargument\ascii{#1}\ascii} %D Plugins |