beta 2013.04.09 19:57

12 files changed, 433 insertions, 10 deletions

diff --git a/context/data/scite/lexers/scite-context-lexer-tex.lua b/context/data/scite/lexers/scite-context-lexer-tex.lua
index e39ca2baa..cbe6d261d 100644
--- a/context/data/scite/lexers/scite-context-lexer-tex.lua
+++ b/context/data/scite/lexers/scite-context-lexer-tex.lua
@@ -410,6 +410,7 @@ local stopluacode            = #stoplua * token("embedded", stoplua)
 
 local metafuncall            = ( P("reusable") + P("usable") + P("unique") + P("use") + P("reuse") ) * ("MPgraphic")
                              + P("uniqueMPpagegraphic")
+                             + P("MPpositiongraphic")
 
 local metafunenvironment     = metafuncall -- ( P("use") + P("reusable") + P("unique") ) * ("MPgraphic")
                              + P("MP") * ( P("code")+ P("page") + P("inclusions") + P("initializations") + P("definitions") + P("extensions") + P("graphic") )
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index f63e30ab2..d1d4ed5cf 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.04.09 16:22}
+\newcontextversion{2013.04.09 19:57}
 
 %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 e772cbe4e..64fef745c 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 6e9705938..37d3fd6e4 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 71a1d746b..91dd4ad7a 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.04.09 16:22}
+\edef\contextversion{2013.04.09 19:57}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/lpdf-nod.lua b/tex/context/base/lpdf-nod.lua
index 0ce589c32..60d3fcd5b 100644
--- a/tex/context/base/lpdf-nod.lua
+++ b/tex/context/base/lpdf-nod.lua
@@ -126,7 +126,7 @@ function nodepool.pdfdestination(w,h,d,name,view,n)
         local s = copy_node(pdfsave)
         local m = copy_node(pdfsetmatrix)
         local r = copy_node(pdfrestore)
-        m.data = format("1 0 0 1")
+        m.data = "1 0 0 1"
         s.next = m  m.next = t  t.next = r
         m.prev = s  t.prev = m  r.prev = t
         return s -- a list
diff --git a/tex/context/base/s-pre-17.tex b/tex/context/base/s-pre-17.mkii
index 7e8310a53..7e8310a53 100644
--- a/tex/context/base/s-pre-17.tex
+++ b/tex/context/base/s-pre-17.mkii
diff --git a/tex/context/base/s-pre-17.mkiv b/tex/context/base/s-pre-17.mkiv
new file mode 100644
index 000000000..9505faa6b
--- /dev/null
+++ b/tex/context/base/s-pre-17.mkiv
@@ -0,0 +1,408 @@
+%D \module
+%D   [      file=s-pre-17,
+%D        version=1999.08.20,
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=Presentation Environment 17,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\setupbodyfont
+  [dejavu,11pt,ss]
+
+\setupsystem
+  [random=medium]
+
+\setupbackgrounds
+  [state=repeat]
+
+\setupbackgrounds
+  [page]
+  [background={page,forward}]
+
+\setupbackgrounds
+  [text][text]
+  [background=blowdown]
+
+\setupinteraction
+  [state=start,
+%    click=off,
+   color=TitleColor,
+   contrastcolor=TitleColor]
+
+\setupinteractionscreen
+  [option=max]
+
+\setuptolerance
+  [verytolerant,stretch]
+
+\definecolor [BackColor]  [s=.30]
+\definecolor [PageColor]  [g=1]
+\definecolor [FrameColor] [r=1]
+\definecolor [TitleColor] [y=1]
+\definecolor [ArrowColor] [b=1]
+
+\defineoverlay [title]    [\useMPgraphic{title}]
+\defineoverlay [page]     [\useMPgraphic{page}]
+\defineoverlay [blowup]   [{\hboxreference[whatever:\CurrentBlaBla]{\overlaybutton{whatever:\CurrentBlaBla}}}]
+\defineoverlay [blowdown] [{\hboxreference[page:\realfolio]{\overlaybutton{page:\realfolio}}}]
+\defineoverlay [forward]  [\overlaybutton{forward}]
+
+\startMPinclusions
+    input "mp-abck.mpiv" ;
+\stopMPinclusions
+
+\startMPpositiongraphic{mppos:connection}
+    path pa, pb, pc ; pair ca, cb ;
+    initialize_box(\MPpos{\MPvar{self}}) ; pa := pxy ; ca := cxy ;
+    initialize_box(\MPpos{\MPvar{prev}}) ; pb := pxy ; cb := cxy ;
+    pickup pencircle scaled .5pt ;
+    pa := pa enlarged 10pt ;
+    pb := pb enlarged 10pt ;
+    for i=1 upto 10 :
+        draw pa randomized 20pt withcolor \MPcolor{FrameColor} ;
+    endfor ;
+    if \MPp{\MPvar{prev}} > 0 :
+        pair a, b, c, d ;
+        for i=1 upto 25 :
+            a := .5[ulcorner pa,urcorner pa] randomized (10pt,10pt) ;
+            b := .5[llcorner pb,lrcorner pb] randomized (20pt,10pt) ;
+            c := .5[a,b] rotatedaround(a,-25) randomized (5pt,5pt) ;
+            d := .5[a,b] rotatedaround(a,+25) randomized (5pt,5pt) ;
+            draw (a--b) withcolor \MPcolor{ArrowColor} ;
+            draw (d--a--c) withcolor \MPcolor{ArrowColor} ;
+        endfor ;
+    fi ;
+    anchor_box(\MPanchor{\MPvar{self}}) ;
+\stopMPpositiongraphic
+
+\startuseMPgraphic{title}
+    pickup pencircle scaled .5pt ;
+    for i=1 upto 10 :
+        draw fullsquare
+            xyscaled(OverlayWidth,OverlayHeight)
+            enlarged 10pt randomized 20pt
+            withcolor \MPcolor{TitleColor} ;
+    endfor ;
+\stopuseMPgraphic
+
+\startuseMPgraphic{page}
+    StartPage ;
+        pickup pencircle scaled .5pt ;
+        fill Page withcolor \MPcolor{BackColor} ;
+        for i=1 upto 20 :
+            draw Page enlarged -50pt randomized 50pt withcolor \MPcolor{PageColor} ;
+        endfor ;
+    StopPage ;
+\stopuseMPgraphic
+
+\newcounter\CurrentBlaBla
+
+\defineframedtext
+   [ZoomText]
+   [before=,
+    after=,
+    width=fit,
+    align=flushleft,
+    frame=off,
+    foregroundcolor=white]
+
+\starttexdefinition StartText
+    \begingroup
+    \getrandomdimen\scratchdimen{250pt}{350pt}
+    \edef\TextWidth{\the\scratchdimen}
+    \setbox\scratchbox\hbox\bgroup
+        \hsize\TextWidth
+        \ZoomText\bgroup
+\stoptexdefinition
+
+\starttexdefinition StartTextSimple
+    \begingroup
+    \setbox\scratchbox\hbox\bgroup
+        \framed [
+            frame=off,
+            foregroundcolor=white
+        ]
+        \bgroup
+\stoptexdefinition
+
+\starttexdefinition StopTextSimple
+    \StopText
+\stoptexdefinition
+
+\starttexdefinition StopText
+        \egroup
+    \egroup
+    \doglobal\increment\CurrentBlaBla
+    \let\PrevBlaBla\CurrentBlaBla \doglobal\decrement\PrevBlaBla
+    \let\NextBlaBla\CurrentBlaBla \doglobal\increment\NextBlaBla
+    \setMPpositiongraphic {
+        connection:\CurrentBlaBla
+    }{
+        mppos:connection
+    }{
+        seed=\CurrentBlaBla,
+        prev=connection:\PrevBlaBla,
+        next=connection:\NextBlaBla
+    }
+    \hbox to 600pt \bgroup
+        \setupinteraction[focus=fitr]
+        \getrandomdimen\scratchdimen{50pt}{75pt}
+        \hskip0pt plus \scratchdimen minus \scratchdimen
+        \hpos {
+            connection:\CurrentBlaBla
+        }{
+            \framed [
+                frame=off,
+                offset=overlay,
+                backgroundoffset=50pt,
+                background=blowup
+            ] {
+                \box\scratchbox
+            }
+        }
+        \getrandomdimen\scratchdimen{50pt}{75pt}
+        \hskip0pt plus \scratchdimen minus \scratchdimen
+    \egroup
+    \getrandomdimen\scratchdimen{75pt}{125pt}
+    \vskip\scratchdimen
+    \endgroup
+\stoptexdefinition
+
+\dontcomplain
+
+\disablemode[SpreadPage]
+
+\starttexdefinition StartPage #1
+    \doglobal\increment(\CurrentBlaBla,100)%
+    \setvariables[StartPage][title={#1}]
+    \setbox\scratchbox\hbox\bgroup
+        \valign\bgroup
+            \ignorespaces
+            \alignmark\alignmark
+            \vss
+            \cr
+\stoptexdefinition
+
+\starttexdefinition StopPage
+    \cr
+    \egroup
+    \egroup
+    \setbox\scratchbox\vbox\bgroup
+        \vskip100pt
+        \doifmodeelse {SpreadPage} {
+            \hbox spread 200pt
+        } {
+            \hbox to \wd\scratchbox
+        }
+        \bgroup
+            \setupinteraction[focus=fitr]
+            \hss
+            \switchtobodyfont[big]%
+            \bfd
+            \doglobal\increment\CurrentBlaBla
+            \setupinterlinespace
+            \hpos {
+                title:\realfolio
+            }{
+                \framed [
+                    frame=off,
+                    offset=overlay,
+                    backgroundoffset=50pt,
+                    background=blowup
+                ] {
+                    \framed [
+                        frame=off,
+                        align=middle,
+                        foregroundcolor=white,
+                        background=title
+                    ] {
+                        \getvariable{StartPage}{title}
+                    }
+                }
+            }
+            \hss
+        \egroup
+        \vskip100pt
+        \box\scratchbox
+    \egroup
+    \normalexpanded {
+        \definepapersize [
+            MasterPage
+        ] [
+            width=\the\dimexpr\wd\scratchbox+100pt\relax,
+            height=\the\dimexpr\ht\scratchbox+\dp\scratchbox+100pt\relax
+        ]
+    }
+    \setuppapersize
+        [MasterPage]
+        [MasterPage]
+    \setuplayout [
+        topspace=25pt,
+        backspace=25pt,
+        width=middle,
+        header=0pt,
+        footer=0pt,
+        height=middle
+    ]
+    \centerbox {
+        \box\scratchbox
+    }
+   \page
+\stoptexdefinition
+
+\starttexdefinition StartTopic #1
+    \removeunwantedspaces
+    \cr
+    \doglobal\increment(\CurrentBlaBla,100)%
+    \vbox\bgroup
+        \vskip100pt
+        \bgroup
+            \definecolor[FrameColor][TitleColor]
+            \switchtobodyfont[big]
+            \bfd
+            \setupinterlinespace
+            \StartTextSimple
+                \ignorespaces
+                #1
+                \removeunwantedspaces
+            \StopTextSimple
+            \vskip25pt
+        \egroup
+\stoptexdefinition
+
+\starttexdefinition StopTopic
+    \vskip-\lastskip
+    \vskip100pt
+    \egroup
+    \ignorespaces
+\stoptexdefinition
+
+\starttexdefinition TitlePage #1
+    \begingroup
+        \def\\{\vskip1ex\bfc\def\\{\vskip1ex\bfb}}
+        \enablemode[SpreadPage]
+        \StartPage{#1}
+        \StopPage
+    \endgroup
+\stoptexdefinition
+
+\continueifinputfile{s-pre-17.mkiv}
+
+\starttext
+
+\nopdfcompression
+
+\TitlePage{About Text\\Today's Talk\\Hans Hagen}
+
+\StartPage{The First Page}
+
+    \StartTopic{Some Text}
+        \StartText \input tufte \StopText
+        \StartText \input knuth \StopText
+        \StartText \input zapf  \StopText
+        \StartText \input knuth \StopText
+    \StopTopic
+
+    \StartTopic{Another Text}
+        \StartText \input tufte \StopText
+        \StartText \input zapf  \StopText
+        \StartText \input knuth \StopText
+    \StopTopic
+
+    \StartTopic{Some More Text}
+        \StartText \input tufte \StopText
+        \StartText \input knuth \StopText
+        \StartText \input zapf  \StopText
+        \StartText \input tufte \StopText
+    \StopTopic
+
+    \StartTopic{Some Text Again}
+        \StartText \input tufte \StopText
+        \StartText \input zapf  \StopText
+        \StartText \input knuth \StopText
+        \StartText \input tufte \StopText
+    \StopTopic
+
+\StopPage
+
+\StartPage{The Second Page}
+
+    \StartTopic{Some Text}
+        \StartText \input tufte \StopText
+        \StartText \input knuth \StopText
+        \StartText \input zapf  \StopText
+        \StartText \input tufte \StopText
+        \StartText \input knuth \StopText
+        \StartText \input zapf  \StopText
+    \StopTopic
+
+    \StartTopic{Another Text}
+        \StartText \input tufte \StopText
+        \StartText \input knuth \StopText
+        \StartText \input zapf  \StopText
+    \StopTopic
+
+    \StartTopic{Some Nice Text}
+        \StartText \input tufte \StopText
+        \StartText \input knuth \StopText
+        \StartText \input zapf  \StopText
+        \StartText \input tufte \StopText
+        \StartText \input tufte \StopText
+    \StopTopic
+
+    \StartTopic{Some Funny Text}
+        \StartText \input tufte \StopText
+        \StartText \input knuth \StopText
+    \StopTopic
+
+    \StartTopic{Quite Some Text}
+        \StartText \input tufte \StopText
+        \StartText \input knuth \StopText
+        \StartText \input zapf  \StopText
+        \StartText \input tufte \StopText
+        \StartText \input knuth \StopText
+        \StartText \input zapf  \StopText
+        \StartText \input tufte \StopText
+        \StartText \input knuth \StopText
+        \StartText \input zapf  \StopText
+    \StopTopic
+
+    \StartTopic{Even More Text}
+        \StartText \input knuth \StopText
+        \StartText \input zapf  \StopText
+        \StartText \input tufte \StopText
+        \StartText \input knuth \StopText
+        \StartText \input zapf  \StopText
+    \StopTopic
+
+\StopPage
+
+\StartPage{The Third Page}
+
+    \StartTopic{Some Short Text}
+        \StartText \input tufte \StopText
+        \StartText \input knuth \StopText
+        \StartText \input zapf  \StopText
+    \StopTopic
+
+    \StartTopic{Some Minimal Text}
+        \StartText \input tufte \StopText
+        \StartText \input zapf  \StopText
+    \StopTopic
+
+    \StartTopic{Some More Text}
+        \StartText \input tufte \StopText
+        \StartText \input knuth \StopText
+        \StartText \input zapf  \StopText
+        \StartText \input tufte \StopText
+        \StartText \input tufte \StopText
+    \StopTopic
+
+\StopPage
+
+\stoptext
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index ef645abce..d7f5fc2fe 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 8e25ce1de..da4c9cde6 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-ref.mkvi b/tex/context/base/strc-ref.mkvi
index 54f180d8e..c82a09d20 100644
--- a/tex/context/base/strc-ref.mkvi
+++ b/tex/context/base/strc-ref.mkvi
@@ -259,12 +259,26 @@
    \fi}
 
 \def\strc_references_set_page_only_destination_box_attribute#cs#labels%
-   {\strc_references_set_page_only_destination_attribute{#labels}%
-    \ifnum\lastdestinationattribute>\zerocount
-      \edef#cs{attr \destinationattribute\number\lastdestinationattribute}%
-    \else
-      \let#cs\empty
-    \fi}
+  {\strc_references_set_page_only_destination_attribute{#labels}%
+   \ifnum\lastdestinationattribute>\zerocount
+     \edef#cs{attr \destinationattribute\number\lastdestinationattribute}%
+   \else
+     \let#cs\empty
+   \fi}
+
+%D It's about time to clean up references .. stable enough now.
+
+\unexpanded\def\boxreference[#1]%
+  {\begingroup
+   \dowithnextbox
+    {\strc_references_set_page_only_destination_attribute{#1}%
+     \hbox
+       \ifnum\lastdestinationattribute=\attributeunsetvalue\else attr \destinationattribute \lastdestinationattribute \fi
+       {\box\b_strc_destination_nodes\box\nextbox}%
+     \endgroup}}
+
+\unexpanded\def\hboxreference[#1]{\boxreference[#1]\hbox}
+\unexpanded\def\vboxreference[#1]{\boxreference[#1]\vbox}
 
 % \ifx\currentdestinationattribute\empty
 %   \begingroup\attribute\destinationattribute\currentdestinationattribute\emptyhbox\endgroup % todo
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index fc8197ff0..a82bc71b4 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/09/13 16:22:38
+-- merge date  : 04/09/13 19:57:01
 
 do -- begin closure to overcome local limits and interference