summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-01-20 21:27:44 +0000
committerKarl Berry <karl@freefriends.org>2022-01-20 21:27:44 +0000
commitb99febdc7e40b7c00b6bc795463ad0a58840ecdf (patch)
tree9af6ed738aa29a5c66373a018bf434421ba210ac
parenta527d6abe7828d590bda9b872044223e41bd16bc (diff)
sillypage (20jan22)
git-svn-id: svn://tug.org/texlive/trunk@61670 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/sillypage/README.md6
-rw-r--r--Master/texmf-dist/doc/latex/sillypage/sillypage-example.pdfbin94027 -> 103728 bytes
-rw-r--r--Master/texmf-dist/doc/latex/sillypage/sillypage.pdfbin185382 -> 196129 bytes
-rw-r--r--Master/texmf-dist/doc/latex/sillypage/sillywalk-map.pdfbin0 -> 18636 bytes
-rw-r--r--Master/texmf-dist/source/latex/sillypage/sillypage.dtx44
-rw-r--r--Master/texmf-dist/source/latex/sillypage/sillypage.ins10
-rw-r--r--Master/texmf-dist/tex/latex/sillypage/sillypage.sty17
-rw-r--r--Master/texmf-dist/tex/latex/sillypage/sillywalk-map.pngbin6060 -> 0 bytes
8 files changed, 43 insertions, 34 deletions
diff --git a/Master/texmf-dist/doc/latex/sillypage/README.md b/Master/texmf-dist/doc/latex/sillypage/README.md
index 1a04f516268..8a1807f4179 100644
--- a/Master/texmf-dist/doc/latex/sillypage/README.md
+++ b/Master/texmf-dist/doc/latex/sillypage/README.md
@@ -41,10 +41,11 @@ Yes.
## Authors
-Blame these two blokes:
+Blame these three individuals:
- Phelype Oleinik
- Paulo Cereda
+- samcarter
## License
@@ -52,3 +53,6 @@ The `sillypage` package may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c of
this license or (at your option) any later version.
+Images used in this package are created from scratch and released under
+the [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/)
+license.
diff --git a/Master/texmf-dist/doc/latex/sillypage/sillypage-example.pdf b/Master/texmf-dist/doc/latex/sillypage/sillypage-example.pdf
index 0a2811a5215..878dde7288b 100644
--- a/Master/texmf-dist/doc/latex/sillypage/sillypage-example.pdf
+++ b/Master/texmf-dist/doc/latex/sillypage/sillypage-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/sillypage/sillypage.pdf b/Master/texmf-dist/doc/latex/sillypage/sillypage.pdf
index df65d10c021..9789f40c0ac 100644
--- a/Master/texmf-dist/doc/latex/sillypage/sillypage.pdf
+++ b/Master/texmf-dist/doc/latex/sillypage/sillypage.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/sillypage/sillywalk-map.pdf b/Master/texmf-dist/doc/latex/sillypage/sillywalk-map.pdf
new file mode 100644
index 00000000000..1ef96bfca11
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/sillypage/sillywalk-map.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/sillypage/sillypage.dtx b/Master/texmf-dist/source/latex/sillypage/sillypage.dtx
index 2ec5a6635bd..4795c81c03f 100644
--- a/Master/texmf-dist/source/latex/sillypage/sillypage.dtx
+++ b/Master/texmf-dist/source/latex/sillypage/sillypage.dtx
@@ -1,7 +1,8 @@
% \iffalse meta-comment
% Copyright (C) 2022
% by Phelype Oleinik <phelype.oleinik@latex-project.org>
-% and Paulo Cereda <cereda.paulo@gmail.com>
+% Paulo Cereda <cereda.paulo@gmail.com>
+% and samcarter <sam.carter8@aol.com>
%
% This work may be distributed and/or modified under the conditions of
% the LaTeX Project Public License, either version 1.3c of this license
@@ -17,8 +18,8 @@
% by Phelype Oleinik and Paulo Cereda.
%
%<*package>
-\def\sillypageDate{2022-01-11}
-\def\sillypageVersion{1.2}
+\def\sillypageDate{2022-01-20}
+\def\sillypageVersion{1.3}
%</package>
%<*driver>
\documentclass[a4paper,full]{l3doc}
@@ -42,17 +43,23 @@
% }
%
% \author{^^A
-% Phelype H. Oleinik\thanks
+% Phelype \emph{lemon curry} Oleinik\thanks
% {^^A
% E-mail:
% \href{mailto:phelype.oleinik@latex-project.org}
% {phelype.oleinik\meta{at}latex-project.org}^^A
% }\\
-% Paulo R. M. Cereda\thanks
+% Paulo \emph{dictates a letter} Cereda\thanks
% {^^A
% E-mail:
% \href{mailto:cereda.paulo@gmail.com}
% {cereda.paulo\meta{at}gmail.com}^^A
+% }\\
+% samcarter \emph{cheesy comestibles}\thanks
+% {^^A
+% E-mail:
+% \href{mailto:sam.carter8@aol.com}
+% {sam.carter8\meta{at}aol.com}^^A
% }^^A
% }
%
@@ -71,13 +78,13 @@
%
% \begin{quotation}
% The sketch as originally depicted in the series begins with John Cleese
-% playing Mr.\ Teabag, a civil servant who, after purchasing The Times
+% playing Mr.~Teabag, a civil servant who, after purchasing The Times
% from the newsagent in the previous sketch, walks through the streets
% of London (at the crossing of Thorpebank Road and Dunraven Road) in a
% very peculiar manner. He eventually arrives at his place of business:
% The Ministry of Silly Walks, on the northern end of Whitehall. In the
% hallway, he passes other employees all exhibiting their own silly walks
-% before arriving at his office. Once there, he finds Mr Putey (Michael
+% before arriving at his office. Once there, he finds Mr.~Putey (Michael
% Palin) waiting for him and apologizes for the delay, explaining that
% his walk has become particularly silly of late and it takes longer for
% him to reach his destination.
@@ -157,10 +164,12 @@
%
% \section{The silly walk routine}
%
-% This is the complete silly walk routine provided by Jazeen Hollings in the
-% \href{https://bit.ly/3fc9x46}{corresponding Wikipedia article}. The images
-% used in this package are from that particular instruction set, licensed
-% under CC BY-SA 3.0. We gathered them together for optimization purposes.
+% This is the complete silly walk routine as described by Jazeen Hollings in the
+% \href{https://bit.ly/3fc9x46}{corresponding Wikipedia article}. Please note that the
+% images used in this package are created by samcarter and released under
+% the \href{https://creativecommons.org/licenses/by-sa/4.0/}{CC BY-SA 4.0} license.
+% Image sources (vector format) are available in the
+% \href{https://github.com/cereda/sillypage}{package repository}
%
% \bigskip
%
@@ -202,17 +211,17 @@
% \begin{macro}{\silly,\sillystep}
% \begin{macro}[int]{\@silly}
% \begin{macro}{
-% \silly@steps,\silly@width,
-% \silly@picture,\silly@height}
+% \silly@steps,
+% \silly@picture,
+% \silly@height}
% \begin{macrocode}
\newcommand*\silly[1]{\expandafter\@silly\csname c@#1\endcsname}
\newcommand*\sillystep[1]{\@silly{#1}}
\newcommand*\@silly[1]{\expandafter\@silly@walk
\expandafter{\number\numexpr#1\relax}}
\newcommand*\silly@steps{12}%
-\newcommand*\silly@width{48px}%
\newcommand*\silly@height{.8cm}%
-\newcommand*\silly@picture{sillywalk-map.png}%
+\newcommand*\silly@picture{sillywalk-map.pdf}%
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -229,10 +238,7 @@
\expandafter\@silly@walk@\expandafter
{\number\numexpr#1-\silly@steps\expandafter}%
\else
- \expandafter\includegraphics\expanded{[height=\silly@height,trim={%
- \the\dimexpr\silly@width*(#1-1)\relax\space 0
- \the\dimexpr\silly@width*(\silly@steps-#1)\relax\space 0},clip]}%
- {\silly@picture}%
+ \includegraphics[height=\silly@height,page=#1]{\silly@picture}%
\fi}
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/sillypage/sillypage.ins b/Master/texmf-dist/source/latex/sillypage/sillypage.ins
index 38d2e59db1c..4d85a866a60 100644
--- a/Master/texmf-dist/source/latex/sillypage/sillypage.ins
+++ b/Master/texmf-dist/source/latex/sillypage/sillypage.ins
@@ -1,7 +1,8 @@
%%
%% Copyright (C) 2022
%% by Phelype Oleinik <phelype.oleinik@latex-project.org>
-%% and Paulo Cereda <cereda.paulo@gmail.com>
+%% Paulo Cereda <cereda.paulo@gmail.com>
+%% and samcarter <sam.carter8@aol.com>
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
@@ -14,7 +15,7 @@
%% version 2005/12/01 or later.
%%
%% This work is "maintained" (as per the LPPL maintenance status)
-%% by Phelype Oleinik and Paulo Cereda.
+%% by Phelype Oleinik, Paulo Cereda and samcarter.
%%
\def\projectname{sillypage}%
\def\nameofplainTeX{plain}%
@@ -33,6 +34,7 @@ This is a generated file.
Copyright 2022 Phelype Oleinik /phelype.oleinik@latex-project.org/
Paulo Cereda /cereda.paulo@gmail.com/
+ samcarter /sam.carter8@aol.com/
This work may be distributed and/or modified under the conditions of the
LaTeX Project Public License, either version 1.3c of this license or (at
@@ -48,13 +50,13 @@ and version 1.3c or later is part of all distributions of LaTeX version
\postamble
This work is "maintained" (as per the LPPL maintenance status)
-by Phelype Oleinik and Paulo Cereda.
+by Phelype Oleinik, Paulo Cereda and samcarter.
This work consists of the files \projectname.dtx, and
\projectname.ins,
and the derived files \projectname.\mainext,
\projectname.pdf,
- sillywalk-map.png, and
+ sillywalk-map.pdf, and
README.md.%
\endpostamble
diff --git a/Master/texmf-dist/tex/latex/sillypage/sillypage.sty b/Master/texmf-dist/tex/latex/sillypage/sillypage.sty
index 3bb8a4c03ff..5bfb15ddb1c 100644
--- a/Master/texmf-dist/tex/latex/sillypage/sillypage.sty
+++ b/Master/texmf-dist/tex/latex/sillypage/sillypage.sty
@@ -10,6 +10,7 @@
%%
%% Copyright 2022 Phelype Oleinik /phelype.oleinik@latex-project.org/
%% Paulo Cereda /cereda.paulo@gmail.com/
+%% samcarter /sam.carter8@aol.com/
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
@@ -20,8 +21,8 @@
%% and version 1.3c or later is part of all distributions of LaTeX version
%% 2005/12/01 or later.
%%
-\def\sillypageDate{2022-01-11}
-\def\sillypageVersion{1.2}
+\def\sillypageDate{2022-01-20}
+\def\sillypageVersion{1.3}
\ProvidesPackage{sillypage}[\sillypageDate\space\sillypageVersion\space
The silly walk as page numbering style]
\RequirePackage{graphicx}
@@ -30,9 +31,8 @@
\newcommand*\@silly[1]{\expandafter\@silly@walk
\expandafter{\number\numexpr#1\relax}}
\newcommand*\silly@steps{12}%
-\newcommand*\silly@width{48px}%
\newcommand*\silly@height{.8cm}%
-\newcommand*\silly@picture{sillywalk-map.png}%
+\newcommand*\silly@picture{sillywalk-map.pdf}%
\def\@silly@walk#1{%
\@ifundefined{texorpdfstring}{\@firstoftwo}{\texorpdfstring}%
{\@silly@walk@{#1}}% TeX
@@ -42,20 +42,17 @@
\expandafter\@silly@walk@\expandafter
{\number\numexpr#1-\silly@steps\expandafter}%
\else
- \expandafter\includegraphics\expanded{[height=\silly@height,trim={%
- \the\dimexpr\silly@width*(#1-1)\relax\space 0
- \the\dimexpr\silly@width*(\silly@steps-#1)\relax\space 0},clip]}%
- {\silly@picture}%
+ \includegraphics[height=\silly@height,page=#1]{\silly@picture}%
\fi}
%%
%% This work is "maintained" (as per the LPPL maintenance status)
-%% by Phelype Oleinik and Paulo Cereda.
+%% by Phelype Oleinik, Paulo Cereda and samcarter.
%%
%% This work consists of the files sillypage.dtx, and
%% sillypage.ins,
%% and the derived files sillypage.sty,
%% sillypage.pdf,
-%% sillywalk-map.png, and
+%% sillywalk-map.pdf, and
%% README.md.
%%
%% End of file `sillypage.sty'.
diff --git a/Master/texmf-dist/tex/latex/sillypage/sillywalk-map.png b/Master/texmf-dist/tex/latex/sillypage/sillywalk-map.png
deleted file mode 100644
index 229d85f8284..00000000000
--- a/Master/texmf-dist/tex/latex/sillypage/sillywalk-map.png
+++ /dev/null
Binary files differ