From 8fa34e5db9cbb1bf1a553f325fde107abb861177 Mon Sep 17 00:00:00 2001 From: Marius Date: Fri, 2 Mar 2012 23:00:14 +0200 Subject: beta 2012.03.02 21:28 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4068 -> 4069 bytes tex/context/base/context-version.png | Bin 103861 -> 104970 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/page-set.mkiv | 4 ++-- tex/context/base/status-files.pdf | Bin 24322 -> 24329 bytes tex/context/base/status-lua.pdf | Bin 172399 -> 172399 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 10 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 3b594c5ab..2bc4ad186 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.03.02 21:03} +\newcontextversion{2012.03.02 21:28} %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 7eb58cde5..4018f3ed1 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.03.02 21:03} +\newcontextversion{2012.03.02 21:28} %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 index 5b4ce70af..b59ef7b95 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png index 182e9dc59..2c6a907e9 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png differ diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index 8103933c3..b034bb731 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.03.02 21:03} +\edef\contextversion{2012.03.02 21:28} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index aa0ac326f..1ec714575 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -23,7 +23,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2012.03.02 21:03} +\edef\contextversion{2012.03.02 21:28} %D For those who want to use this: diff --git a/tex/context/base/page-set.mkiv b/tex/context/base/page-set.mkiv index bbceef77a..9eb810a19 100644 --- a/tex/context/base/page-set.mkiv +++ b/tex/context/base/page-set.mkiv @@ -2467,7 +2467,7 @@ \setcolumnsetspanhsize\mofcolumns\!!countc % a/b used \hsize\columnsetspanhsize \setbox\scratchbox\vbox\bgroup - \dostartframedtext{cs:#1}[\v!none]% geen nils placement + \pack_framed_text_start{cs:#1}[\v!none]% geen nils placement % spoils spacing : \vskip-\struttotal\par\verticalstrut\par \ifnum\columnsetlevel>\zerocount \namedframedtextparameter{cs:#1}\c!before @@ -2486,7 +2486,7 @@ \else \endgraf \fi - \dostopframedtext + \pack_framed_text_stop \egroup \setbox\scratchbox\frozenhbox to \hsize {\dontcomplain diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 73be9f0a9..84c6d6a7c 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index fa90034f8..fb3f6b267 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 97e28dca9..e6a055804 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 : 03/02/12 21:03:58 +-- merge date : 03/02/12 21:28:05 do -- begin closure to overcome local limits and interference -- cgit v1.2.3