2016-03-04 10:42:00

9 files changed, 9 insertions, 8 deletions

diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 63825bb1f..2aa144111 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 0ca1ff640..5b82eabc2 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2016.03.03 23:31}
+\newcontextversion{2016.03.04 10:39}
 
 %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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 63c95ce2a..f495db59d 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2016.03.03 23:31}
+\edef\contextversion{2016.03.04 10:39}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index efcccd539..1e54084c3 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 91828160c..9cf850c00 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/strc-lst.lua b/tex/context/base/mkiv/strc-lst.lua
index 770947e32..37bdf07d6 100644
--- a/tex/context/base/mkiv/strc-lst.lua
+++ b/tex/context/base/mkiv/strc-lst.lua
@@ -1021,6 +1021,7 @@ implement {
                     { "location" },
                     { "prefix" },
                     { "reference" },
+                    { "view" },
                     { "order", "integer" },
                 }
             },
diff --git a/tex/context/base/mkiv/strc-lst.mkvi b/tex/context/base/mkiv/strc-lst.mkvi
index 78e55b874..3159374c0 100644
--- a/tex/context/base/mkiv/strc-lst.mkvi
+++ b/tex/context/base/mkiv/strc-lst.mkvi
@@ -1392,7 +1392,7 @@
 %    \fi
 %    \edef\p_interaction_backward{\namedheadparameter\currentlist\c!interaction}% \namedheadparameter !
 %    \ifx\p_interaction_backward\v!list
-%      \strc_references_set_simple_page_reference{*\currentlistentrylocation}%
+%      \strc_references_set_simple_reference{*\currentlistentrylocation}%
 %      \a_strc_lists_destination\currentdestinationattribute
 %    \else
 %      \a_strc_lists_destination\attributeunsetvalue
@@ -1426,7 +1426,7 @@
    \fi
    \edef\p_interaction_backward{\namedheadparameter\currentlist\c!interaction}% \namedheadparameter !
    \ifx\p_interaction_backward\v!list
-     \strc_references_set_simple_page_reference{*\currentlistentrylocation}%
+     \strc_references_set_simple_reference{*\currentlistentrylocation}%
      \a_strc_lists_destination\currentdestinationattribute
    \else
      \a_strc_lists_destination\attributeunsetvalue
diff --git a/tex/context/base/mkiv/strc-ref.mkvi b/tex/context/base/mkiv/strc-ref.mkvi
index 4821c6832..177abd835 100644
--- a/tex/context/base/mkiv/strc-ref.mkvi
+++ b/tex/context/base/mkiv/strc-ref.mkvi
@@ -389,7 +389,7 @@
 
 %D For internal usage:
 
-\def\strc_references_set_simple_page_reference#label%
+\def\strc_references_set_simple_reference#label%
   {\iflocation
      \strc_references_start_destination_nodes
      \setnextinternalreference
@@ -497,7 +497,7 @@
    \scratchdepth \dp\nextbox
    \setbox\nextbox\hbox
      {\framed[\c!frame=\v!off,#2]{\box\nextbox}}%
-   \strc_references_set_simple_page_reference{#1}%
+   \strc_references_set_simple_reference{#1}%
    \setbox\nextbox\hbox attr \destinationattribute \currentdestinationattribute
      {\strc_references_flush_destination_nodes
       \box\nextbox}%
@@ -509,7 +509,7 @@
    \egroup}
 
 \def\strc_references_content_nop_finish#1#2%
-  {\strc_references_set_simple_page_reference{#1}%
+  {\strc_references_set_simple_reference{#1}%
    \hbox attr \destinationattribute \currentdestinationattribute
      {\strc_references_flush_destination_nodes
       \box\nextbox}%
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 8d60db765..8b411ce15 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 03/03/16 23:31:11
+-- merge date  : 03/04/16 10:39:33
 
 do -- begin closure to overcome local limits and interference