summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2013-03-27 23:38:22 +0100
committerPhilipp Gesang <phg@phi-gamma.net>2013-03-27 23:38:22 +0100
commit0f4d3d3932149016d2bf1919ad82823a7212d121 (patch)
tree9b61910bc8d0a076817eb2bc2d0755b964f1cbee /tex
parentbf831fa4f6fcaa8b00982f3d8e84b58fbbbba43e (diff)
downloadt-letterspace-0f4d3d3932149016d2bf1919ad82823a7212d121.tar.gz
adapt to mkvi
Diffstat (limited to 'tex')
-rw-r--r--tex/context/interface/third/t-letterspace.xml8
-rw-r--r--tex/context/third/letterspace/t-letterspace.mkvi (renamed from tex/context/third/letterspace/t-letterspace.mkiv)42
2 files changed, 25 insertions, 25 deletions
diff --git a/tex/context/interface/third/t-letterspace.xml b/tex/context/interface/third/t-letterspace.xml
index bac1f3f..945e59a 100644
--- a/tex/context/interface/third/t-letterspace.xml
+++ b/tex/context/interface/third/t-letterspace.xml
@@ -3,9 +3,9 @@
<cd:interface xmlns:cd="http://www.pragma-ade.com/commands"
name="context"
language="en"
- version="2011-03-16T10:30:36+0100">
+ version="2013-03-27 23:12:17+0100">
- <cd:command name="setupletterspace" file="t-letterspace.mkiv">
+ <cd:command name="setupletterspace" file="t-letterspace.mkvi">
<cd:sequence>
<cd:string value="setupletterspace"/>
</cd:sequence>
@@ -44,7 +44,7 @@
</cd:arguments>
</cd:command>
- <cd:command name="letterspace" generated="yes" file="t-letterspace.mkiv">
+ <cd:command name="letterspace" generated="yes" file="t-letterspace.mkvi">
<cd:sequence>
<cd:variable value="letterspace"/>
</cd:sequence>
@@ -56,7 +56,7 @@
</cd:arguments>
</cd:command>
- <cd:command name="letterspace" generated="yes" type="environment" file="t-letterspace.mkiv">
+ <cd:command name="letterspace" generated="yes" type="environment" file="t-letterspace.mkvi">
<cd:sequence>
<cd:variable value="letterspace"/>
</cd:sequence>
diff --git a/tex/context/third/letterspace/t-letterspace.mkiv b/tex/context/third/letterspace/t-letterspace.mkvi
index 03c2e0d..f84b509 100644
--- a/tex/context/third/letterspace/t-letterspace.mkiv
+++ b/tex/context/third/letterspace/t-letterspace.mkvi
@@ -46,32 +46,32 @@
%D You’ll have to thank him if it works and blame me if it doesn’t.
\appendtoks
- \setuevalue{\currentletterspace }{\doletterspace[\currentletterspace]}%
- \setuevalue{\e!start\currentletterspace}{\dostartletterspace[\currentletterspace]}%
- \setuevalue{\e!stop \currentletterspace}{\dostopletterspace}%
+ \setuevalue{\currentletterspace }{\letterspace_cmd[\currentletterspace]}%
+ \setuevalue{\e!start\currentletterspace}{\letterspace_env_start[\currentletterspace]}%
+ \setuevalue{\e!stop \currentletterspace}{\letterspace_env_stop}%
\to \everydefineletterspace
\definecharacterkerning [letterspace:current]
-\unexpanded\def\doletterspace[#1]{%
- \edef\currentletterspace{#1}%
- \dosingleempty\dodoletterspace%
+\unexpanded\def\letterspace_cmd[#id]{%
+ \edef\currentletterspace{#id}%
+ \dosingleempty\letterspace_cmd_parameters%
}
-\def\dodoletterspace[#1]{%
+\def\letterspace_cmd_parameters[#parms]{%
\iffirstargument
- \doifassignmentelse{#1}{%
- \setupletterspace[\currentletterspace][#1]%
+ \doifassignmentelse{#parms}{%
+ \setupletterspace[\currentletterspace][#parms]%
}\relax
\fi
- \dododoletterspace%
+ \letterspace_cmd_content%
}
\definefontfeature [letterspace:kerning] [kern=yes]
\def\letterspace_truevalues{true,yep,yes}
-\def\dododoletterspace#1{%
- \def\currentobject{#1}%
+\def\letterspace_cmd_content#obj{%
+ \def\currentobject{#obj}%
\dontleavehmode
\setupcharacterkerning[letterspace:current][factor=\letterspaceparameter{factor}]%
\def\letterspace_setstuff{%
@@ -107,8 +107,8 @@
%D token being anything else -- \type{\letterspace} will proceed
%D without changing anything.
-\def\doifnextspace#1{%
- \def\!!string{#1}%
+\def\doifnextspace#tok{%
+ \def\!!string{#tok}%
\futurelet\nexttoken\inspectnexttoken%
}
@@ -127,19 +127,19 @@
%D The \type{\[start|stop]letterspace} environment is provided
%D for sake of completeness.
-\unexpanded\def\dostartletterspace[#1]{%
- \edef\currentletterspace{#1}%
- \dosingleempty\dodostartletterspace%
+\unexpanded\def\letterspace_env_start[#id]{%
+ \edef\currentletterspace{#id}%
+ \dosingleempty\letterspace_env_start_indeed%
}
-\def\dodostartletterspace[#1]{%
+\def\letterspace_env_start_indeed[#parms]{%
\iffirstargument
- \setupletterspace[\currentletterspace][#1]%
+ \setupletterspace[\currentletterspace][#parms]%
\fi
- \dododoletterspace\bgroup%
+ \letterspace_cmd_content\bgroup%
}
-\let\dostopletterspace\egroup
+\let\letterspace_env_stop\egroup
%D \macros
%D {setupletterspace}