context-simpleslides name fix (27jun09)

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

51 files changed, 36 insertions, 244 deletions

diff --git a/Master/texmf-dist/doc/context/third/simple-slides/simple-slides.pdf b/Master/texmf-dist/doc/context/third/simpleslides/simpleslides.pdf
index 0605f264d9a..d6d45ea63ac 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/simple-slides.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/simpleslides.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/simple-slides.tex b/Master/texmf-dist/doc/context/third/simpleslides/simpleslides.tex
index 04e83127e23..6ca38555f84 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/simple-slides.tex
+++ b/Master/texmf-dist/doc/context/third/simpleslides/simpleslides.tex
@@ -732,7 +732,7 @@ Szeged} theme in \LATEX's \filename{beamer} package.
 
 A very simple and sober style, with shaded narrow stripes. 
 
-\ShowStyle {NarrowStripes-blue}
+\ShowStyle {NarrowStripes-green}
 \page
 
 \subsubject{RainbowStripe}
@@ -858,11 +858,19 @@ you have your own typescript for a font, your setup will look like this:
 \stopEXAMPLE
 
 Internally, the font size is stored in the macro \typeTEX{\NormalSize}. The main
-text is set at size \typeTEX{\NormalSize}; the title page and the slide title
-are set at size \typeTEX{\TitleSize}. The module uses some heuristics to select
-a reasonable value of \typeTEX{\TitleSize}. If you do not like the size of the
-title page and slide titles, you can change the value to \typeTEX{\TitleSize} to
-whatever you like.
+text is set at size \typeTEX{\NormalSize}; the main title is set at
+\typeTEX{\TitleSize} while the author and date on the title page, and the slide
+title are set at \typeTEX{\SlideTitleSize}. 
+
+\typeTEX{\NormalSize}, \typeTEX{\TitleSize}, and \typeTEX{\SlideTitleSize} are
+defined in terms of the dimensions \typeTEX{\simpleslidesNormalSize},
+\typeTEX{\simpleslidesTitleSize}, and \typeTEX{\simpleslidesSlideTitleSize}.
+\typeTEX{\simpleslidesNormalSize} is equal to the \options{size} option. The
+module uses some heuristics to select a reasonable value of
+\typeTEX{\simpleslidesTitleSize} and \typeTEX{\simpleslidesSlideTitleSize}. If
+you do not like the size of the title page and slide titles, you can change
+their value to whatever you like.
+
 
 \section[sec:setuptitle] Changing the title page
 
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/solutions/generic-talk-15min-45min.tex b/Master/texmf-dist/doc/context/third/simpleslides/solutions/generic-talk-15min-45min.tex
index 520c52afb87..520c52afb87 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/solutions/generic-talk-15min-45min.tex
+++ b/Master/texmf-dist/doc/context/third/simpleslides/solutions/generic-talk-15min-45min.tex
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/solutions/speaker_introduction-2min.tex b/Master/texmf-dist/doc/context/third/simpleslides/solutions/speaker_introduction-2min.tex
index 98dc4131d6a..98dc4131d6a 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/solutions/speaker_introduction-2min.tex
+++ b/Master/texmf-dist/doc/context/third/simpleslides/solutions/speaker_introduction-2min.tex
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/solutions/style-template.tex b/Master/texmf-dist/doc/context/third/simpleslides/solutions/style-template.tex
index ee84e37b794..ee84e37b794 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/solutions/style-template.tex
+++ b/Master/texmf-dist/doc/context/third/simpleslides/solutions/style-template.tex
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/BigNumber-blue.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/BigNumber-blue.pdf
index 957b02ed52f..957b02ed52f 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/BigNumber-blue.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/BigNumber-blue.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/BigNumber-red.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/BigNumber-red.pdf
index 435a545693e..435a545693e 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/BigNumber-red.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/BigNumber-red.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/BottomSquares.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/BottomSquares.pdf
index 80c3217f4ba..80c3217f4ba 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/BottomSquares.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/BottomSquares.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/Boxed.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/Boxed.pdf
index 8a235767ae4..8a235767ae4 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/Boxed.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/Boxed.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/Ellipse.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/Ellipse.pdf
index ab5053d411f..ab5053d411f 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/Ellipse.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/Ellipse.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/Embossed.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/Embossed.pdf
index 107bb92a73e..107bb92a73e 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/Embossed.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/Embossed.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/Framed-square.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/Framed-square.pdf
index 2b403f60a92..2b403f60a92 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/Framed-square.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/Framed-square.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/Framed-stripe.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/Framed-stripe.pdf
index 2032682b39e..2032682b39e 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/Framed-stripe.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/Framed-stripe.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/FramedTitle.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/FramedTitle.pdf
index d0b0bd7f996..d0b0bd7f996 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/FramedTitle.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/FramedTitle.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/HorizontalStripes-blue.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/HorizontalStripes-blue.pdf
index 62d4bbef549..62d4bbef549 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/HorizontalStripes-blue.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/HorizontalStripes-blue.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/HorizontalStripes-green.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/HorizontalStripes-green.pdf
index 5c7e0e9d04a..5c7e0e9d04a 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/HorizontalStripes-green.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/HorizontalStripes-green.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/HorizontalStripes-red.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/HorizontalStripes-red.pdf
index eaf7d86f669..eaf7d86f669 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/HorizontalStripes-red.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/HorizontalStripes-red.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/NarrowStripes-blue.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/NarrowStripes-blue.pdf
index ed3b849ce65..ed3b849ce65 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/NarrowStripes-blue.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/NarrowStripes-blue.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/NarrowStripes-green.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/NarrowStripes-green.pdf
index 7af649b1cf6..7af649b1cf6 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/NarrowStripes-green.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/NarrowStripes-green.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/NarrowStripes-red.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/NarrowStripes-red.pdf
index b8c405455c4..b8c405455c4 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/NarrowStripes-red.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/NarrowStripes-red.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/RainbowStripe.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/RainbowStripe.pdf
index 913757aba62..913757aba62 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/RainbowStripe.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/RainbowStripe.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/Rounded.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/Rounded.pdf
index 61e8ad02d79..61e8ad02d79 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/Rounded.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/Rounded.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/Shaded-blue.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/Shaded-blue.pdf
index 116aa95eabf..116aa95eabf 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/Shaded-blue.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/Shaded-blue.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/Shaded-green.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/Shaded-green.pdf
index e1f6ef66240..e1f6ef66240 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/Shaded-green.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/Shaded-green.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/SideSquares.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/SideSquares.pdf
index 10b8354eb55..10b8354eb55 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/SideSquares.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/SideSquares.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/Split.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/Split.pdf
index 16c6a7b5753..16c6a7b5753 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/Split.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/Split.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/Sunrise.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/Sunrise.pdf
index f537e0a9f5a..f537e0a9f5a 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/Sunrise.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/Sunrise.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/Swoosh.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/Swoosh.pdf
index fd7a8d17a7a..fd7a8d17a7a 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/Swoosh.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/Swoosh.pdf
diff --git a/Master/texmf-dist/doc/context/third/simple-slides/styles/ThickStripes.pdf b/Master/texmf-dist/doc/context/third/simpleslides/styles/ThickStripes.pdf
index f3e91ab7d03..f3e91ab7d03 100644
--- a/Master/texmf-dist/doc/context/third/simple-slides/styles/ThickStripes.pdf
+++ b/Master/texmf-dist/doc/context/third/simpleslides/styles/ThickStripes.pdf
diff --git a/Master/texmf-dist/scripts/context/lua/third/simple-slides/mtx-simpleslides.lua b/Master/texmf-dist/scripts/context/lua/third/simple-slides/mtx-simpleslides.lua
deleted file mode 100644
index edbe8d47254..00000000000
--- a/Master/texmf-dist/scripts/context/lua/third/simple-slides/mtx-simpleslides.lua
+++ /dev/null
@@ -1,218 +0,0 @@
-if not modules then modules = { } end modules ['mtx-simplestyles'] = {
-    version   = 0.1,
-    comment   = "Show a particular style of simpleslides module",
-    author    = "Aditya Mahajan and Thomas A. Schmitz",
-    copyright = "Aditya Mahajan and Thomas A. Schmitz",
-    license   = "GNU Public License v 2.0"
-}
-
--- Usage: To generate all variations for BigNumber use
---      mtxrun --script simpleslides --style=BigNumber
--- To generate all variations of all styles use
---      mtxrun --script simpleslides --all
---
--- By default, luatex engine is used. If you want a specific engine, you can
--- pass --engine=pdftex or --engine=xetex to the program.
-
-third        = third or {}
-simpleslides = third.simpleslides or {}
-
-simpleslides.options = {
-  ["BigNumber"]         ={color={"blue", "red"}},
-  ["BottomSquares"]     ={},
-  ["Boxed"]             ={},
-  ["Ellipse"]           ={},
-  ["Embossed"]          ={},
-  ["Framed"]            ={alternative={"square", "stripe"}},
-  ["FramedTitle"]       ={},
-  ["HorizontalStripes"] ={color={"blue", "green", "red"}},
-  ["NarrowStripes"]     ={color={"blue", "green", "red"}},
-  ["RainbowStripe"]     ={},
-  ["Rounded"]           ={},
-  ["Shaded"]            ={color={"blue", "green", "bluered"}},
-  ["SideSquares"]       ={},
-  ["Split"]             ={},
-  ["Sunrise"]           ={},
-  ["Swoosh"]            ={},
-  ["ThickStripes"]      ={},
-}
-
-function simpleslides.setup(style, color, alternative)
-  local usemodule = "\\usemodule[simpleslides]\n"
-  local options   = ""
-  if style  then options = options .. "style=" ..style.. ",\n" end 
-  if color  then options = options .. "color=" ..color.. ",\n" end
-  if alternative then options = options .. "alternative="..alternative..",\n" end
-  return usemodule .. "[" .. options .. "]\n"
-end
-
-simpleslides.body = [[
-\setupTitle
-  [title={Presentation Title},
-   author={F.~Author, S.~Another},
-   date={Date / Occasion}]
-
-\setupexternalfigures[location={local,global,default}] 
-
-\starttext
-
-\placeTitle
-
-
-\SlideTitle{Make Titles Informative}
-
-\startitemize
-  \item Use bullets points when appropriate.
-  \item Use pictures when possible
-  \item Do not put too much information on one slide
-\stopitemize
-
-\IncludePicture
-  [horizontal]
-  [cow] % Name of the image
-  {A Dutch Cow} % Title of the slide
-
-\IncludePicture
-  [horizontal]
-  [cow] % Name of the image
-  [highlight=yes,
-   grid=yes]
-  {A Dutch Cow with a grid} % Title of the slide
-
-\IncludePicture
-  [horizontal]
-  [cow] % Name of the image
-  [highlight=yes,
-   grid=yes,
-   steps=5, % Each grid block is broken into these many parts.
-   subgrid=yes]
-  {A Dutch Cow with a fine grid} % Title of the slide
-
-\IncludePicture
-  [horizontal]
-  [cow] % Name of the image
-  [highlight=yes,
-   grid=yes,
-   subgrid=yes,
-   alternative=circle,
-   color=orange,
-   x=1.4,
-   y=8.2,
-   xscale=1.5,
-   shadow=bottomleft]
-  {The head of a dutch cow}
-
-
-\IncludePicture
-  [horizontal]
-  [cow] % Name of the image
-  [highlight=yes,
-   grid=no,
-   subgrid=no,
-   alternative=circle,
-   color=orange,
-   x=1.4,
-   y=8.2,
-   xscale=1.5,
-   shadow=bottomleft]
-   {The head of a dutch cow}
-
-\IncludePicture
-  [horizontal]
-  [cow] % Name of the image
-  [highlight=yes,
-   grid=no,
-   subgrid=no,
-   alternative=arrow,
-   color=orange,
-   x=0.4,
-   y=6.8,
-   direction=-90, 
-   length=3cm,
-   shadow=topright]
-   {The mouth of a dutch cow}
-
-\IncludePicture
-  [horizontal]
-  [cow] % Name of the image
-  [highlight=yes,
-   grid=no,
-   subgrid=no,
-   alternative=focus,
-   color=orange,
-   x=1.4,
-   y=8.2,
-   xscale=1.5,
-   opacity=0.5]
-   {The head of a dutch cow}
-
-\IncludePicture
-  [vertical]
-  [mill]
-  [width=\NormalWidth]
-  {The windmills are an example of a green energy source.}
-
-\SlideTitle{Summary}
-
-\startitemize
-  \item The {\em first main message} of your talk in one or two lines.
-  \item The {\em second main message} of your talk in one or two lines.
-  \item Perhaps a {\em third message}, but not more than that.
-\stopitemize
-
-\stoptext
-]]
-
-local engine   = environment.argument("engine") or "luatex"
-local command  = "context --" .. engine  -- .. " --batchmode"
-local styles   = environment.argument("styles")
-local filename = "styles/simpleslides-example.tex"
-
-function simpleslides.create_test(style, color, alternative)
-  local file = assert(io.open(filename, "w"))
-  file:write(simpleslides.setup(style,color,alternative))
-  file:write(simpleslides.body)
-  assert(io.close(file))
-  local result = "--result=styles/"..style
-  if color  then result = result .. "-" .. color  end
-  if alternative then result = result .. "-" .. alternative end 
-  local str = command .. " " .. filename .. " " .. result
-  logs.report("simpleslides", "executing " .. str)
-  os.execute(str)
-end
-
-function simpleslides.show_style(style)
-  if simpleslides.options[style] then
-    local colors  = simpleslides.options[style].color
-    local bottoms = simpleslides.options[style].alternative
-    if colors then
-      for i,color in pairs(colors) do
-        if bottoms then
-          for j,alternative in pairs(bottoms) do
-            simpleslides.create_test(style,color,alternative)
-          end
-        else
-          simpleslides.create_test(style,color,nil)
-        end
-      end
-    else
-      if bottoms then
-        for j,alternative in pairs(bottoms) do
-          simpleslides.create_test(style,nil,alternative)
-        end
-      else
-        simpleslides.create_test(style,nil,nil)
-      end
-    end
-  else 
-    logs.report("simplestyles", "style \"" .. style .. "\" does not exist")
-  end
-end
-
-if styles == "all" then
-  for s,i in pairs(simpleslides.options) do
-    simpleslides.show_style(s)
-  end
-else
-  simpleslides.show_style(styles)
-end
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-f-default.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-f-default.tex
index e8674847b1a..bb368d8e91c 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-f-default.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-f-default.tex
@@ -27,6 +27,7 @@
 
 \newdimen\simpleslidesNormalSize  
 \newdimen\simpleslidesTitleSize  
+\newdimen\simpleslidesSlideTitleSize  
 
 \simpleslidesNormalSize=\moduleparameter{simpleslides}{size}\relax
 
@@ -40,8 +41,11 @@
 	\fi%
 \fi%
 
-\def\NormalSize{\the\simpleslidesNormalSize}
-\def\TitleSize {\the\simpleslidesTitleSize}
+\simpleslidesSlideTitleSize = \simpleslidesTitleSize
+
+\def\NormalSize     {\the\simpleslidesNormalSize}
+\def\TitleSize      {\the\simpleslidesTitleSize}
+\def\SlideTitleSize {\the\simpleslidesSlideTitleSize}
 
 \beginOLDTEX 
 \setupencoding[default=ec]
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-BigNumber.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BigNumber.tex
index f0d890b0fb8..f0d890b0fb8 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-BigNumber.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BigNumber.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-BottomSquares.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BottomSquares.tex
index 77633d23c69..77633d23c69 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-BottomSquares.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BottomSquares.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Boxed.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Boxed.tex
index cec57643210..cec57643210 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Boxed.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Boxed.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Ellipse.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Ellipse.tex
index 09657f7ccc2..09657f7ccc2 100755..100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Ellipse.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Ellipse.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Embossed.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Embossed.tex
index e8e24f39bd4..e8e24f39bd4 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Embossed.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Embossed.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Framed.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Framed.tex
index 4cde7723962..4cde7723962 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Framed.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Framed.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-FramedTitle.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-FramedTitle.tex
index 6c6c3abe8a7..6c6c3abe8a7 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-FramedTitle.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-FramedTitle.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-HorizontalStripes.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-HorizontalStripes.tex
index 025b74534e0..025b74534e0 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-HorizontalStripes.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-HorizontalStripes.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-NarrowStripes.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-NarrowStripes.tex
index 471eb208e31..471eb208e31 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-NarrowStripes.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-NarrowStripes.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-RainbowStripe.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-RainbowStripe.tex
index 5ca00ec6b2e..5ca00ec6b2e 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-RainbowStripe.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-RainbowStripe.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Rounded.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Rounded.tex
index 10c15be7139..10c15be7139 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Rounded.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Rounded.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Shaded.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Shaded.tex
index 97844cb5cd3..97844cb5cd3 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Shaded.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Shaded.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-SideSquares.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-SideSquares.tex
index 8ecce564439..8ecce564439 100755..100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-SideSquares.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-SideSquares.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Split.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Split.tex
index c1fbe136d48..c1fbe136d48 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Split.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Split.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Sunrise.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Sunrise.tex
index 756b981aec5..756b981aec5 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Sunrise.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Sunrise.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Swoosh.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Swoosh.tex
index da62bf6dc4e..da62bf6dc4e 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Swoosh.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Swoosh.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-ThickStripes.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-ThickStripes.tex
index b7deead545b..b7deead545b 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-ThickStripes.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-ThickStripes.tex
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-default.tex b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-default.tex
index 513d0e744c2..58764fa0b53 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-default.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-default.tex
@@ -232,10 +232,10 @@
    \c!title\c!style={\switchtobodyfont[\TitleSize]},
    \c!title\c!color=,
    \c!title\c!align=,%\v!middle,
-   \c!author\c!style=,
+   \c!author\c!style=,%{\switchtobodyfont[\SlideTitleSize]},
    \c!author\c!color=,
    \c!author\c!align=,%\v!middle, 
-   \c!date\c!style=,
+   \c!date\c!style=,%{\switchtobodyfont[\SlideTitleSize]},
    \c!date\c!color=,
    \c!date\c!align=,%\v!middle,
    \c!before\c!title=,
@@ -300,7 +300,7 @@
 
 \setupSlideTitle
   [\c!page=\v!yes,
-   \c!style={\switchtobodyfont[\TitleSize]},
+   \c!style={\switchtobodyfont[\SlideTitleSize]},
    \c!before={\setupPageBackground[horizontal]},
    \c!after={\blank[0.75cm]},
    \c!align=\v!middle,
@@ -444,7 +444,8 @@
 \def\setPictureDimensionsTo#1#2% graphic width 
   {\doifelsenothing{\simpleslidesPictureParameter\c!width}
      {\doifelsenothing{\simpleslidesPictureParameter\c!height}
-        {\setbox\scratchbox\hbox{\externalfigure[#1]}
+        {\setbox\scratchbox\hbox{\externalfigure[#1]
+          [\c!page=\simpleslidesPictureParameter\c!page]}
         % Courtsey Wolfgang Schuster
         \ifdim\dimexpr#2*100/\wd\scratchbox\relax < 
               \dimexpr\PictureFrameHeight*100/\ht\scratchbox\relax
@@ -490,7 +491,8 @@
      \c!height=\PictureFrameHeight]
     {\externalfigure[#1]
                     [\c!height=\getvalue{simpleslides:picture:height},
-                      \c!width=\getvalue{simpleslides:picture:width}]}%
+                      \c!width=\getvalue{simpleslides:picture:width},
+                       \c!page=\simpleslidesPictureParameter\c!page]}%
     \page}% Otherwise last page is not correct in \MKII.
 
 %D This macro places the picture in vertical mode.
@@ -505,7 +507,8 @@
          \c!width=\PictureFrameWidth]
          {\externalfigure[#1]
                     [\c!height=\getvalue{simpleslides:picture:height},
-                      \c!width=\getvalue{simpleslides:picture:width}]}}{}
+                      \c!width=\getvalue{simpleslides:picture:width},
+                       \c!page=\simpleslidesPictureParameter\c!page]}}{}
        {\framed[\c!frame=\v!off,
                 \c!height=\textheight,
                 \c!width=\PictureFrameWidth,
@@ -674,8 +677,6 @@
 %D is \type{length} long in the direction specified by \type{direction}. The
 %D arrow is \type{2×rulethickness} thick (the factor of 2 is there so that the
 %D same default works for both circle and arrows) and is on \type{color} color.
-%D
-%D TODO: Add \type{shadow} key.
 
 \startuseMPgraphic{simpleslides:MP:highligh:arrow}
   autoarrows := true ; % so that arrow heads are scaled correctly.
@@ -690,8 +691,8 @@
 
   \ifcase \simpleslidesShadow \else
   save shadow_direction ; pair shadow_direction ;
-  shadow_direction =2*\simpleslidesPictureParameter\c!rulethickness * 
-     dir(\simpleslidesPictureParameter{direction} + 
+  shadow_direction = 2*\simpleslidesPictureParameter\c!rulethickness * 
+     dir(%\simpleslidesPictureParameter{direction} +
      \ifcase \simpleslidesShadow \or 
           135 \or 45 \or -45 \or -135 \fi ) ;
 
@@ -767,6 +768,7 @@
 \stopuniqueMPgraphic
 
 
+
 \protect
 
 \stopmodule
diff --git a/Master/texmf-dist/tex/context/third/simple-slides/t-simpleslides.tex b/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.tex
index 19e26c5fe0f..50b8e6afea9 100644
--- a/Master/texmf-dist/tex/context/third/simple-slides/t-simpleslides.tex
+++ b/Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.tex
@@ -64,6 +64,10 @@
    alternative=square]
 
 \usemodule
+  [simpleslides-f]
+  [default]
+
+\usemodule
   [simpleslides-s]
   [default]
 
@@ -71,10 +75,6 @@
   {\usemodule[\currentmoduleparameter\c!style]}
   {\usemodule[simpleslides-s][\currentmoduleparameter\c!style]}
 
-\usemodule
-  [simpleslides-f]
-  [default]
-
 \protect
 
 \stopmodule
diff --git a/Master/tlpkg/tlpsrc/context-simpleslides.tlpsrc b/Master/tlpkg/tlpsrc/context-simpleslides.tlpsrc
index 7aa2626c11e..8e194d47208 100644
--- a/Master/tlpkg/tlpsrc/context-simpleslides.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-simpleslides.tlpsrc
@@ -1,5 +1 @@
 category ConTeXt
-runpattern f texmf-dist/tex/context/interface/third/t-simpleslides.xml
-runpattern d texmf-dist/tex/context/third/simple-slides
-runpattern d texmf-dist/scripts/context/lua/third/simple-slides
-docpattern d texmf-dist/doc/context/third/simple-slides