summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/context/third/simpleslides/simpleslides.pdfbin3423094 -> 3422868 bytes
-rw-r--r--Master/texmf-dist/doc/context/third/simpleslides/simpleslides.tex4
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-default.tex102
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkii84
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkiv85
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.tex86
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check5
7 files changed, 232 insertions, 134 deletions
diff --git a/Master/texmf-dist/doc/context/third/simpleslides/simpleslides.pdf b/Master/texmf-dist/doc/context/third/simpleslides/simpleslides.pdf
index d0bde203a86..35c0acba53e 100644
--- a/Master/texmf-dist/doc/context/third/simpleslides/simpleslides.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/simpleslides.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/context/third/simpleslides/simpleslides.tex b/Master/texmf-dist/doc/context/third/simpleslides/simpleslides.tex
index ba1945696bb..c642db02c8f 100644
--- a/Master/texmf-dist/doc/context/third/simpleslides/simpleslides.tex
+++ b/Master/texmf-dist/doc/context/third/simpleslides/simpleslides.tex
@@ -545,7 +545,7 @@ These layouts are shown in \in{Figure}[fig:pictures].
{\externalfigure[styles/BigNumber-blue]
[page=3,width=0.55\textwidth]}{A horizontal picture}
\startEXAMPLEframe[width=0.55\textwidth]
-\startTEX
+\startSIMPLETEX
\usemodule[simpleslides]
[...]
\starttext
@@ -556,7 +556,7 @@ These layouts are shown in \in{Figure}[fig:pictures].
{The windmills are an example of a green energy source}
...
\stoptext
-\stopTEX
+\stopSIMPLETEX
\stopEXAMPLEframe
{A vertical picture}
{\externalfigure[styles/BigNumber-blue]
diff --git a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-default.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-default.tex
index 43253a837a0..117934ac02a 100644
--- a/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-default.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-default.tex
@@ -1,6 +1,6 @@
%D \module
%D [ file=simpleslides-s-default,
-%D version=2009.03.30
+%D version=2012.02.12
%D title=\CONTEXT\ Style File,
%D subtitle=Presentation Module simpleslides --- Default style setup,
%D author=Thomas A. Schmitz \& Aditya Mahajan,
@@ -218,22 +218,25 @@
%D This setup command can also setup the color and style for the title, author,
%D and date.
-\def\setupTitle%
- {\dosingleargument\dosetupTitle}
+\enabletrackers[interfaces.namespaces]
-\def\dosetupTitle%[#1]%
- {\setvariables[simpleslides:title]}% [#1]
-
-%D A few macros to save some typing
+\definenamespace
+ [simpleslidestitle]
+ [
+ \c!type=module,
+ \c!name=simpleslidestitle,
+ setup=list,
+ \c!style=\v!yes,
+ \s!parent=simpleslidetitle,
+ ]
-\def\simpleslidestitleparameter%#1
- {\getvariable{simpleslides:title}}
+\let\setupTitle\setupsimpleslidestitle
\def\simpleslidestitlecomponent#1%
{\simpleslidestitleparameter{\c!before#1}
\startalignment[\simpleslidestitleparameter{#1\c!align}]
- \doattributes{\??vars:simpleslides:title:}{#1\c!style}{#1\c!color}
- {\getvariable{simpleslides:title}{#1}}
+ \usesimpleslidestitlestyleandcolor{#1\c!style}{#1\c!color}%
+ \simpleslidestitleparameter{#1}%
\stopalignment
\simpleslidestitleparameter{\c!after#1}}
@@ -248,11 +251,10 @@
\null
\simpleslidestitleparameter\c!before
\startalignment[\simpleslidestitleparameter\c!align]
- \dostartattributes{\??vars:simpleslides:title:}\c!style\c!color
+ \usesimpleslidestitlestyleandcolor\c!style\c!color
\simpleslidestitlecomponent\c!title
\simpleslidestitlecomponent\c!author
\simpleslidestitlecomponent\c!date
- \dostopattributes
\stopalignment
\simpleslidestitleparameter\c!after
\page}
@@ -282,13 +284,13 @@
\c!after=\vfill,
\c!title\c!style={\switchtobodyfont[\TitleSize]},
\c!title\c!color=,
- \c!title\c!align=,%\v!middle,
+ \c!title\c!align=\simpleslidestitleparameter\c!align,
\c!author\c!style=,%{\switchtobodyfont[\SlideTitleSize]},
\c!author\c!color=,
- \c!author\c!align=,%\v!middle,
+ \c!author\c!align=\simpleslidestitleparameter\c!align,
\c!date\c!style=,%{\switchtobodyfont[\SlideTitleSize]},
\c!date\c!color=,
- \c!date\c!align=,%\v!middle,
+ \c!date\c!align=\simpleslidestitleparameter\c!align,
\c!before\c!title=,
\c!before\c!author=,
\c!before\c!date=,
@@ -302,16 +304,16 @@
%D (alignment, size, distance to text, color etc.) vary from module to module,
%D so this macro is defined in each of the submodules.
-\def\setupSlideTitle
- {\dosingleargument\dosetupSlideTitle}
-
-\def\dosetupSlideTitle[#1]%
- {\setvariables[simpleslides:slidetitle]
- [\c!alternative=\v!normal,\c!width=\textwidth,
- \c!height=2\lineheight,#1]}
-
-\def\simpleslidesslidetitleparameter%#1
- {\getvariable{simpleslides:slidetitle}}
+\definenamespace
+ [SlideTitle]
+ [
+ \c!type=module,
+ \c!name=SlideTitle,
+ \c!command=\v!yes,
+ setup=list,
+ \c!style=\v!yes,
+ \s!parent=SlideTitle,
+ ]
\def\defineSlideTitleAlternative
{\dodoubleargument\dodefineSlideTitleAlternative}
@@ -320,38 +322,42 @@
{\setvalue{simpleslides:slidetitle:#1}}
\defineSlideTitleAlternative[\v!normal]#1%
- {\page[\simpleslidesslidetitleparameter\c!page]%
- \simpleslidesslidetitleparameter\c!before
- \startalignment[\simpleslidesslidetitleparameter\c!align]
- \doattributes{\??vars:simpleslides:slidetitle:}\c!style\c!color{#1}%
+ {\page[\SlideTitleparameter\c!page]%
+ \SlideTitleparameter\c!before
+ \startalignment[\SlideTitleparameter\c!align]
+ \useSlideTitlestyleandcolor\c!style\c!color
+ #1%
\stopalignment
- \simpleslidesslidetitleparameter\c!after}
+ \SlideTitleparameter\c!after}
%D The layered alternative is adapted from a sample document that Brooks Moses
%D published on the wiki:
\defineSlideTitleAlternative[layer]#1%
- {\page[\simpleslidesslidetitleparameter\c!page]%
- \simpleslidesslidetitleparameter\c!before
+ {\page[\SlideTitleparameter\c!page]%
+ \SlideTitleparameter\c!before
\setlayer[simpleslides:layer:slidetitle]%
{\getvalue{simpleslides:framed}
- [\c!width=\simpleslidesslidetitleparameter\c!width,
- \c!height=\simpleslidesslidetitleparameter\c!height,
- \c!align=\simpleslidesslidetitleparameter\c!align]
- {\doattributes{\??vars:simpleslides:slidetitle:}\c!style\c!color{#1}}}%
- \simpleslidesslidetitleparameter\c!after}
+ [\c!width=\SlideTitleparameter\c!width,
+ \c!height=\SlideTitleparameter\c!height,
+ \c!align=\SlideTitleparameter\c!align]
+ {\useSlideTitlestyleandcolor\c!style\c!color
+ #1}}%
+ \SlideTitleparameter\c!after}
\defineSlideTitleAlternative[page]#1%
- {\page[\simpleslidesslidetitleparameter\c!page]%
- %\simpleslidesslidetitleparameter\c!before
+ {\page[\SlideTitleparameter\c!page]%
+ %\SlideTitleparameter\c!before
\setlayer[simpleslides:layer:page]%
- [\c!preset=\simpleslidesslidetitleparameter\c!preset,
- \c!hoffset=\simpleslidesslidetitleparameter\c!hoffset,
- \c!voffset=\simpleslidesslidetitleparameter\c!voffset]
+ [\c!preset=\SlideTitleparameter\c!preset,
+ \c!hoffset=\SlideTitleparameter\c!hoffset,
+ \c!voffset=\SlideTitleparameter\c!voffset]
{\getvalue{simpleslides:framed:page}
- [\c!align=\simpleslidesslidetitleparameter\c!align]
- {\let\\\crlf\doattributes{\??vars:simpleslides:slidetitle:}\c!style\c!color{#1}}}}
- %\simpleslidesslidetitleparameter\c!after}
+ [\c!align=\SlideTitleparameter\c!align]
+ {\let\\\crlf
+ \useSlideTitlestyleandcolor\c!style\c!color
+ #1}}}
+ %\SlideTitleparameter\c!after}
%D Now the main user command
@@ -359,13 +365,15 @@
\def\SlideTitle{\dowithpargument\doSlideTitle}
\def\doSlideTitle% #1
- {\getvalue{simpleslides:slidetitle:\simpleslidesslidetitleparameter{alternative}}}
+ {\getvalue{simpleslides:slidetitle:\SlideTitleparameter\c!alternative}}
\setupSlideTitle
[\c!page=\v!yes,
\c!style={\switchtobodyfont[\SlideTitleSize]},
\c!before={\setupPageBackground[horizontal]},
\c!after={\blank[0.75cm]},
+ \c!width=\textwidth,
+ \c!height=2\lineheight,
\c!align=\v!middle,
\c!alternative=\v!normal]
diff --git a/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkii b/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkii
new file mode 100644
index 00000000000..61d657bcfe4
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkii
@@ -0,0 +1,84 @@
+%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
new file mode 100644
index 00000000000..702af15bdfe
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkiv
@@ -0,0 +1,85 @@
+%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}}
+ {\expanded{\usemodule[simpleslides-s-\currentmoduleparameter\c!style]}}
+
+\protect
+
+\stopmodule
diff --git a/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.tex b/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.tex
index c39cb5dd0a8..65d6eccefc9 100644
--- a/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.tex
@@ -1,84 +1,2 @@
-%D \module
-%D [ file=t-simpleslides,
-%D version=2009.03.30
-%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
+% Temporary file, otherwise the file from the distro is loaded
+\loadmarkfile{t-simpleslides}
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 47bbbab20f7..e7773246355 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -325,7 +325,8 @@ my @TLP_working = qw(
pst-sigsys pst-slpe pst-solarsystem pst-solides3d pst-soroban pst-spectra
pst-stru pst-support pst-text pst-thick pst-tools pst-tree pst-tvz pst-uml
pst-vowel pst-vue3d
- pst2pdf pstool pstricks pstricks-add pstricks-examples pstricks-examples-en
+ pst2pdf pstool pstricks pstricks-add pstricks-examples
+ pstricks-examples-en pstricks_calcnotes
psu-thesis ptptex punknova purifyeps
pxfonts pxgreeks pxtxalfa
qcm qobitree quoting qstest qsymbols qtree quotchap quotmark
@@ -490,6 +491,8 @@ my @TLP_no_check = (
"pdftex", # binary
"pdftools", # binary
"powerdot", # stale generated files on CTAN
+ "ps2pkm", # binary
+ "pstools", # binary
"synctex", # binary
"t1utils", # binary
"tetex", # our sources