diff options
Diffstat (limited to 'tex')
| -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 | 4147 -> 4133 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 106496 -> 105114 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/mult-sys.mkiv | 4 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24483 -> 24487 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 182717 -> 182715 bytes | |||
| -rw-r--r-- | tex/context/base/tabl-mis.mkiv | 16 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
11 files changed, 15 insertions, 15 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 6b7274026..06c283047 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.07.08 17:45} +\newcontextversion{2012.07.08 20:02} %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 890ba5c92..cdb44b1da 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.07.08 17:45} +\newcontextversion{2012.07.08 20:02} %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/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex d183ac677..5576edcd5 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 5ed2ea44b..150dedf60 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 d5b830901..98422d683 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.07.08 17:45} +\edef\contextversion{2012.07.08 20:02} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 82648c891..6d3b18ae6 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.07.08 17:45} +\edef\contextversion{2012.07.08 20:02} %D For those who want to use this: diff --git a/tex/context/base/mult-sys.mkiv b/tex/context/base/mult-sys.mkiv index 03e7f44e5..407fd4ce6 100644 --- a/tex/context/base/mult-sys.mkiv +++ b/tex/context/base/mult-sys.mkiv @@ -253,8 +253,8 @@ \definesystemconstant {multi} \definesystemconstant {indeed} -\def\s!parent{=>} % 1% faster -\def\s!child {<=} % 1% faster +% \def\s!parent{=>} % 1% faster / does not work in assignments +% \def\s!child {<=} % 1% faster / does not work in assignments \definesystemconstant {hasnumber} \definesystemconstant {hastitle} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 40e7768ec..ca1df2412 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 aefbb1c96..df6eddfe4 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/tabl-mis.mkiv b/tex/context/base/tabl-mis.mkiv index f2666cf40..e1ab77ecd 100644 --- a/tex/context/base/tabl-mis.mkiv +++ b/tex/context/base/tabl-mis.mkiv @@ -133,11 +133,10 @@ \def\typo_paragraphs_setup[#1][#2][#3]% we are downward compatible with [each] and [1,3] {\ifthirdargument - \def\typo_paragraphs_setup_three[#1][#2][#3]% - {\doifelse{#2}\v!each - {\typo_paragraphs_setup_saved[#1][#3]} - {\def\typo_paragraphs_setup_step##1{\typo_paragraphs_setup_saved[#1:##1][#3]}% - \processcommalist[#2]\typo_paragraphs_setup_step}} + \doifelse{#2}\v!each + {\typo_paragraphs_setup_saved[#1][#3]} + {\def\typo_paragraphs_setup_step##1{\typo_paragraphs_setup_saved[#1:##1][#3]}% + \processcommalist[#2]\typo_paragraphs_setup_step}% \else\ifsecondargument \typo_paragraphs_setup_saved[#1][#2]% \else\iffirstargument @@ -145,12 +144,13 @@ \fi\fi\fi} \appendtoks - \letvalue {\e!next \currentparagraphs}\nextparagraphs + \letvalue{\e!next \currentparagraphs}\nextparagraphs + \letvalue\currentparagraphs\nextparagraphs \setuevalue{\e!start\currentparagraphs}{\startparagraphs[\currentparagraphs]}% - \letvalue {\e!stop \currentparagraphs}\stopparagraphs + \letvalue{\e!stop \currentparagraphs}\stopparagraphs %setuevalue{\e!setup\currentparagraph\e!endsetup}{\typo_paragraphs_setup_saved[\currentparagraphs]}% \dorecurse{\paragraphsparameter\c!n} - {\normalexpanded{\typo_paragraphs_setup_saved[\currentparagraphs:\recurselevel][\c!width=,\s!parent=\??paragraphs\currentparagraphs]}}% + {\normalexpanded{\typo_paragraphs_setup_saved[\currentparagraphs:\recurselevel][\c!width=,\s!parent=\??paragraphs\currentparagraphs]}}% \typo_paragraphs_setup_saved[\currentparagraphs:1][\c!distance=\zeropoint]% \to \everydefineparagraphs diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index f1e08721b..22a1f4a59 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 : 07/08/12 17:45:38 +-- merge date : 07/08/12 20:02:35 do -- begin closure to overcome local limits and interference |
