diff options
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4102 -> 4104 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/spac-ver.mkiv | 11 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24737 -> 24732 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.log | 5 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
7 files changed, 14 insertions, 8 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 43a11cf21..044c99035 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{2013.08.08 18:39} +\newcontextversion{2013.08.08 19:24} %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 a2cb167d7..9427b3d59 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index f03409883..266168631 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{2013.08.08 18:39} +\edef\contextversion{2013.08.08 19:24} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/spac-ver.mkiv b/tex/context/base/spac-ver.mkiv index 8434e2a31..cc5142818 100644 --- a/tex/context/base/spac-ver.mkiv +++ b/tex/context/base/spac-ver.mkiv @@ -2095,8 +2095,13 @@ \prevdepth\zeropoint -\appendtoks - \ifvmode\ctxcommand{resetprevdepth()}\fi -\to \everyafteroutput +% not ok, so we need to figure out another way to fix this messy prevdepth-across-page issue +% as encountered in forced blank skips (see lua code) +% +% \appendtoks +% \ifvmode\ctxcommand{resetprevdepth()}\fi +% \to \everyafteroutput +% +% this should only happen when there is nothing left over (how to detemine that) \protect \endinput diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex bf95142de..31f8762c6 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log index c27eb7ddd..ac8836a0b 100644 --- a/tex/context/base/status-lua.log +++ b/tex/context/base/status-lua.log @@ -1,11 +1,12 @@ (cont-yes.mkiv -ConTeXt ver: 2013.08.08 18:39 MKIV beta fmt: 2013.8.8 int: english/english +ConTeXt ver: 2013.08.08 19:24 MKIV beta fmt: 2013.8.8 int: english/english system > 'cont-new.mkiv' loaded (cont-new.mkiv) system > 'cont-loc.mkiv' loaded (c:/data/develop/context/sources/cont-loc.mkiv +!!!! > testing prevdepth across page !!!! > testing rotation and scaling ) system > 'cont-exp.mkiv' loaded @@ -76,4 +77,4 @@ references > unknown reference '[][math]' references > unknown reference '[][mathematics]' references > unknown reference '[][mbox]' references > unknown reference '[][md5]' -references > unknown reference '[][metapost]'
\ No newline at end of file +re
\ No newline at end of file diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 62a8ec7b3..eafc874e7 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 : 08/08/13 18:39:36 +-- merge date : 08/08/13 19:24:01 do -- begin closure to overcome local limits and interference |