diff options
Diffstat (limited to 'tex/context/base/spac-hor.mkiv')
| -rw-r--r-- | tex/context/base/spac-hor.mkiv | 59 |
1 files changed, 11 insertions, 48 deletions
diff --git a/tex/context/base/spac-hor.mkiv b/tex/context/base/spac-hor.mkiv index 73e4771fe..2ce502fb5 100644 --- a/tex/context/base/spac-hor.mkiv +++ b/tex/context/base/spac-hor.mkiv @@ -486,17 +486,17 @@ \ifdefined\thinspace \else - \unexpanded\def\thinspace {\kern .16667\emwidth} - \unexpanded\def\negthinspace{\kern-.16667\emwidth} - \unexpanded\def\enspace {\kern .5\emwidth} + \def\thinspace {\kern .16667\emwidth} + \def\negthinspace{\kern-.16667\emwidth} + \def\enspace {\kern .5\emwidth} \fi \ifdefined\quad \else - \unexpanded\def\enskip{\hskip.5\emwidth} - \unexpanded\def\quad {\hskip \emwidth} - \unexpanded\def\qquad {\hskip 2\emwidth} + \def\enskip{\hskip.5\emwidth} + \def\quad {\hskip \emwidth} + \def\qquad {\hskip 2\emwidth} \fi @@ -613,51 +613,14 @@ {\begingroup \dodoubleempty\spac_narrower_start_named} -% \def\spac_narrower_start_named[#1][#2]% -% {\edef\currentnarrower{#1}% -% \ifsecondargument -% \spac_narrower_start_apply{#2}% -% \else -% \spac_narrower_start_apply{\narrowerparameter\v!default}% -% \fi} - -\def\spac_narrower_start_named - {\ifsecondargument - \expandafter\spac_narrower_start_named_two +\def\spac_narrower_start_named[#1][#2]% + {\edef\currentnarrower{#1}% + \ifsecondargument + \spac_narrower_start_apply{#2}% \else - \expandafter\spac_narrower_start_named_one + \spac_narrower_start_apply{\narrowerparameter\v!default}% \fi} -\def\spac_narrower_start_named_one[#1]% - {\doifassignmentelse{#1}\spac_narrower_start_named_one_yes\spac_narrower_start_named_one_nop[#1]} - -\def\spac_narrower_start_named_one_yes[#1][#2]% [settings] [] - {\setupcurrentnarrower[#1]% - \spac_narrower_start_apply{\narrowerparameter\v!default}} - -\def\spac_narrower_start_named_one_nop[#1][#2]% [tag] [] - {\edef\currentnarrower{#1}% - \spac_narrower_start_apply{\narrowerparameter\v!default}} - -\def\spac_narrower_start_named_two[#1]% - {\doifassignmentelse{#1}\spac_narrower_start_named_settings_how\spac_narrower_start_named_tag_unknown[#1]} - -\def\spac_narrower_start_named_settings_how[#1][#2]% [settings] [how] - {\setupcurrentnarrower[#1]% - \spac_narrower_start_apply{#2}} - -\def\spac_narrower_start_named_tag_unknown[#1][#2]% [tag] [...] - {\doifassignmentelse{#2}\spac_narrower_start_named_tag_settings\spac_narrower_start_named_tag_how[#1][#2]} - -\def\spac_narrower_start_named_tag_settings[#1][#2]% [tag] [settings] - {\edef\currentnarrower{#1}% - \setupcurrentnarrower[#2]% - \spac_narrower_start_apply{\narrowerparameter\v!default}} - -\def\spac_narrower_start_named_tag_how[#1][#2]% [tag] [how] - {\edef\currentnarrower{#1}% - \spac_narrower_start_apply{#2}} - \let\stopnarrow\spac_narrower_stop \newdimen\d_spac_effective_hsize \def\effectivehsize {\hsize} |