summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2012-06-22 13:11:00 +0200
committerHans Hagen <pragma@wxs.nl>2012-06-22 13:11:00 +0200
commit614f10aaaf6ed9b12ab2415915341f505fcb0667 (patch)
treecfade5a219588ce0bce2dba66258234e44ea10fc /tex
parent15a688c9c75de1bb36135929d865e7bcbda13f00 (diff)
downloadcontext-614f10aaaf6ed9b12ab2415915341f505fcb0667.tar.gz
beta 2012.06.22 13:11
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4143 -> 4145 bytes
-rw-r--r--tex/context/base/context-version.pngbin106238 -> 105884 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/lpdf-ano.lua2
-rw-r--r--tex/context/base/lpdf-nod.lua13
-rw-r--r--tex/context/base/node-ref.lua4
-rw-r--r--tex/context/base/status-files.pdfbin24497 -> 24487 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin182307 -> 182309 bytes
-rw-r--r--tex/context/base/strc-itm.mkvi10
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
13 files changed, 21 insertions, 18 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index e660b64f3..52c3f024d 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.06.22 11:22}
+\newcontextversion{2012.06.22 13:11}
%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 3a179a151..f902d6937 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.06.22 11:22}
+\newcontextversion{2012.06.22 13:11}
%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 d9850e933..1e567e2f1 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 0c3ce6be6..742fef507 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index db2a3c765..3fa3c60f7 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.06.22 11:22}
+\edef\contextversion{2012.06.22 13:11}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index b29381b55..380a52d6d 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.06.22 11:22}
+\edef\contextversion{2012.06.22 13:11}
%D For those who want to use this:
diff --git a/tex/context/base/lpdf-ano.lua b/tex/context/base/lpdf-ano.lua
index 154296e9b..01e226351 100644
--- a/tex/context/base/lpdf-ano.lua
+++ b/tex/context/base/lpdf-ano.lua
@@ -325,7 +325,7 @@ function nodeinjections.destination(width,height,depth,name,view)
if trace_destinations then
report_destination("w=%s, h=%s, d=%s, n=%s, v=%s",width,height,depth,name,view or "no view")
end
- return pdfdestination_node(width,height,depth,name,view)
+ return pdfdestination_node(width,height,depth,name,view) -- can be begin/end node
end
end
diff --git a/tex/context/base/lpdf-nod.lua b/tex/context/base/lpdf-nod.lua
index 0d5a1bbd9..0ce589c32 100644
--- a/tex/context/base/lpdf-nod.lua
+++ b/tex/context/base/lpdf-nod.lua
@@ -122,19 +122,14 @@ function nodepool.pdfdestination(w,h,d,name,view,n)
t.dest_id = name
t.dest_type = view
if hasdimensions and view == 0 then -- xyz
- -- see (!)
+ -- see (!) s -> m -> t -> r
local s = copy_node(pdfsave)
local m = copy_node(pdfsetmatrix)
- -- local t
local r = copy_node(pdfrestore)
m.data = format("1 0 0 1")
- s.next = m
- m.next = t
- t.next = r
- m.prev = s
- t.prev = m
- r.prev = t
- return s
+ s.next = m m.next = t t.next = r
+ m.prev = s t.prev = m r.prev = t
+ return s -- a list
else
return t
end
diff --git a/tex/context/base/node-ref.lua b/tex/context/base/node-ref.lua
index 75126d902..d5fa7fa01 100644
--- a/tex/context/base/node-ref.lua
+++ b/tex/context/base/node-ref.lua
@@ -493,12 +493,12 @@ local function makedestination(width,height,depth,reference)
for n=1,#name do
local annot = nodeinjections.destination(width,height,depth,name[n],view)
if not result then
- result, current = annot, annot
+ result = annot
else
current.next = annot
annot.prev = current
- current = annot
end
+ current = find_node_tail(annot)
end
if result then
-- some internal error
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 83670d1b4..c6d8ea788 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index e2f1c0820..fd6b58ce4 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/strc-itm.mkvi b/tex/context/base/strc-itm.mkvi
index a621781c5..a28eaacd8 100644
--- a/tex/context/base/strc-itm.mkvi
+++ b/tex/context/base/strc-itm.mkvi
@@ -243,11 +243,17 @@
\strc_itemgroups_insert_reference_indeed
\fi \fi}
+\def\strc_itemgroups_insert_extra_reference
+ {\iftrialtypesetting \else \ifx\currentitemreference \empty \else
+ \normalexpanded{\textreference[\currentitemreference]{\strc_itemgroups_extra_symbol}}%
+ \fi \fi}
+
\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
\strc_references_start_destination_nodes
- \ctxlua {structures.references.setandgetattribute("\s!full", "\referenceprefix","\currentitemreference",
+ % this is somewhat over the top ... we should use the counter's reference
+ \ctxcommand{setreferenceattribute("\s!full", "\referenceprefix","\currentitemreference",
{
metadata = {
kind = "item",% ?
@@ -1233,6 +1239,7 @@
{\setbox\b_strc_itemgroups\hbox
{\ifconditional\c_strc_itemgroups_head
\ifconditional\c_strc_itemgroups_symbol
+ \strc_itemgroups_insert_extra_reference
\useitemgroupstyleandcolor\c!symstyle\c!symcolor
\strc_itemgroups_extra_symbol
\else
@@ -1241,6 +1248,7 @@
\fi
\else
\ifconditional\c_strc_itemgroups_symbol
+ \strc_itemgroups_insert_extra_reference
\useitemgroupstyleandcolor\c!symstyle\c!symcolor
\strc_itemgroups_extra_symbol
\else
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index dfbfd66fe..f3da9f3fb 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 : 06/22/12 11:22:41
+-- merge date : 06/22/12 13:11:51
do -- begin closure to overcome local limits and interference