From 554c7ba08fa4364a344bfcaae8291a9eb685e376 Mon Sep 17 00:00:00 2001 From: Marius Date: Fri, 30 Mar 2012 17:40:12 +0300 Subject: beta 2012.03.30 16:16 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4076 -> 4075 bytes tex/context/base/context-version.png | Bin 105665 -> 105591 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/page-txt.mkvi | 2 +- tex/context/base/status-files.pdf | Bin 24359 -> 24358 bytes tex/context/base/status-lua.pdf | Bin 172423 -> 172421 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 10 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 78cffbe6d..42ab55185 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.30 13:55} +\newcontextversion{2012.03.30 16:16} %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 c867a49d3..760252db1 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.30 13:55} +\newcontextversion{2012.03.30 16:16} %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 f6208d7ce..08c15cc14 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 6c34340db..971d88184 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 20209608d..95495ce1a 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.30 13:55} +\edef\contextversion{2012.03.30 16:16} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 6426583b4..67b158a41 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.30 13:55} +\edef\contextversion{2012.03.30 16:16} %D For those who want to use this: diff --git a/tex/context/base/page-txt.mkvi b/tex/context/base/page-txt.mkvi index f16ab70d7..c86597338 100644 --- a/tex/context/base/page-txt.mkvi +++ b/tex/context/base/page-txt.mkvi @@ -302,7 +302,7 @@ {\ignorecrlf#content{}{}{}}} \def\page_layouts_process_element_single_limited#content% - {\doifelsemarking\ascii + {\doifelsemarking\m_page_layouts_element_content {\limitatetext{\getmarking[\m_page_layouts_element_content][\v!first]}\currentlayoutelementwidth\unknown} {\ignorecrlf\limitatetext{#content{}{}{}}\currentlayoutelementwidth\unknown}} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 82e143583..98002c45c 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 15ca607e9..ff8034063 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 bb0c91522..ad560c0b1 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/30/12 13:55:29 +-- merge date : 03/30/12 16:16:58 do -- begin closure to overcome local limits and interference -- cgit v1.2.3