From 99b7853b5bae730921bad190f5b5d0eb9552f7aa Mon Sep 17 00:00:00 2001 From: Marius Date: Sat, 7 Apr 2012 16:20:14 +0300 Subject: beta 2012.04.07 14:42 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4071 -> 4069 bytes tex/context/base/context-version.png | Bin 104667 -> 105638 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/status-files.pdf | Bin 24330 -> 24324 bytes tex/context/base/status-lua.pdf | Bin 172441 -> 172422 bytes tex/context/base/strc-ref.mkvi | 18 ++++++++++++------ tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 10 files changed, 17 insertions(+), 11 deletions(-) diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 4d6bbd111..91bcc50f7 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.04.06 23:08} +\newcontextversion{2012.04.07 14:42} %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 ea36c4bc4..03ebfd76d 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.04.06 23:08} +\newcontextversion{2012.04.07 14:42} %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 178a138e7..8d640e84d 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 864ac45d3..cb12b5add 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 25c4c8a1b..cdecb2f4e 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.04.06 23:08} +\edef\contextversion{2012.04.07 14:42} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 6c3fefcfc..7283f850c 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.04.06 23:08} +\edef\contextversion{2012.04.07 14:42} %D For those who want to use this: diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 4e9c140a3..931b38569 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 aa49e4e0b..95c01e8fb 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-ref.mkvi b/tex/context/base/strc-ref.mkvi index 0a0f0a546..d1ebffb4a 100644 --- a/tex/context/base/strc-ref.mkvi +++ b/tex/context/base/strc-ref.mkvi @@ -130,6 +130,12 @@ \unhbox\b_strc_destination_nodes \fi} +\unexpanded\def\strc_references_start_destination_nodes % messy but we need the delay + {\setbox\b_strc_destination_nodes\hbox\bgroup} % also sets lastdestinationattribute + +\unexpanded\def\strc_references_stop_destination_nodes + {\normalexpanded{\egroup\lastdestinationattribute\the\lastdestinationattribute\relax}} + \unexpanded\def\strc_references_set_named_reference_indeed#kind#labels#userdata#text% labels userdata text -> todo: userdata {\ifreferencing % we could have a more efficient one for page references but for the moment @@ -156,7 +162,7 @@ \fi % beware, the structures.references.set writes a % \setnextinternalreference - \setbox\b_strc_destination_nodes\hbox\bgroup % messybut we need the delay + \strc_references_start_destination_nodes \ctxlua{structures.references.setandgetattribute("\currentreferencekind", "\referenceprefix","\currentreferencelabels", { references = { @@ -181,7 +187,7 @@ \fi },"\interactionparameter\c!focus") }% - \egroup + \strc_references_stop_destination_nodes \fi \else \setbox\b_strc_destination_nodes\emptyhbox @@ -203,7 +209,7 @@ \setbox\b_strc_destination_nodes\emptyhbox \lastdestinationattribute\attributeunsetvalue \else - \setbox\b_strc_destination_nodes\hbox\bgroup % messybut we need the delay + \strc_references_start_destination_nodes \ctxlua{structures.references.setandgetattribute("\s!page", "\referenceprefix","\currentreferencelabels", { references = { @@ -215,7 +221,7 @@ }, },"\interactionparameter\c!focus") }% - \egroup + \strc_references_stop_destination_nodes \fi \else \setbox\b_strc_destination_nodes\emptyhbox @@ -241,7 +247,7 @@ \def\strc_references_set_simple_page_reference#label% {\iflocation - \setbox\b_strc_destination_nodes\hbox\bgroup + \strc_references_start_destination_nodes \ctxlua{structures.references.setandgetattribute("\s!page", "\referenceprefix","#label", { references = { @@ -253,7 +259,7 @@ }, },"\interactionparameter\c!focus") }% - \egroup + \strc_references_stop_destination_nodes \xdef\currentdestinationattribute{\number\lastdestinationattribute}% \else \setbox\b_strc_destination_nodes\emptyhbox diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index b0489ad34..eaee06969 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 : 04/06/12 23:08:20 +-- merge date : 04/07/12 14:42:32 do -- begin closure to overcome local limits and interference -- cgit v1.2.3