contracard (22jul18)

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

8 files changed, 133 insertions, 35 deletions

diff --git a/Master/texmf-dist/doc/latex/contracard/Makefile b/Master/texmf-dist/doc/latex/contracard/Makefile
index 2338a069bde..e49635bd543 100644
--- a/Master/texmf-dist/doc/latex/contracard/Makefile
+++ b/Master/texmf-dist/doc/latex/contracard/Makefile
@@ -83,6 +83,15 @@ by.png:
 by-nc.png:
 	wget http://mirrors.creativecommons.org/presskit/buttons/80x15/png/by-nc.png
 
+gendoc-offline: $(DTX)
+	@echo "Compiling documentation"
+	$(DO_LATEX_WRITE18)
+	$(DO_SPLITINDEX)
+	$(DO_MAKEINDEX)
+	$(DO_MAKECHANGES)
+	while ($(DO_LATEX_WRITE18) ; \
+	grep -q "Rerun to get" $(NAME).log ) do true; \
+	done
 
 gendoc: $(DTX) resources
 	@echo "Compiling documentation"
@@ -116,7 +125,7 @@ $(CTAN_ZIP): $(CTAN_FILES)
 	@$(RM) -- $@
 	@mkdir -p $(NAME)/
 	@cp $^ $(NAME)/
-	@zip -9 $@ $(NAME)/* >/dev/null
+	@zip -9 -f $@ $(NAME)/* >/dev/null
 	@rm -rf $(NAME)/
 
 define run-install
diff --git a/Master/texmf-dist/doc/latex/contracard/README b/Master/texmf-dist/doc/latex/contracard/README
index 5df2be4b14c..0c52a7b8808 100644
--- a/Master/texmf-dist/doc/latex/contracard/README
+++ b/Master/texmf-dist/doc/latex/contracard/README
@@ -6,15 +6,14 @@ class which generates calling cards for the same.
 ## Download
 
 Development of this package occurs primarily on
-[GitHub](https://github.com/SamWhited/contracard). Issues and pull requests
-should be submitted there.
+[GitHub](https://github.com/SamWhited/contracard).
+Issues and pull requests should be submitted there.
 
 The current [release
 version](http://ctan.org/tex-archive/macros/latex/contrib/contracard) of
 **Contra Card** and associated
 [documentation](http://mirrors.ctan.org/macros/latex/contrib/contracard/contracard.pdf)
-[PDF] is available from [CTAN](http://ctan.org/pkg/contracard) or
-[GitHub](https://github.com/SamWhited/contracard/releases).
+[PDF] is available from [CTAN](http://ctan.org/pkg/contracard).
 
 ## License
 
@@ -33,9 +32,8 @@ This work has the LPPL maintenance status `maintained'.
 
 - Author:     Sam Whited
 - Maintainer: Sam Whited
-- Website:    https://samwhited.com
+- Website:    https://blog.samwhited.com
 - Contact:    sam@samwhited.com
-- Public key: 0xEC2C9934
 
 This work consists of this file contracard.dtx and the derived files
 `contracard.sty`, `contracard.cls`, `contracard.pdf`, `README.md`, and `README`.
diff --git a/Master/texmf-dist/doc/latex/contracard/README.md b/Master/texmf-dist/doc/latex/contracard/README.md
index 5df2be4b14c..0c52a7b8808 100644
--- a/Master/texmf-dist/doc/latex/contracard/README.md
+++ b/Master/texmf-dist/doc/latex/contracard/README.md
@@ -6,15 +6,14 @@ class which generates calling cards for the same.
 ## Download
 
 Development of this package occurs primarily on
-[GitHub](https://github.com/SamWhited/contracard). Issues and pull requests
-should be submitted there.
+[GitHub](https://github.com/SamWhited/contracard).
+Issues and pull requests should be submitted there.
 
 The current [release
 version](http://ctan.org/tex-archive/macros/latex/contrib/contracard) of
 **Contra Card** and associated
 [documentation](http://mirrors.ctan.org/macros/latex/contrib/contracard/contracard.pdf)
-[PDF] is available from [CTAN](http://ctan.org/pkg/contracard) or
-[GitHub](https://github.com/SamWhited/contracard/releases).
+[PDF] is available from [CTAN](http://ctan.org/pkg/contracard).
 
 ## License
 
@@ -33,9 +32,8 @@ This work has the LPPL maintenance status `maintained'.
 
 - Author:     Sam Whited
 - Maintainer: Sam Whited
-- Website:    https://samwhited.com
+- Website:    https://blog.samwhited.com
 - Contact:    sam@samwhited.com
-- Public key: 0xEC2C9934
 
 This work consists of this file contracard.dtx and the derived files
 `contracard.sty`, `contracard.cls`, `contracard.pdf`, `README.md`, and `README`.
diff --git a/Master/texmf-dist/doc/latex/contracard/contracard.lod b/Master/texmf-dist/doc/latex/contracard/contracard.lod
index 88a75a80388..f95fa926ad9 100644
--- a/Master/texmf-dist/doc/latex/contracard/contracard.lod
+++ b/Master/texmf-dist/doc/latex/contracard/contracard.lod
@@ -1,7 +1,9 @@
 \contentsline {dance}{\numberline {1}\ignorespaces Monarch Grove\unskip }{1}{dance.1}
-\contentsline {dance}{\numberline {2}\ignorespaces Code's Compiling\unskip }{5}{dance.2}
-\contentsline {dance}{\numberline {3}\ignorespaces Whirling Dervish\unskip }{6}{dance.3}
-\contentsline {dance}{\numberline {4}\ignorespaces Turn Around Waltz\unskip }{7}{dance.4}
-\contentsline {dance}{\numberline {5}\ignorespaces Untitled Blues \textnumero \ 1\unskip }{10}{dance.5}
-\contentsline {dance}{\numberline {6}\ignorespaces Untitled Blues \textnumero \ 2\unskip }{11}{dance.6}
-\contentsline {dance}{\numberline {7}\ignorespaces East Meets West\unskip }{18}{dance.7}
+\contentsline {dance}{\numberline {2}\ignorespaces Lament To Sarah\unskip }{3}{dance.2}
+\contentsline {dance}{\numberline {3}\ignorespaces Code's Compiling\unskip }{6}{dance.3}
+\contentsline {dance}{\numberline {4}\ignorespaces Whirling Dervish\unskip }{7}{dance.4}
+\contentsline {dance}{\numberline {5}\ignorespaces Turn Around Waltz\unskip }{8}{dance.5}
+\contentsline {dance}{\numberline {6}\ignorespaces Untitled Blues \textnumero \ 1\unskip }{11}{dance.6}
+\contentsline {dance}{\numberline {7}\ignorespaces Untitled Blues \textnumero \ 2\unskip }{12}{dance.7}
+\contentsline {dance}{\numberline {8}\ignorespaces East Meets West\unskip }{19}{dance.8}
+\contentsline {dance}{\numberline {9}\ignorespaces Snowball Shimmy\unskip }{22}{dance.9}
diff --git a/Master/texmf-dist/doc/latex/contracard/contracard.pdf b/Master/texmf-dist/doc/latex/contracard/contracard.pdf
index 8cff5084e22..04b2277716a 100644
--- a/Master/texmf-dist/doc/latex/contracard/contracard.pdf
+++ b/Master/texmf-dist/doc/latex/contracard/contracard.pdf
diff --git a/Master/texmf-dist/source/latex/contracard/contracard.dtx b/Master/texmf-dist/source/latex/contracard/contracard.dtx
index 80bfae7ed3e..37faf7bf617 100644
--- a/Master/texmf-dist/source/latex/contracard/contracard.dtx
+++ b/Master/texmf-dist/source/latex/contracard/contracard.dtx
@@ -11,15 +11,14 @@ class which generates calling cards for the same.
 ## Download
 
 Development of this package occurs primarily on
-[GitHub](https://github.com/SamWhited/contracard). Issues and pull requests
-should be submitted there.
+[GitHub](https://github.com/SamWhited/contracard).
+Issues and pull requests should be submitted there.
 
 The current [release
 version](http://ctan.org/tex-archive/macros/latex/contrib/contracard) of
 **Contra Card** and associated
 [documentation](http://mirrors.ctan.org/macros/latex/contrib/contracard/contracard.pdf)
-[PDF] is available from [CTAN](http://ctan.org/pkg/contracard) or
-[GitHub](https://github.com/SamWhited/contracard/releases).
+[PDF] is available from [CTAN](http://ctan.org/pkg/contracard).
 
 ## License
 
@@ -38,9 +37,8 @@ This work has the LPPL maintenance status `maintained'.
 
 - Author:     Sam Whited
 - Maintainer: Sam Whited
-- Website:    https://samwhited.com
+- Website:    https://blog.samwhited.com
 - Contact:    sam@samwhited.com
-- Public key: 0xEC2C9934
 
 This work consists of this file contracard.dtx and the derived files
 `contracard.sty`, `contracard.cls`, `contracard.pdf`, `README.md`, and `README`.
@@ -78,7 +76,6 @@ This work consists of this file contracard.dtx and the derived files
   Maintainer: Sam Whited
   Website:    https://samwhited.com
   Contact:    sam@samwhited.com
-  Public key: 0xEC2C9934
 
   This work consists of this file contracard.dtx
             and the derived files contracard.sty
@@ -187,8 +184,7 @@ This work consists of this file contracard.dtx and the derived files
 % \title{The Contra Card Project}
 % \author{
 %   \name{Sam Whited}\\*
-%   \texttt{sam@samwhited.com}\\*
-%   \texttt{0xEC2C9934}
+%   \texttt{sam@samwhited.com}
 % }
 % \date{\today\\*\gittag}
 %
@@ -224,7 +220,7 @@ This work consists of this file contracard.dtx and the derived files
 % \subsection{About the source}
 %
 % Contributions are welcome, and the latest development version of the project
-% can always be found at \url{https://github.com/samwhited/contracard}.
+% can always be found at \url{https://github.com/SamWhited/contracard}.
 %
 % \subsection{License}
 %
@@ -254,6 +250,28 @@ This work consists of this file contracard.dtx and the derived files
 % order). Also to Sarah Snyder, and all of my other favorite dance partners from
 % the Atlanta dance community.
 %
+% \begin{exampledance}
+% \begin{contra}{Lament To Sarah}{Sam Whited}{Duple improper}
+%   \lines*[In your set, short]
+%   \move[4]{open up across}
+%   \rollawayhalfsashay
+%   \move[4]{Neighbor two hand turn}\unskip\moveindex{Two hand turn}%
+%
+%   \move[8]{Cont.\ two hand turn}\unskip\moveindex{Two hand turn}%
+%   \swing*[Melt into a]{8}
+%
+%   \balanceand\longpetronella
+%   \balanceand\longpetronella
+%   \balanceand\longpetronella
+%   \move[8]{Balance with your partner and two hand turn while rotating to the
+%   right to end facing new neighbors}\unskip\moveindex{Balance}\moveindex{Two hand turn}
+%   \notes{%
+%     Open up with your neighbor in four steps, facing across with leads on the
+%     right.%
+%   }
+% \end{contra}
+% \end{exampledance}
+%
 % \StopEventually{}
 % \changes{0.1}{2013/02/09}{Created boilerplate for class}
 % \changes{0.3}{2013/02/20}{Split core functionality out into package}
@@ -266,8 +284,10 @@ This work consists of this file contracard.dtx and the derived files
 %
 % \section{Building and using \pkg{contracard}}
 %
-% \paragraph{Dependencies} Before building the \pkg{contracard} package you
-% should verify that the following dependencies are installed:
+% \paragraph{Dependencies} The following dependencies are loaded by
+% \pkg{contracard} (you do not need to include them in your project,
+% \pkg{contracard} does this for you); before building the \pkg{contracard}
+% package you should verify that they are installed.
 %
 %    \begin{macrocode}
 %<*contracard-pkg>
@@ -743,7 +763,7 @@ This work consists of this file contracard.dtx and the derived files
 % \begin{exampledance}
 % \setlength{\phrasevspace}{0em}
 % \renewcommand*{\partdelimiter}{:}
-% \begin{contra}{Untitled Blues \textnumero\ 1}{\href{http://www.dancerhapsody.com/calling/dances.html}{Seth Tepfer}}{Duple minor im.}
+% \begin{contra}{Untitled Blues \textnumero\ 1}{Seth Tepfer}{Duple minor im.}
 %   \gypsy*[Neighbor]{8}
 %   \gypsy*[Ladies]{8}
 %   \newdancephrase
@@ -786,7 +806,7 @@ This work consists of this file contracard.dtx and the derived files
 % \setlength{\phrasevspace}{0em}
 % \renewcommand*{\partdelimiter}{:}
 % \setcounter{dancephraselength}{16}
-% \begin{contra}{Untitled Blues \textnumero\ 2}{\href{http://www.dancerhapsody.com/calling/dances.html}{Seth Tepfer}}{Duple minor im.}
+% \begin{contra}{Untitled Blues \textnumero\ 2}{Seth Tepfer}{Duple minor im.}
 %   \gypsy*[Neighbor]{8}
 %   \move[8]{Gents allemande\moveindex{Allemande} left 1\textonehalf}
 %   \balanceand*[Partner]\swing{16}
@@ -1445,6 +1465,14 @@ This work consists of this file contracard.dtx and the derived files
 % \changes{1.0.0}{2013/09/08}{Add move shortcut}
 % \begin{macro}{\longpetronella*}
 % \changes{1.0.0}{2013/09/08}{Add move shortcut}
+% \begin{macro}{\petronellanella}
+% \changes{1.1.0}{2018/07/21}{Add nella-nella petronella variants}
+% \begin{macro}{\petronellanella*}
+% \changes{1.1.0}{2018/07/21}{Add nella-nella petronella variants}
+% \begin{macro}{\longpetronellanella}
+% \changes{1.1.0}{2018/07/21}{Add nella-nella petronella variants}
+% \begin{macro}{\longpetronellanella*}
+% \changes{1.1.0}{2018/07/21}{Add nella-nella petronella variants}
 % Petronella's are normally performed in rings of four, and aren't with another
 % individual, however, the \code{\textbackslash petronella} macro still takes a
 % single optional argument for those rare occasions when two individuals are
@@ -1454,6 +1482,19 @@ This work consists of this file contracard.dtx and the derived files
 % longpetronella} which takes up the full 8 counts. This way you can write
 % \code{\textbackslash balanceand\textbackslash longpetronella} and the timing
 % will be correct.
+% A petronella-nella has the same timing as an ormal petronella but instead of
+% moving one place to the right dancers move two places.
+% \begin{exampledance}
+% \begin{contra}{Snowball Shimmy}{Seth Tepfer}{Duple becket}
+%   \move[8]{Circle left all the way}
+%   \allemande*[Gents]{8}{left 1\textonehalf}
+%   \balanceand\swing[neighbor]{16}
+%   \balanceand\longpetronella
+%   \balanceand\longpetronellanella
+%   \balanceand\swing[partner]{16}
+%   \notes{nella-nella variant of Erik Weberg's Wasatch Wiggle}
+% \end{contra}
+% \end{exampledance}
 %    \begin{macrocode}
 \newcommand*{\petronella}{%
   \moveindex{Petronella}%
@@ -1477,11 +1518,39 @@ This work consists of this file contracard.dtx and the derived files
   \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
   \move[8]{\ignorespaces#1\unskip\ petronella}%
 }
+\newcommand*{\petronellanella}{%
+  \moveindex{Petronella}%
+  \moveindex{Petronella-nella}%
+  \@ifstar\@petronellanellaStar\@petronellanellaNoStar%
+}
+\newcommand*{\@petronellanellaNoStar}[1][\unskip]{%
+  \move[4]{Petronella-nella \ignorespaces#1\unskip}%
+}
+\newcommand*{\@petronellanellaStar}[1][%
+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
+  \move[4]{\ignorespaces#1\unskip\ petronella-nella}%
+}
+\newcommand*{\longpetronellanella}{%
+  \moveindex{Petronella}%
+  \moveindex{Petronella-nella}%
+  \@ifstar\@longpetronellanellaStar\@longpetronellanellaNoStar%
+}
+\newcommand*{\@longpetronellanellaNoStar}[1][\unskip]{%
+  \move[8]{Petronella-nella \ignorespaces#1\unskip}%
+}
+\newcommand*{\@longpetronellanellaStar}[1][%
+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
+  \move[8]{\ignorespaces#1\unskip\ petronella-nella}%
+}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\promenade}
 % \changes{1.0.0}{2013/09/06}{Add move shortcut}
diff --git a/Master/texmf-dist/tex/latex/contracard/contracard.cls b/Master/texmf-dist/tex/latex/contracard/contracard.cls
index f676b3a1f1d..eb2087471bf 100644
--- a/Master/texmf-dist/tex/latex/contracard/contracard.cls
+++ b/Master/texmf-dist/tex/latex/contracard/contracard.cls
@@ -79,7 +79,6 @@
 %%   Maintainer: Sam Whited
 %%   Website:    https://samwhited.com
 %%   Contact:    sam@samwhited.com
-%%   Public key: 0xEC2C9934
 %% 
 %%   This work consists of this file contracard.dtx
 %%             and the derived files contracard.sty
diff --git a/Master/texmf-dist/tex/latex/contracard/contracard.sty b/Master/texmf-dist/tex/latex/contracard/contracard.sty
index 9e50d2fea3b..aebcb58e3bc 100644
--- a/Master/texmf-dist/tex/latex/contracard/contracard.sty
+++ b/Master/texmf-dist/tex/latex/contracard/contracard.sty
@@ -484,6 +484,30 @@
   \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
   \move[8]{\ignorespaces#1\unskip\ petronella}%
 }
+\newcommand*{\petronellanella}{%
+  \moveindex{Petronella}%
+  \moveindex{Petronella-nella}%
+  \@ifstar\@petronellanellaStar\@petronellanellaNoStar%
+}
+\newcommand*{\@petronellanellaNoStar}[1][\unskip]{%
+  \move[4]{Petronella-nella \ignorespaces#1\unskip}%
+}
+\newcommand*{\@petronellanellaStar}[1][%
+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
+  \move[4]{\ignorespaces#1\unskip\ petronella-nella}%
+}
+\newcommand*{\longpetronellanella}{%
+  \moveindex{Petronella}%
+  \moveindex{Petronella-nella}%
+  \@ifstar\@longpetronellanellaStar\@longpetronellanellaNoStar%
+}
+\newcommand*{\@longpetronellanellaNoStar}[1][\unskip]{%
+  \move[8]{Petronella-nella \ignorespaces#1\unskip}%
+}
+\newcommand*{\@longpetronellanellaStar}[1][%
+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
+  \move[8]{\ignorespaces#1\unskip\ petronella-nella}%
+}
 \newcommand*{\promenade}{%
   \moveindex{Promenade}
   \@ifstar\@promenadeStar\@promenadeNoStar%
@@ -766,7 +790,6 @@
 %%   Maintainer: Sam Whited
 %%   Website:    https://samwhited.com
 %%   Contact:    sam@samwhited.com
-%%   Public key: 0xEC2C9934
 %% 
 %%   This work consists of this file contracard.dtx
 %%             and the derived files contracard.sty