From d30dc77c610b72db7e7bc53f2a10e18756cfe437 Mon Sep 17 00:00:00 2001
From: Marius <mariausol@gmail.com>
Date: Sat, 14 Apr 2012 01:40:13 +0300
Subject: beta 2012.04.14 00:10
---
tex/context/base/cont-new.mkii | 2 +-
tex/context/base/cont-new.mkiv | 2 +-
tex/context/base/context-version.pdf | Bin 4072 -> 4070 bytes
tex/context/base/context-version.png | Bin 105852 -> 105445 bytes
tex/context/base/context.mkii | 2 +-
tex/context/base/context.mkiv | 2 +-
tex/context/base/status-files.pdf | Bin 24335 -> 24326 bytes
tex/context/base/status-lua.pdf | Bin 172421 -> 172421 bytes
tex/context/base/strc-itm.mkvi | 91 +++++++++++----------
tex/context/base/strc-ref.mkvi | 2 +-
tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +-
11 files changed, 54 insertions(+), 49 deletions(-)
(limited to 'tex')
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index c239a37d9..408e920a0 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.13 23:23}
+\newcontextversion{2012.04.14 00:10}
%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 2312adc65..0ffdc5a33 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.13 23:23}
+\newcontextversion{2012.04.14 00:10}
%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 b144413b1..d6185843b 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 e2a4c2808..cce844c07 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 461cb9b27..207c507e2 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.13 23:23}
+\edef\contextversion{2012.04.14 00:10}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 3e83c4045..0d9be0155 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.13 23:23}
+\edef\contextversion{2012.04.14 00:10}
%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 626b3a560..ff117e85e 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 c2215ba65..e15816a17 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-itm.mkvi b/tex/context/base/strc-itm.mkvi
index 50b4035c2..d0191f78f 100644
--- a/tex/context/base/strc-itm.mkvi
+++ b/tex/context/base/strc-itm.mkvi
@@ -242,50 +242,55 @@
\strc_itemgroups_insert_reference_indeed
\fi \fi}
-\def\strc_itemgroups_insert_reference_indeed % maybe we need a 'frozen counter' numberdata blob
- {\setnextinternalreference
+\def\strc_itemgroups_insert_reference_indeed % maybe we need a 'frozen counter' numberdata blob / quick hack .. .mive this to strc-ref
+ {%\setnextinternalreference
% no need to collect nodes in \b_strc_destination_nodes here ... maybe at some point
- \ctxlua {structures.references.setandgetattribute("\s!full", "\referenceprefix","\currentitemreference",
- {
- metadata = {
- kind = "item",% ?
- catcodes = \the\catcodetable,
- xmlroot = \ifx\currentreferencecoding\s!xml "\xmldocument" \else nil \fi, % only useful when text
- },
- references = {
- internal = \nextinternalreference,
- section = structures.sections.currentid(),
- },
- prefixdata = structures.helpers.simplify {
- prefix = "\counterparameter\v_strc_itemgroups_counter\c!prefix",
- separatorset = "\counterparameter\v_strc_itemgroups_counter\c!prefixseparatorset",
- conversion = \!!bs\counterparameter\v_strc_itemgroups_counter\c!prefixconversion\!!es,
- conversionset = "\counterparameter\v_strc_itemgroups_counter\c!prefixconversionset",
- set = "\counterparameter\v_strc_itemgroups_counter\c!prefixset",
- segments = "\counterparameter\v_strc_itemgroups_counter\c!prefixsegments",
- % segments = "\askedprefixsegments",
- connector = \!!bs\counterparameter\v_strc_itemgroups_counter\c!prefixconnector\!!es,
- },
- numberdata = structures.helpers.simplify {
- numbers = structures.counters.compact("\v_strc_itemgroups_counter",nil,true),
- separatorset = "\counterparameter\v_strc_itemgroups_counter\c!numberseparatorset",
-% conversion = "\counterparameter\v_strc_itemgroups_counter\c!numberconversion",
-% conversion = "\currentitemgroupconversionset",
-% conversionset = "\counterparameter\v_strc_itemgroups_counter\c!numberconversionset",
-% todo: fixedconversion = "\currentitemgroupconversionset", % temp hack:
-conversionset = "fixed::\currentitemgroupconversionset",
- %
- % for the moment no stopper, we need to make references configurable first
- % stopper = \!!bs\counterparameter\v_strc_itemgroups_counter\c!numberstopper\!!es,
- segments = "\counterparameter\v_strc_itemgroups_counter\c!numbersegments",
- },
- })
- }%
- \xdef\currentitemattribute{\number\lastdestinationattribute}%
- \begingroup
- \attribute\destinationattribute\currentitemattribute
- \kern\zeropoint % signal
- \endgroup}
+ \strc_references_start_destination_nodes
+ \ctxlua {structures.references.setandgetattribute("\s!full", "\referenceprefix","\currentitemreference",
+ {
+ metadata = {
+ kind = "item",% ?
+ catcodes = \the\catcodetable,
+ xmlroot = \ifx\currentreferencecoding\s!xml "\xmldocument" \else nil \fi, % only useful when text
+ },
+ references = {
+ % internal = \nextinternalreference, % no: this spoils references
+ block = "\currentsectionblock",
+ section = structures.sections.currentid(),
+ },
+ prefixdata = structures.helpers.simplify {
+ prefix = "\counterparameter\v_strc_itemgroups_counter\c!prefix",
+ separatorset = "\counterparameter\v_strc_itemgroups_counter\c!prefixseparatorset",
+ conversion = \!!bs\counterparameter\v_strc_itemgroups_counter\c!prefixconversion\!!es,
+ conversionset = "\counterparameter\v_strc_itemgroups_counter\c!prefixconversionset",
+ set = "\counterparameter\v_strc_itemgroups_counter\c!prefixset",
+ segments = "\counterparameter\v_strc_itemgroups_counter\c!prefixsegments",
+ % segments = "\askedprefixsegments",
+ connector = \!!bs\counterparameter\v_strc_itemgroups_counter\c!prefixconnector\!!es,
+ },
+ numberdata = structures.helpers.simplify {
+ numbers = structures.counters.compact("\v_strc_itemgroups_counter",nil,true),
+ separatorset = "\counterparameter\v_strc_itemgroups_counter\c!numberseparatorset",
+ % conversion = "\counterparameter\v_strc_itemgroups_counter\c!numberconversion",
+ % conversion = "\currentitemgroupconversionset",
+ % conversionset = "\counterparameter\v_strc_itemgroups_counter\c!numberconversionset",
+ % todo: fixedconversion = "\currentitemgroupconversionset", % temp hack:
+ conversionset = "fixed::\currentitemgroupconversionset",
+ %
+ % for the moment no stopper, we need to make references configurable first
+ % stopper = \!!bs\counterparameter\v_strc_itemgroups_counter\c!numberstopper\!!es,
+ segments = "\counterparameter\v_strc_itemgroups_counter\c!numbersegments",
+ },
+ })
+ }%
+ \strc_references_stop_destination_nodes
+ \xdef\currentdestinationattribute{\number\lastdestinationattribute}%
+ % will become an option:
+ \ifnum\lastdestinationattribute>\zerocount
+ \dontleavehmode\hbox attr \destinationattribute\lastdestinationattribute\bgroup
+ \strc_references_flush_destination_nodes
+ \egroup
+ \fi}
%D Defining and setup:
diff --git a/tex/context/base/strc-ref.mkvi b/tex/context/base/strc-ref.mkvi
index d1ebffb4a..d3c932598 100644
--- a/tex/context/base/strc-ref.mkvi
+++ b/tex/context/base/strc-ref.mkvi
@@ -171,7 +171,7 @@
section = structures.sections.currentid(),
},
metadata = { % we could assume page to have no metadata
- kind = "#kind",
+ kind = "#kind", % \currentreferencekind
\ifx\currentreferencekind\s!page\else
catcodes = \the\catcodetable,
xmlroot = \ifx\currentreferencecoding\s!xml "\xmldocument"\else nil\fi, % only useful when text
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 031fd6a1b..df477dd17 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/13/12 23:23:16
+-- merge date : 04/14/12 00:10:51
do -- begin closure to overcome local limits and interference
--
cgit v1.2.3