stable 2012.05.30 11:26

1 files changed, 12 insertions, 13 deletions

diff --git a/tex/context/base/typo-cap.mkiv b/tex/context/base/typo-cap.mkiv
index feab6b35d..28ced7c42 100644
--- a/tex/context/base/typo-cap.mkiv
+++ b/tex/context/base/typo-cap.mkiv
@@ -183,22 +183,21 @@
 %D
 %D \showsetup{setupcapitals}
 
-\installcorenamespace{capitals}
+\let\normalsmallcapped\smallcapped
 
-\installsetuponlycommandhandler \??capitals {capitals}
+\definesystemvariable{kk}
 
-\let\normalsmallcapped\smallcapped
+\unexpanded\def\setupcapitals
+  {\dosingleempty\typo_capitals_setup}
 
-\appendtoks
-    \doifelse{\directcapitalsparameter\c!title}\v!yes
-      {\definealternativestyle[\v!capital  ][\normalsmallcapped][\normalsmallcapped]%
-       \definealternativestyle[\v!smallcaps][\sc               ][\sc               ]}
-      {\definealternativestyle[\v!capital  ][\normalsmallcapped][\normalWORD       ]%
-       \definealternativestyle[\v!smallcaps][\sc               ][\normalWORD       ]}%
-    \doifelse{\directcapitalsparameter\s!sc}\v!yes
-      \userealcaps
-      \usepseudocaps
-\to \everysetupcapitals
+\def\typo_capitals_setup[#1]% todo: don't use grouping just a switch
+  {\getparameters[\??kk][#1]%
+   \doifelse\@@kktitle\v!yes
+     {\definealternativestyle[\v!capital  ][\normalsmallcapped][\normalsmallcapped]%
+      \definealternativestyle[\v!smallcaps][\sc               ][\sc               ]}
+     {\definealternativestyle[\v!capital  ][\normalsmallcapped][\normalWORD       ]%
+      \definealternativestyle[\v!smallcaps][\sc               ][\normalWORD       ]}%
+   \doifelse\@@kksc\v!yes\userealcaps\usepseudocaps}
 
 \let\uppercased\normalWORD
 \let\lowercased\normalword