diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/typo-del.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/typo-del.mkiv | 58 |
1 files changed, 33 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/context/base/typo-del.mkiv b/Master/texmf-dist/tex/context/base/typo-del.mkiv index b2213db65bb..82cc7472d44 100644 --- a/Master/texmf-dist/tex/context/base/typo-del.mkiv +++ b/Master/texmf-dist/tex/context/base/typo-del.mkiv @@ -17,14 +17,19 @@ % THIS IS OBSOLETE: -\unexpanded\def\setuphyphenmark - {\dodoubleargument\getparameters[\??kp]} +\installcorenamespace{hyphenmarksign} % let's not waste a setuphandler (yet) \unexpanded\def\setuphyphenmark[#1]% sign=normal|wide - {\dodoubleargument\getparameters[\??kp][#1]% - \doifelse\@@kpsign {\v!normal}% was inset? - {\let\textmodehyphen\normalhyphen \let\textmodehyphendiscretionary\normalhyphendiscretionary} - {\let\textmodehyphen\composedhyphen\let\textmodehyphendiscretionary\composedhyphendiscretionary}} + {\getdummyparameters[#1]% + \expandnamespaceparameter\??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} \setuphyphenmark[\c!sign=\v!wide] @@ -32,19 +37,19 @@ \definesymbol[\c!righthyphen] [\languageparameter\c!righthyphen] \definesymbol[\c!hyphen] [\languageparameter\c!hyphen] -\def\normalhyphen +\unexpanded\def\normalhyphen {\hbox{\directsymbol\empty\c!hyphen}} -\def\composedhyphen +\unexpanded\def\composedhyphen {\hbox{\directsymbol\empty\c!compoundhyphen}} -\def\normalhyphendiscretionary +\unexpanded\def\normalhyphendiscretionary {\discretionary {\hbox{\directsymbol\empty\c!righthyphen}} {\hbox{\directsymbol\empty\c!lefthyphen}} {\hbox{\directsymbol\empty\c!hyphen}}} -\def\composedhyphendiscretionary +\unexpanded\def\composedhyphendiscretionary {\discretionary {\hbox{\directsymbol\empty\c!rightcompoundhyphen}} {\hbox{\directsymbol\empty\c!leftcompoundhyphen}} @@ -219,8 +224,10 @@ [\c!middlespeech] [\leftboundarycharacter\c!middlespeech{speech}] -\appendtoks\def\quotation#1{"#1"}\to\simplifiedcommands -\appendtoks\def\quote #1{'#1'}\to\simplifiedcommands +\appendtoks + \def\quotation#1{"#1"}% + \def\quote #1{'#1'}% +\to \everysimplifycommands %D The next features was so desperately needed by Giuseppe %D Bilotta that he made a module for it. Since this is a @@ -352,17 +359,17 @@ \ignorespaces} \def\typo_delimited_stop_par - {\removeunwantedspaces - \removelastskip - \rightdelimitedtextmark - \endgroup - \popmacro\checkindentation - \typo_delimited_stop_par_indeed - \delimitedtextparameter\c!after - \doifsomething{\delimitedtextparameter\c!spaceafter} - {\blank[\delimitedtextparameter\c!spaceafter]}% - \useindentnextparameter\delimitedtextparameter - \dorechecknextindentation}% AM: This was missing! + {\removeunwantedspaces + \removelastskip + \rightdelimitedtextmark + \carryoverpar\endgroup % new per 2013-01-21 ... please left floats + \popmacro\checkindentation + \typo_delimited_stop_par_indeed + \delimitedtextparameter\c!after + \doifsomething{\delimitedtextparameter\c!spaceafter} + {\blank[\delimitedtextparameter\c!spaceafter]}% + \useindentnextparameter\delimitedtextparameter + \dorechecknextindentation}% AM: This was missing! \def\typo_delimited_start_txt {\let\typo_delimited_stop\typo_delimited_stop_txt @@ -469,6 +476,7 @@ \fi \strut % new, needed below \delimitedtextparameter#1% unhbox\scratchbox + \penalty\plustenthousand % new per 2013-03-09 WS mailing list \hskip\d_typo_delimited_signal % +- \prewordbreak \fi \endgroup} @@ -530,10 +538,10 @@ \def\typo_delimited_fontdriven_b {\dostarttagged\t!delimited\currentdelimitedtext - \languageparameter{\c!left\currentdelimitedtext}} + \languageparameter{\c!left\currentparentdelimitedtext}}% was: \currentdelimitedtext \def\typo_delimited_fontdriven_e - {\languageparameter{\c!right\currentdelimitedtext}% + {\languageparameter{\c!right\currentparentdelimitedtext}% was: \currentdelimitedtext \dostoptagged \typo_delimited_pop} |