diff options
author | Karl Berry <karl@freefriends.org> | 2009-11-23 18:02:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-11-23 18:02:17 +0000 |
commit | ce23501cc3677b075ea61b6793acfc67386e5d99 (patch) | |
tree | 3cc60d03bae9cce29c93bd9ba009ae9268442606 /Master/texmf-dist/tex/context | |
parent | c122d4a9d23e5df043506418f5185b3350e5b4bf (diff) |
context-simpleslides update (3nov09)
git-svn-id: svn://tug.org/texlive/trunk@16142 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context')
17 files changed, 427 insertions, 42 deletions
diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BigNumber.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BigNumber.tex index f0d890b0fb8..f0426a34d1e 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BigNumber.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BigNumber.tex @@ -4,7 +4,7 @@ %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- Big Number Style, %D author=Aditya Mahajan and Thomas A. Schmitz, -%D date=\PRESTITdate, +%D date=\currentdate %D copyright={Aditya Mahajan and Thomas A. Schmitz}] %C %C Copyright 2007 Aditya Mahajan and Thomas A. Schmitz diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BottomSquares.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BottomSquares.tex index 77633d23c69..3f866ed6d68 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BottomSquares.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BottomSquares.tex @@ -4,7 +4,7 @@ %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- BottomSquares style, %D author=Aditya Mahajan and Thomas A. Schmitz, -%D date=\PRESTITdate, +%D date=\currentdate | update , %D copyright={Aditya Mahajan and Thomas A. Schmitz}] %C %C Copyright 2007 Aditya Mahajan and Thomas A. Schmitz @@ -80,7 +80,11 @@ save w; numeric w; w = xpart (lrcorner Field[Text][Text] - llcorner Field[Text][Text]) - diff ; save factor; numeric factor; -factor = w/(NOfPages - 1) ; +if NOfPages <= 1 : + factor = w ; +else : + factor = w/(NOfPages - 1) ; +fi ; save p; path p ; p = unitsquare xyscaled (diff,diff) diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BoxedTitle.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BoxedTitle.tex new file mode 100644 index 00000000000..8a1a97fc6e0 --- /dev/null +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BoxedTitle.tex @@ -0,0 +1,196 @@ +%D \module +%D [ file=simpleslides-s-BoxedTitle, +%D version=2009.10.04 +%D title=\CONTEXT\ Style File, +%D subtitle=Presentation Module --- FramedTitle style, +%D author=Aditya Mahajan and Thomas A. Schmitz, +%D date=\PRESTITdate, +%D copyright={Aditya Mahajan and Thomas A. Schmitz}] +%C +%C Copyright 2009 Aditya Mahajan and Thomas A. Schmitz +%C This file may be distributed under the GNU General Public License v. 2.0. + +%D This file provides the \quotation{BoxedTitle} style for the presentation +%D module. It is loaded at runtime. +%D +\writestatus{simpleslides}{loading style BoxedTitle} + +\startmodule[simpleslides-s-BoxedTitle] + +\unprotect + +%D The page layout: + +\setuplayout [width=fit, + margin=0cm, + height=fit, + header=0cm, + footer=0cm, + topspace=1.35cm, + backspace=1cm, + location=singlesided] + +\setuplayout [simpleslides:layout:horizontal][header=1.75cm] +\setuplayout [simpleslides:layout:vertical] [header=0cm] +\setuplayout [simpleslides:layout:title] [header=0cm] + +%D We also specify the position of the slidetitle. + +\setuplayer[simpleslides:layer:slidetitle] + [x=10mm,y=5mm] + + +%D These macros are used for placing figures/pictures: + +\define\NormalHeight {\textheight} +\define\NormalWidth {.476\textwidth} +\define\PictureFrameHeight {\textheight} +\define\PictureFrameWidth {.476\textwidth} + +\setupframed[simpleslides:framed] + [background={BoxedTitle:Title}] + +%D We define our color scheme: + +\definecolor [simpleslides:backgroundcolor] [s=.98] +\definecolor [simpleslides:variantcolor] [r=0.05,g=0.06,b=0.5] +\definecolor [simpleslides:contrastcolor] [r=.46,g=0.67,b=0.84] +\definecolor [simpleslides:itemize:color] [simpleslides:variantcolor] + +%D We let Metapost calculate the background: + +\startuniqueMPgraphic{MyShade} + save p ; path p ; + p := unitsquare xscaled \overlaywidth yscaled \overlayheight smoothed 3mm ; + linear_shade(p,6,\MPcolor{simpleslides:variantcolor},\MPcolor{simpleslides:contrastcolor}) ; +\stopuniqueMPgraphic + +\startuniqueMPgraphic{simpleslides:MP:horizontal} +StartPage ; +save q ; path q ; +q = unitsquare xscaled \overlaywidth yscaled \overlayheight smoothed 7mm ; +fill Page withcolor black ; +fill q withcolor \MPcolor{simpleslides:backgroundcolor} ; +StopPage ; +\stopuniqueMPgraphic + +\startuseMPgraphic{simpleslides:MP:ornament} +StartPage ; +save a, b ; numeric a, b ; +save p ; path p ; +a = 3.5mm ; +z0 = (0,5mm) ; +z1 = z0 shifted (a * NOfPages,0) ; +b = arclength (z0 --z1) ; + +z2 = z0 shifted (PaperWidth/2 - b/2,0) ; +z3 = z1 shifted (PaperWidth/2 - b/2,0) ; +z4 = z3 shifted (0,a) ; +z5 = z2 shifted (0,a) ; +pickup pencircle scaled 0.5pt ; +p = z2 -- z3 -- z4 -- z5 -- cycle ; +pair za[] ; +pair zb[] ; +z.a1 = z2 ; +z.b1 = z5 ; +for i = 2 upto (NOfPages + 1): + z.a[i] = z.a[(i - 1)] shifted (a,0) ; + z.b[i] = z.b[(i - 1)] shifted (a,0) ; + for k = 2 upto (PageNumber + 1) : + z.a[k] = z.a[(k - 1)] shifted (a,0) ; + z.b[k] = z.b[(k - 1)] shifted (a,0) ; + path q[] ; + q[k] = z.a[(k -1 )] -- z.a[k] -- z.b[k] -- z.b[(k - 1)] -- cycle ; + circular_shade(q[k],0,\MPcolor{simpleslides:contrastcolor},\MPcolor{simpleslides:variantcolor}) ; + endfor ; + pickup pencircle scaled 1pt ; + draw z.a[i] -- z.b[i] withcolor \MPcolor{simpleslides:variantcolor} ; +endfor ; +draw p withcolor \MPcolor{simpleslides:variantcolor} ; +StopPage ; +\stopuseMPgraphic + +\startuniqueMPgraphic{FilledSquare} +save p ; path p ; +p = unitsquare xyscaled(0.4cm,0.4cm) ; +circular_shade(p,0,\MPcolor{simpleslides:contrastcolor},\MPcolor{simpleslides:variantcolor}) ; +\stopuniqueMPgraphic + +%D We define these backgrounds as overlays: + +\defineoverlay + [simpleslides:background:horizontal] + [\useMPgraphic{simpleslides:MP:horizontal}] + +\defineoverlay + [simpleslides:background:vertical] + [\useMPgraphic{simpleslides:MP:horizontal}] + +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:horizontal}] + +\defineoverlay + [simpleslides:background:ornament] + [\useMPgraphic{simpleslides:MP:ornament}] + +\defineoverlay + [BoxedTitle:Title] + [\uniqueMPgraphic{MyShade}] + +%D We want the title to placed in a framed box. We redefine all the keys of +%D \type{\setupTitle}, so that the module is easier to maintain. + +\setupTitle + [\c!title=, + \c!author=, + \c!date=\currentdate, + \c!headstyle=, + \c!headcolor={simpleslides:backgroundcolor}, + \c!align=\v!middle, + \c!before={\vfill\getvalue{simpleslides:framed} + [\c!width=\textwidth,\c!height=.75\textheight, + \c!align=\v!middle, \c!strut=\v!no] + \bgroup}, + \c!after={\egroup\vfill}, + \c!title\c!style={\switchtobodyfont[\TitleSize]}, + \c!title\c!color=, + \c!title\c!align=,%\v!middle, + \c!author\c!style=, + \c!author\c!color=, + \c!author\c!align=,%\v!middle, + \c!date\c!style=, + \c!date\c!color=, + \c!date\c!align=,%\v!middle, + \c!before\c!title=, + \c!before\c!author=, + \c!before\c!date=, + \c!after\c!title={\blank[1*line]}, + \c!after\c!author={\blank[2*line]}, + \c!after\c!date=] + +%D We also want the slide title in a framed box. + +\setupSlideTitle + [\c!after=, + \c!alternative=layer, + \c!height=2.1cm, + \c!width=\textwidth, + \c!color=simpleslides:backgroundcolor] + +%D In this style, the space opposite vertical pictures has the same shaded +%D frame as the slide title. + +\setupPicture[verticalbackground=BoxedTitle:Title, + verticalforegroundcolor=simpleslides:backgroundcolor] + +%D The symbol for the first level of itemizations. + +\definesymbol[1][\uniqueMPgraphic{FilledSquare}] +\setupitemize[1][color=simpleslides:variantcolor] + +\protect +\stopmodule + +\endinput + diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Ellipse.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Ellipse.tex index 09657f7ccc2..79cbb9c43ae 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Ellipse.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Ellipse.tex @@ -4,7 +4,7 @@ %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module Ellipse, %D author=Aditya Mahajan and Thomas A. Schmitz, -%D date=\PRESTITdate, +%D date=\currentdate, %D copyright={Aditya Mahajan and Thomas A. Schmitz}] %C %C Copyright 2007 Aditya Mahajan and Thomas A. Schmitz diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Embossed.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Embossed.tex index e8e24f39bd4..97b7526245a 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Embossed.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Embossed.tex @@ -4,7 +4,7 @@ %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- Embossed style, %D author=Aditya Mahajan and Thomas A. Schmitz, -%D date=\PRESTITdate, +%D date=\currentdate, %D copyright={Aditya Mahajan and Thomas A. Schmitz}] %C %C Copyright 2007 Aditya Mahajan and Thomas A. Schmitz diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Framed.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Framed.tex index 4cde7723962..63e4d8054fc 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Framed.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Framed.tex @@ -4,7 +4,7 @@ %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- Framed Style, %D author=Aditya Mahajan and Thomas A. Schmitz, -%D date=\PRESTITdate, +%D date=\currentdate, %D copyright={Aditya Mahajan and Thomas A. Schmitz}] %C %C Copyright 2007 Aditya Mahajan and Thomas A. Schmitz @@ -100,7 +100,12 @@ linear_shade(p[1],0, \MPcolor{simpleslides:contrastcolor}) ; save i ; -numeric i; i = PageNumber/NOfPages ; +numeric i; +if NOfPages = 0 : + i = PageNumber ; +else : + i = PageNumber/NOfPages ; +fi ; p[2] = ulcorner p[1] -- urcorner p[1] ; p[3] = llcorner p[1] -- lrcorner p[1] ; diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-FramedTitle.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-FramedTitle.tex index 6c6c3abe8a7..197869e6849 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-FramedTitle.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-FramedTitle.tex @@ -4,7 +4,7 @@ %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- FramedTitle style, %D author=Aditya Mahajan and Thomas A. Schmitz, -%D date=\PRESTITdate, +%D date=\currentdate, %D copyright={Aditya Mahajan and Thomas A. Schmitz}] %C %C Copyright 2007 Aditya Mahajan and Thomas A. Schmitz diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-HorizontalStripes.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-HorizontalStripes.tex index 025b74534e0..37aa554d86b 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-HorizontalStripes.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-HorizontalStripes.tex @@ -4,7 +4,7 @@ %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module HorizontalStripes, %D author=Aditya Mahajan and Thomas A. Schmitz, -%D date=\PRESTITdate, +%D date=\currentdate, %D copyright={Aditya Mahajan and Thomas A. Schmitz}] %C %C Copyright 2007 Aditya Mahajan and Thomas A. Schmitz diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-PlainCounter.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-PlainCounter.tex new file mode 100644 index 00000000000..d3044b75e09 --- /dev/null +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-PlainCounter.tex @@ -0,0 +1,165 @@ +%D \module +%D [ file=simpleslides-s-PlainCounter, +%D version=2009.07.30 +%D title=\CONTEXT\ Style File, +%D subtitle=Presentation Module --- Plain Counter, +%D author=Aditya Mahajan and Thomas A. Schmitz, +%D date=\currentdate, +%D copyright={Aditya Mahajan and Thomas A. Schmitz}] +%C +%C Copyright 2009 Aditya Mahajan and Thomas A. Schmitz +%C This file may be distributed under the GNU General Public License v. 2.0. + +%D This file provides the \quotation{PlainCounter} style for the presentation +%D module. It is loaded at runtime. + +\writestatus{simpleslides}{loading Plain Counter style} + +\startmodule[simpleslides-s-PlainCounter] + +\unprotect + +%D First, we change the page layout to have more space all around + +\setuplayout + [\c!topspace=2\lineheight, + \c!top=2\lineheight, + \c!topdistance=0cm, + \c!header=0cm, + \c!headerdistance=0cm, + \c!height=middle, + \c!footerdistance=\lineheight, + \c!footer=1.25\lineheight, + \c!bottomspace=0.25\lineheight, + \c!bottom=0.25\lineheight, + \c!bottomdistance=0cm, + \c!backspace=0.5in, + \c!leftmargin=0.25cm, + \c!leftmargindistance=.15cm, + \c!width=middle, + \c!cutspace=0.5in, + \c!rightmargin=.25cm, + \c!rightmargindistance=.15cm, + \c!grid=on, + \c!columndistance=5pt, + \c!columns=6, + ] +%D This module has two color schemes: dull and bright + +\startsetups simpleslides:setups:dull +\definecolor [simpleslides:backgroundcolor] [s=.95] +\definecolor [simpleslides:variantcolor] [s=.8] +\definecolor [simpleslides:contrastcolor] [b=.5] +\definecolor [simpleslides:itemize:color] [simpleslides:contrastcolor] +\definecolor [simpleslides:altcontrastcolor] [r=.95] +\definecolor [simpleslides:imp:background] [r=1,g=1,b=0.85] +\stopsetups + +\startsetups simpleslides:setups:bright +\definecolor [simpleslides:backgroundcolor] [white] +\definecolor [simpleslides:variantcolor] [s=.9] +\definecolor [simpleslides:contrastcolor] [b=.65] +\definecolor [simpleslides:itemize:color] [simpleslides:contrastcolor] +\definecolor [simpleslides:altcontrastcolor] [r=.95] +\definecolor [simpleslides:imp:background] [r=1,g=1,b=0.85] +\stopsetups + +%D Now we choose the scheme that the user asked for + +\doifsetupselse{simpleslides:setups:\moduleparameter{simpleslides}{color}} + {\setups{simpleslides:setups:\moduleparameter{simpleslides}{color}}} + {\setups{simpleslides:setups:dull}} + +\simpleslidesTitleSize=1.73\simpleslidesNormalSize\relax +\simpleslidesSlideTitleSize =1.44\simpleslidesNormalSize \relax + +\setupTitle + [\c!before={\vfill\vfill}, + \c!align=\v!middle, + \c!titlecolor=simpleslides:contrastcolor, + \c!after\c!title=\vfill, + afterauthor={\vfill\vfill}, + \c!after={\vfill}] + +\startuniqueMPgraphic{simpleslides:MP:horizontal} +StartPage ; +fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; +StopPage +\stopuniqueMPgraphic + +\startuseMPgraphic{simpleslides:MP:ornament} +StartPage ; + +save a, b; +numeric a,b; +b = PaperWidth/2 - NOfPages*5pt/2 ; + +save p,q ; path p, q; +p =((0,15bp) -- (3bp,30bp)) shifted (b,0); +q =((-22bp,15bp) -- (0,30bp) ) shifted (b,0); + for i := NOfPages-1 downto 1: + draw (if i mod 5 = 0 : q else : p fi) + randomized 1bp + shifted (i*5pt,0) + withcolor (if i < RealPageNumber : \MPcolor{simpleslides:contrastcolor} + else : \MPcolor{simpleslides:variantcolor} + fi) + withpen pencircle scaled (1bp randomized .5bp) ; + endfor ; + +StopPage ; +\stopuseMPgraphic + +\defineoverlay + [simpleslides:background:horizontal] + [\useMPgraphic{simpleslides:MP:horizontal}] + +\defineoverlay + [simpleslides:background:vertical] + [\useMPgraphic{simpleslides:MP:horizontal}] + +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:horizontal}] + +\defineoverlay + [simpleslides:background:ornament] + [\useMPgraphic{simpleslides:MP:ornament}] + + + +\setupSlideTitle + [align=flushleft, + style={\switchtobodyfont[\SlideTitleSize]\bolditalic}, + color=simpleslides:contrastcolor] + +% \setuphead +% [subsubject] +% [numberstyle=bolditalic, textstyle=bolditalic,color=darkblue,style=\tfb, +% before=\blank,after=\blank] + + +\setupalign[\v!flushleft,\v!nothyphenated,\v!verytolerant] + +\setupinterlinespace[\v!auto,\v!medium] + +\setupcombinations[\c!distance=3em] + +\setupitemize[\c!color=simpleslides:itemize:color, + \c!headstyle=\tfa, + \c!headcolor=simpleslides:itemize:color] + +\setupitemize[\v!autointro] + +\setupitemize[2][\v!packed] +\setupitemize[2][\c!headstyle=\v!bold, \c!headcolor=] + +\definesymbol[2][\useMPgraphic{simpleslides:itemize:triangle}] +\definesymbol[1][{\symbol[circle]}] +\definesymbol[2][{\symbol[triangle]}] +\definesymbol[3][{\symbol[dash]}] + +\protect +\stopmodule + +\endinput diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-RainbowStripe.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-RainbowStripe.tex index 5ca00ec6b2e..f2bf47f0933 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-RainbowStripe.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-RainbowStripe.tex @@ -4,7 +4,7 @@ %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module RainbowStripe, %D author=Aditya Mahajan and Thomas A. Schmitz, -%D date=\PRESTITdate, +%D date=\currentdate, %D copyright={Aditya Mahajan and Thomas A. Schmitz}] %C %C Copyright 2007 Aditya Mahajan and Thomas A. Schmitz @@ -169,7 +169,12 @@ StopPage ; StartPage path p[] ; p[1] := unitsquare xyscaled(MakeupWidth,.4cm) shifted (2cm,0.7cm) ; -numeric i; i = (PageNumber - 1)/(NOfPages - 1) ; +numeric i; +if NOfPages <= 1 : + i = (PageNumber - 1) ; +else : + i = (PageNumber - 1)/(NOfPages - 1) ; +fi ; p[2] = ulcorner p[1] -- urcorner p[1] ; p[3] = llcorner p[1] -- lrcorner p[1] ; pair o[] ; diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Shaded.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Shaded.tex index 97844cb5cd3..7da4ef5d847 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Shaded.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Shaded.tex @@ -4,7 +4,7 @@ %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- Shaded style, %D author=Aditya Mahajan and Thomas A. Schmitz, -%D date=\PRESTITdate, +%D date=\currentdate, %D copyright={Aditya Mahajan and Thomas A. Schmitz}] %C %C Copyright 2007 Aditya Mahajan and Thomas A. Schmitz diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-SideSquares.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-SideSquares.tex index 8ecce564439..08d588408a2 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-SideSquares.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-SideSquares.tex @@ -4,7 +4,7 @@ %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module SideSquares, %D author=Aditya Mahajan and Thomas A. Schmitz, -%D date=\PRESTITdate, +%D date=\currentdate, %D copyright={Aditya Mahajan and Thomas A. Schmitz}] %C %C Copyright 2007 Aditya Mahajan and Thomas A. Schmitz @@ -68,7 +68,11 @@ path q ; q = z1 -- z5 ; t := arclength (q) ; u := t/15 ; -v := (PageNumber/NOfPages) ; +if NOfPages = 0 : + v := PageNumber ; +else : + v := (PageNumber/NOfPages) ; +fi ; z4 = (x1+1cm, y1-1cm) ; z3 = (x4, y1) ; z2 = (x1, y4) ; diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Split.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Split.tex index c1fbe136d48..360307835eb 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Split.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Split.tex @@ -4,7 +4,7 @@ %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- Split style, %D author=Aditya Mahajan and Thomas A. Schmitz, -%D date=\PRESTITdate, +%D date=\currentdate, %D copyright={Aditya Mahajan and Thomas A. Schmitz}] %C %C Copyright 2007 Aditya Mahajan and Thomas A. Schmitz @@ -117,16 +117,16 @@ fill p[2] withcolor \MPcolor{simpleslides:variantcolor} ; fill p[3] withcolor \MPcolor{simpleslides:variantcolor} ; fill p[4] withcolor \MPcolor{simpleslides:contrastcolor} ; -draw \sometxt[simpleslides:sometxt:left]{\noexpand\moduleparameter{simpleslides:title}{date}} +draw \sometxt[simpleslides:sometxt:left]{\getvariable{simpleslides:title}{date}} shifted (1cm,y1) ; draw \sometxt[simpleslides:sometxt:right]{\folio\ of \lastpage} shifted (x5,y1) ; -draw \sometxt[simpleslides:sometxt:left]{\noexpand\moduleparameter{simpleslides:title}{author}} +draw \sometxt[simpleslides:sometxt:left]{\getvariable{simpleslides:title}{author}} shifted (1cm,0) ; -draw \sometxt[simpleslides:sometxt:right]{\noexpand\moduleparameter{simpleslides:title}{title}} +draw \sometxt[simpleslides:sometxt:right]{\getvariable{simpleslides:title}{title}} shifted (x5,0) ; StopPage ; diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Swoosh.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Swoosh.tex index da62bf6dc4e..dd6bf48453f 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Swoosh.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Swoosh.tex @@ -124,7 +124,7 @@ pair s[] ; pair circcenter ; circcenter = lrcorner Page shifted (-1cm, 1cm) ; picture pic ; b = 1.5cm ; -if \realfolio > 1: +if NOfPages > 1: theta = (PageNumber - 1)/(NOfPages - 1) ; p[4] = fullcircle scaled b rotated 90 ; fill p[4] withcolor \MPcolor{simpleslides:altcontrastcolor} ; diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-ThickStripes.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-ThickStripes.tex index b7deead545b..52b86f7da23 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-ThickStripes.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-ThickStripes.tex @@ -4,7 +4,7 @@ %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- Thick Stripes style, %D author=Aditya Mahajan and Thomas A. Schmitz, -%D date=\PRESTITdate, +%D date=\currentdate, %D copyright={Aditya Mahajan and Thomas A. Schmitz}] %C %C Copyright 2007 Aditya Mahajan and Thomas A. Schmitz @@ -97,7 +97,7 @@ fill p[3] withcolor \MPcolor{simpleslides:variantcolor} ; pickup pencircle scaled 5pt ; -if \realfolio > 1: +if NOfPages > 1: theta = (PageNumber - 1)/(NOfPages - 1) ; p[4] = unitcircle scaled b rotated 90 shifted (b + ((a-b)/2),(a-b)/2) ; fill p[4] withcolor \MPcolor{simpleslides:backgroundcolor} ; diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-default.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-default.tex index 58764fa0b53..08da947b477 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-default.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-default.tex @@ -66,12 +66,12 @@ %D Presentations have relatively dense lines, we do not care about underfull %D lines, but allow emergency stretch. -\setuptolerance[verytolerant,stretch] +\setuptolerance[\v!verytolerant,\v!stretch] %D We use combinations for placing vertical pictures and text side by side, and -%D we want a distance of 1.1 cm between both. +%D we want a distance of 3em between both. -\setupcombinations[distance=1.1cm] +\setupcombinations[distance=3em] %D Next we define some dimensions that are used as nominal values by other %D macros and the user. @@ -170,19 +170,19 @@ \def\setupTitle% {\dosingleargument\dosetupTitle} -\def\dosetupTitle[#1]% - {\setupmodule[simpleslides:title][#1]} +\def\dosetupTitle%[#1]% + {\setvariables[simpleslides:title]}% [#1] %D A few macros to save some typing \def\simpleslidestitleparameter%#1 - {\moduleparameter{simpleslides:title}} + {\getvariable{simpleslides:title}} \def\simpleslidestitlecomponent#1% {\simpleslidestitleparameter{\c!before#1} \startalignment[\simpleslidestitleparameter{#1\c!align}] \doattributes{\??md:simpleslides:title:}{#1\c!style}{#1\c!color} - {\moduleparameter{simpleslides:title}{#1}} + {\getvariable{simpleslides:title}{#1}} \stopalignment \simpleslidestitleparameter{\c!after#1}} @@ -255,12 +255,12 @@ {\dosingleargument\dosetupSlideTitle} \def\dosetupSlideTitle[#1]% - {\setupmodule[simpleslides:slidetitle] - [\c!alternative=\v!normal,\c!width=\textwidth, - \c!height=2\lineheight,#1]} + {\setvariables[simpleslides:slidetitle] + [\c!alternative=\v!normal,\c!width=\textwidth, + \c!height=2\lineheight,#1]} \def\simpleslidesslidetitleparameter%#1 - {\moduleparameter{simpleslides:slidetitle}} + {\getvariable{simpleslides:slidetitle}} \def\defineSlideTitleAlternative {\dodoubleargument\dodefineSlideTitleAlternative} @@ -331,13 +331,13 @@ {\dosingleargument\dosetupPicture} \def\dosetupPicture[#1]% - {\setupmodule[simpleslides:picture] - [highlight=\v!no, - steps=5, - opacity=0.5, - \c!x\c!scale=couple, - \c!y\c!scale=couple, - \c!width=,\c!height=,#1]} + {\setvariables[simpleslides:picture] + [highlight=\v!no, + steps=5, + opacity=0.5, + \c!x\c!scale=couple, + \c!y\c!scale=couple, + \c!width=,\c!height=,#1]} \setupPicture [highlight=\v!no,%yes|no|default=no @@ -357,10 +357,13 @@ opacity=0.5, shadow=\v!no, shadow\c!color=black, + verticalbackground=none, + verticalbackgroundcolor=simpleslides:backgroundcolor, + verticalforegroundcolor=simpleslides:textcolor, ] \def\simpleslidesPictureParameter%#1 - {\moduleparameter{simpleslides:picture}} + {\getvariable{simpleslides:picture}} \newconditional\simpleslidesHighlight \setfalse\simpleslidesHighlight @@ -472,7 +475,7 @@ \c!strut=\v!no, \c!offset=\zeropoint,#1] {\framed[\c!frame=\v!off, - \c!framecolor=red, + \c!framecolor=red, \c!strut=\v!no, \c!offset=\zeropoint, \c!width=\v!fit, @@ -512,6 +515,9 @@ {\framed[\c!frame=\v!off, \c!height=\textheight, \c!width=\PictureFrameWidth, + background=\simpleslidesPictureParameter{verticalbackground}, + backgroundcolor=\simpleslidesPictureParameter{verticalbackgroundcolor}, + foregroundcolor=\simpleslidesPictureParameter{verticalforegroundcolor}, \c!top=\vss, \c!bottom=\vss, \c!align=\v!middle, diff --git a/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.tex b/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.tex index 50b8e6afea9..302188c6395 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.tex @@ -57,7 +57,7 @@ \unprotect \setupmodule - [style=DoubleFrame, + [style=, font=LatinModernSans, size=17pt, color=blue, |