diff options
| -rw-r--r-- | tex/context/base/cont-new.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4145 -> 4145 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 105409 -> 106287 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/spac-ali.mkiv | 60 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24601 -> 24588 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 196231 -> 196231 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
10 files changed, 52 insertions, 18 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index a1ee3872a..0c49d48e9 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2012.10.30 18:06} +\newcontextversion{2012.10.30 19:22} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index dc8c7ed54..8112bd13c 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2012.10.30 18:06} +\newcontextversion{2012.10.30 19:22} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex ef095f4ba..62a1809e2 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png Binary files differindex 47f59bfe8..8e06bef93 100644 --- a/tex/context/base/context-version.png +++ b/tex/context/base/context-version.png diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index a53292787..466346626 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2012.10.30 18:06} +\edef\contextversion{2012.10.30 19:22} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index bf5fb6d59..da78cea4d 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -25,7 +25,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2012.10.30 18:06} +\edef\contextversion{2012.10.30 19:22} %D For those who want to use this: diff --git a/tex/context/base/spac-ali.mkiv b/tex/context/base/spac-ali.mkiv index c0a503d85..f3dd03002 100644 --- a/tex/context/base/spac-ali.mkiv +++ b/tex/context/base/spac-ali.mkiv @@ -636,6 +636,19 @@ \setvalue{\??aligncommand\v!verytolerant }{\t_spac_align_collected\expandafter{\the\t_spac_align_collected\spac_align_set_very_tolerant}} \setvalue{\??aligncommand\v!stretch }{\t_spac_align_collected\expandafter{\the\t_spac_align_collected\spac_align_set_stretch}} +%D For Wolfgang: + +\newtoks \t_spac_every_swap_align + +\appendtoks + \setvalue{\??aligncommand\v!right}{\c_spac_align_state_horizontal\plusthree}% + \setvalue{\??aligncommand\v!left }{\c_spac_align_state_horizontal\plustwo }% +\to \t_spac_every_swap_align + +\unexpanded\def\enablereversealignment + {\the\t_spac_every_swap_align + \t_spac_every_swap_align\emptytoks} + % Visible commands: \let\notragged \spac_align_set_horizontal_none @@ -836,22 +849,43 @@ % direct commands -\unexpanded\def\leftaligned {\doalignline\relax \hss } -\unexpanded\def\midaligned {\doalignline\hss \hss } -\unexpanded\def\rightaligned{\doalignline\hss \relax} -\unexpanded\def\maxaligned {\doalignline\relax \relax} +\installcorenamespace{alignwrapper} + +\setuvalue{\??alignwrapper\v!left }{\doalignline\relax \hss } +\setuvalue{\??alignwrapper\v!middle}{\doalignline\hss \hss } +\setuvalue{\??alignwrapper\v!right }{\doalignline\hss \relax} +\setuvalue{\??alignwrapper\v!max }{\doalignline\relax \relax} + +\def\spac_align_wrapper_handle#1% + {\csname\??alignwrapper\ifcsname\??alignwrapper#1\endcsname#1\else\v!middle\fi\endcsname} + +\unexpanded\def\spac_align_wrapper_start[#1]% + {\spac_align_wrapper_handle{#1}% + \bgroup\ignorespaces} + +\unexpanded\def\spac_align_wrapper_stop + {\removeunwantedspaces\egroup} + +\unexpanded\def\startlinealignment + {\dosingleempty\spac_align_wrapper_start} + +\let\stoplinealignment\spac_align_wrapper_stop + +\unexpanded\def\startleftaligned {\spac_align_wrapper_start[\v!left ]} \let\stopleftaligned \spac_align_wrapper_stop +\unexpanded\def\startmiddlealigned{\spac_align_wrapper_start[\v!middle]} \let\stopmiddlealigned \spac_align_wrapper_stop +\unexpanded\def\startrightaligned {\spac_align_wrapper_start[\v!right ]} \let\stoprightaligned \spac_align_wrapper_stop +\unexpanded\def\startmaxaligned {\spac_align_wrapper_start[\v!max ]} \let\stopmaxaligned \spac_align_wrapper_stop -\unexpanded\def\startleftaligned {\doalignline\relax \hss \bgroup\ignorespaces} -\unexpanded\def\startmidaligned {\doalignline\hss \hss \bgroup\ignorespaces} -\unexpanded\def\startrightaligned{\doalignline\hss \relax\bgroup\ignorespaces} -\unexpanded\def\startmaxaligned {\doalignline\relax \relax\bgroup\ignorespaces} +\let\startmidaligned \startmiddlealigned \let\stopmidaligned \stopmiddlealignment +\let\startcenteraligned\startmiddlealigned \let\stopcenteraligned \stopmiddlealignment -\unexpanded\def\stopleftaligned {\removeunwantedspaces\egroup} -\unexpanded\def\stopmidaligned {\removeunwantedspaces\egroup} -\unexpanded\def\stoprightaligned{\removeunwantedspaces\egroup} -\unexpanded\def\stopmaxaligned {\removeunwantedspaces\egroup} +\unexpanded\def\leftaligned {\spac_align_wrapper_handle\v!left } +\unexpanded\def\midaligned {\spac_align_wrapper_handle\v!middle} +\unexpanded\def\rightaligned{\spac_align_wrapper_handle\v!right } +\unexpanded\def\maxaligned {\spac_align_wrapper_handle\v!max } -\let\centeraligned\midaligned +\let\midaligned \middlealigned +\let\centeraligned\middlealigned \installcorenamespace{alignline} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex cdb9b4f43..393448379 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex da43a6540..b863133dc 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 71e094e76..998fd6df6 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 10/30/12 18:06:37 +-- merge date : 10/30/12 19:22:14 do -- begin closure to overcome local limits and interference |
