From 8b8f107dcf9fe451cf32f78572aa1c98307f35dc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 15 Jul 2022 21:43:44 +0000 Subject: context-simpleslides (15jul22) git-svn-id: svn://tug.org/texlive/trunk@63903 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/context/third/simpleslides/VERSION | 2 +- .../simpleslides/s-simpleslides-BigNumber.tex | 71 ++++++------- .../simpleslides/s-simpleslides-BottomSquares.tex | 43 ++++---- .../third/simpleslides/s-simpleslides-Boxed.tex | 47 +++++---- .../simpleslides/s-simpleslides-BoxedTitle.tex | 47 +++++---- .../third/simpleslides/s-simpleslides-Ellipse.tex | 53 +++++----- .../third/simpleslides/s-simpleslides-Embossed.tex | 38 +++---- .../third/simpleslides/s-simpleslides-Framed.tex | 91 +++++++++-------- .../simpleslides/s-simpleslides-FramedTitle.tex | 43 ++++---- .../simpleslides/s-simpleslides-FuzzyFrame.tex | 56 +++++------ .../s-simpleslides-HorizontalStripes.tex | 44 +++++---- .../simpleslides/s-simpleslides-NarrowStripes.tex | 23 +++-- .../simpleslides/s-simpleslides-PlainCounter.tex | 56 +++++------ .../simpleslides/s-simpleslides-RainbowStripe.tex | 45 +++++---- .../third/simpleslides/s-simpleslides-Shaded.tex | 35 ++++--- .../simpleslides/s-simpleslides-SideSquares.tex | 61 ++++++------ .../third/simpleslides/s-simpleslides-Split.tex | 37 ++++--- .../third/simpleslides/s-simpleslides-Sunrise.tex | 44 +++++---- .../third/simpleslides/s-simpleslides-Swoosh.tex | 67 +++++++------ .../simpleslides/s-simpleslides-ThickStripes.tex | 23 +++-- .../third/simpleslides/s-simpleslides-default.tex | 110 ++++++++++----------- 21 files changed, 505 insertions(+), 531 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/context/third/simpleslides/VERSION b/Master/texmf-dist/doc/context/third/simpleslides/VERSION index c742dc5235c..dd038fd49e2 100644 --- a/Master/texmf-dist/doc/context/third/simpleslides/VERSION +++ b/Master/texmf-dist/doc/context/third/simpleslides/VERSION @@ -1 +1 @@ -2014.06.15 +2022.07.13 diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BigNumber.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BigNumber.tex index 57d3b9fbe22..66127572315 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BigNumber.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BigNumber.tex @@ -1,17 +1,17 @@ %D \module %D [ file=simpleslides-s-BigNumber, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- Big Number Style, %D author=Aditya Mahajan and Thomas A. Schmitz, -%D date=\currentdate +%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. %D This file provides the \quotation{BigNumber} style for the presentation -%D module. It is loaded at runtime. +%D module. It is loaded at runtime. \writestatus{simpleslides}{loading Big Number style} @@ -26,9 +26,9 @@ height=fit, leftmargindistance=.8cm, rightmargindistance=0cm, - header=18mm, - footer=0cm, - topspace=.8cm, + header=18mm, + footer=0cm, + topspace=.8cm, backspace=1.9cm, location=singlesided] @@ -40,7 +40,7 @@ [width=\paperwidth, height=\paperheight,x=20mm] -%D Next we a generic frames, which will be used by other macros to +%D Next we define generic frames, which will be used by other macros to %D get a consistent look and feel. \defineframed[simpleslides:framed:small] @@ -81,22 +81,8 @@ %D The characteristic feature of this module is that the page number is drawn in %D big letters on the slide. First we define the font used to draw the number. -%D The is a bit verbose since \MKII\ and \MKIV\ have different ways of loading -%D fonts. -\beginOLDTEX -\loadmapfile[qhv-ec.map] -\definefontsynonym [BigNumberFont] [ec-qhvb] -\endOLDTEX - -\beginXETEX -\loadmapfile[qhv-ec.map] -\definefontsynonym [BigNumberFont] [ec-qhvb] -\endXETEX - -\beginLUATEX \definefontsynonym [BigNumberFont] [name:texgyreherosbold] -\endLUATEX \definefont [NumberFont] [BigNumberFont at 30pt] @@ -124,25 +110,25 @@ StartPage ; save Left, Right ; picture Left, Right ; -Left := textext("\NumberFont \color[simpleslides:contrastcolor]{\folio}") ysized 4cm ; -Right := textext("\NumberFont \color[simpleslides:backgroundcolor]{\folio}") ysized 4cm ; +Left := textext("\NumberFont \color[simpleslides:contrastcolor]{\pagenumber}") ysized 4cm ; +Right := textext("\NumberFont \color[simpleslides:backgroundcolor]{\pagenumber}") ysized 4cm ; save LeftBox, RightBox ; path LeftBox, RightBox ; save split ; numeric split ; -split := if PageNumber < 10 : 1/2 else : 3/4 fi ; +split := if RealPageNumber < 10 : 1/2 else : 3/4 fi ; %split := 1/2 ; LeftBox := llcorner Left -- split[llcorner Left, lrcorner Left] -- split[ulcorner Left, urcorner Left] -- ulcorner Left --cycle ; - + RightBox := lrcorner Right -- split[lrcorner Right, llcorner Right] -- split[urcorner Right, ulcorner Right] -- urcorner Right --cycle ; save shft ; numeric shft ; shft = arclength(llcorner Right -- lrcorner Right) ; -if PageNumber >= 10 : +if RealPageNumber >= 10 : RightBox := RightBox shifted (shft/2, 0) ; fi; @@ -161,14 +147,14 @@ StopPage ; \stopuseMPgraphic %D We also use \METAPOST\ to draw the horizontal and vertical page backgrounds. - -\startuniqueMPgraphic{simpleslides:MP:horizontal} + +\startuniqueMPgraphic{simpleslides:MP:horizontal} StartPage ; fill Page withcolor \MPcolor{simpleslides:contrastcolor} ; fill Field[Text][Text] enlarged 0.2cm withcolor \MPcolor{simpleslides:backgroundcolor} ; StopPage ; -\stopuniqueMPgraphic +\stopuniqueMPgraphic \startuniqueMPgraphic{simpleslides:MP:vertical} StartPage ; @@ -190,21 +176,21 @@ StopPage ; %D We define these backgrounds as overlays: -\defineoverlay - [simpleslides:background:horizontal] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:horizontal] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:vertical] - [\useMPgraphic{simpleslides:MP:vertical}] +\defineoverlay + [simpleslides:background:vertical] + [\useMPgraphic{simpleslides:MP:vertical}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [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 slide title is placed on the top of the text area. The layer takes care %D of the positioning. @@ -222,7 +208,7 @@ StopPage ; \c!date\c!color=simpleslides:textcolor, \c!author\c!color=simpleslides:textcolor] -%D Squares are used as the first level of itemizations +%D Squares are used as the first level of itemizations \definesymbol[1][$\square$] \setupitemize[1][inmargin] @@ -232,4 +218,3 @@ StopPage ; \stopmodule \endinput - 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 index ea7bcbeba64..845fd2fb1ca 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BottomSquares.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BottomSquares.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-BottomSquares, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- BottomSquares style, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -12,7 +12,7 @@ %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. +%D presentation Taco gave at EuroTeX 2006. \writestatus{simpleslides}{loading module BottomSquares} @@ -27,8 +27,8 @@ margin=0cm, height=fit, margindistance=0cm, - header=0cm, - footer=0cm, + header=0cm, + footer=0cm, topspace=1cm, bottomspace=2cm, backspace=1.5cm, @@ -51,7 +51,7 @@ \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] @@ -68,18 +68,18 @@ %AM: Why not implement this as an interaction bar? -\startuseMPgraphic{simpleslides:MP:ornament} +\startuseMPgraphic{simpleslides:MP:ornament} StartPage ; fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; -save diff ;numeric diff; +save diff ;numeric diff; diff = .3cm ; -save w; numeric w; +save w; numeric w; w = xpart (lrcorner Field[Text][Text] - llcorner Field[Text][Text]) - diff ; -save factor; numeric factor; +save factor; numeric factor; if NOfPages <= 1 : factor = w ; else : @@ -87,30 +87,30 @@ else : fi ; save p; path p ; -p = unitsquare xyscaled (diff,diff) +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) + if RealPageNumber = 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) + fill p shifted ( (i-1)*factor, 0) withcolor \MPcolor{simpleslides:variantcolor} ; fi ; endfor ; StopPage ; -\stopuseMPgraphic +\stopuseMPgraphic %D We define these backgrounds as overlays: -\defineoverlay - [simpleslides:background:ornament] - [\useMPgraphic{simpleslides:MP:ornament}] +\defineoverlay + [simpleslides:background:ornament] + [\useMPgraphic{simpleslides:MP:ornament}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:ornament}] +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:ornament}] %D We want the title information to be colored @@ -162,7 +162,7 @@ fill p[2] withcolor \MPcolor{simpleslides:contrastcolor} ; \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. +%D The symbol for the first level of itemizations. \definesymbol[1][\useMPgraphic{simpleslides:itemize:square}] \setupitemize[1][color={simpleslides:itemize:color}] @@ -171,4 +171,3 @@ fill p[2] withcolor \MPcolor{simpleslides:contrastcolor} ; \stopmodule \endinput - diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Boxed.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Boxed.tex index cec57643210..61c5b1c0e52 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Boxed.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Boxed.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-Boxed, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- Boxed Style, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -12,7 +12,7 @@ %D This file provides the \quotation{Boxed} style for the presentation %D module. It is loaded at runtime. The look of this style was inspired by the -%D screen version of the Metafun manual. +%D screen version of the Metafun manual. \writestatus{simpleslides}{loading style Boxed} @@ -27,9 +27,9 @@ height=fit, leftmargindistance=1cm, rightmargindistance=0cm, - header=2.8cm, - footer=1cm, - topspace=.7cm, + header=2.8cm, + footer=1cm, + topspace=.7cm, backspace=2cm, location=singlesided] @@ -60,7 +60,7 @@ %D We let Metapost calculate the background: -\startuniqueMPgraphic{simpleslides:MP:horizontal} +\startuniqueMPgraphic{simpleslides:MP:horizontal} StartPage ; save p; path p[] ; @@ -95,13 +95,13 @@ draw z7 -- z4 withcolor \MPcolor{simpleslides:contrastcolor} ; draw z8 -- z3 withcolor \MPcolor{simpleslides:contrastcolor} ; StopPage ; -\stopuniqueMPgraphic +\stopuniqueMPgraphic \startuseMPgraphic{simpleslides:MP:ornament} StartPage save a; numeric a; -a := 1.5cm ; +a := 1.5cm ; save factor, allpages, shift ; numeric factor, allpages, shift ; @@ -116,8 +116,8 @@ save p ;path p ; p := fullcircle scaled 4mm shifted (a + shift/2, a/2) ; for i = 1 upto allpages/factor : - fill p shifted ( (i-1)*shift, 0) - if i - 1 = floor ((PageNumber - 1)/factor) : + fill p shifted ( (i-1)*shift, 0) + if i - 1 = floor ((RealPageNumber - 1)/factor) : withcolor \MPcolor{simpleslides:variantcolor} ; else : withcolor \MPcolor{simpleslides:backgroundcolor} ; @@ -130,21 +130,21 @@ StopPage %D We define these backgrounds as overlays: -\defineoverlay - [simpleslides:background:horizontal] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:horizontal] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:vertical] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:vertical] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [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: @@ -161,7 +161,7 @@ StopPage \c!height=2.3cm, \c!after=] -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \definesymbol[1][\useMPgraphic{simpleslides:itemize:square}] \setupitemize[1][inmargin][color={simpleslides:itemize:color}] @@ -170,4 +170,3 @@ StopPage \stopmodule \endinput - diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BoxedTitle.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BoxedTitle.tex index c2d3211fbf8..43396024828 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BoxedTitle.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-BoxedTitle.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-BoxedTitle, -%D version=2009.10.04 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- FramedTitle style, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -11,7 +11,7 @@ %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 module. It is loaded at runtime. \writestatus{simpleslides}{loading style BoxedTitle} @@ -24,9 +24,9 @@ \setuplayout [width=fit, margin=0cm, height=fit, - header=0cm, - footer=0cm, - topspace=1.35cm, + header=0cm, + footer=0cm, + topspace=1.35cm, backspace=1cm, location=singlesided] @@ -65,14 +65,14 @@ linear_shade(p,6,\MPcolor{simpleslides:variantcolor},\MPcolor{simpleslides:contrastcolor}) ; \stopuniqueMPgraphic -\startuniqueMPgraphic{simpleslides:MP:horizontal} +\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 +\stopuniqueMPgraphic \startuseMPgraphic{simpleslides:MP:ornament} StartPage ; @@ -96,7 +96,7 @@ 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) : + for k = 2 upto (RealPageNumber + 1) : z.a[k] = z.a[(k - 1)] shifted (a,0) ; z.b[k] = z.b[(k - 1)] shifted (a,0) ; path q[] ; @@ -115,24 +115,24 @@ 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:horizontal] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:vertical] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:vertical] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:ornament] - [\useMPgraphic{simpleslides:MP:ornament}] +\defineoverlay + [simpleslides:background:ornament] + [\useMPgraphic{simpleslides:MP:ornament}] \defineoverlay [BoxedTitle:Title] @@ -158,7 +158,7 @@ circular_shade(p,0,\MPcolor{simpleslides:contrastcolor},\MPcolor{simpleslides:va \c!title\c!align=,%\v!middle, \c!author\c!style=, \c!author\c!color=simpleslides:backgroundcolor, - \c!author\c!align=,%\v!middle, + \c!author\c!align=,%\v!middle, \c!date\c!style=, \c!date\c!color=simpleslides:backgroundcolor, \c!date\c!align=,%\v!middle, @@ -184,7 +184,7 @@ circular_shade(p,0,\MPcolor{simpleslides:contrastcolor},\MPcolor{simpleslides:va \setupPicture[verticalbackground=BoxedTitle:Title, verticalforegroundcolor=simpleslides:backgroundcolor] -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \definesymbol[1][\uniqueMPgraphic{FilledSquare}] \setupitemize[1][color=simpleslides:variantcolor] @@ -193,4 +193,3 @@ circular_shade(p,0,\MPcolor{simpleslides:contrastcolor},\MPcolor{simpleslides:va \stopmodule \endinput - diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Ellipse.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Ellipse.tex index 79cbb9c43ae..60670ecfe88 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Ellipse.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Ellipse.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-Ellipse, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module Ellipse, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -12,7 +12,7 @@ %D This file provides the \quotation{Ellipse} style for the presentation %D module. The design is inspired by Hans's "funny" presentation module -%D (s-pre-03). It is loaded at runtime. +%D (s-pre-03). It is loaded at runtime. \writestatus{simpleslides}{loading Ellipse style} @@ -25,9 +25,9 @@ \setuplayout [width=fit, height=fit, margin=0cm, - header=1.2cm, - footer=0cm, - topspace=1.8cm, + header=1.2cm, + footer=0cm, + topspace=1.8cm, backspace=1.5cm, location=singlesided] @@ -60,7 +60,7 @@ \startuseMPgraphic{simpleslides:MP:horizontal} StartPage ; fill Page withcolor \MPcolor{simpleslides:variantcolor} ; - save p ; path p ; + save p ; path p ; p := Page enlarged (-15pt,-15pt) superellipsed .9 ; fill p withcolor \MPcolor{simpleslides:backgroundcolor} ; pickup pencircle scaled 20pt ; @@ -68,40 +68,40 @@ StartPage ; StopPage ; \stopuseMPgraphic -\startuseMPgraphic{simpleslides:MP:ornament} +\startuseMPgraphic{simpleslides:MP:ornament} StartPage ; save p ; path p ; p := Page enlarged (-15pt,-15pt) superellipsed .9 ; pickup pencircle scaled 20pt ; save pa, pb; pair pa, pb ; - if PageNumber>1: - pa := point (3 + (6*PageNumber) / NOfPages) of p ; - pb := point (3 + (6*(PageNumber-1)) / NOfPages) of p ; - draw (p cutafter pa) cutbefore pb + if RealPageNumber>1: + pa := point (3 + (6*RealPageNumber) / NOfPages) of p ; + pb := point (3 + (6*(RealPageNumber-1)) / NOfPages) of p ; + draw (p cutafter pa) cutbefore pb withcolor \MPcolor{simpleslides:altcontrastcolor} ; fi ; StopPage ; -\stopuseMPgraphic +\stopuseMPgraphic %D We define these backgrounds as overlays: -\defineoverlay - [simpleslides:background:horizontal] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:horizontal] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:vertical] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:vertical] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:ornament] - [\useMPgraphic{simpleslides:MP:ornament}] +\defineoverlay + [simpleslides:background:ornament] + [\useMPgraphic{simpleslides:MP:ornament}] -%D We want the title to placed in color. +%D We want the title to placed in color. \setupTitle[\c!headcolor={simpleslides:contrastcolor}] @@ -117,7 +117,7 @@ StopPage ; \setupcombinations[distance=0cm] -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \definesymbol[1][\useMPgraphic{simpleslides:itemize:square}] \setupitemize[1][\c!color={simpleslides:itemize:color}] @@ -126,4 +126,3 @@ StopPage ; \stopmodule \endinput - diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Embossed.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Embossed.tex index 97b7526245a..8ed078a3e73 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Embossed.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Embossed.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s--Embossed, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- Embossed style, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -11,7 +11,7 @@ %C This file may be distributed under the GNU General Public License v. 2.0. %D This file provides the \quotation{embossed} style for the presentation -%D module. It is loaded at runtime. +%D module. It is loaded at runtime. \writestatus{simpleslides}{loading module embossed} @@ -23,9 +23,9 @@ \setuplayout [width=fit, margin=1.3cm, height=fit, - header=1cm, - footer=1cm, - topspace=10mm, + header=1cm, + footer=1cm, + topspace=10mm, backspace=2cm, location=singlesided] @@ -69,25 +69,14 @@ %D This module write "Made with ConTeXt" in bold at the bottom. We first define %D a font for it. -\beginOLDTEX -\loadmapfile[qhv-ec.map] -\definefontsynonym [Embossed] [ec-qhvb] -\endOLDTEX - -\beginXETEX -\loadmapfile[qhv-ec.map] -\definefontsynonym [Embossed] [ec-qhvb] -\endXETEX - -\beginLUATEX \definefontsynonym [Embossed] [name:texgyreherosbold] -\endLUATEX \definefont[EmblemFont] [Embossed at 30pt] -%D The emblem string is configurable. +%D Some strings are configurable. -\setuplabeltext [\s!en] [simpleslidesemblem={Made with \CONTEXT}] +\setuplabeltext [\s!en] [simpleslidesemblem={Made with \CONTEXT},of=of] +\setuplabeltext [\s!de] [simpleslidesemblem={Gesetzt mit \CONTEXT},of=von] \definetextext[simpleslides:sometxt:left] {\TaspresentSometxtLeft} \definetextext[simpleslides:sometxt:right]{\TaspresentSometxtRight} @@ -118,17 +107,17 @@ bottom = llcorner Page -- z1 -- z2 -- lrcorner Page -- cycle ; fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; fill bottom withcolor \MPcolor{simpleslides:variantcolor} ; -draw Page withcolor \MPcolor{simpleslides:framecolor} +draw Page withcolor \MPcolor{simpleslides:framecolor} withpen pencircle scaled 12pt ; draw topboundary bottom withcolor \MPcolor{simpleslides:framecolor} withpen pencircle scaled 6pt ; -draw \sometxt[simpleslides:sometxt:left]{\labeltext{simpleslidesemblem} \hfill \pagenumber\ of \lastpage} +draw \sometxt[simpleslides:sometxt:left]{\labeltext{simpleslidesemblem} \hfill \pagenumber\ \labeltext{of} \lastpage} shifted (1.96cm,0.04cm) ; -draw \sometxt[simpleslides:sometxt:right]{\labeltext{simpleslidesemblem} \hfill \pagenumber\ of \lastpage} - shifted (2cm,0) ; +draw \sometxt[simpleslides:sometxt:right]{\labeltext{simpleslidesemblem} \hfill \pagenumber\ \labeltext{of} \lastpage} + shifted (2cm,0) ; StopPage ; \stopuseMPgraphic @@ -160,7 +149,7 @@ StopPage ; \c!align=\v!middle] -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \definesymbol[1][\useMPgraphic{simpleslides:itemize:square}] \setupitemize[1][color={simpleslides:itemize:color}] @@ -169,4 +158,3 @@ StopPage ; \stopmodule \endinput - diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Framed.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Framed.tex index 63e4d8054fc..6bb446c1aee 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Framed.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Framed.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-Framed, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- Framed Style, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -11,7 +11,7 @@ %C This file may be distributed under the GNU General Public License v. 2.0. %D This file provides the \quotation{Framed} style for the presentation -%D module. It is loaded at runtime. +%D module. It is loaded at runtime. \writestatus{simpleslides}{loading style Framed} @@ -23,11 +23,11 @@ \setuplayout [width=fit, margin=0.6cm, - height=fit, - header=2.1cm, - footer=1.35cm, + height=fit, + header=2.1cm, + footer=1.35cm, footerdistance=0.5cm, - topspace=0.5cm, + topspace=0.5cm, backspace=1cm, location=singlesided] @@ -60,7 +60,7 @@ %D ornaments, square or stripes. We define both, and then choose one depending %D on the user's choice. -\startuseMPgraphic{simpleslides:MP:ornament:square} +\startuseMPgraphic{simpleslides:MP:ornament:square} StartPage; save a,b,c,p; @@ -77,15 +77,15 @@ endfor ; if NOfPages >= 12: save n ; numeric n ; - n := (10*(PageNumber - 1) div (NOfPages - 1)) + 1; + n := (10*(RealPageNumber - 1) div (NOfPages - 1)) + 1; - draw llcorner p[n] -- urcorner p[n] - withpen pencircle scaled 2pt + draw llcorner p[n] -- urcorner p[n] + withpen pencircle scaled 2pt withcolor \MPcolor{simpleslides:backgroundcolor} ; fi ; StopPage; -\stopuseMPgraphic +\stopuseMPgraphic \startuseMPgraphic{simpleslides:MP:ornament:stripe} StartPage; @@ -100,11 +100,11 @@ linear_shade(p[1],0, \MPcolor{simpleslides:contrastcolor}) ; save i ; -numeric i; -if NOfPages = 0 : - i = PageNumber ; -else : - i = PageNumber/NOfPages ; +numeric i; +if NOfPages = 0 : + i = RealPageNumber ; +else : + i = RealPageNumber/NOfPages ; fi ; p[2] = ulcorner p[1] -- urcorner p[1] ; @@ -123,56 +123,56 @@ clip currentpicture to p[4] ; StopPage; \stopuseMPgraphic -\startuniqueMPgraphic{simpleslides:MP:vertical} +\startuniqueMPgraphic{simpleslides:MP:vertical} StartPage ; -fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; +fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; -draw Page enlarged (-.2cm) - withpen pencircle scaled 4pt - withcolor \MPcolor{simpleslides:framecolor} ; +draw Page enlarged (-.2cm) + withpen pencircle scaled 4pt + withcolor \MPcolor{simpleslides:framecolor} ; -draw unitsquare - xyscaled(0.448*PaperWidth,0.815*PaperHeight) +draw unitsquare + xyscaled(0.448*PaperWidth,0.815*PaperHeight) shifted (0.528*PaperWidth, 0.15*PaperHeight) - withpen pencircle scaled 2pt - withcolor \MPcolor{simpleslides:framecolor} ; + withpen pencircle scaled 2pt + withcolor \MPcolor{simpleslides:framecolor} ; StopPage ; -\stopuniqueMPgraphic +\stopuniqueMPgraphic -\startuniqueMPgraphic{simpleslides:MP:horizontal} +\startuniqueMPgraphic{simpleslides:MP:horizontal} StartPage ; -fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; +fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; -draw Page enlarged (-.2cm) - withpen pencircle scaled 4pt - withcolor \MPcolor{simpleslides:framecolor} ; +draw Page enlarged (-.2cm) + withpen pencircle scaled 4pt + withcolor \MPcolor{simpleslides:framecolor} ; draw unitsquare - xyscaled(0.95*PaperWidth,0.7*PaperHeight) + xyscaled(0.95*PaperWidth,0.7*PaperHeight) shifted (0.025*PaperWidth, 0.15*PaperHeight) - withpen pencircle scaled 2pt - withcolor \MPcolor{simpleslides:framecolor} ; + withpen pencircle scaled 2pt + withcolor \MPcolor{simpleslides:framecolor} ; StopPage; -\stopuniqueMPgraphic +\stopuniqueMPgraphic %D We define these backgrounds as overlays: -\defineoverlay - [simpleslides:background:horizontal] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:horizontal] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:vertical] - [\useMPgraphic{simpleslides:MP:vertical}] +\defineoverlay + [simpleslides:background:vertical] + [\useMPgraphic{simpleslides:MP:vertical}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:horizontal}] %D We define the ornament according to user's choice. @@ -216,7 +216,7 @@ StopPage; \c!height=2.1cm, \c!after=] -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \definesymbol[1][\useMPgraphic{simpleslides:itemize:square}] \setupitemize[1][color={simpleslides:itemize:color}] @@ -225,4 +225,3 @@ StopPage; \stopmodule \endinput - diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FramedTitle.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FramedTitle.tex index 8ba572024ab..25b454481e6 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FramedTitle.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FramedTitle.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-FramedTitle, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- FramedTitle style, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -25,9 +25,9 @@ \setuplayout [width=fit, margin=0cm, height=fit, - header=2.2cm, - footer=.8cm, - topspace=.6cm, + header=2.2cm, + footer=.8cm, + topspace=.6cm, backspace=1cm, location=singlesided] @@ -61,11 +61,11 @@ %D We let Metapost calculate the background: -\startuniqueMPgraphic{simpleslides:MP:horizontal} +\startuniqueMPgraphic{simpleslides:MP:horizontal} StartPage ; fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; StopPage ; -\stopuniqueMPgraphic +\stopuniqueMPgraphic \startuseMPgraphic{simpleslides:MP:ornament} StartPage ; @@ -83,7 +83,7 @@ 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:contrastcolor} + withcolor if i < RealPageNumber : \MPcolor{simpleslides:contrastcolor} else : \MPcolor{simpleslides:variantcolor} fi ; endfor ; @@ -92,21 +92,21 @@ StopPage ; %D We define these backgrounds as overlays: -\defineoverlay - [simpleslides:background:horizontal] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:horizontal] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:vertical] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:vertical] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:ornament] - [\useMPgraphic{simpleslides:MP:ornament}] +\defineoverlay + [simpleslides:background:ornament] + [\useMPgraphic{simpleslides:MP:ornament}] %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. @@ -128,7 +128,7 @@ StopPage ; \c!title\c!align=\v!middle, \c!author\c!style=, \c!author\c!color=simpleslides:backgroundcolor, - \c!author\c!align=\v!middle, + \c!author\c!align=\v!middle, \c!date\c!style=, \c!date\c!color=simpleslides:backgroundcolor, \c!date\c!align=\v!middle, @@ -149,7 +149,7 @@ StopPage ; \c!color=simpleslides:backgroundcolor] -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \definesymbol[1][\useMPgraphic{simpleslides:itemize:square}] \setupitemize[1][color=simpleslides:contrastcolor] @@ -158,4 +158,3 @@ StopPage ; \stopmodule \endinput - 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 index 4e96b61cfbf..645b24453b0 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FuzzyFrame.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-FuzzyFrame.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-SideToc, -%D version=2010.02.09, +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- SideToc style, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -11,7 +11,7 @@ %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. +%D module. It is loaded at runtime. \writestatus{simpleslides}{loading Fuzzy Frame style} @@ -25,12 +25,12 @@ \setuplayout [simpleslides:layout:vertical] [leftmargin=0cm, rightmargin=0cm, - header=0.1cm, + header=0.1cm, headerdistance=1.7cm, - header=0cm, + header=0cm, headerdistance=0cm, - footer=0cm, - topspace=1cm, + footer=0cm, + topspace=1cm, backspace=1cm, bottomspace=0cm, bottom=0pt, @@ -40,11 +40,11 @@ [width=fit, leftmargin=0cm, rightmargin=0cm, - height=fit, - header=0.1cm, + height=fit, + header=0.1cm, headerdistance=1.7cm, - footer=0cm, - topspace=1cm, + footer=0cm, + topspace=1cm, backspace=1cm, bottomspace=0cm, bottom=0pt, @@ -54,11 +54,11 @@ [width=fit, leftmargin=0cm, rightmargin=0cm, - height=fit, - header=0cm, + height=fit, + header=0cm, headerdistance=0cm, - footer=0cm, - topspace=1cm, + footer=0cm, + topspace=1cm, backspace=1cm, bottomspace=0cm, bottom=0pt, @@ -141,10 +141,10 @@ 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) ; +r = 150*(RealPageNumber/NOfPages) ; z[3] = z[1] shifted (r, -4pt) ; for i=1 upto 150 : - draw p[1] shifted (i*s/150, 0) randomized 2pt withcolor + draw p[1] shifted (i*s/150, 0) randomized 2pt withcolor (if i < r : \MPcolor{simpleslides:contrastcolor} else : \MPcolor{simpleslides:altcontrastcolor} fi) ; @@ -153,7 +153,7 @@ StopPage ; \stopuseMPgraphic \startuseMPgraphic{simpleslides:MP:ornament} -StartPage ; +StartPage ; save v, s, l, r ; numeric v, s, l, r ; save p ; path p ; v = 0.8cm ; @@ -161,10 +161,10 @@ 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) ; +r = (l*RealPageNumber/NOfPages) ; z[3] = z[1] shifted (-5mm, -3mm) ; z[4] = z[1] shifted (-5mm, 3mm) ; -if PageNumber = NOfPages : +if RealPageNumber = NOfPages : z[5] = z[1] shifted (r+5mm,-3mm) ; z[6] = z[1] shifted (r+5mm,3mm) ; else: @@ -178,7 +178,7 @@ pickup pencircle scaled .5pt ; 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 ; +clip old to z[3] -- z[4] -- z[6] -- z[5] -- cycle ; draw old withcolor \MPcolor{simpleslides:contrastcolor} ; StopPage ; \stopuseMPgraphic @@ -193,15 +193,15 @@ StopPage ; [simpleslides:background:vertical] [\useMPgraphic{simpleslides:MP:vertical}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:title}] +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:title}] -\defineoverlay - [simpleslides:background:ornament] +\defineoverlay + [simpleslides:background:ornament] [\useMPgraphic{simpleslides:MP:ornament2}] -%D We want the title to placed in color. +%D We want the title to placed in color. \setupTitle [\c!title=, @@ -217,7 +217,7 @@ StopPage ; \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, @@ -237,7 +237,7 @@ StopPage ; \c!height=2.5cm, \c!color=black] -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \startuseMPgraphic{simpleslides:itemize:square} save p ; path p[] ; diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-HorizontalStripes.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-HorizontalStripes.tex index 37aa554d86b..13856fdf085 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-HorizontalStripes.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-HorizontalStripes.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-HorizontalStripes, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module HorizontalStripes, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -26,9 +26,9 @@ \setuplayout [width=fit, margin=0cm, height=fit, - header=2.73cm, - footer=0.9cm, - topspace=0cm, + header=2.73cm, + footer=0.9cm, + topspace=0cm, backspace=1cm, location=singlesided] @@ -36,6 +36,11 @@ \setuplayout [simpleslides:layout:vertical] [header=0.75cm] \setuplayout [simpleslides:layout:title] [header=0cm] +%D Some strings are configurable. + +\setuplabeltext [\s!en] [of=of] +\setuplabeltext [\s!de] [of=von] + %D In this style, we don't want the ornament background for vertical slides: \startsetups simpleslides:background:vertical @@ -91,8 +96,8 @@ %D We let Metapost calculate the background: -\startuseMPgraphic{simpleslides:MP:common} -save a ; numeric a ; +\startuseMPgraphic{simpleslides:MP:common} +save a ; numeric a ; a = 1.5mm ; save p; path p[] ; @@ -111,7 +116,7 @@ p[4] = p[3] shifted (0,.75cm) ; fill p[1] withcolor \MPcolor{simpleslides:framecolor} ; fill p[3] withcolor \MPcolor{simpleslides:framecolor} ; fill p[4] withcolor \MPcolor{simpleslides:framecolor} ; -\stopuseMPgraphic +\stopuseMPgraphic \startuniqueMPgraphic{simpleslides:MP:vertical} StartPage ; @@ -130,17 +135,17 @@ StopPage ; %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:horizontal] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:vertical}] +\defineoverlay + [simpleslides:background:vertical] + [\useMPgraphic{simpleslides:MP:vertical}] + +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:vertical}] %D We define the footer @@ -152,7 +157,7 @@ StopPage ; \c!height=0.65cm, \c!width=\textwidth] {\simpleslidestitleparameter{title} - \hfill \pagenumber\ of \lastpage}}] + \hfill \pagenumber\ \labeltext{of} \lastpage}}] %D this sets up the title page: @@ -172,7 +177,7 @@ StopPage ; \c!height=2.2cm, \c!after=] -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \definesymbol[1][\useMPgraphic{simpleslides:itemize:square}] \setupitemize[1][color={simpleslides:itemize:color}] @@ -181,4 +186,3 @@ StopPage ; \stopmodule \endinput - diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-NarrowStripes.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-NarrowStripes.tex index 471eb208e31..29431e026ae 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-NarrowStripes.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-NarrowStripes.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-NarrowStripes, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module NarrowStripes, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -27,10 +27,10 @@ rightmargin=0cm, leftmargindistance=1.8cm, rightmargindistance=0pt, - height=fit, - header=2.5cm, - footer=0cm, - topspace=.4cm, + height=fit, + header=2.5cm, + footer=0cm, + topspace=.4cm, backspace=3.2cm, cutspace=3.7cm, bottomspace=0cm, @@ -127,8 +127,8 @@ linear_shade(p[2],2, fill p[3] withcolor \MPcolor{simpleslides:variantcolor} ; -if PageNumber > 1: - draw \sometxt[simpleslides:sometxt:text]{\folio} shifted (0,PaperHeight-a) ; +if RealPageNumber > 1: + draw \sometxt[simpleslides:sometxt:text]{\pagenumber} shifted (0,PaperHeight-a) ; fi ; StopPage ; \stopuseMPgraphic @@ -137,9 +137,9 @@ StopPage ; [simpleslides:background:ornament] [\useMPgraphic{simpleslides:MP:ornament}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:ornament}] +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:ornament}] %D this sets up the title page: @@ -158,7 +158,7 @@ StopPage ; \c!height=2.25cm, \c!after=] -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \definesymbol[1][\useMPgraphic{simpleslides:itemize:square}] \setupitemize[1][inmargin][color={simpleslides:itemize:color}] @@ -167,4 +167,3 @@ StopPage ; \stopmodule \endinput - diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-PlainCounter.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-PlainCounter.tex index d3044b75e09..848d4e5fa15 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-PlainCounter.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-PlainCounter.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-PlainCounter, -%D version=2009.07.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- Plain Counter, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -11,7 +11,7 @@ %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. +%D module. It is loaded at runtime. \writestatus{simpleslides}{loading Plain Counter style} @@ -21,7 +21,7 @@ %D First, we change the page layout to have more space all around -\setuplayout +\setuplayout [\c!topspace=2\lineheight, \c!top=2\lineheight, \c!topdistance=0cm, @@ -51,7 +51,7 @@ \definecolor [simpleslides:variantcolor] [s=.8] \definecolor [simpleslides:contrastcolor] [b=.5] \definecolor [simpleslides:itemize:color] [simpleslides:contrastcolor] -\definecolor [simpleslides:altcontrastcolor] [r=.95] +\definecolor [simpleslides:altcontrastcolor] [r=.95] \definecolor [simpleslides:imp:background] [r=1,g=1,b=0.85] \stopsetups @@ -60,7 +60,7 @@ \definecolor [simpleslides:variantcolor] [s=.9] \definecolor [simpleslides:contrastcolor] [b=.65] \definecolor [simpleslides:itemize:color] [simpleslides:contrastcolor] -\definecolor [simpleslides:altcontrastcolor] [r=.95] +\definecolor [simpleslides:altcontrastcolor] [r=.95] \definecolor [simpleslides:imp:background] [r=1,g=1,b=0.85] \stopsetups @@ -80,8 +80,8 @@ \c!after\c!title=\vfill, afterauthor={\vfill\vfill}, \c!after={\vfill}] - -\startuniqueMPgraphic{simpleslides:MP:horizontal} + +\startuniqueMPgraphic{simpleslides:MP:horizontal} StartPage ; fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; StopPage @@ -90,7 +90,7 @@ StopPage \startuseMPgraphic{simpleslides:MP:ornament} StartPage ; -save a, b; +save a, b; numeric a,b; b = PaperWidth/2 - NOfPages*5pt/2 ; @@ -98,33 +98,33 @@ 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) + draw (if i mod 5 = 0 : q else : p fi) randomized 1bp shifted (i*5pt,0) - withcolor (if i < RealPageNumber : \MPcolor{simpleslides:contrastcolor} + withcolor (if i < RealRealPageNumber : \MPcolor{simpleslides:contrastcolor} else : \MPcolor{simpleslides:variantcolor} - fi) + fi) withpen pencircle scaled (1bp randomized .5bp) ; endfor ; StopPage ; \stopuseMPgraphic -\defineoverlay - [simpleslides:background:horizontal] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:horizontal] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:vertical] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:vertical] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:ornament] - [\useMPgraphic{simpleslides:MP:ornament}] +\defineoverlay + [simpleslides:background:ornament] + [\useMPgraphic{simpleslides:MP:ornament}] @@ -133,7 +133,7 @@ StopPage ; style={\switchtobodyfont[\SlideTitleSize]\bolditalic}, color=simpleslides:contrastcolor] -% \setuphead +% \setuphead % [subsubject] % [numberstyle=bolditalic, textstyle=bolditalic,color=darkblue,style=\tfb, % before=\blank,after=\blank] @@ -145,7 +145,7 @@ StopPage ; \setupcombinations[\c!distance=3em] -\setupitemize[\c!color=simpleslides:itemize:color, +\setupitemize[\c!color=simpleslides:itemize:color, \c!headstyle=\tfa, \c!headcolor=simpleslides:itemize:color] @@ -155,9 +155,9 @@ StopPage ; \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]}] +\definesymbol[1][{\symbol[circle]}] +\definesymbol[2][{\symbol[triangle]}] +\definesymbol[3][{\symbol[dash]}] \protect \stopmodule diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-RainbowStripe.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-RainbowStripe.tex index f2bf47f0933..e982bec0a07 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-RainbowStripe.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-RainbowStripe.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-t-RainbowStripe, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module RainbowStripe, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -11,7 +11,7 @@ %C This file may be distributed under the GNU General Public License v. 2.0. %D This file provides the \quotation{RainbowStripe} style for the presentation -%D module. It is loaded at runtime. +%D module. It is loaded at runtime. \writestatus{simpleslides}{loading RainbowStripe style} @@ -24,9 +24,9 @@ \setuplayout [width=fit, margin=1.5cm, height=fit, - header=11mm, - footer=0cm, - topspace=15mm, + header=11mm, + footer=0cm, + topspace=15mm, backspace=2cm, location=singlesided] @@ -69,7 +69,7 @@ %\setupexternalfigures[location={global}] -%\defineoverlay[rainb][{\externalfigure[rainbow.pdf][width=1.05\textwidth,height=1.4\textheight]}] +%\defineoverlay[rainb][{\externalfigure[rainbow.pdf][width=1.05\textwidth,height=1.4\textheight]}] % \startuniqueMPgraphic{gray} % StartPage ; @@ -169,11 +169,11 @@ StopPage ; StartPage path p[] ; p[1] := unitsquare xyscaled(MakeupWidth,.4cm) shifted (2cm,0.7cm) ; -numeric i; +numeric i; if NOfPages <= 1 : - i = (PageNumber - 1) ; + i = (RealPageNumber - 1) ; else : - i = (PageNumber - 1)/(NOfPages - 1) ; + i = (RealPageNumber - 1)/(NOfPages - 1) ; fi ; p[2] = ulcorner p[1] -- urcorner p[1] ; p[3] = llcorner p[1] -- lrcorner p[1] ; @@ -189,21 +189,21 @@ StopPage %D We define these backgrounds as overlays: -\defineoverlay - [simpleslides:background:horizontal] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:horizontal] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:vertical] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:vertical] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:ornament] - [\useMPgraphic{simpleslides:MP:ornament}] +\defineoverlay + [simpleslides:background:ornament] + [\useMPgraphic{simpleslides:MP:ornament}] %D We set up our SlideTitles: @@ -214,7 +214,7 @@ StopPage \c!align=\v!center, \c!height=1.5cm] -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \definesymbol[1][\useMPgraphic{simpleslides:itemize:square}] \setupitemize[1][inmargin] @@ -223,4 +223,3 @@ StopPage \stopmodule \endinput - diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Shaded.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Shaded.tex index a8da39b1c2c..3f2a5f43216 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Shaded.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Shaded.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-Shaded, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- Shaded style, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -11,7 +11,7 @@ %C This file may be distributed under the GNU General Public License v. 2.0. %D This file provides the \quotation{Shaded} style for the presentation -%D module. It is loaded at runtime. +%D module. It is loaded at runtime. \writestatus{simpleslides}{loading Shaded style} @@ -25,10 +25,10 @@ margin=1.5cm, leftmargindistance=0pt, rightmargindistance=0pt, - height=fit, - header=0pt, - footer=0pt, - topspace=.8cm, + height=fit, + header=0pt, + footer=0pt, + topspace=.8cm, backspace=1.5cm, bottomspace=1cm, bottom=1cm, @@ -86,7 +86,7 @@ \startuseMPgraphic{simpleslides:MP:ornament} StartPage ; save p ; path p[] ; -save a ; +save a ; if NOfPages <= 15: a = 0.7cm ; elseif NOfPages <= 30: @@ -99,10 +99,10 @@ factor = (TextWidth - a)/(NOfPages - 1) ; linear_shade(Page, 6, \MPcolor{simpleslides:backgroundcolor}, \MPcolor{simpleslides:variantcolor}) ; -if PageNumber >1: +if RealPageNumber >1: for i = 1 upto NOfPages : p[i] = unitcircle scaled a shifted (BackSpace + (i-1)*factor, (2cm - a)/2) ; - if i = PageNumber : + if i = RealPageNumber : % p[i] := p[i] zscaled (1.2,1.5) ; pickup pencircle scaled 5pt ; drawfill p[i] withcolor \MPcolor{simpleslides:variantcolor} ; @@ -121,26 +121,26 @@ StopPage ; [simpleslides:background:ornament] [\useMPgraphic{simpleslides:MP:ornament}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:ornament}] +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:ornament}] -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \definesymbol[1][\useMPgraphic{simpleslides:itemize:square}] \setupitemize[1][color={simpleslides:itemize:color}] - + % %D The \quotation{Shaded} style uses \CONTEXT's interactionbar: -% +% % \setupsubpagenumber[way=bytext,state=start] -% +% % \setupinteraction % [page=yes, % color=simpleslides:interactioncolor, % contrastcolor=simpleslides:contrastcolor, % menu=on, % state=start] -% +% % %\setupinteractionbar % %\startinteractionmenu[bottom] % \setupbottomtexts[XXX{\interactionbar[state=start,alternative=e,width=8cm,height=0.2cm,step=small,frame=on]}YYY] @@ -152,4 +152,3 @@ StopPage ; \stopmodule \endinput - diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-SideSquares.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-SideSquares.tex index 08d588408a2..ddefc136dea 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-SideSquares.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-SideSquares.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-SideSquares, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module SideSquares, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -11,7 +11,7 @@ %C This file may be distributed under the GNU General Public License v. 2.0. %D This file provides the \quotation{SideSquares} style for the presentation -%D module. It is loaded at runtime. +%D module. It is loaded at runtime. \writestatus{simpleslides}{loading SideSquares style} @@ -27,9 +27,9 @@ height=fit, leftmargindistance=.4cm, rightmargindistance=0cm, - header=1.5cm, - footer=0cm, - topspace=1cm, + header=1.5cm, + footer=0cm, + topspace=1cm, backspace=2.5cm, cutspace=1.5cm, location=singlesided] @@ -59,7 +59,7 @@ %D We let Metapost calculate the background: -\startuseMPgraphic{simpleslides:MP:horizontal} +\startuseMPgraphic{simpleslides:MP:horizontal} StartPage ; fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; z1 = ulcorner Page ; @@ -69,9 +69,9 @@ q = z1 -- z5 ; t := arclength (q) ; u := t/15 ; if NOfPages = 0 : - v := PageNumber ; + v := RealPageNumber ; else : - v := (PageNumber/NOfPages) ; + v := (RealPageNumber/NOfPages) ; fi ; z4 = (x1+1cm, y1-1cm) ; z3 = (x4, y1) ; @@ -88,45 +88,45 @@ m[8] = m[1] shifted (0, (-14*u-0.5mm)) ; for i=1 upto 8: fill m[i] withcolor\MPcolor{simpleslides:contrastcolor} ; endfor; -if PageNumber=1: +if RealPageNumber=1: fill m[1] withcolor \MPcolor{simpleslides:altcontrastcolor} ; elseif (v>.001) and (v<.167) : - fill m[2] withcolor \MPcolor{simpleslides:altcontrastcolor} ; + fill m[2] withcolor \MPcolor{simpleslides:altcontrastcolor} ; elseif (v>.166) and (v<.334): - fill m[3] withcolor \MPcolor{simpleslides:altcontrastcolor} ; + fill m[3] withcolor \MPcolor{simpleslides:altcontrastcolor} ; elseif (v>.333) and (v<.501): - fill m[4] withcolor \MPcolor{simpleslides:altcontrastcolor} ; + fill m[4] withcolor \MPcolor{simpleslides:altcontrastcolor} ; elseif (v>.5) and (v<.667): - fill m[5] withcolor \MPcolor{simpleslides:altcontrastcolor} ; + fill m[5] withcolor \MPcolor{simpleslides:altcontrastcolor} ; elseif (v>.666) and (v<.834): - fill m[6] withcolor \MPcolor{simpleslides:altcontrastcolor} ; + fill m[6] withcolor \MPcolor{simpleslides:altcontrastcolor} ; elseif (v>.833) and (v<1): - fill m[7] withcolor \MPcolor{simpleslides:altcontrastcolor} ; + fill m[7] withcolor \MPcolor{simpleslides:altcontrastcolor} ; elseif v=1: fill m[8] withcolor \MPcolor{simpleslides:altcontrastcolor} ; fi ; StopPage ; -\stopuseMPgraphic +\stopuseMPgraphic %D We define these backgrounds as overlays: -\defineoverlay - [simpleslides:background:horizontal] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:horizontal] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:vertical] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:vertical] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:ornament] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:ornament] + [\useMPgraphic{simpleslides:MP:horizontal}] -%D We want the title to placed in color. +%D We want the title to placed in color. \setupTitle[\c!headcolor={simpleslides:contrastcolor}] @@ -149,7 +149,7 @@ StopPage ; \setupcombinations[distance=0cm] -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \definesymbol[1][$\square$] \setupitemize[1][inmargin][color=simpleslides:itemize:color] @@ -158,4 +158,3 @@ StopPage ; \stopmodule \endinput - diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Split.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Split.tex index 360307835eb..a62b1666e9b 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Split.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Split.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-Split, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- Split style, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -28,9 +28,9 @@ \setuplayout [width=fit, margin=0cm, height=fit, - header=3.2cm, - footer=.5cm, - topspace=.6cm, + header=3.2cm, + footer=.5cm, + topspace=.6cm, backspace=1cm, location=singlesided] @@ -43,6 +43,12 @@ \setuplayer[simpleslides:layer:slidetitle] [x=10mm,y=12mm] +%D Some strings are configurable. + +\setuplabeltext [\s!en] [of=of] +\setuplabeltext [\s!de] [of=von] + + %D These macros are used for placing figures/pictures: \define\NormalHeight {\textheight} @@ -89,7 +95,7 @@ %D Now we use \METAPOST\ to draw a page ornament, which will then be inherited %D by different backgrounds. -\startuseMPgraphic{simpleslides:MP:ornament} +\startuseMPgraphic{simpleslides:MP:ornament} StartPage ; save p, Main, a ; path p[] ; path Main ; @@ -120,7 +126,7 @@ fill p[4] withcolor \MPcolor{simpleslides:contrastcolor} ; draw \sometxt[simpleslides:sometxt:left]{\getvariable{simpleslides:title}{date}} shifted (1cm,y1) ; -draw \sometxt[simpleslides:sometxt:right]{\folio\ of \lastpage} +draw \sometxt[simpleslides:sometxt:right]{\pagenumber\ \labeltext{of} \lastpage} shifted (x5,y1) ; draw \sometxt[simpleslides:sometxt:left]{\getvariable{simpleslides:title}{author}} @@ -130,17 +136,17 @@ draw \sometxt[simpleslides:sometxt:right]{\getvariable{simpleslides:title}{title shifted (x5,0) ; StopPage ; -\stopuseMPgraphic +\stopuseMPgraphic %D We use this ornament in different backgrounds. -\defineoverlay - [simpleslides:background:ornament] - [\useMPgraphic{simpleslides:MP:ornament}] +\defineoverlay + [simpleslides:background:ornament] + [\useMPgraphic{simpleslides:MP:ornament}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:ornament}] +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:ornament}] %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. @@ -162,7 +168,7 @@ StopPage ; \c!title\c!align=,%\v!middle, \c!author\c!style=, \c!author\c!color=, - \c!author\c!align=,%\v!middle, + \c!author\c!align=,%\v!middle, \c!date\c!style=, \c!date\c!color=, \c!date\c!align=,%\v!middle, @@ -183,7 +189,7 @@ StopPage ; \c!color=simpleslides:backgroundcolor] -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \definesymbol[1][\useMPgraphic{simpleslides:itemize:square}] \setupitemize[1][\c!color={simpleslides:itemize:color}] @@ -192,4 +198,3 @@ StopPage ; \stopmodule \endinput - diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Sunrise.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Sunrise.tex index 756b981aec5..46798d07f87 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Sunrise.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Sunrise.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-Sunrise, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module Sunrise %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -26,10 +26,10 @@ \setuplayout [width=fit, margin=0cm, height=fit, - header=2.75cm, - footer=1.5cm, + header=2.75cm, + footer=1.5cm, footerdistance=0.4cm, - topspace=0cm, + topspace=0cm, backspace=1cm, location=singlesided] @@ -41,6 +41,11 @@ [simpleslides:layer:slidetitle] [x=10mm] +%D Some strings are configurable. + +\setuplabeltext [\s!en] [of=of] +\setuplabeltext [\s!de] [of=von] + %D These macros are used for placing figures/pictures: \define\NormalHeight {\textheight} @@ -57,9 +62,9 @@ %D We let \METAPOST\ calculate the background: -%D Both horizontal and vertical group share this part of the background. +%D Both horizontal and vertical group share this part of the background. -\startuseMPgraphic{simpleslides:MP:common} +\startuseMPgraphic{simpleslides:MP:common} save a, b ; numeric a; a=2.1cm ; numeric b; b=1.5cm ; @@ -97,7 +102,7 @@ fill p[2] withcolor \MPcolor{simpleslides:backgroundcolor} ; fill p[3] withcolor \MPcolor{simpleslides:backgroundcolor} ; fill p[4] withcolor \MPcolor{simpleslides:backgroundcolor} ; fill p[5] withcolor \MPcolor{simpleslides:contrastcolor} ; -\stopuseMPgraphic +\stopuseMPgraphic \startuniqueMPgraphic{simpleslides:MP:vertical} StartPage ; @@ -130,17 +135,17 @@ StopPage ; %D We define these backgrounds as overlays: -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:horizontal] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:horizontal] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:vertical] - [\useMPgraphic{simpleslides:MP:vertical}] +\defineoverlay + [simpleslides:background:vertical] + [\useMPgraphic{simpleslides:MP:vertical}] %D We define the footer @@ -152,7 +157,7 @@ StopPage ; \c!height=1cm, \c!width=\textwidth] {\simpleslidestitleparameter{title} - \hfill \pagenumber\ of \lastpage}}] + \hfill \pagenumber\ \labeltext{of} \lastpage}}] %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. @@ -174,7 +179,7 @@ StopPage ; \c!title\c!align=,%\v!middle, \c!author\c!style=, \c!author\c!color=, - \c!author\c!align=,%\v!middle, + \c!author\c!align=,%\v!middle, \c!date\c!style=, \c!date\c!color=, \c!date\c!align=,%\v!middle, @@ -193,7 +198,7 @@ StopPage ; \c!color={simpleslides:contrastcolor}] -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \definesymbol[1][\useMPgraphic{simpleslides:itemize:square}] @@ -203,4 +208,3 @@ StopPage ; \stopmodule \endinput - diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Swoosh.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Swoosh.tex index 9ea77624a98..fc818b318a5 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Swoosh.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-Swoosh.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-Swoosh, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module -- Swoosh Style, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -24,9 +24,9 @@ \startsetups simpleslides:setup:randomizeyes \startuseMPgraphic{simpleslides:MP:randomize} if condition = 1: - qw := qw shifted (-5pt - c*0.1*uniformdeviate(10), 0) ; + qw := qw shifted (-5pt - c*0.1*uniformdeviate(10), 0) ; elseif condition = 2: - qw := qw shifted (0, c*0.1*uniformdeviate(10)) ; + qw := qw shifted (0, c*0.1*uniformdeviate(10)) ; fi ; \stopuseMPgraphic \stopsetups @@ -35,9 +35,9 @@ fi ; \setuplayout [simpleslides:layout:horizontal][header=3cm,footer=0cm] \startuseMPgraphic{simpleslides:MP:counter} if NOfPages > 1: - numeric prog ; prog = PageNumber/NOfPages - 0.005 ; + numeric prog ; prog = RealPageNumber/NOfPages - 0.005 ; fi ; -if PageNumber > 1: +if RealPageNumber > 1: if condition = 1: z11 = (prog * PaperWidth, PaperHeight) ; z12 = (x11, 0) ; @@ -64,8 +64,8 @@ pair circcenter ; circcenter = lrcorner Page shifted (-1cm, 1cm) ; pair zt, zr, zb, zl ; picture pic ; b = 1.5cm ; -if PageNumber > 1: - theta = (PageNumber - 1)/(NOfPages - 1) ; +if RealPageNumber > 1: + theta = (RealPageNumber - 1)/(NOfPages - 1) ; p[4] = fullcircle scaled b rotated 90 ; p[4] := p[4] shifted circcenter ; fill p[4] withcolor \MPcolor{simpleslides:altcontrastcolor} ; @@ -89,7 +89,7 @@ if PageNumber > 1: draw p[3] withcolor \MPcolor{simpleslides:backgroundcolor} ; label(textext("\switchtobodyfont[10pt]\startcolor[simpleslides:backgroundcolor]\pagenumber\stopcolor"),center p[3]) ; fi ; -\stopuseMPgraphic +\stopuseMPgraphic \stopsetups \doifsetupselse{simpleslides:setups:\moduleparameter{simpleslides}{counter}} @@ -106,9 +106,9 @@ fi ; \setuplayout [width=fit, margin=0cm, height=fit, - header=3cm, - footer=0.8cm, - topspace=.6cm, + header=3cm, + footer=0.8cm, + topspace=.6cm, backspace=1cm, location=singlesided] @@ -139,13 +139,13 @@ fi ; \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] +\definecolor [simpleslides:textcolor] [simpleslides:altcontrastcolor] \setupcolors[textcolor=simpleslides:textcolor] %D We use \METAPOST\ to draw backgrounds. -\startuseMPgraphic{simpleslides:MP:horizontal} +\startuseMPgraphic{simpleslides:MP:horizontal} StartPage ; fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; numeric c ; c = PaperWidth * 0.4 ; @@ -170,20 +170,20 @@ qw = z2 .. z3 .. z4 .. z5 .. z6 .. z7 ; z9 = ql intersectionpoint qw ; z10 = qr intersectionpoint qw ; qw := qw cutbefore z9 cutafter z10 ; -fill qr & qt & ql -- qw -- cycle withcolor \MPcolor{simpleslides:contrastcolor} ; +fill qr & qt & ql -- qw -- cycle withcolor \MPcolor{simpleslides:contrastcolor} ; draw qw withcolor white ; \includeMPgraphic{simpleslides:MP:counter} ; StopPage ; -\stopuseMPgraphic +\stopuseMPgraphic -\startuseMPgraphic{simpleslides:MP:vertical} +\startuseMPgraphic{simpleslides:MP:vertical} StartPage ; fill Page withcolor \MPcolor{simpleslides:backgroundcolor} ; numeric c ; c = PaperHeight * 0.4 ; numeric d ; d = 2.2cm ; numeric e ; e = PaperHeight / 46.9 ; if NOfPages > 1: - numeric prog ; prog = PageNumber/NOfPages - 0.005 ; + numeric prog ; prog = RealPageNumber/NOfPages - 0.005 ; fi ; numeric condition ; condition = 2 ; save ql, qr, qt, qw, qc, qu, qb ; path ql, qr, qt, qw, qc, qu, qb ; @@ -209,21 +209,21 @@ fill qw -- qr & ql & qu -- cycle withcolor \MPcolor{simpleslides:contrastcolor} draw qw withcolor white ; \includeMPgraphic{simpleslides:MP:counter} ; StopPage ; -\stopuseMPgraphic +\stopuseMPgraphic %D We define these backgrounds as overlays: -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:horizontal] - [\useMPgraphic{simpleslides:MP:horizontal}] +\defineoverlay + [simpleslides:background:horizontal] + [\useMPgraphic{simpleslides:MP:horizontal}] -\defineoverlay - [simpleslides:background:vertical] - [\useMPgraphic{simpleslides:MP:vertical}] +\defineoverlay + [simpleslides:background:vertical] + [\useMPgraphic{simpleslides:MP:vertical}] \defineoverlay [simpleslides:background:ornament] @@ -258,7 +258,7 @@ StopPage ; \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, @@ -269,22 +269,22 @@ StopPage ; \c!after\c!author={\blank[2*line]}, \c!after\c!date=] -% +% % %D We want the title to be of a specific height -% +% % \setuphead[SlideTitle] % [\c!after=, % \c!alternative=\v!text, % \c!color=white, % \c!command=\doSlideTitle] -% +% % \define[2]\doSlideTitle % {\setlayer[simpleslides:layer:slidetitle]% % {\getvalue{simpleslides:framed}[\c!width=\textwidth,\c!height=1.1cm, % \c!align=\v!right] -% {#1#2}}} +% {#1#2}}} -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \definesymbol[1][\useMPgraphic{simpleslides:itemize:square}] \setupitemize[1][color=simpleslides:itemize:color] @@ -293,4 +293,3 @@ StopPage ; \stopmodule \endinput - diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-ThickStripes.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-ThickStripes.tex index 52b86f7da23..cd1bb407ba7 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-ThickStripes.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-ThickStripes.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-ThickStripes, -%D version=2009.03.30 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module --- Thick Stripes style, %D author=Aditya Mahajan and Thomas A. Schmitz, @@ -28,10 +28,10 @@ rightmargin=0cm, leftmargindistance=.9cm, rightmargindistance=0pt, - height=fit, - header=2.5cm, - footer=0cm, - topspace=.4cm, + height=fit, + header=2.5cm, + footer=0cm, + topspace=.4cm, backspace=2.9cm, cutspace=2.8cm, bottomspace=0cm, @@ -98,7 +98,7 @@ fill p[3] withcolor \MPcolor{simpleslides:variantcolor} ; pickup pencircle scaled 5pt ; if NOfPages > 1: - theta = (PageNumber - 1)/(NOfPages - 1) ; + theta = (RealPageNumber - 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} ; t[0] = center p[4] ; @@ -117,11 +117,11 @@ StopPage ; [simpleslides:background:ornament] [\useMPgraphic{simpleslides:MP:ornament}] -\defineoverlay - [simpleslides:background:title] - [\useMPgraphic{simpleslides:MP:ornament}] +\defineoverlay + [simpleslides:background:title] + [\useMPgraphic{simpleslides:MP:ornament}] -%D We want the title to placed in color. +%D We want the title to placed in color. \setupTitle[\c!headcolor={simpleslides:contrastcolor}] @@ -134,7 +134,7 @@ StopPage ; \c!height=2.5cm, \c!color=simpleslides:backgroundcolor] -%D The symbol for the first level of itemizations. +%D The symbol for the first level of itemizations. \definesymbol[1][\useMPgraphic{simpleslides:itemize:triangle}] \setupitemize[1][inmargin][color=simpleslides:backgroundcolor] @@ -143,4 +143,3 @@ StopPage ; \stopmodule \endinput - diff --git a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-default.tex b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-default.tex index 117934ac02a..93b51299304 100644 --- a/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-default.tex +++ b/Master/texmf-dist/tex/context/third/simpleslides/s-simpleslides-default.tex @@ -1,6 +1,6 @@ %D \module %D [ file=simpleslides-s-default, -%D version=2012.02.12 +%D version=2022.07.13, %D title=\CONTEXT\ Style File, %D subtitle=Presentation Module simpleslides --- Default style setup, %D author=Thomas A. Schmitz \& Aditya Mahajan, @@ -22,13 +22,13 @@ %D redefine some internal macros to achieve fancier effects. -%D We start with the page layout. S6 has the ratio of a usual computer screen. +%D We start with the page layout. S6 has the 3:4 ratio of a traditional computer screen. \setuppapersize[S6][S6] %D We do not want page numbers, but we sometimes want to use the page numbering %D mechanism, so we make sure pages are counted, but the numbers are not -%D displayed. +%D displayed. \setuppagenumbering[location=] @@ -37,11 +37,11 @@ \setuplayout [width=middle, margin=0.6cm, - height=middle, - header=0.15cm, - footer=1.35cm, + height=middle, + header=0.15cm, + footer=1.35cm, footerdistance=0.5cm, - topspace=0.5cm, + topspace=0.5cm, backspace=1cm, location=singlesided] @@ -71,13 +71,13 @@ \setupcolors[state=start] %D And colored typesetting for \TEX\ code. - +% HR: outdated! \definetype[typeTEX][option=color] %D Presentations have relatively dense lines, we do not care about underfull %D lines, but allow emergency stretch. -\setuptolerance[\v!verytolerant,\v!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 3em between both. @@ -190,7 +190,7 @@ simpleslides:layer:page}] \stopsetups -%D We also define some fall backs for presentation backgrounds. +%D We also define some fallbacks for presentation backgrounds. \startsetups simpleslides:background:default \setups{simpleslides:background:horizontal} @@ -205,7 +205,7 @@ \message{I don't know the name of the background you have provided.} \setups{simpleslides:background:horizontal} \stopsetups - + %D Now we move on to specific components of the presentation. The first thing in %D any presentation is the title page, so we start with that. We define a macro %D that stores values for the title, author and date of the presentation. These @@ -267,7 +267,7 @@ %D This parameter can be accessed inside the module as %D \type{\simpleslidestitleparameter{institute}}, and the module writer %D can redefine \type{\placeTitle} to display the institute at the appropriate -%D place. +%D place. %D Now we setup some default values for the title page. Other modules will @@ -302,7 +302,7 @@ %D \tex{SlideTitle}: well, the name says it all. The %D argument is typeset as the title, but the implementation and the result %D (alignment, size, distance to text, color etc.) vary from module to module, -%D so this macro is defined in each of the submodules. +%D so this macro is defined in each of the submodules. \definenamespace [SlideTitle] @@ -385,8 +385,8 @@ %D order to provide a cleaner user interface and to make the code easier to %D maintain. We now have just one macro, \tex{IncludePicture}, which %D automatically inserts page breaks and adjusts the background and margins, if -%D necessary. This macro takes four arguments: -%D \setup{IncludePicture} +%D necessary. This macro takes four arguments: +%D \setup{IncludePicture} %D The first argument decides whether the picture will be place in a horizontal %D or vertical arrangement; the second argument is the filename of the picture %D you want to include; the third argument does some setup, and the fourth @@ -441,7 +441,7 @@ \newconditional\simpleslidesGrid \setfalse\simpleslidesGrid \newconditional\simpleslidesSubGrid \setfalse\simpleslidesSubGrid -\chardef\simpleslidesHighlightAlternative\zerocount %0=none, 1=circle, +\chardef\simpleslidesHighlightAlternative\zerocount %0=none, 1=circle, %2=arrow, 3=focus \chardef\simpleslidesShadow\zerocount %0=no, 1=topleft, 2=topright, %3=bottomright, 4=bottomleft @@ -451,7 +451,7 @@ \def\doIncludePicture[#1][#2][#3]#4% dir graphic options text - {\begingroup % Else the settings of \setupPicture are global + {\begingroup % Else the settings of \setupPicture are global \setupPicture[#3]% \processaction [\simpleslidesPictureParameter{highlight}] @@ -505,7 +505,7 @@ \v!default=>{\doIncludePictureHorizontal[#2]{#4}}, \v!unknown=>{\doIncludePictureHorizontal[#2]{#4}}% \message{Keywords for positioning pictures are - "horizontal" or "vertical." + "horizontal" or "vertical." Please specify one of them!}] \endgroup} @@ -516,13 +516,13 @@ %D the available space. Small pictures will be enlarged, big pictures will be %D fit. This code was suggested by Wolfgang Schuster on the mailing list. -\def\setPictureDimensionsTo#1#2#3% graphic height width +\def\setPictureDimensionsTo#1#2#3% graphic height width {\doifelsenothing{\simpleslidesPictureParameter\c!width} {\doifelsenothing{\simpleslidesPictureParameter\c!height} {\setbox\scratchbox\hbox{\externalfigure[#1] [\c!page=\simpleslidesPictureParameter\c!page]} % Courtsey Wolfgang Schuster - \ifdim\dimexpr#3*100/\wd\scratchbox\relax < + \ifdim\dimexpr#3*100/\wd\scratchbox\relax < \dimexpr#2*100/\ht\scratchbox\relax % \setvalue{simpleslides:picture:width}{#3}% @@ -536,7 +536,7 @@ {\setvalue{simpleslides:picture:width}{\simpleslidesPictureParameter\c!width} \setvalue{simpleslides:picture:height}{}}}% not \simpleslidesPictureParameter\c!height -%D This macro places the picture centered both vertically and horizontally. +%D This macro places the picture centered both vertically and horizontally. \def\doplacePictureFrame[#1]#2% {\framed[\c!frame=\v!off, @@ -612,11 +612,11 @@ \c!width=\paperwidth, \c!page=\simpleslidesPictureParameter\c!page]}% \page}% Otherwise last page is not correct in \MKII. - + %D Now, we define the main \METAPOST\ graphic to highlight the picture. It first %D checks if the user has asked for a grid, and if so, draws a grid and a %D subgrid. Then it checks which alternative (arrow, circle, focus) is requested -%D and draws that. Notice that we have intermixed \TEX\ and \METAPOST, +%D and draws that. Notice that we have intermixed \TEX\ and \METAPOST, %D exploiting the power of the MP-TEX interaction provided by \CONTEXT. \startuseMPgraphic{simpleslides:MP:highlight} @@ -647,25 +647,25 @@ for i = 0 upto 10 : - draw xaxis shifted (i/10*OverlayWidth, 0) - withpen pencircle scaled (OverlayWidth/250) + draw xaxis shifted (i/10*OverlayWidth, 0) + withpen pencircle scaled (OverlayWidth/250) withcolor \MPcolor\simpleslidesGridColor ; - draw yaxis shifted (0,i/10*OverlayHeight) - withpen pencircle scaled (OverlayWidth/250) + draw yaxis shifted (0,i/10*OverlayHeight) + withpen pencircle scaled (OverlayWidth/250) withcolor \MPcolor\simpleslidesGridColor ; - label.bot(textext("\switchtobodyfont[9pt]\startcolor[simpleslides:textcolor]" + label.bot(textext("\switchtobodyfont[9pt]\startcolor[simpleslides:textcolor]" & decimal i & "\stopcolor"), (i/10*OverlayWidth, 0)) ; - label.top(textext("\switchtobodyfont[9pt]\startcolor[simpleslides:textcolor]" + label.top(textext("\switchtobodyfont[9pt]\startcolor[simpleslides:textcolor]" & decimal i & "\stopcolor"), (i/10*OverlayWidth, OverlayHeight)) ; - label.lft(textext("\switchtobodyfont[9pt]\startcolor[simpleslides:textcolor]" + label.lft(textext("\switchtobodyfont[9pt]\startcolor[simpleslides:textcolor]" & decimal i & "\stopcolor"), (0, i/10*OverlayHeight)) ; - label.rt(textext("\switchtobodyfont[9pt]\startcolor[simpleslides:textcolor]" + label.rt(textext("\switchtobodyfont[9pt]\startcolor[simpleslides:textcolor]" & decimal i & "\stopcolor"), (OverlayWidth, i/10*OverlayHeight)) ; endfor ; @@ -675,7 +675,7 @@ %D The Metapost graphic draws a fine grid on the picture. The number of grid %D lines is controlled by \type{steps} parameter of \type{\setupPicture}. Each %D grid box of the 10x10 grid drawn above is subdivided into \type{steps} number -%D of finer lines. +%D of finer lines. \startuseMPgraphic{simpleslides:MP:highlight:subgrid} save xaxis, yaxis ; path xaxis, yaxis ; @@ -688,13 +688,13 @@ for i = 0 step 10/stepSize until 100 : if i mod 10 <> 0 : - draw xaxis shifted (i/100*OverlayWidth, 0) - withpen pencircle scaled (OverlayWidth/500) + draw xaxis shifted (i/100*OverlayWidth, 0) + withpen pencircle scaled (OverlayWidth/500) withcolor \MPcolor\simpleslidesGridColor ; - draw yaxis shifted (0,i/100*OverlayHeight) - withpen pencircle scaled (OverlayWidth/500) + draw yaxis shifted (0,i/100*OverlayHeight) + withpen pencircle scaled (OverlayWidth/500) withcolor \MPcolor\simpleslidesGridColor ; - fi + fi endfor ; setbounds currentpicture to OverlayBox ; @@ -737,19 +737,19 @@ \startuseMPgraphic{simpleslides:MP:highligh:circle} save p; path p; - p := fullcircle xyscaled - % The dimensions are divided by 5 rather than 10, since the scale + p := fullcircle xyscaled + % The dimensions are divided by 5 rather than 10, since the scale % measures the radius, rather than the diameter. (\simpleslidesCurrentXscale, \simpleslidesCurrentYscale) - rotated (\simpleslidesPictureParameter\c!direction) + rotated (\simpleslidesPictureParameter\c!direction) shifted (\simpleslidesPictureParameter\c!x *OverlayWidth/10, \simpleslidesPictureParameter\c!y *OverlayHeight/10) ; \ifcase \simpleslidesShadow \else - + save shadow_direction ; pair shadow_direction ; - shadow_direction =\simpleslidesPictureParameter\c!rulethickness * + shadow_direction =\simpleslidesPictureParameter\c!rulethickness * \ifcase \simpleslidesShadow \or (-1,1) \or (1,1) \or (1,-1) \or (-1,-1) \fi ; @@ -762,7 +762,7 @@ \includeMPgraphic{simpleslides:MP:highligh:shadow} \fi - draw p withcolor \MPcolor{\simpleslidesPictureParameter\c!color} + draw p withcolor \MPcolor{\simpleslidesPictureParameter\c!color} withpen pencircle scaled (\simpleslidesPictureParameter\c!rulethickness); \stopuseMPgraphic @@ -785,9 +785,9 @@ \ifcase \simpleslidesShadow \else save shadow_direction ; pair shadow_direction ; - shadow_direction = 2*\simpleslidesPictureParameter\c!rulethickness * + shadow_direction = 2*\simpleslidesPictureParameter\c!rulethickness * dir(%\simpleslidesPictureParameter{direction} + - \ifcase \simpleslidesShadow \or + \ifcase \simpleslidesShadow \or 135 \or 45 \or -45 \or -135 \fi ) ; save shadow_thickness ; numeric shadow_thickness ; @@ -799,7 +799,7 @@ \fi drawarrow p - withcolor \MPcolor{\simpleslidesPictureParameter\c!color} + withcolor \MPcolor{\simpleslidesPictureParameter\c!color} withpen pencircle scaled (2*\simpleslidesPictureParameter\c!rulethickness); \stopuseMPgraphic @@ -811,11 +811,11 @@ \startuseMPgraphic{simpleslides:MP:highligh:focus} save p; path p; - p := fullcircle xyscaled - % The dimensions are divided by 5 rather than 10, since the scale + p := fullcircle xyscaled + % The dimensions are divided by 5 rather than 10, since the scale % measures the radius, rather than the diameter. (\simpleslidesCurrentXscale, \simpleslidesCurrentYscale) - rotated (\simpleslidesPictureParameter\c!direction) + rotated (\simpleslidesPictureParameter\c!direction) shifted (\simpleslidesPictureParameter\c!x *OverlayWidth/10, \simpleslidesPictureParameter\c!y *OverlayHeight/10) ; @@ -839,25 +839,25 @@ \startuseMPgraphic{simpleslides:MP:highligh:shadow} %% I hope there were a better way to do this. for i = 1 upto 20 : - shadow_draw p shifted shadow_direction + shadow_draw p shifted shadow_direction withcolor transparent (1, \simpleslidesPictureParameter{opacity}/10, % 0.1, - \MPcolor{\simpleslidesPictureParameter{shadow\c!color}}) + \MPcolor{\simpleslidesPictureParameter{shadow\c!color}}) withpen pencircle scaled (i*shadow_thickness/20) ; - endfor + endfor \stopuseMPgraphic %D This is a small square which will be used for itemizations; it will be -%D placed in the margin. +%D placed in the margin. \startuniqueMPgraphic{simpleslides:itemize:triangle} - fill (0,0) -- (0,0.4cm) -- (0.6cm,0.2cm) -- cycle + fill (0,0) -- (0,0.4cm) -- (0.6cm,0.2cm) -- cycle withcolor \MPcolor{simpleslides:itemize:color} ; \stopuniqueMPgraphic \startuniqueMPgraphic{simpleslides:itemize:square} - fill unitsquare xyscaled(0.4cm,0.4cm) + fill unitsquare xyscaled(0.4cm,0.4cm) withcolor \MPcolor{simpleslides:itemize:color} ; \stopuniqueMPgraphic -- cgit v1.2.3