summaryrefslogtreecommitdiff
path: root/tex/context/base/typo-del.mkiv
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2012-10-19 01:20:13 +0300
committerMarius <mariausol@gmail.com>2012-10-19 01:20:13 +0300
commit69d2352af4b60929b37fc49f3bdb263977016244 (patch)
treedb5eb11398e345dfa23b4c4500fb93575d2afb7c /tex/context/base/typo-del.mkiv
parentc18f7cbe51449a611ea1819fedd9a4ff18529b7d (diff)
downloadcontext-69d2352af4b60929b37fc49f3bdb263977016244.tar.gz
stable 2012.05.30 11:26
Diffstat (limited to 'tex/context/base/typo-del.mkiv')
-rw-r--r--tex/context/base/typo-del.mkiv31
1 files changed, 12 insertions, 19 deletions
diff --git a/tex/context/base/typo-del.mkiv b/tex/context/base/typo-del.mkiv
index 7c36ef3c8..b2213db65 100644
--- a/tex/context/base/typo-del.mkiv
+++ b/tex/context/base/typo-del.mkiv
@@ -17,19 +17,14 @@
% THIS IS OBSOLETE:
-\installcorenamespace{hyphenmarksign} % let's not waste a setuphandler (yet)
+\unexpanded\def\setuphyphenmark
+ {\dodoubleargument\getparameters[\??kp]}
\unexpanded\def\setuphyphenmark[#1]% sign=normal|wide
- {\getdummyparameters[#1]%
- \expandcheckedcsname\??hyphenmarksign{\dummyparameter\c!sign}\v!normal}
-
-\setvalue{\??hyphenmarksign\v!normal}%
- {\let\textmodehyphen\normalhyphen
- \let\textmodehyphendiscretionary\normalhyphendiscretionary}
-
-\setvalue{\??hyphenmarksign\v!wide}%
- {\let\textmodehyphen\composedhyphen
- \let\textmodehyphendiscretionary\composedhyphendiscretionary}
+ {\dodoubleargument\getparameters[\??kp][#1]%
+ \doifelse\@@kpsign {\v!normal}% was inset?
+ {\let\textmodehyphen\normalhyphen \let\textmodehyphendiscretionary\normalhyphendiscretionary}
+ {\let\textmodehyphen\composedhyphen\let\textmodehyphendiscretionary\composedhyphendiscretionary}}
\setuphyphenmark[\c!sign=\v!wide]
@@ -37,19 +32,19 @@
\definesymbol[\c!righthyphen] [\languageparameter\c!righthyphen]
\definesymbol[\c!hyphen] [\languageparameter\c!hyphen]
-\unexpanded\def\normalhyphen
+\def\normalhyphen
{\hbox{\directsymbol\empty\c!hyphen}}
-\unexpanded\def\composedhyphen
+\def\composedhyphen
{\hbox{\directsymbol\empty\c!compoundhyphen}}
-\unexpanded\def\normalhyphendiscretionary
+\def\normalhyphendiscretionary
{\discretionary
{\hbox{\directsymbol\empty\c!righthyphen}}
{\hbox{\directsymbol\empty\c!lefthyphen}}
{\hbox{\directsymbol\empty\c!hyphen}}}
-\unexpanded\def\composedhyphendiscretionary
+\def\composedhyphendiscretionary
{\discretionary
{\hbox{\directsymbol\empty\c!rightcompoundhyphen}}
{\hbox{\directsymbol\empty\c!leftcompoundhyphen}}
@@ -224,10 +219,8 @@
[\c!middlespeech]
[\leftboundarycharacter\c!middlespeech{speech}]
-\appendtoks
- \def\quotation#1{"#1"}%
- \def\quote #1{'#1'}%
-\to \everysimplifycommands
+\appendtoks\def\quotation#1{"#1"}\to\simplifiedcommands
+\appendtoks\def\quote #1{'#1'}\to\simplifiedcommands
%D The next features was so desperately needed by Giuseppe
%D Bilotta that he made a module for it. Since this is a