summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-06-28 23:32:25 +0000
committerKarl Berry <karl@freefriends.org>2009-06-28 23:32:25 +0000
commit764e0c19c9e1b388b6c2f003d7f6b91f0d994b1b (patch)
treea4faeb236cd1e4bcb827067c494de4663f90e0db /Master/texmf-dist/tex/context
parentf791da06d3c46df5086e8e9f6a492326b488c650 (diff)
context-simpleslides name fix (27jun09)
git-svn-id: svn://tug.org/texlive/trunk@13987 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context')
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-f-default.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-f-default.tex)8
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BigNumber.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-BigNumber.tex)0
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-BottomSquares.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-BottomSquares.tex)0
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Boxed.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Boxed.tex)0
-rw-r--r--[-rwxr-xr-x]Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Ellipse.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Ellipse.tex)0
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Embossed.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Embossed.tex)0
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Framed.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Framed.tex)0
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-FramedTitle.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-FramedTitle.tex)0
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-HorizontalStripes.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-HorizontalStripes.tex)0
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-NarrowStripes.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-NarrowStripes.tex)0
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-RainbowStripe.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-RainbowStripe.tex)0
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Rounded.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Rounded.tex)0
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Shaded.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Shaded.tex)0
-rw-r--r--[-rwxr-xr-x]Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-SideSquares.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-SideSquares.tex)0
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Split.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Split.tex)0
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Sunrise.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Sunrise.tex)0
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-Swoosh.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-Swoosh.tex)0
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-ThickStripes.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-ThickStripes.tex)0
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/simpleslides-s-default.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/simpleslides-s-default.tex)22
-rw-r--r--Master/texmf-dist/tex/context/third/simpleslides/t-simpleslides.tex (renamed from Master/texmf-dist/tex/context/third/simple-slides/t-simpleslides.tex)8
20 files changed, 22 insertions, 16 deletions
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