diff options
author | Karl Berry <karl@freefriends.org> | 2014-06-26 23:57:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-06-26 23:57:29 +0000 |
commit | 112ac9ab798410f2e0fe5c5319df57376ad2144a (patch) | |
tree | da31804906f9dc5d23f1cad518f8a7bc60be9371 /Master/texmf-dist/tex/context/third/simpleslides | |
parent | cef69eb80d87d25fa4472c84aabe4c76594a0398 (diff) |
context-simpleslides
git-svn-id: svn://tug.org/texlive/trunk@34438 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/third/simpleslides')
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BigNumber.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BigNumber.tex) | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BlackBoard.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BottomSquares.tex) | 54 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BottomSquares.tex | 174 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Boxed.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Boxed.tex) | 30 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BoxedTitle.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BoxedTitle.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Ellipse.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Ellipse.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Embossed.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Embossed.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Framed.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Framed.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FramedTitle.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-FramedTitle.tex) | 12 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FuzzyFrame.tex | 259 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FuzzyTopic.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-FuzzyTopic.tex) | 14 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-HorizontalStripes.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-HorizontalStripes.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-NarrowStripes.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-NarrowStripes.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-PlainCounter.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-PlainCounter.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-RainbowStripe.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-RainbowStripe.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Rounded.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Rounded.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Shaded.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Shaded.tex) | 47 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-SideSquares.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-SideSquares.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-SideToc.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-SideToc.tex) | 24 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Split.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Split.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Sunrise.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Sunrise.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Swoosh.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Swoosh.tex) | 26 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-ThickStripes.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-ThickStripes.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-default.tex (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-default.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-fontsdefault.mkiv (renamed from Master/texmf-dist/tex/context/third/simpleslides/simpleslides-f-default.tex) | 67 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/simpleslides-c-default.tex | 179 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkii | 84 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkiv | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/simpleslides/t-slidesvisualcounter.tex | 502 |
29 files changed, 509 insertions, 973 deletions
diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BigNumber.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BigNumber.tex index 2580c5e2dec..57d3b9fbe22 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BigNumber.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BigNumber.tex @@ -34,7 +34,7 @@ \setuplayout [simpleslides:layout:horizontal][header=18mm] \setuplayout [simpleslides:layout:vertical] [header=0mm] -\setuplayout [simpleslides:layout:title] +\setuplayout [simpleslides:layout:title] [header=0mm] \setuplayer[simpleslides:layer:slidetitle] [width=\paperwidth, diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BottomSquares.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BlackBoard.tex index a319085f726..11e9f34ba07 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BottomSquares.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BlackBoard.tex @@ -31,13 +31,12 @@ footer=0cm, topspace=1cm, bottomspace=2cm, - bottom=1cm, backspace=1.5cm, location=singlesided] \setuplayout [simpleslides:layout:horizontal][header=1.4cm] \setuplayout [simpleslides:layout:vertical] [header=0cm] -\setuplayout [simpleslides:layout:title] [header=0cm,bottom=0pt,bottomspace=0pt] +\setuplayout [simpleslides:layout:title] [header=0cm] %D We also specify the position of the slidetitle. @@ -65,23 +64,6 @@ \definecolor [simpleslides:variantcolor] [s=.3] \definecolor [simpleslides:itemize:color] [simpleslides:contrastcolor] -\definevisualcounter - [simpleslides:bottomsquarescounter] - [squaremarkers] - [counter=userpage, - distance={(\the\dimexpr\visualcounterparameter{maxwidth})/m + width}, - path=unitsquare, - maxwidth=\textwidth, - height=0.3cm, - width=0.3cm] - -\definepalet[visualcounter:squaremarkers] - [active=simpleslides:contrastcolor, - future=simpleslides:variantcolor, - past=simpleslides:variantcolor] - -\setupbottomtexts[\usevisualcounter{simpleslides:bottomsquarescounter}] - %D We let \METAPOST\ calculate the background: %AM: Why not implement this as an interaction bar? @@ -89,34 +71,14 @@ \startuseMPgraphic{simpleslides:MP:ornament} StartPage ; +picture p ; + fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; -% -% save diff ;numeric diff; -% diff = .3cm ; -% -% save w; numeric w; -% w = xpart (lrcorner Field[Text][Text] - llcorner Field[Text][Text]) - diff ; -% -% save factor; numeric factor; -% if NOfPages <= 1 : -% factor = w ; -% else : -% factor = w/(NOfPages - 1) ; -% fi ; -% -% save p; path p ; -% p = unitsquare xyscaled (diff,diff) -% shifted (xpart llcorner Field[Text][Text],0.85cm) ; -% -% for i = 1 upto NOfPages: -% if PageNumber = i: -% fill p xyscaled (0,2) shifted ( (i-1)*factor,-diff-0.85cm) -% withcolor \MPcolor{simpleslides:contrastcolor} ; -% else : -% fill p shifted ( (i-1)*factor, 0) -% withcolor \MPcolor{simpleslides:variantcolor} ; -% fi ; -% endfor ; + +p := image (externalfigure "/tmp/blackboard.jpg") ; + +addto currentpicture also p ; + StopPage ; \stopuseMPgraphic diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BottomSquares.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BottomSquares.tex new file mode 100644 index 00000000000..ea7bcbeba64 --- /dev/null +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BottomSquares.tex @@ -0,0 +1,174 @@ +%D \module +%D [ file=simpleslides-s-BottomSquares, +%D version=2009.03.30 +%D title=\CONTEXT\ Style File, +%D subtitle=Presentation Module --- BottomSquares style, +%D author=Aditya Mahajan and Thomas A. Schmitz, +%D date=\currentdate | update , +%D copyright={Aditya Mahajan and Thomas A. Schmitz}] +%C +%C Copyright 2007 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{BottomSquares} style for the presentation +%D module. It is loaded at runtime. This minimalistic design is inspired by a +%D presentation Taco gave at EuroTeX 2006. + +\writestatus{simpleslides}{loading module BottomSquares} + +\startmodule[simpleslides-s-BottomSquares] + +\unprotect + +%D The page layout: + +\setuplayout [width=fit, + height=middle, + margin=0cm, + height=fit, + margindistance=0cm, + header=0cm, + footer=0cm, + topspace=1cm, + bottomspace=2cm, + backspace=1.5cm, + location=singlesided] + +\setuplayout [simpleslides:layout:horizontal][header=1.4cm] +\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=15mm] + +%D These macros are used for placing figures/pictures: + +\define\NormalHeight {\textheight} +\define\NormalWidth {.5\textwidth} +\define\PictureFrameHeight {\textheight} +\define\PictureFrameWidth {.5\textwidth} + +% %D We define a generic frame that is used by the slide title. +% +% \defineframed[simpleslides:framed] +% [frame=off,offset=0pt, +% top=\vss,bottom=\vss] + + +%D We define our color scheme: + +\definecolor [simpleslides:backgroundcolor] [s=.95] +\definecolor [simpleslides:contrastcolor] [r=.7,g=.1,b=.3] +\definecolor [simpleslides:variantcolor] [s=.3] +\definecolor [simpleslides:itemize:color] [simpleslides:contrastcolor] + +%D We let \METAPOST\ calculate the background: + +%AM: Why not implement this as an interaction bar? + +\startuseMPgraphic{simpleslides:MP:ornament} +StartPage ; + +fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; + +save diff ;numeric diff; +diff = .3cm ; + +save w; numeric w; +w = xpart (lrcorner Field[Text][Text] - llcorner Field[Text][Text]) - diff ; + +save factor; numeric factor; +if NOfPages <= 1 : + factor = w ; +else : + factor = w/(NOfPages - 1) ; +fi ; + +save p; path p ; +p = unitsquare xyscaled (diff,diff) + shifted (xpart llcorner Field[Text][Text],0.85cm) ; + +for i = 1 upto NOfPages: + if PageNumber = i: + fill p xyscaled (0,2) shifted ( (i-1)*factor,-diff-0.85cm) + withcolor \MPcolor{simpleslides:contrastcolor} ; + else : + fill p shifted ( (i-1)*factor, 0) + withcolor \MPcolor{simpleslides:variantcolor} ; + fi ; +endfor ; +StopPage ; +\stopuseMPgraphic + +%D We define these backgrounds as overlays: + +\defineoverlay + [simpleslides:background:ornament] + [\useMPgraphic{simpleslides:MP:ornament}] + +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:ornament}] + +%D We want the title information to be colored + +\setupTitle + [color=simpleslides:contrastcolor] + +%D The slide title is typeset in a layer + +\setupSlideTitle + [\c!color={simpleslides:contrastcolor}, + \c!alternative=layer, + \c!align=\v!center, + \c!width=\textwidth, + \c!height=3cm, + \c!after=] + +%D attempt! + +\startuniqueMPgraphic{Important} +save p, q ; path p[], q[] ; +p[1] = unitsquare xyscaled (\overlaywidth,\overlayheight) ; +z[1] = ulcorner p[1] ; +z[2] = llcorner p[1] ; +save a ; numeric a ; +a = arclength (z[1] -- z[2])/15 ; +z[3] = ulcorner p[1] shifted (a,0) ; +z[4] = urcorner p[1] shifted (-a,0) ; +z[5] = urcorner p[1] shifted (0,-a) ; +z[6] = lrcorner p[1] shifted (0,a) ; +z[7] = lrcorner p[1] shifted (-a,0) ; +z[8] = llcorner p[1] shifted (a,0) ; +z[9] = llcorner p[1] shifted (0,a) ; +z[10] = ulcorner p[1] shifted (0,-a) ; +z[11] = z[8] shifted (5mm,0) ; +z[12] = z[5] shifted (0,-5mm) ; +p[2] = z[3] --- z[4] .. z[5] --- z[6] .. z[7] --- z[8] .. z[9] --- z[10] .. cycle ; +q[1] = z[11] --- z[7] .. z[6] --- z[12] ; +for i = 3 upto 22: + pickup pencircle scaled (i*0.5mm) ; + draw q[1] withcolor transparent ("normal", 0.01, black) ; +endfor +pickup pencircle scaled 2pt ; +fill p[2] withcolor \MPcolor{simpleslides:contrastcolor} ; +%draw z[8] withcolor red ; +\stopuniqueMPgraphic + +\defineoverlay[VImportant][\useMPgraphic{Important}] + +\define[1]\Important% + {\blank[line]\midaligned{{\framed[height=5cm,width=0.9\textwidth,frame=off,background=VImportant,align=middle,offset=0pt,top=\vss,bottom=\vss,strut=no,foregroundcolor=simpleslides:backgroundcolor]{#1}}}} + +%D The symbol for the first level of itemizations. + +\definesymbol[1][\useMPgraphic{simpleslides:itemize:square}] +\setupitemize[1][color={simpleslides:itemize:color}] + +\protect +\stopmodule + +\endinput + diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Boxed.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Boxed.tex index 17c3ed506d7..cec57643210 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Boxed.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Boxed.tex @@ -28,9 +28,7 @@ leftmargindistance=1cm, rightmargindistance=0cm, header=2.8cm, - bottomspace=0.4cm, - bottom=1cm, - footer=0cm, + footer=1cm, topspace=.7cm, backspace=2cm, location=singlesided] @@ -60,24 +58,6 @@ \definecolor [simpleslides:variantcolor] [yellow] \definecolor [simpleslides:itemize:color] [simpleslides:contrastcolor] -\definevisualcounter - [simpleslides:squarescounter] - [markers] - [counter=userpage, - distance={(\the\dimexpr\visualcounterparameter{maxwidth})/(max(m-1,1)) - width}, - path=unitcircle, - maxwidth=\textwidth, - height=0.5cm, - width=0.5cm] - -\definepalet[visualcounter:markers] - [active=simpleslides:variantcolor, - future=simpleslides:backgroundcolor, - past=simpleslides:backgroundcolor] - -\setupbottomtexts[\usevisualcounter{simpleslides:squarescounter}] - - %D We let Metapost calculate the background: \startuniqueMPgraphic{simpleslides:MP:horizontal} @@ -162,14 +142,14 @@ StopPage [simpleslides:background:title] [\useMPgraphic{simpleslides:MP:horizontal}] -% \defineoverlay -% [simpleslides:background:ornament] -% [\useMPgraphic{simpleslides:MP:ornament}] +\defineoverlay + [simpleslides:background:ornament] + [\useMPgraphic{simpleslides:MP:ornament}] %D The title page: \setupTitle - [\c!color={simpleslides:contrastcolor}] + [\c!headcolor={simpleslides:contrastcolor}] %D The slide title is typeset in a layer diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BoxedTitle.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BoxedTitle.tex index c2d3211fbf8..c2d3211fbf8 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BoxedTitle.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BoxedTitle.tex diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Ellipse.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Ellipse.tex index 79cbb9c43ae..79cbb9c43ae 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Ellipse.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Ellipse.tex diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Embossed.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Embossed.tex index 97b7526245a..97b7526245a 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Embossed.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Embossed.tex diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Framed.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Framed.tex index 63e4d8054fc..63e4d8054fc 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Framed.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Framed.tex diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-FramedTitle.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FramedTitle.tex index 197869e6849..8ba572024ab 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-FramedTitle.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FramedTitle.tex @@ -124,14 +124,14 @@ StopPage ; \bgroup}, \c!after={\egroup\vfill}, \c!title\c!style={\switchtobodyfont[\TitleSize]}, - \c!title\c!color=, - \c!title\c!align=,%\v!middle, + \c!title\c!color=simpleslides:backgroundcolor, + \c!title\c!align=\v!middle, \c!author\c!style=, - \c!author\c!color=, - \c!author\c!align=,%\v!middle, + \c!author\c!color=simpleslides:backgroundcolor, + \c!author\c!align=\v!middle, \c!date\c!style=, - \c!date\c!color=, - \c!date\c!align=,%\v!middle, + \c!date\c!color=simpleslides:backgroundcolor, + \c!date\c!align=\v!middle, \c!before\c!title=, \c!before\c!author=, \c!before\c!date=, diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FuzzyFrame.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FuzzyFrame.tex new file mode 100644 index 00000000000..4e96b61cfbf --- /dev/null +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FuzzyFrame.tex @@ -0,0 +1,259 @@ +%D \module +%D [ file=simpleslides-s-SideToc, +%D version=2010.02.09, +%D title=\CONTEXT\ Style File, +%D subtitle=Presentation Module --- SideToc style, +%D author=Aditya Mahajan and Thomas A. Schmitz, +%D date=\currentdate, +%D copyright={Aditya Mahajan and Thomas A. Schmitz}] +%C +%C Copyright 2010 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{SideToc} style for the presentation +%D module. It is loaded at runtime. + +\writestatus{simpleslides}{loading Fuzzy Frame style} + +\startmodule[simpleslides-s-FuzzyFrame] + +\unprotect + +%D We create different layouts for the title page, horizontal, and vertical +%D slides. + +\setuplayout [simpleslides:layout:vertical] + [leftmargin=0cm, + rightmargin=0cm, + header=0.1cm, + headerdistance=1.7cm, + header=0cm, + headerdistance=0cm, + footer=0cm, + topspace=1cm, + backspace=1cm, + bottomspace=0cm, + bottom=0pt, + location=middle] + +\setuplayout [simpleslides:layout:horizontal] + [width=fit, + leftmargin=0cm, + rightmargin=0cm, + height=fit, + header=0.1cm, + headerdistance=1.7cm, + footer=0cm, + topspace=1cm, + backspace=1cm, + bottomspace=0cm, + bottom=0pt, + location=middle] + +\setuplayout [simpleslides:layout:title] + [width=fit, + leftmargin=0cm, + rightmargin=0cm, + height=fit, + header=0cm, + headerdistance=0cm, + footer=0cm, + topspace=1cm, + backspace=1cm, + bottomspace=0cm, + bottom=0pt, + location=middle] + +\setupcombinations[distance=0.75cm] + +%D This is basically the same as the FuzzyTopic style, minus the "Topic" list; +%D I just wanted something with a randomized border and took that style as +%D template. + +%D These macros are used for placing figures/pictures: + +\define\NormalHeight {\textheight} +\define\NormalWidth {.476\textwidth} +\define\PictureFrameHeight {\textheight} +\define\PictureFrameWidth {.476\textwidth} + +\setuplayer + [simpleslides:layer:slidetitle] + [x=1cm,y=0mm] + +%D We define our color scheme +\definecolor [simpleslides:contrastcolor] [r=0.23,g=0.31,b=0.59] +\definecolor [simpleslides:backgroundcolor] [s=0.9] +\definecolor [simpleslides:altcontrastcolor] [s=0.95] +\definecolor [simpleslides:textcolor] [s=0] +\definecolor [simpleslides:itemize:color] [simpleslides:contrastcolor] + +%D We use \METAPOST to draw the background. + +\startuseMPgraphic{simpleslides:MP:title} +StartPage ; +fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; +for i=1 upto 20 : + draw Page enlarged -5pt randomized 15pt withcolor \MPcolor{simpleslides:contrastcolor} ; +endfor ; +StopPage ; +\stopuseMPgraphic + +\startuseMPgraphic{simpleslides:MP:horizontal} +StartPage ; +pickup pencircle scaled .5pt ; +fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; +for i=1 upto 20 : + draw Page enlarged -5pt randomized 15pt withcolor \MPcolor{simpleslides:contrastcolor} ; +endfor ; +z[1] = ulcorner Page shifted (1cm, -2.2cm) ; +z[2] = urcorner Page shifted (-1cm, -2.2cm) ; +path sep ; sep = z[1] -- z[2] ; +for i=1 upto 20 : + draw sep randomized 15pt withcolor \MPcolor{simpleslides:contrastcolor} ; +endfor ; +StopPage ; +\stopuseMPgraphic + +\startuseMPgraphic{simpleslides:MP:vertical} +StartPage ; +pickup pencircle scaled .5pt ; +fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; +for i=1 upto 20 : + draw Page enlarged -5pt randomized 15pt withcolor \MPcolor{simpleslides:contrastcolor} ; +endfor ; +z[1] = 1/2[ulcorner Page, urcorner Page] shifted (0, -8mm) ; +z[2] = 1/2[llcorner Page, lrcorner Page] shifted (0, 15mm) ; +path sep ; sep = z[1] -- z[2] ; +for i=1 upto 20 : + draw sep randomized 15pt withcolor \MPcolor{simpleslides:contrastcolor} ; +endfor ; +StopPage ; +\stopuseMPgraphic + +\startuseMPgraphic{simpleslides:MP:ornament2} +StartPage ; +save d, s, r ; numeric d, s, r ; +d = 4mm ; +s = 0.33 * PaperWidth ; +z[1] = (0,0) shifted (s, 1.5*d) ; +z[2] = z[1] shifted (0, d) ; +save p ; path p[] ; +p[1] = z[1] -- z[2] ; +pickup pencircle scaled 0.5pt ; +r = 150*(PageNumber/NOfPages) ; +z[3] = z[1] shifted (r, -4pt) ; +for i=1 upto 150 : + draw p[1] shifted (i*s/150, 0) randomized 2pt withcolor + (if i < r : \MPcolor{simpleslides:contrastcolor} + else : \MPcolor{simpleslides:altcontrastcolor} + fi) ; +endfor ; +StopPage ; +\stopuseMPgraphic + +\startuseMPgraphic{simpleslides:MP:ornament} +StartPage ; +save v, s, l, r ; numeric v, s, l, r ; +save p ; path p ; +v = 0.8cm ; +s = 0.33*PaperWidth ; +z[1] = (0,0) shifted (s,v) ; +z[2] = (PaperWidth,0) shifted (-s,v) ; +l = arclength (z[1] --z[2]) ; +r = (l*PageNumber/NOfPages) ; +z[3] = z[1] shifted (-5mm, -3mm) ; +z[4] = z[1] shifted (-5mm, 3mm) ; +if PageNumber = NOfPages : + z[5] = z[1] shifted (r+5mm,-3mm) ; + z[6] = z[1] shifted (r+5mm,3mm) ; +else: + z[5] = z[1] shifted (r,-3mm) ; + z[6] = z[1] shifted (r,3mm) ; +fi ; +pickup pencircle scaled 3pt ; +p = z[1] -- z[2] ; +pickup pencircle scaled .5pt ; + for i=1 upto 15 : + draw p randomized 12pt withcolor \MPcolor{simpleslides:altcontrastcolor} ; + endfor ; +picture old ; old := currentpicture ; +clip old to z[3] -- z[4] -- z[6] -- z[5] -- cycle ; +draw old withcolor \MPcolor{simpleslides:contrastcolor} ; +StopPage ; +\stopuseMPgraphic + +%D We define these backgrounds as overlays: + +\defineoverlay + [simpleslides:background:horizontal] + [\useMPgraphic{simpleslides:MP:horizontal}] + +\defineoverlay + [simpleslides:background:vertical] + [\useMPgraphic{simpleslides:MP:vertical}] + +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:title}] + +\defineoverlay + [simpleslides:background:ornament] + [\useMPgraphic{simpleslides:MP:ornament2}] + +%D We want the title to placed in color. + +\setupTitle + [\c!title=, + \c!author=, + \c!date=\currentdate, + \c!headstyle=, + \c!headcolor={simpleslides:contrastcolor}, + \c!align=\v!middle, + \c!before=\vfill, + \c!after=\vfill, + \c!title\c!style={\switchtobodyfont[\TitleSize]}, + \c!title\c!color=simpleslides:contrastcolor, + \c!title\c!align=\v!middle, + \c!author\c!style=, + \c!author\c!color={simpleslides:contrastcolor}, + \c!author\c!align=\v!middle, + \c!date\c!style=, + \c!date\c!color={simpleslides:contrastcolor}, + \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 want the slide title on the top + +\setupSlideTitle + [\c!after=, + \c!alternative=layer, + \c!width=\textwidth, + \c!height=2.5cm, + \c!color=black] + +%D The symbol for the first level of itemizations. + +\startuseMPgraphic{simpleslides:itemize:square} +save p ; path p[] ; +save d ; numeric d ; d := 4mm ; +p[1] := unitsquare xyscaled(d,d) ; +p[2] := ulcorner p[1] -- llcorner p[1] ; +pickup pencircle scaled (d/100) ; +for i=1 upto 15 : + draw p[2] shifted (i*d/15, 0) randomized (d/12.5) withcolor \MPcolor{simpleslides:itemize:color} ; +endfor ; +\stopuseMPgraphic + +\definesymbol[1][\useMPgraphic{simpleslides:itemize:square}] +\setupitemize[1][color=simpleslides:itemize:color] + +\protect +\stopmodule + +\endinput diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-FuzzyTopic.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FuzzyTopic.tex index 270b7102859..93bacf719e5 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-FuzzyTopic.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FuzzyTopic.tex @@ -105,10 +105,10 @@ %D Here are the main macros for defining and typesetting the Topic list: -\define[3]\FancyEntry% - {\doifelse{#1}{\MyMark}% +\define[3]\FancyEntry{% + \doifelse \rawstructurelistfirst \MyMark% {\framed[width=3cm,height=1cm,frame=off,top=\vss,bottom=\vss,background=simpleslides:current,offset=1mm,align=center]{\switchtobodyfont[11pt]#1}}% - {\framed[width=3cm,height=1cm,frame=off,top=\vss,bottom=\vss,offset=2mm,align=center]{\switchtobodyfont[11pt]#1}}} + {\framed[width=3cm,height=1cm,frame=off,top=\vss,bottom=\vss,offset=1mm,align=center]{\switchtobodyfont[11pt]#1}}} \definelist[MyTopics][criterium=all] @@ -122,7 +122,7 @@ \def\doTopic[#1]{% \gdef\MyMark{#1}% - \writetolist[MyTopics][location=none]{#1}}% + \writetolist[MyTopics][location=none]{#1}{}}% %\def\Topic% % {\dosingleargument\doTopic} @@ -349,13 +349,13 @@ currentpicture := currentpicture \c!after=\vfill, \c!title\c!style={\switchtobodyfont[\TitleSize]}, \c!title\c!color=simpleslides:contrastcolor, - \c!title\c!align=,%\v!middle, + \c!title\c!align=\v!middle, \c!author\c!style=, \c!author\c!color={simpleslides:contrastcolor}, - \c!author\c!align=,%\v!middle, + \c!author\c!align=\v!middle, \c!date\c!style=, \c!date\c!color={simpleslides:contrastcolor}, - \c!date\c!align=,%\v!middle, + \c!date\c!align=\v!middle, \c!before\c!title=, \c!before\c!author=, \c!before\c!date=, diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-HorizontalStripes.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-HorizontalStripes.tex index 37aa554d86b..37aa554d86b 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-HorizontalStripes.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-HorizontalStripes.tex diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-NarrowStripes.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-NarrowStripes.tex index 471eb208e31..471eb208e31 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-NarrowStripes.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-NarrowStripes.tex diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-PlainCounter.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-PlainCounter.tex index d3044b75e09..d3044b75e09 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-PlainCounter.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-PlainCounter.tex diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-RainbowStripe.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-RainbowStripe.tex index f2bf47f0933..f2bf47f0933 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-RainbowStripe.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-RainbowStripe.tex diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Rounded.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Rounded.tex index 10c15be7139..10c15be7139 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Rounded.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Rounded.tex diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Shaded.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Shaded.tex index 6e07bdd8623..a8da39b1c2c 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Shaded.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Shaded.tex @@ -21,8 +21,7 @@ %D The page layout: -\setuplayout [simpleslides:layout:horizontal] - [width=fit, +\setuplayout [width=fit, margin=1.5cm, leftmargindistance=0pt, rightmargindistance=0pt, @@ -35,9 +34,6 @@ bottom=1cm, location=singlesided] -\setuplayout [simpleslides:layout:title] - [bottomspace=0pt] - %D These macros are used for placing figures/pictures: \define\NormalHeight {.88\textheight} @@ -81,23 +77,6 @@ \setupcolors[textcolor={simpleslides:textcolor}] -\definevisualcounter - [simpleslides:shadedcounter] - [markers] - [counter=userpage, -% distance=0.5cm, - distance={(\the\dimexpr\visualcounterparameter{maxwidth})/m + width}, - path=unitcircle, - maxwidth=\textwidth, - width=0.3cm] - -\definepalet[visualcounter:markers] - [active=blue, %simpleslides:interactioncolor, % not enough contrast - future=simpleslides:contrastcolor, - past=simpleslides:variantcolor] - -\setupbottomtexts[\usevisualcounter{simpleslides:shadedcounter}] - \setupTitle[color=white] %D This module shades the background in a gradient. We use \METAPOST\ to draw @@ -106,9 +85,33 @@ \startuseMPgraphic{simpleslides:MP:ornament} StartPage ; +save p ; path p[] ; +save a ; +if NOfPages <= 15: + a = 0.7cm ; +elseif NOfPages <= 30: + a = 0.45cm ; +else : + a = 0.25cm ; +fi ; +save factor ; numeric factor ; +factor = (TextWidth - a)/(NOfPages - 1) ; linear_shade(Page, 6, \MPcolor{simpleslides:backgroundcolor}, \MPcolor{simpleslides:variantcolor}) ; +if PageNumber >1: + for i = 1 upto NOfPages : + p[i] = unitcircle scaled a shifted (BackSpace + (i-1)*factor, (2cm - a)/2) ; + if i = PageNumber : +% p[i] := p[i] zscaled (1.2,1.5) ; + pickup pencircle scaled 5pt ; + drawfill p[i] withcolor \MPcolor{simpleslides:variantcolor} ; + else : + circular_shade(p[i],2,\MPcolor{simpleslides:backgroundcolor}, + \MPcolor{simpleslides:variantcolor}) ; + fi + endfor ; +fi ; StopPage ; \stopuseMPgraphic diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-SideSquares.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-SideSquares.tex index 08d588408a2..08d588408a2 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-SideSquares.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-SideSquares.tex diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-SideToc.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-SideToc.tex index c835b8c8335..4b4190ccd13 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-SideToc.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-SideToc.tex @@ -108,8 +108,9 @@ \definecolor [simpleslides:altcontrastcolor] [b=.6] \definecolor [simpleslides:contrastcolor] [s=.3] \definecolor [simpleslides:itemize:color] [simpleslides:altcontrastcolor] -\define[3]\FancyEntry - {\doifelse{#1}{\MyMark}% + +\define[3]\FancyEntry{% + \doifelse \rawstructurelistfirst \MyMark% {\framed[width=3.5cm, height=4ex, align=middle, @@ -127,6 +128,7 @@ foregroundcolor=simpleslides:backgroundcolor] {\switchtobodyfont[13pt]#1}}% normal layout } + \stopmode \startmode[light] @@ -141,14 +143,14 @@ frame=off, align=middle, foregroundcolor=simpleslides:altcontrastcolor] - {\switchtobodyfont[13pt]\bf #1}}% fancy layout + {\switchtobodyfont[13pt]\bf Y #1}}% fancy layout {\framed[width=3.5cm, height=4ex, align=middle, frame=off, framecolor=red, foregroundcolor=simpleslides:altcontrastcolor] - {\switchtobodyfont[13pt]#1}}% normal layout + {\switchtobodyfont[13pt] X #1}}% normal layout } \stopmode @@ -162,9 +164,9 @@ %{\relax} {\dosingleargument\doTopic} -\def\doTopic[#1]{% - \def\MyMark{#1}% - \writetolist[MyTopics]{#1}{}% +\def\doTopic[#1]{ + \gdef\MyMark{#1}% + \writetolist[MyTopics][location=none]{#1}{}% } \setuplist[MyTopics] @@ -278,18 +280,18 @@ StopPage ; \c!date=\currentdate, \c!headstyle=, \c!headcolor={simpleslides:backgroundcolor}, - \c!align=\v!middle, + \c!align=middle, \c!before=\vfill, \c!after=\vfill, \c!title\c!style={\switchtobodyfont[\TitleSize]}, \c!title\c!color=simpleslides:backgroundcolor, - \c!title\c!align=,%\v!middle, + \c!title\c!align=middle, \c!author\c!style=, \c!author\c!color=simpleslides:backgroundcolor, - \c!author\c!align=,%\v!middle, + \c!author\c!align=middle, \c!date\c!style=, \c!date\c!color=simpleslides:backgroundcolor, - \c!date\c!align=,%\v!middle, + \c!date\c!align=middle, \c!before\c!title=, \c!before\c!author=, \c!before\c!date=, diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Split.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Split.tex index 360307835eb..360307835eb 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Split.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Split.tex diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Sunrise.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Sunrise.tex index 756b981aec5..756b981aec5 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Sunrise.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Sunrise.tex diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Swoosh.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Swoosh.tex index 3230523e1b4..9ea77624a98 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Swoosh.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Swoosh.tex @@ -87,7 +87,7 @@ if PageNumber > 1: p[3] = zt .. zr .. zb .. zl .. cycle ; fill p[3] withcolor \MPcolor{simpleslides:contrastcolor} ; draw p[3] withcolor \MPcolor{simpleslides:backgroundcolor} ; - label(textext("\switchtobodyfont[10pt]\color[simpleslides:backgroundcolor]\pagenumber"),center p[3]) ; + label(textext("\switchtobodyfont[10pt]\startcolor[simpleslides:backgroundcolor]\pagenumber\stopcolor"),center p[3]) ; fi ; \stopuseMPgraphic \stopsetups @@ -135,21 +135,9 @@ fi ; %D We define our color scheme: -\define\SScolorsbackground{r=.88,g=.92,b=.95} -\define\SScolorscontrasta{r=.4,g=.6,b=.8} -\define\SScolorscontrastb{r=.1,g=.1,b=.4} - -%D I'm still trying to implement a color mechanism that can be set by the users -%D in their files. - -\def\setupSimpleSlideColors[#1]% - {\getparameters[SScolors][#1]} - -% \setupSimpleSlideColors[background={r=1,g=0,b=0}] - -\definecolor [simpleslides:backgroundcolor] [\SScolorsbackground] -\definecolor [simpleslides:contrastcolor] [\SScolorscontrasta] -\definecolor [simpleslides:altcontrastcolor] [\SScolorscontrastb] +\definecolor [simpleslides:backgroundcolor] [r=.88,g=.92,b=.95] +\definecolor [simpleslides:contrastcolor] [r=.4,g=.6,b=.8] +\definecolor [simpleslides:altcontrastcolor] [r=.1,g=.1,b=.4] \definecolor [simpleslides:itemize:color] [simpleslides:contrastcolor] \definecolor [simpleslides:textcolor] [simpleslides:altcontrastcolor] @@ -267,13 +255,13 @@ StopPage ; \c!after=\vfill, \c!title\c!style={\switchtobodyfont[\TitleSize]}, \c!title\c!color=simpleslides:altcontrastcolor, - \c!title\c!align=,%\v!middle, + \c!title\c!align=\v!middle, \c!author\c!style=, \c!author\c!color=simpleslides:altcontrastcolor, - \c!author\c!align=,%\v!middle, + \c!author\c!align=\v!middle, \c!date\c!style=, \c!date\c!color=simpleslides:altcontrastcolor, - \c!date\c!align=,%\v!middle, + \c!date\c!align=\v!middle, \c!before\c!title=, \c!before\c!author=, \c!before\c!date=, diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-ThickStripes.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-ThickStripes.tex index 52b86f7da23..52b86f7da23 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-ThickStripes.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-ThickStripes.tex diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-default.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-default.tex index 117934ac02a..117934ac02a 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-default.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-default.tex diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-f-default.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-fontsdefault.mkiv index f2e595d0c96..95781180fa9 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-f-default.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-fontsdefault.mkiv @@ -12,7 +12,7 @@ \writestatus{simpleslides}{loading default font setup} -\startmodule[simpleslides-f-default] +\startmodule[s-simpleslides-fontsdefault] \unprotect @@ -47,10 +47,6 @@ \def\TitleSize {\the\simpleslidesTitleSize} \def\SlideTitleSize {\the\simpleslidesSlideTitleSize} -\beginOLDTEX -\setupencoding[default=ec] -\endOLDTEX - %D The bodyfont needs to be defined so \CONTEXT\ can calculate size switches, %D math formulas, etc. @@ -88,17 +84,7 @@ \setupbodyfont[ss,\NormalSize] \stopsetups -\beginLUATEX \usetypescriptfile[type-otf] %Isn't this included by default? -\endLUATEX - -\beginXETEX -\usetypescriptfile[type-otf] -\endXETEX - -\beginOLDTEX -\usetypescriptfile[type-gyr] -\endOLDTEX %AM: For all the fonts, I have used traditional names rather than TeX Gyre %names. @@ -120,7 +106,6 @@ \setupbodyfont[bookman,\NormalSize] \stopsetups -\beginLUATEX %AM: Was Chorus \startsetups simpleslides:font:Chancery \starttypescript[serif] [chancery] @@ -141,30 +126,6 @@ \usetypescript[chancery] \setupbodyfont[chancery,\NormalSize] \stopsetups -\endLUATEX - -\beginOLDTEX -\startsetups simpleslides:font:Chancery - \loadmapfile[qzc-ec.map] - \starttypescript[serif] [chancery] - \definefontsynonym [ChanceryRoman] [ec-qzcmi] [encoding=ec] - \stoptypescript - - \starttypescript [serif] [chancery] - \definefontsynonym [Serif] [ChanceryRoman] - \definefontsynonym [SerifItalic] [Serif] - \definefontsynonym [SerifBold] [Serif] - \definefontsynonym [SerifBoldItalic] [Serif] - \definefontsynonym [SerifCaps] [Serif] -\stoptypescript - -\starttypescript [chancery] - \definetypeface [chancery] [rm] [serif] [chancery] [encoding=ec] -\stoptypescript -\usetypescript[chancery] -\setupbodyfont[chancery,\NormalSize] -\stopsetups -\endOLDTEX \startsetups simpleslides:font:Gothic \starttypescript[gothic] @@ -185,21 +146,11 @@ \stopsetups -\beginLUATEX %AM: Was Pagella \startsetups simpleslides:font:Palatino \usetypescript[palatino] \setupbodyfont[palatino,\NormalSize] \stopsetups -\endLUATEX - -\beginOLDTEX -\startsetups simpleslides:font:Palatino -\definetypeface [palatino] [rm] [serif] [palatino] [default] [encoding=texnansi] -\definetypeface [palatino] [tt] [mono] [modern] [default] [encoding=texnansi] -\setupbodyfont[palatino,\NormalSize] -\stopsetups -\endOLDTEX \startsetups simpleslides:font:Schoolbook \starttypescript[schoolbook] @@ -212,26 +163,10 @@ \setupbodyfont[schoolbook,\NormalSize] \stopsetups -\beginLUATEX -\startsetups simpleslides:font:Times - \usetypescript[postscript] - \setupbodyfont[postscript,\NormalSize] -\stopsetups -\endLUATEX - -\beginOLDTEX \startsetups simpleslides:font:Times - \starttypescript [postscript] - \definetypeface [postscript] [rm] [serif] [times] [default] - \definetypeface [postscript] [ss] [sans] [helvetica] [default] [rscale=.9] - \definetypeface [postscript] [tt] [mono] [courier] [default] [rscale=1.1] - \definetypeface [postscript] [mm] [math] [times] [default] - \stoptypescript \usetypescript[postscript] \setupbodyfont[postscript,\NormalSize] \stopsetups -\endOLDTEX - \doifsetupselse{simpleslides:font:\moduleparameter{simpleslides}{font}} {\setups{simpleslides:font:\moduleparameter{simpleslides}{font}}} diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-c-default.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-c-default.tex deleted file mode 100644 index b6d19de0fa8..00000000000 --- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-c-default.tex +++ /dev/null @@ -1,179 +0,0 @@ -%D \module -%D [ file=simpleslides-c-default, -%D version=2010.09.20 -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Module simpleslides --- Default counter setup, -%D author=Aditya Mahajan and Thomas A. Schmitz, -%D date=\currentdate, -%D copyright={Aditya Mahajan and Thomas A. Schmitz}] -%C -%C Copyright 2010 Aditya Mahajan and Thomas A. Schmitz -%C This file may be distributed under the GNU General Public License v. 2.0. - -\writestatus{simpleslides}{loading default counter setup} - -\startmodule[simpleslides-c-default] - -\unprotect - -%D Attempt to make the counters for the simpleslides module more "modular." -%D This file is called by t-simpleslides.tex and provides the metapost code for -%D page counters which are then included in the backgrounds of the style -%D modules. - -% \def\setupSlideCounter% -% {\dosingleargument\dosetupSlideCounter} -% -% \def\dosetupSlideCounter[#1]% -% {\setvariables[simpleslides:counter] -% [#1]} -% -% \processaction -% [\getvariable{simpleslides:counter}{alternative}] -% [ a=>\def\simpleslidescounter{simpleslides:shaded:counter1}, -% b=>\def\simpleslidescounter{simpleslides:shaded:counter2}, -% c=>\def\simpleslidescounter{simpleslides:shaded:counter3}, -% \v!default=>\def\simpleslidescounter{simpleslides:shaded:counter1}, -% \v!unknown=>\def\simpleslidescounter{simpleslides:shaded:counter1}] - -\def\simpleslidescounter{simpleslides:shaded:counter5} - -\startuseMPgraphic{simpleslides:shaded:counter1} -save p ; path p[] ; -save a ; -if NOfPages <= 15: - a = 0.7cm ; -elseif NOfPages <= 30: - a = 0.45cm ; -else : - a = 0.25cm ; -fi ; -save factor ; numeric factor ; -factor = (TextWidth - a)/(NOfPages - 2) ; -for i = 2 upto NOfPages : - p[i] = unitcircle scaled a shifted (BackSpace + (i-2)*factor, (2cm - a)/2) ; - if i = PageNumber : - pickup pencircle scaled 5pt ; - drawfill p[i] withcolor \MPcolor{simpleslides:variantcolor} ; - else : - circular_shade(p[i],2,\MPcolor{simpleslides:backgroundcolor}, \MPcolor{simpleslides:variantcolor}) ; - fi -endfor ; -\stopuseMPgraphic - -\startuseMPgraphic{simpleslides:shaded:counter2} -save a,b ; -numeric a,b ; -a = 7mm ; -b = PaperWidth/2 - NOfPages * 2.5pt ; - -save p,q; path p,q ; -p =((0,5mm) -- (1mm,11mm)) shifted (b,0) ; -q =((-8mm,5mm) -- (0,11mm) ) shifted (b,0) ; - -pickup pencircle scaled 3pt ; -for i := NOfPages-1 downto 1: - draw (if i mod 5 = 0 : q else : p fi) - shifted (i*5pt, 0pt) - withcolor if i < PageNumber : \MPcolor{simpleslides:variantcolor} - else : \MPcolor{simpleslides:contrastcolor} - fi ; -endfor ; -\stopuseMPgraphic - -\startuseMPgraphic{simpleslides:shaded:counter3} -save diff ;numeric diff; -if NOfPages <= 25: - diff = 0.4cm ; -elseif NOfPages <= 35: - diff = 0.3cm ; -else : - diff = 0.2cm ; -fi ; - -save factor; numeric factor; -factor = TextWidth/(NOfPages - 2) ; - -save p; path p ; -p = unitsquare xyscaled (diff,diff) - shifted (BackSpace,0.85cm) ; - -for i = 2 upto NOfPages: - if PageNumber = i: - fill p xyscaled (0,2) shifted ( (i-2)*factor,-diff-0.85cm) - withcolor \MPcolor{simpleslides:contrastcolor} ; - else : - fill p shifted ( (i-2)*factor, 0) - withcolor \MPcolor{simpleslides:variantcolor} ; - fi ; -endfor ; -\stopuseMPgraphic - -\startuseMPgraphic{simpleslides:shaded:counter4} -save p ; -path p[] ; -linejoin := rounded ; - -p[1] := unitsquare xyscaled(TextWidth,1cm) shifted (BackSpace,0.8cm) ; -save i ; -numeric i; -i = PageNumber/NOfPages ; - -p[2] = ulcorner p[1] -- urcorner p[1] ; -p[3] = llcorner p[1] -- lrcorner p[1] ; - -save o; -pair o[] ; - -o[1] := point i along p[2] ; -o[2] := point i along p[3] ; - -p[4] = ulcorner p[1] -- o[1] -- o[2] -- llcorner p[1] -- cycle ; - -fill p[1] withcolor 0.7\MPcolor{simpleslides:backgroundcolor} ; -fill p[4] withcolor \MPcolor{simpleslides:contrastcolor} ; - -pickup pencircle scaled 1pt ; -draw ulcorner p[1] -- urcorner p[1] -- lrcorner p[1] withcolor 0.3white ; -draw lrcorner p[1] -- llcorner p[1] -- ulcorner p[1] withcolor 0.8white ; - -%clip currentpicture to p[4] ; - -% linear_shade(p[1],0,white,red) ; -% -% % \MPcolor{simpleslides:backgroundcolor}, -% % \MPcolor{simpleslides:contrastcolor}) ; -% -% -% -% -\stopuseMPgraphic - -\startuseMPgraphic{simpleslides:shaded:counter5} -save a,b ; -numeric a,b ; -save p ; -path p ; -p = unitsquare xyscaled (3mm,7mm) randomized 2mm shifted (BackSpace, 5mm) ; -fill p withcolor red ; -% a = 7mm ; -% b = PaperWidth/2 - NOfPages * 2.5pt ; -% -% save p,q; path p,q ; -% p =((0,5mm) -- (1mm,11mm)) shifted (b,0) ; -% q =((-8mm,5mm) -- (0,11mm) ) shifted (b,0) ; -% -% pickup pencircle scaled 3pt ; -% for i := NOfPages-1 downto 1: -% draw (if i mod 5 = 0 : q else : p fi) -% shifted (i*5pt, 0pt) -% withcolor if i < PageNumber : red -% else : yellow -% fi ; -% endfor ; -\stopuseMPgraphic - - -\protect - -\stopmodule diff --git a/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkii b/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkii deleted file mode 100644 index 61d657bcfe4..00000000000 --- a/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkii +++ /dev/null @@ -1,84 +0,0 @@ -%D \module -%D [ file=t-simpleslides, -%D version=2012.02.12 -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Module simpleslides, -%D author=Aditya Mahajan and Thomas A. Schmitz, -%D date=\currentdate, -%D copyright={Aditya Mahajan and Thomas A. Schmitz}] -%C -%C Copyright 2007 Aditya Mahajan and Thomas A. Schmitz -%C This file may be distributed under the GNU General Public License v. 2.0. - -%M \usemodule[int-load] -%M \setupcolors[state=start] -%M \loadsetups[cont-en.xml] -%M \loadsetups[t-simpleslides.xml] - -%D This module is meant to facilitate writing presentations in \CONTEXT. It -%D provides a consistent interface and macros; there are different styles which -%D give different output. The module has been written for projector||based -%D presentations, so elements which are typical for screen presentations (such -%D as interactive hyperlinks or tables of contents) are not included. The -%D module is meant for an academic environment, specifically in the humanities. -%D Hence, it has the following characteristics: -%D -%D \startitemize -%D -%D \item The look is rather sober. In academia, presentations are not meant to -%D showcase fancy \TeX\ effects; nothing should divert the audience's attention -%D from the content. -%D -%D \item The module is written for slides which exhibit text and/or images. -%D From my own experience with \TeX||based presentations, I have provided a -%D setup for horizontal (landscape) pictures and for vertical (portrait) -%D pictures, which are accompanied by an area for explanatory text. -%D -%D \item A simple switch in the module setup command will produce different -%D output. -%D -%D \item It is easy to customize the module or to add more styles. -%D -%D \stopitemize -%D -%D The macros are commented rather extensively to give users (especially users -%D relatively new to \CONTEXT) the chance to understand the mechanisms and -%D create their own styles. Of course, I did not invent this code on my own. My -%D thanks are due, as always, to Hans Hagen, whose presentation modules in the -%D \CONTEXT\ core have been a wonderful source of inspiration, to Mojca -%D Miklavec, who provided help with Metapost, and to Aditya Mahajan, who helped -%D tremendously in cleaning up the code and making the user interface more -%D consistent. - -\writestatus{loading}{module simpleslides} - -\startmodule[simpleslides] - -\unprotect - -\setupmodule - [style=, - font=LatinModernSans, - size=17pt, - color=blue, - alternative=square] - -\usemodule - [simpleslides-f] - [default] - -\usemodule - [simpleslides-s] - [default] - -% \usemodule -% [simpleslides-c] -% [default] - -\doiffileelse{s-\currentmoduleparameter\c!style} - {\ReadFile{s-\currentmoduleparameter\c!style}} - {\usemodule[simpleslides-s-\currentmoduleparameter\c!style]} - -\protect - -\stopmodule diff --git a/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkiv b/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkiv index 702af15bdfe..192cdd28a0b 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkiv +++ b/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkiv @@ -64,12 +64,10 @@ alternative=square] \usemodule - [simpleslides-f] - [default] + [simpleslides-fontsdefault] \usemodule - [simpleslides-s] - [default] + [simpleslides-default] % \usemodule % [simpleslides-c] @@ -78,7 +76,7 @@ \doiffileelse{s-\currentmoduleparameter\c!style} {\ReadFile{s-\currentmoduleparameter\c!style}} - {\expanded{\usemodule[simpleslides-s-\currentmoduleparameter\c!style]}} + {\expanded{\usemodule[simpleslides-\currentmoduleparameter\c!style]}} \protect diff --git a/Master/texmf-dist/tex/context/third/simpleslides/t-slidesvisualcounter.tex b/Master/texmf-dist/tex/context/third/simpleslides/t-slidesvisualcounter.tex deleted file mode 100644 index 2c0bea60ae0..00000000000 --- a/Master/texmf-dist/tex/context/third/simpleslides/t-slidesvisualcounter.tex +++ /dev/null @@ -1,502 +0,0 @@ -% macros=mkvi - -%D \module -%D [ file=t-visualcounter, -%D version=2011.10.05, -%D title=\CONTEXT\ User Module, -%D subtitle=Visual Counter, -%D author=Aditya Mahajan, -%D date=\currentdate, -%D copyright=Aditya Mahajan, -%D email=adityam <at> ieee <dot> org, -%D license=Simplified BSD License] - -\writestatus{loading}{Visual Counter (ver: 2011.10.05)} - -\startmodule [visualcounter] - -\unprotect - -\startinterface all - \setinterfaceconstant {last} {last} - \setinterfaceconstant {palette} {palette} - \setinterfaceconstant {path} {path} -\stopinterface - -\definenamespace - [visualcounter] - [ \c!type=module, - \c!name=visualcounter, - \c!command=\v!yes, - setup=\v!list, - \c!style=\v!yes, - \s!parent=visualcounter, - ] - -\setupvisualcounter - [ \s!counter=, - \c!n={\rawstructurecounter[\visualcounterparameter\s!counter]}, - \c!text={\getstructurecounter[\visualcounterparameter\s!counter]}, - \c!max\c!text={\laststructurecounter[\visualcounterparameter\s!counter]}, - \c!last={\laststructurecounter[\visualcounterparameter\s!counter]}, - \c!style=, - \c!color=, - \c!mp=visualcounter:countdown, - \c!palette=visualcounter:countdown, - \c!width=1EmWidth, - \c!height=1ExHeight, - \c!rulethickness=1bp, - \c!distance=1cm, - % Parameters passed to scale - \c!maxwidth=\maxdimen, - \c!maxheight=\maxdimen, - ] - - -\def\usevisualcounter#{name}% - {\edef\currentvisualcounter{#{name}}% - \scale - [ - \c!maxwidth=\visualcounterparameter\c!maxwidth, - \c!maxheight=\visualcounterparameter\c!maxheight, - ]{\useMPgraphic{\visualcounterparameter\c!mp}}} - -\unexpanded\def\getvisualcountertext - {\dosetvisualcounterattributes\c!style\c!color - \visualcounterparameter\c!text} - -\unexpanded\def\getmaxvisualcountertext - {\dosetvisualcounterattributes\c!style\c!color - \visualcounterparameter{\c!max\c!text}} - -%D \section {The counters} -%D -%D \subsection {SqareMarker} - -\definevisualcounter - [squaremarkers] - [ \c!mp=visualcounter:squaremarkers, - \c!palette=visualcounter:squaremarkers, - \c!width=1EmWidth, - \c!distance=1EmWidth, - ] - -\definepalet - [visualcounter:squaremarkers] - [active=orange, - past=blue, - future=gray] - -\startuseMPgraphic{visualcounter:squaremarkers} - begingroup ; - - newnumeric n, m ; - % current count - n := \visualcounterparameter\c!n ; - % total count - m := max(\visualcounterparameter\c!last, 1) ; - - newnumeric width ; width := \visualcounterparameter\c!width ; - newnumeric height ; height := \visualcounterparameter\c!height ; - newnumeric distance ; distance := \visualcounterparameter\c!distance ; - - newpath marker ; - - pickup pencircle scaled \visualcounterparameter\c!rulethickness ; - - for i := 1 upto m : -% fill marker shifted (i*(width + distance), 0) -% hmm, I found no more elegant way of including the scaling - if i < n : marker := \visualcounterparameter{path} xyscaled (width, height) ; - fill marker shifted (i*(width + distance), 0) withcolor \MPcolor{\visualcounterparameter{\c!palette}:past} - elseif i = n : marker := \visualcounterparameter{path} xyscaled (width, 2*height) ; - fill marker shifted (i*(width + distance), -height) withcolor \MPcolor{\visualcounterparameter{\c!palette}:active} - else : marker := \visualcounterparameter{path} xyscaled (width, height) ; - fill marker shifted (i*(width + distance), 0) withcolor \MPcolor{\visualcounterparameter{\c!palette}:future} - fi ; - endfor ; - endgroup ; -\stopuseMPgraphic - -% -% save diff ;numeric diff; -% diff = .3cm ; -% -% save w; numeric w; -% w = xpart (lrcorner Field[Text][Text] - llcorner Field[Text][Text]) - diff ; -% -% save factor; numeric factor; -% if NOfPages <= 1 : -% factor = w ; -% else : -% factor = w/(NOfPages - 1) ; -% fi ; -% -% save p; path p ; -% p = unitsquare xyscaled (diff,diff) -% shifted (xpart llcorner Field[Text][Text],0.85cm) ; -% -% for i = 1 upto NOfPages: -% if PageNumber = i: -% fill p xyscaled (0,2) shifted ( (i-1)*factor,-diff-0.85cm) -% withcolor \MPcolor{simpleslides:contrastcolor} ; -% else : -% fill p shifted ( (i-1)*factor, 0) -% withcolor \MPcolor{simpleslides:variantcolor} ; -% fi ; -% endfor ; - -%D -%D \subsection {Dots} - -\definevisualcounter - [markers] - [ \c!mp=visualcounter:markers, - \c!palette=visualcounter:markers, - \c!width=1EmWidth, - \c!distance=1EmWidth, - path=unitcircle, - ] - -\definepalet - [visualcounter:markers] - [active=orange, - past=blue, - future=gray] - -\startuseMPgraphic{visualcounter:markers} - begingroup ; - - newnumeric n, m ; - % current count - n := \visualcounterparameter\c!n ; - % total count - m := max(\visualcounterparameter\c!last, 1) ; - - newnumeric width ; width := \visualcounterparameter\c!width ; - newnumeric distance ; distance := \visualcounterparameter\c!distance ; - - newpath marker ; - marker := \visualcounterparameter{\c!path} % - xyscaled (width, width) ; - - pickup pencircle scaled \visualcounterparameter\c!rulethickness ; - - for i := 1 upto m : - fill marker shifted (i*(width + distance), 0) withcolor - if i < n : \MPcolor{\visualcounterparameter{\c!palette}:past} - elseif i = n : \MPcolor{\visualcounterparameter{\c!palette}:active} - else : \MPcolor{\visualcounterparameter{\c!palette}:future} - fi ; - endfor ; -\stopuseMPgraphic - -%D \subsection {Count down} - -\definevisualcounter - [countdown] - [ \c!mp=visualcounter:countdown, - \c!palette=visualcounter:countdown, - \c!width=1EmWidth, - \c!height=1ExHeight, - \c!distance=1cm, - ] - -\definepalet - [visualcounter:countdown] - [active=orange, - past=blue, - future=gray] - -\startMPdefinitions - % mp-tool does not define new pair. - def newpair text v = forsuffixes i=v : save i ; pair i ; endfor ; enddef ; -\stopMPdefinitions - -\startuseMPgraphic{visualcounter:countdown} - begingroup ; - - % label - newpicture countertext ; countertext := textext("\getvisualcountertext") ; - newpicture max_countertext ; max_countertext := textext("\getmaxvisualcountertext") ; - - newnumeric inner_diameter, outer_diameter ; - inner_diameter := 1.5 * max(bbwidth(max_countertext), bbheight(max_countertext)); - outer_diameter := inner_diameter + - max(\visualcounterparameter\c!width, \visualcounterparameter\c!height) ; - - newpath inner_circle, outer_circle ; - % make the circle start at 12 o'clock and go clockwise - inner_circle := reverse (fullcircle scaled inner_diameter) rotated 90; - outer_circle := reverse (fullcircle scaled outer_diameter) rotated 90; - - newnumeric n, m ; - % current count - n := \visualcounterparameter\c!n ; - % total count - m := max(\visualcounterparameter\c!last, 1) ; - - % boundary distance - newnumeric inner_boundary, outer_boundary ; - inner_boundary := \visualcounterparameter\c!distance/m * (inner_diameter)/(outer_diameter) ; - outer_boundary := \visualcounterparameter\c!distance/m ; - - % step size - newnumeric inner_time, outer_time ; - inner_time := arclength (inner_circle)/m ; - outer_time := arclength (outer_circle)/m ; - - newpath slice ; - - newpair pt_inner_left, pt_inner_right ; - newpair pt_outer_left, pt_outer_right ; - - for i = 1 upto m : - pt_inner_left := point ((i-1)*inner_time) on inner_circle ; - pt_inner_right := point (i*inner_time - inner_boundary) on inner_circle ; - - pt_outer_left := point ((i-1)*outer_time) on outer_circle ; - pt_outer_right := point (i*outer_time - outer_boundary) on outer_circle ; - - slice := inner_circle cutbefore pt_inner_left cutafter pt_inner_right - --- reverse (outer_circle cutbefore pt_outer_left cutafter pt_outer_right ) - --- cycle ; - - fill slice withcolor - if i < n : \MPcolor{\visualcounterparameter{\c!palette}:past} - elseif i = n : \MPcolor{\visualcounterparameter{\c!palette}:active} - else : \MPcolor{\visualcounterparameter{\c!palette}:future} - fi ; - - endfor ; - - label (countertext, origin) ; - - endgroup ; - -\stopuseMPgraphic - -%D \subsection {Pulse line} - -\definevisualcounter - [pulseline] - [ \c!mp=visualcounter:pulseline, - \c!path={origin -- (((n-1)*width, 0) .. ((n-0.5)*width, -0.2height) - -- (n*width, height) -- ((n+0.5)*width, -0.2height) - .. ((n+1)*width,0)) -- ((m+1)*width, 0) - randomized 0.3width}, - \c!palette=visualcounter:pulseline, - \c!width=0.5EmWidth, - \c!height=3ExHeight, - \c!rulethickness=1bp, - ] - - -\definepalet - [visualcounter:pulseline] - [active=lightgreen, - past=darkgreen, - future=gray] - -\startuseMPgraphic{visualcounter:pulseline} - begingroup ; - - newnumeric width ; width := \visualcounterparameter\c!width ; - newnumeric height ; height := \visualcounterparameter\c!height ; - - numeric n ; n := \visualcounterparameter\c!n ; - numeric m ; m := max(\visualcounterparameter\c!last, 5) ; - - - newpath pulse ; - pulse := \visualcounterparameter\c!path ; - - newpath helper_line ; - helper_line := (0,-height) -- (0,height) ; - - newpair start_pulse, stop_pulse ; - start_pulse := pulse intersectionpoint (helper_line shifted ((n-1)*width, 0)) ; - stop_pulse := pulse intersectionpoint (helper_line shifted ((n+1)*width, 0)) ; - - - newpath past_pulse, active_pulse, future_pulse ; - past_pulse := pulse cutafter start_pulse ; - active_pulse := pulse cutbefore start_pulse cutafter stop_pulse ; - future_pulse := pulse cutbefore stop_pulse ; - - pickup pencircle scaled \visualcounterparameter\c!rulethickness ; - draw past_pulse withcolor \MPcolor{\visualcounterparameter{\c!palette}:past} ; - draw active_pulse withcolor \MPcolor{\visualcounterparameter{\c!palette}:active} ; - draw future_pulse withcolor \MPcolor{\visualcounterparameter{\c!palette}:future} ; - - endgroup ; -\stopuseMPgraphic - -%D \subsection {Scratch Marks} - -\definevisualcounter - [scratchmarks] - [ \c!mp=visualcounter:scratchmarks, - \c!palette=visualcounter:scratchmarks, - \c!width=3bp, - \c!height=3ExHeight, - \c!distance=0.5EmWidth, - angle=75, - ] - -\definepalet - [visualcounter:scratchmarks] - [active=orange, - past=blue, - future=gray] - -\startuseMPgraphic{visualcounter:scratchmarks} - begingroup ; - - linecap := rounded ; - - newnumeric distance ; distance := \visualcounterparameter\c!distance ; - newnumeric width ; width := \visualcounterparameter\c!width ; - newnumeric height ; height := \visualcounterparameter\c!height ; - newnumeric theta ; theta := \visualcounterparameter{angle} ; - - numeric n ; n := \visualcounterparameter\c!n ; - numeric m ; m := max(\visualcounterparameter\c!last, 1) ; - - - newpath left_marker, right_marker ; - - left_marker := origin -- height*dir(theta) ; - right_marker := (-4*width, height*sind(theta)) -- origin ; - - save marker ; - def marker (expr i) = - (if i mod 5 = 0 : right_marker else : left_marker fi) - shifted (i*distance, 0) - withcolor - if i < n : \MPcolor{\visualcounterparameter{\c!palette}:past} - elseif i = n : \MPcolor{\visualcounterparameter{\c!palette}:active} - else : \MPcolor{\visualcounterparameter{\c!palette}:future} - fi ; - enddef ; - - pickup pencircle scaled \visualcounterparameter\c!width ; - - for i := m downto 1 : - draw marker(i) ; - endfor ; - - draw marker(n) ; - - endgroup ; -\stopuseMPgraphic - -%D \subsection {Maya markers} - -\definevisualcounter - [mayanumbers] - [ \c!mp=visualcounter:mayanumbers, - \c!palette=visualcounter:mayanumbers, - \c!width=1EmWidth, - \c!height=1ExHeight, - \c!distance=0.25EmWidth, - ] - -\definepalet - [visualcounter:mayanumbers] - [active=orange, - past=blue, - future=gray] - - -\startuseMPgraphic{visualcounter:mayanumbers} - begingroup ; - - newnumeric n, m ; - % current count - n := \visualcounterparameter\c!n ; - % total count - m := max(\visualcounterparameter\c!last, 1) ; - - newnumeric distance ; distance := \visualcounterparameter\c!distance ; - - newnumeric width ; width := \visualcounterparameter\c!width ; - newnumeric height; height := \visualcounterparameter\c!height ; - - newnumeric linewidth ; linewidth := 4width + 5distance ; - newnumeric linedistance ; linedistance := 2distance ; - - newpath marker; - marker := ((0,0.5height) .. (0.5width,-0.1height) .. (0.5width, -0.4height) - .. (0,-0.8height) - .. (-0.5width,-0.4height) .. (-0.5width, -0.1height) .. cycle) ; - - newpath line ; - line := (-0.5width - distance, 0) .. (0.1width,0.8height) - --- (3.1width + 3distance, 0.8height) .. (3.5width + 4distance, 0) .. (3.6width + 2distance, -0.8height) - --- (0.1width, -0.8height) .. cycle ; - - newpath boundary ; - boundary := (linewidth -0.5width - distance, 0.9height) - -- ( (1 + floor(m/5))*(linewidth+linedistance), 0.9height) - -- ( (1 + floor(m/5))*(linewidth+linedistance), -0.9height) - -- (linewidth -0.5width - distance, -0.9height) - -- cycle; - - - % Draw the filled solid lines - newnumeric linecount ; linecount := floor ((n - 1) / 5) ; - for i = 1 upto linecount : - fill line shifted (i*(linewidth + linedistance), 0) - withcolor \MPcolor{\visualcounterparameter{\c!palette}:past} ; - endfor - - % Draw the filled dots - newnumeric offset ; offset := (linecount + 1)*(linewidth + linedistance) ; - - newnumeric markercount ; markercount := n - linecount*5 ; - if markercount = 5 : - fill line shifted (offset,0) - withcolor - \MPcolor{\visualcounterparameter{\c!palette}:active} ; - else : for i = 1 upto markercount : - fill marker shifted (offset + (i-1)*(width+distance), 0 ) - withcolor - if i = markercount : - \MPcolor{\visualcounterparameter{\c!palette}:active} ; - else : - \MPcolor{\visualcounterparameter{\c!palette}:past} ; - fi - endfor fi - - % Draw the empty dots - newnumeric markermax ; markermax := min(m - linecount*5, 4) ; - if markercount < 4 : - for i = markercount + 1 upto markermax : - fill marker shifted (offset + (i-1)*(width+distance),0) - withcolor - \MPcolor{\visualcounterparameter{\c!palette}:future} ; - endfor - fi - - for blockcount = linecount + 1 upto ceiling(m/5) : - offset := (blockcount + 1)*(linewidth + linedistance) ; - markercount := min(4, m - blockcount*5) ; - for i = 1 upto markercount : - fill marker shifted (offset + (i-1)*(width+distance),0) - withcolor - \MPcolor{\visualcounterparameter{\c!palette}:future} ; - endfor - endfor - - setbounds currentpicture to boundary ; - - endgroup ; - -\stopuseMPgraphic - - -\protect - -\stopmodule - |