From 3f565beecadca6a2f09528a7ae683781fd80c281 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Sun, 8 Jul 2012 17:45:00 +0200 Subject: beta 2012.07.08 17:45 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4141 -> 4147 bytes tex/context/base/context-version.png | Bin 104912 -> 106496 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/math-ali.mkiv | 4 ++-- tex/context/base/pack-rul.mkiv | 12 ++++++------ tex/context/base/status-files.pdf | Bin 24442 -> 24483 bytes tex/context/base/status-lua.pdf | Bin 182714 -> 182717 bytes tex/context/base/strc-flt.mkvi | 2 +- tex/context/base/strc-ref.mkvi | 3 +-- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 13 files changed, 15 insertions(+), 16 deletions(-) diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 30a3c8e89..6b7274026 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.07 15:04} +\newcontextversion{2012.07.08 17:45} %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 21e02edbc..890ba5c92 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.07 15:04} +\newcontextversion{2012.07.08 17:45} %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 3af0ed139..d183ac677 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 dbedf4088..5ed2ea44b 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 f1593a6fa..d5b830901 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.07 15:04} +\edef\contextversion{2012.07.08 17:45} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 5a5d889ad..82648c891 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.07 15:04} +\edef\contextversion{2012.07.08 17:45} %D For those who want to use this: diff --git a/tex/context/base/math-ali.mkiv b/tex/context/base/math-ali.mkiv index ef82e9adb..567e41f42 100644 --- a/tex/context/base/math-ali.mkiv +++ b/tex/context/base/math-ali.mkiv @@ -100,7 +100,7 @@ \def\math_both_eqalign_no#1#2% {\ifmmode - \the\mathdisplayaligntweaks % \let\doplaceformulanumber\relax % strange hack + \the\mathdisplayaligntweaks % \let\strc_formulas_place_number\relax % strange hack \vcenter\bgroup \let\math_finish_eqalign_no\egroup \else @@ -942,7 +942,7 @@ \let\normalleqno\leqno \let\normaleqno \eqno % added - \doplaceformulanumber + \strc_formulas_place_number \setbox\scratchbox\math_hbox to \displaywidth\bgroup \mathinnerstrut $% diff --git a/tex/context/base/pack-rul.mkiv b/tex/context/base/pack-rul.mkiv index 33b3c0ce9..330e153bc 100644 --- a/tex/context/base/pack-rul.mkiv +++ b/tex/context/base/pack-rul.mkiv @@ -2608,24 +2608,24 @@ \setuevalue\currentframed{\pack_framed_defined_process[\currentframed]}% \to \everydefineframed -\newcount\c_framed_crap +\newcount\c_temp_framed_crap \unexpanded\def\pack_framed_defined_process[#1]% official (not much checking, todo: parent) {\bgroup \ifcsname\??regularframedlevel#1\endcsname - \expandafter\let\expandafter\c_framed_temp\csname\??regularframedlevel#1\endcsname + \expandafter\let\expandafter\c_pack_framed_temp\csname\??regularframedlevel#1\endcsname \else - \let\c_framed_temp\c_framed_crap + \let\c_pack_framed_temp\c_temp_framed_crap \fi - \advance\c_framed_temp\plusone - \expandafter\def\csname\??framed#1>\the\c_framed_temp:\s!parent\endcsname{\??framed#1}% \inheritlocalframed + \advance\c_pack_framed_temp\plusone + \expandafter\def\csname\??framed#1>\the\c_pack_framed_temp:\s!parent\endcsname{\??framed#1}% \inheritlocalframed \bgroup \edef\currentframed{#1>\the\c_pack_framed_temp}% \pack_framed_initialize \dosingleempty\pack_framed_defined_process_indeed} \def\pack_framed_defined_process_indeed[#1]% - {\ifsingleargument % faster + {\iffirstargument % faster \setupcurrentframed[#1]% here ! \fi \pack_framed_process_indeed} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 7aa77290f..40e7768ec 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 4e1369aeb..aefbb1c96 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/strc-flt.mkvi b/tex/context/base/strc-flt.mkvi index 4787ae32d..6c56495b5 100644 --- a/tex/context/base/strc-flt.mkvi +++ b/tex/context/base/strc-flt.mkvi @@ -2064,7 +2064,7 @@ \initializeboxstack\??localfloatstack -\newcounter\c_strc_localfloats_n +\newcount\c_strc_localfloats_n \let\noflocalfloats\c_strc_localfloats_n \unexpanded\def\resetlocalfloats {\global\c_strc_localfloats_n\zerocount diff --git a/tex/context/base/strc-ref.mkvi b/tex/context/base/strc-ref.mkvi index c11b49bd3..7efc967b7 100644 --- a/tex/context/base/strc-ref.mkvi +++ b/tex/context/base/strc-ref.mkvi @@ -1498,8 +1498,7 @@ {#content} \def\dofromurlliteral#content% called at the lua end - {\dousestyleparameter\@@urstyle - \dousecolorparameter\@@urcolor + {\useurlstyleandcolor\c!style\c!color \hyphenatedurl{#content}} \let\dofromfiledescription\dofromurldescription diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 93c21412b..f1e08721b 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/07/12 15:04:48 +-- merge date : 07/08/12 17:45:38 do -- begin closure to overcome local limits and interference -- cgit v1.2.3