From e8a06e89017f7bd9907c73ae7a656d3a725fd064 Mon Sep 17 00:00:00 2001 From: Marius Date: Wed, 1 Jan 2014 15:20:24 +0200 Subject: beta 2014.01.01 14:11 --- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4128 -> 4096 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/status-files.pdf | Bin 24540 -> 24524 bytes tex/context/base/status-lua.pdf | Bin 228351 -> 228233 bytes tex/context/base/strc-ref.mkvi | 50 +++++++++++++++++---- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 7 files changed, 45 insertions(+), 11 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 60cb19079..d1ed5972a 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{2013.12.30 22:40} +\newcontextversion{2014.01.01 14:11} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index 95266774e..c4f54879d 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.mkiv b/tex/context/base/context.mkiv index be68a3eb1..9c2f652d3 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -28,7 +28,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2013.12.30 22:40} +\edef\contextversion{2014.01.01 14:11} \edef\contextkind {beta} %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 c0b423c4e..1e398b8a0 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 f836ffa32..de6a11472 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 69ad4629e..85c6a0729 100644 --- a/tex/context/base/strc-ref.mkvi +++ b/tex/context/base/strc-ref.mkvi @@ -209,14 +209,14 @@ xmlroot = \ifx\currentreferencecoding\s!xml "\xmldocument"\else nil\fi, % only useful when text \fi }, - \ifx\currentreferencedata\empty\else - entries = { - text = \!!bs\currentreferencedata\!!es - }, - \fi - \ifx\currentreferenceuserdata\empty\else - userdata = structures.helpers.touserdata(\!!bs\detokenize{#userdata}\!!es) - \fi + \ifx\currentreferencedata\empty\else + entries = { + text = \!!bs\currentreferencedata\!!es + }, + \fi + \ifx\currentreferenceuserdata\empty\else + userdata = structures.helpers.touserdata(\!!bs\detokenize{#userdata}\!!es) + \fi },"\interactionparameter\c!focus") }% \strc_references_stop_destination_nodes @@ -261,6 +261,40 @@ \lastdestinationattribute\attributeunsetvalue \fi} +\unexpanded\def\strc_references_direct_full#labels#text% + {\ifreferencing + \strc_references_start_destination_nodes + \ctxcommand{setreferenceattribute("\s!full", "\referenceprefix","#labels", + { + references = { + block = "\currentsectionblock", + section = structures.sections.currentid(), + }, + metadata = { + kind = "\s!full", + }, + entries = { + text = \!!bs#text\!!es + }, + },"\interactionparameter\c!focus") + }% + \strc_references_stop_destination_nodes + \else + \setbox\b_strc_destination_nodes\emptyhbox + \lastdestinationattribute\attributeunsetvalue + \fi + % will become obsolete: + \xdef\currentdestinationattribute{\number\lastdestinationattribute}% + % will become an option: + \ifnum\lastdestinationattribute>\zerocount + \dontleavehmode\hbox attr \destinationattribute\lastdestinationattribute\bgroup + \strc_references_flush_destination_nodes + \egroup + \prewordbreak % new + \fi} + +\let\dodirectfullreference\strc_references_direct_full % for at lua end + \def\strc_references_set_page_only_destination_box_attribute#cs#labels% {\strc_references_set_page_only_destination_attribute{#labels}% \ifnum\lastdestinationattribute>\zerocount diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 1e9c82e04..14a389922 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 : 12/30/13 22:40:58 +-- merge date : 01/01/14 14:11:59 do -- begin closure to overcome local limits and interference -- cgit v1.2.3