context-taspresent update (12aug08)

git-svn-id: svn://tug.org/texlive/trunk@10330 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 173 insertions, 21 deletions

diff --git a/Master/texmf-dist/tex/context/third/taspresent/t-doubleframe.tex b/Master/texmf-dist/tex/context/third/taspresent/t-doubleframe.tex
index 1517fcdd094..9dc579d0a6e 100644
--- a/Master/texmf-dist/tex/context/third/taspresent/t-doubleframe.tex
+++ b/Master/texmf-dist/tex/context/third/taspresent/t-doubleframe.tex
@@ -76,14 +76,14 @@
 
 \define\Maketitle{%
 \titback
-\switchtobodyfont[\Titlesize]
+%\switchtobodyfont[\Titlesize]
 \null
 \vfill
-\midaligned{\color[One]{\getvariable{taspresent}{title}}}
+\midaligned{\color[One]{\tfc\getvariable{taspresent}{title}}}
+\blank[3*line]
+\midaligned{\tfa\getvariable{taspresent}{author}}
 \blank[2*line]
-\midaligned{\tfx\getvariable{taspresent}{author}}
-\blank[line]
-\midaligned{\tfx\currentdate}
+\midaligned{\tfa\currentdate}
 \vfill
 \null\switchtobodyfont[\Normalsize]}
 
diff --git a/Master/texmf-dist/tex/context/third/taspresent/t-embossed.tex b/Master/texmf-dist/tex/context/third/taspresent/t-embossed.tex
index 97888a7977c..efeb9aab5ea 100644
--- a/Master/texmf-dist/tex/context/third/taspresent/t-embossed.tex
+++ b/Master/texmf-dist/tex/context/third/taspresent/t-embossed.tex
@@ -86,8 +86,15 @@
 \definecolor [e] 	       [r=.2,g=.2,b=.5]
 \definecolor [f]               [s=.4]
 
+\beginOLDTEX
 \definefontsynonym [BigBoss] [uhvb8r] 
 \definefont[Emblem] [BigBoss at 30pt]
+\endOLDTEX
+
+\beginLUATEX
+\definefontsynonym [BigBoss] [name:TeXGyreHeros-Bold]
+\definefont[Emblem] [BigBoss at 30pt]
+\endLUATEX
 
 %D However, it seemed more portable to let Metapost calculate the background.
 %D The rainbow effect takes some lines of code, but it's not too bad:
@@ -111,7 +118,7 @@ gr[2] := gr[2] enlarged -2.8.pt ;
 draw gr[2] withcolor \MPcolor{f} ;
 draw z.f1 -- z.f2 withcolor \MPcolor{f} ;
 boss := \sometxt{\framed[width=\textwidth,height=2cm,offset=0pt,align=right,top=\vss,bottom=\vss,frame=off]{\Emblem \color[c]{Made with \CONTEXT\hfill \pagenumber\ of \lastpage}}} ;
-bboss := \sometxt{\framed[width=\textwidth,height=2cm,offset=0pt,align=right,top=\vss,bottom=\vss,frame=off]{\Emblem \color[d]{Made with \CONTEXT\hfill \pagenumber\ of \lastpage}}} ;
+bboss := \sometxt{\framed[width=\textwidth,height=2cm,offset=0pt,align=right,top=\vss,bottom=\vss,frame=off]{\strut\Emblem \color[d]{Made with \CONTEXT\hfill \pagenumber\ of \lastpage}}} ;
 draw bboss shifted (1.96cm,0.04cm) ;
 draw boss shifted (2cm,0) ; 
 StopPage ;
diff --git a/Master/texmf-dist/tex/context/third/taspresent/t-quadblue.tex b/Master/texmf-dist/tex/context/third/taspresent/t-quadblue.tex
index 446b5cdf311..4b79b79eb57 100644
--- a/Master/texmf-dist/tex/context/third/taspresent/t-quadblue.tex
+++ b/Master/texmf-dist/tex/context/third/taspresent/t-quadblue.tex
@@ -94,9 +94,9 @@ z1 = ulcorner Page ;
 z5 = llcorner Page ;
 path q ;
 q = z1 -- z5 ;
-t = arclength (q) ;
-u = t/15 ;
-v = (PageNumber/NOfPages) ;
+t := arclength (q) ;
+u := t/15 ;
+v := (PageNumber/NOfPages) ;
 z4 = (x1+1cm, y1-1cm) ;
 z3 = (x4, y1) ;
 z2 = (x1, y4) ;
diff --git a/Master/texmf-dist/tex/context/third/taspresent/t-rainbowstripe.tex b/Master/texmf-dist/tex/context/third/taspresent/t-rainbowstripe.tex
index cf312d56b2a..a139438c9e5 100644
--- a/Master/texmf-dist/tex/context/third/taspresent/t-rainbowstripe.tex
+++ b/Master/texmf-dist/tex/context/third/taspresent/t-rainbowstripe.tex
@@ -39,9 +39,9 @@
 \setuplayout [width=fit,
               margin=1.5cm,
               height=fit,
-              header=15mm, 
+              header=11mm, 
               footer=0cm, 
-              topspace=18mm, 
+              topspace=15mm, 
               backspace=2cm,
               location=singlesided]
 
@@ -52,7 +52,7 @@
     [width=\paperwidth,
     height=\paperheight,
     x=20mm,
-    y=18mm]
+    y=12mm]
 
 \define[1]\Slidetitle{\page\setlayer[slidetitle]%
      {\framed[frame=off,height=1.5cm,width=\textwidth,offset=0pt,align=middle,top=\vss,bottom=\vss]{\switchtobodyfont[\Titlesize]#1}}}
@@ -198,7 +198,7 @@ StopPage ;
 StartPage
 path p[] ;
 p[1] := unitsquare xyscaled(MakeupWidth,.4cm) shifted (2cm,0.7cm) ;
-numeric i; i = PageNumber/NOfPages ;
+numeric i; i = (PageNumber - 1)/(NOfPages - 1) ;
 p[2] = ulcorner p[1] -- urcorner p[1] ;
 p[3] = llcorner p[1] -- lrcorner p[1] ;
 pair o[] ;
@@ -221,7 +221,7 @@ StopPage
 
 %D These are shortcuts to switch backgrounds:
 
-\define\lecback{\setuplayout[header=15mm]\setupbackgrounds[page][background={graybg,bar,slidetitle}]}
+\define\lecback{\setuplayout[header=11mm]\setupbackgrounds[page][background={graybg,bar,slidetitle}]}
 \define\titback{\setuplayout[header=0mm]\setupbackgrounds[page][background={graybg}]}
 \define\picback{\setuplayout[header=0mm]\setupbackgrounds[page][background={graybg,bar}]}
 \define\noback{\setupbackgrounds[page][background=nobackground]}
diff --git a/Master/texmf-dist/tex/context/third/taspresent/t-taspresent.tex b/Master/texmf-dist/tex/context/third/taspresent/t-taspresent.tex
index 1d2f754df62..5b3f51e95d3 100644
--- a/Master/texmf-dist/tex/context/third/taspresent/t-taspresent.tex
+++ b/Master/texmf-dist/tex/context/third/taspresent/t-taspresent.tex
@@ -82,8 +82,10 @@
 %D background which is defined in the module itself; it is included as a
 %D \type{mode}. All other styles are defined in external files which are
 %D called in turn.
- 
+
+\beginOLDTEX 
 \setupencoding[default=ec]
+\endOLDTEX
 
 \def\DefMode{\enablemode[defaultmode]}
 
@@ -103,12 +105,14 @@
 
 \processaction[\currentmoduleparameter{style}]
 	[  blackblue=>{\usemodule[blackblue]},
-	 doubleframe=>{\usemodule[doubleframe][bottom=\modbottom]},
+	        bonn=>{\usemodule[bonn]},
             bluegray=>{\usemodule[bluegray][color=\modcolor]},
-	    embossed=>{\usemodule[embossed]},
-	   darkshade=>{\usemodule[darkshade][color=\modcolor]},
           bluestripe=>{\usemodule[bluestripe]},
+           bluewhite=>{\usemodule[bluewhite]},
+	   darkshade=>{\usemodule[darkshade][color=\modcolor]},
+	 doubleframe=>{\usemodule[doubleframe][bottom=\modbottom]},
          doubleshade=>{\usemodule[doubleshade]},
+	    embossed=>{\usemodule[embossed]},
            graybeams=>{\usemodule[graybeams]},
           graysquare=>{\usemodule[graysquare]},
            greenblue=>{\usemodule[greenblue]},
@@ -175,11 +179,18 @@
 %D math formulas, etc.
 
 \starttypescript [serif] [default] [size] 
-\definebodyfont [14pt,15pt,16pt,20pt,25pt,\Normalsize,\Titlesize] [rm] [default] 
+\definebodyfont [14pt,15pt,16pt,17pt,20pt,25pt,\Normalsize,\Titlesize] [rm] [default] 
+\stoptypescript
+
+\starttypescript [sans] [default] [size] 
+\definebodyfont [14pt,15pt,16pt,17pt,20pt,25pt,\Normalsize,\Titlesize] [ss] [default] 
 \stoptypescript
 
 %D Modes define which font will be used.
 
+\definebodyfontenvironment[\Normalsize]
+\definebodyfontenvironment[\Titlesize]
+
 \startmode[latinmodern]
 \setupbodyfont[\Normalsize]
 \stopmode
@@ -188,6 +199,26 @@
 \setupbodyfont[ss,\Normalsize]
 \stopmode
 
+\beginLUATEX
+\usetypescriptfile[type-otf]
+
+\startmode[helvetica]
+\usetypescript[times]
+\setupbodyfont[times,ss,\Normalsize]
+\stopmode
+
+\startmode[pagella]
+\usetypescript[palatino]
+\setupbodyfont[palatino,\Normalsize]
+\stopmode
+
+\startmode[times]
+\usetypescript[times]
+\setupbodyfont[times,\Normalsize]
+\stopmode
+\endLUATEX
+
+\beginOLDTEX
 \startmode[helvetica]
 \definetypeface [SlideFace] [rm] [serif] [times] [default]
 \definetypeface [SlideFace] [ss] [sans] [helvetica] [default] [rscale=.9]
@@ -215,6 +246,76 @@
 \usetypescript[MyriadPro] [texnansi]
 \setupbodyfont[MyMyriadPro,ss,\Normalsize]
 \stopmode
+\endOLDTEX
+
+\beginXETEX
+\startmode[times]
+\starttypescript [serif] [sliter]
+  \definefontsynonym [Termes-Roman]          [file:texgyretermes-regular]
+  \definefontsynonym [Termes-Bold]           [file:texgyretermes-bold]
+  \definefontsynonym [Termes-Italic]         [file:texgyretermes-italic]
+  \definefontsynonym [Termes-Bold-Italic]    [file:texgyretermes-bolditalic]
+  \stoptypescript
+
+\starttypescript [serif] [sliter] [name]
+  \definefontsynonym [Serif]           [Termes-Roman] [features=default]
+  \definefontsynonym [SerifItalic]     [Termes-Italic] [features=default]
+  \definefontsynonym [SerifBold]       [Termes-Bold] [features=default]
+  \definefontsynonym [SerifBoldItalic] [Termes-Bold-Italic] [features=default]
+  \definefontsynonym [SerifCaps]       [Serif]
+  \definefontsynonym [OldStyle]       [Serif]
+\stoptypescript
+\definetypeface [SlideFace] [rm] [serif] [sliter] [default]
+\setupbodyfont[SlideFace,\Normalsize]
+\stopmode
+
+\startmode[helvetica]
+\starttypescript [sans] [slihe]
+  \definefontsynonym [Helvetica-Roman]          [file:texgyreheros-regular]
+  \definefontsynonym [Helvetica-Bold]           [file:texgyreheros-bold]
+  \definefontsynonym [Helvetica-Italic]         [file:texgyreheros-italic]
+  \definefontsynonym [Helvetica-Bold-Italic]    [file:texgyreheros-bolditalic]
+  \stoptypescript
+
+\starttypescript [sans] [slihe] [name]
+  \definefontsynonym [Sans]           [Helvetica-Roman] [features=default]
+  \definefontsynonym [SansItalic]     [Helvetica-Italic] [features=default]
+  \definefontsynonym [SansBold]       [Helvetica-Bold] [features=default]
+  \definefontsynonym [SansBoldItalic] [Helvetica-Bold-Italic] [features=default]
+  \definefontsynonym [SansCaps]       [Sans]
+  \definefontsynonym [OldStyle]       [Sans]
+\stoptypescript
+\definetypeface [SlideFace] [rm] [sans] [slihe] [default]
+\setupbodyfont[SlideFace,ss,\Normalsize]
+\stopmode
+
+\startmode[pagella]
+\definebodyfontenvironment[\Normalsize]
+\starttypescript [serif] [slipa]
+  \definefontsynonym [Pagella-Roman]          [file:texgyrepagella-regular]
+  \definefontsynonym [Pagella-Bold]           [file:texgyrepagella-bold]
+  \definefontsynonym [Pagella-Italic]         [file:texgyrepagella-italic]
+  \definefontsynonym [Pagella-Bold-Italic]    [file:texgyrepagella-bolditalic]
+  \stoptypescript
+
+\starttypescript [serif] [slipa] [name]
+  \definefontsynonym [Serif]           [Pagella-Roman] [features=default]
+  \definefontsynonym [SerifItalic]     [Pagella-Italic] [features=default]
+  \definefontsynonym [SerifBold]       [Pagella-Bold] [features=default]
+  \definefontsynonym [SerifBoldItalic] [Pagella-Bold-Italic] [features=default]
+  \definefontsynonym [SerifCaps]       [Serif]
+  \definefontsynonym [OldStyle]       [Serif]
+\stoptypescript
+\definetypeface [SlideFace] [rm] [serif] [slipa] [default]
+\setupbodyfont[SlideFace,\Normalsize]
+\stopmode
+
+\startmode[myriadpro]
+\usetypescriptfile[type-myriadpro]
+\usetypescript[MyriadPro]
+\setupbodyfont[MyMyriadPro,\Normalsize]
+
+\endXETEX
 
 %D This is a definition for Metapost pictures and \tex{sometxt} which I use in
 %D my own presentations.
@@ -270,11 +371,29 @@ picture bboxpicture ;
 draw unitsquare xyscaled (OverlayWidth,OverlayHeight) ;
 bboxpicture := currentpicture ;
 currentpicture := nullpicture ;
+for i=1 upto 18:
+ 	pickup pencircle scaled (i*0.333pt) ;
+ 	draw fullcircle scaled \MPvar{scale}mm shifted (\MPvar{x}mm + 1.5mm,\MPvar{y}mm - 1.5mm) withcolor transparent (1,0.025,black) ;
+ endfor ;
 pickup pencircle scaled 5pt ;
 draw fullcircle scaled \MPvar{scale}mm shifted (\MPvar{x}mm,\MPvar{y}mm) withcolor red ;
 setbounds currentpicture to boundingbox bboxpicture;
 \stopuseMPgraphic
 
+%D This code has been contributed by Wolfgang Schuster and Peter Rolf. It puts
+%D a transparent gray layer over the picture, with one round area being
+%D completely transparent. This looks very neat for emphasizing areas of a
+%D picture.
+
+\setupMPvariables[GraySomething][opacity=30,scale=20,x=10,y=10]
+\startuseMPgraphic{GraySomething}{opacity,scale,x,y}
+op := \MPvar{opacity}/100 ;
+path p, q ;
+p := unitsquare xyscaled(OverlayWidth,OverlayHeight) ;
+q := fullcircle scaled \MPvar{scale}mm shifted (\MPvar{x}mm,\MPvar{y}mm) ;
+fill p--reverse q--cycle withcolor transparent (1,op,black) ;
+\stopuseMPgraphic
+
 %D The next macro allows users a simple interface for placing an image with a
 %D red circle on top. The macro \tex{CircHoriz} takes three arguments: the size
 %D and placement of the red circle, which are given as variables in the form
@@ -286,6 +405,16 @@ setbounds currentpicture to boundingbox bboxpicture;
 \defineoverlay[Red_Circle][\useMPgraphic{CircleSomething}{#1}]
 \midaligned{\framed[frame=off,width=\textwidth,height=\PictureFrameHeight,align=middle,top=\vss,bottom=\vss,strut=no,offset=0pt,background={foreground,Red_Circle}]{\externalfigure[#2][#3]}}}
 
+%D This macro makes use of the gray layer; again, it takes three arguments:
+%D opacity, scale and placement of the transparent circle (the rest of the
+%D image is transparent gray), name of the picture, size of picture.
+
+\def\GrayHoriz{\dotripleargument\doGrayHoriz}
+\def\doGrayHoriz[#1][#2][#3]{%
+\defineoverlay[Gray_Background][\useMPgraphic{GraySomething}{#1}]
+\framed[frame=off,width=\textwidth,height=\textheight,align=middle,top=\vss,bottom=\vss,strut=no,offset=0pt]{\framed[frame=off,width=fit,height=fit,strut=no,offset=0pt,background={foreground,Gray_Background}]{\externalfigure[#2][#3]}}}
+
+
 \def\CircVert{\dotripleargument\doCircVert}
 \def\doCircVert[#1][#2][#3]#4{%
 \defineoverlay[Red_Circle][\useMPgraphic{CircleSomething}{#1}]%
@@ -300,10 +429,17 @@ setbounds currentpicture to boundingbox bboxpicture;
 picture bboxpicture ;
 draw unitsquare xyscaled (OverlayWidth,OverlayHeight) withcolor blue ;
 z1 = (\MPvar{x}mm,\MPvar{y}mm) ;
-ahlength := 15pt ;
 z2 = z1 + 2.5cm*dir(\MPvar{direction}) ;
+z3 = z1 shifted (1.5mm,-1.5mm) ;
+z4 = z2 shifted (1.5mm,-1.5mm) ;
 bboxpicture := currentpicture ;
 currentpicture := nullpicture ;
+for i=1 upto 18:
+	ahlength := (i*0.833pt) ;
+	pickup pencircle scaled (i*0.277pt) ;
+	drawarrow z4--z3 withcolor transparent (1,0.025,black) ;
+endfor ;
+ahlength := 15pt ;
 pickup pencircle scaled 5pt ;
 drawarrow z2--z1 withcolor red;
 setbounds currentpicture to boundingbox bboxpicture;
@@ -328,7 +464,15 @@ setbounds currentpicture to boundingbox bboxpicture;
 \stopcombination%
 }
 
- 
+\beginLUATEX
+\define{\married}%
+{\getglyph{name:TeXGyreHeros-Regular}{\char"26AD}}
+
+\define{\hanky}%
+{\getglyph{name:TeXGyreHeros-Regular}{\char"26AE}}
+\endLUATEX
+
+\beginOLDTEX 
 \loadmapfile[ts1-lm.map]
 
 \startencoding[comp]
@@ -341,6 +485,7 @@ setbounds currentpicture to boundingbox bboxpicture;
 
 \def\married{\begingroup\tsf@nt\textmarried\endgroup}
 \def\hanky{\begingroup\tsf@nt\texthanky\endgroup}
+\endOLDTEX
 
 %D Now the real user macros. \tex{Slidetitle}: well, the name says it all. Ths
 %D argument is typeset as the title, but the implementation and the result