contracard (3mar19)

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

11 files changed, 455 insertions, 643 deletions

diff --git a/Master/texmf-dist/doc/latex/contracard/LICENSE b/Master/texmf-dist/doc/latex/contracard/LICENSE
index 43d372e7df0..e94c3cd909b 100644
--- a/Master/texmf-dist/doc/latex/contracard/LICENSE
+++ b/Master/texmf-dist/doc/latex/contracard/LICENSE
@@ -1,5 +1,3 @@
-# License
-
 Copyright 2013 Samuel Whited
 
 This project may be distributed and/or modified under the
diff --git a/Master/texmf-dist/doc/latex/contracard/Makefile b/Master/texmf-dist/doc/latex/contracard/Makefile
deleted file mode 100644
index e49635bd543..00000000000
--- a/Master/texmf-dist/doc/latex/contracard/Makefile
+++ /dev/null
@@ -1,205 +0,0 @@
-# Makefile for contracard.
-# Copied almost exactly from the fontspec makefile.
-
-#### MAKEFILE CONFIG ####
-
-SHELL = /bin/sh
-.SUFFIXES:
-.SILENT:
-
-#### BEGIN ####
-
-help:
-	@echo 'CONTRACARD makefile targets:'
-	@echo ' '
-	@echo '                  help  -  (this message)'
-	@echo '                unpack  -  extracts all files'
-	@echo '                   doc  -  compile documentation'
-	@echo '                gendoc  -  compile git-aware documentation'
-	@echo '                  ctan  -  generate archive for CTAN'
-	@echo '                   all  -  unpack & doc'
-	@echo '                 world  -  all & ctan'
-	@echo '                 clean  -  remove all generated and built files'
-	@echo '                preview -  preview the documentation'
-	@echo ' '
-	@echo '                   install  -  install the complete class into your home texmf tree'
-	@echo '               cls-install  -  install the class code only'
-	@echo ' install TEXMFROOT=<texmf>  -  install the class into the path <texmf>'
-
-
-NAME = contracard
-DOC = $(NAME).pdf
-DTX = $(NAME).dtx
-
-# Redefine this to print output if you need:
-REDIRECT = > /dev/null
-
-# Files grouped by generation mode
-COMPILED = $(DOC)
-UNPACKED = $(NAME).cls
-SOURCE = $(DTX) Makefile README LICENSE
-GENERATED = $(COMPILED) $(UNPACKED)
-
-CTAN_FILES = $(SOURCE) $(COMPILED)
-
-UNPACKED_DOC =
-
-RUNFILES = $(filter-out $(UNPACKED_DOC), $(UNPACKED))
-DOCFILES = $(COMPILED) README LICENSE $(UNPACKED_DOC)
-SRCFILES = $(DTX) Makefile
-
-ALL_FILES = $(RUNFILES) $(DOCFILES) $(SRCFILES)
-
-# Installation locations
-FORMAT = latex
-RUNDIR = $(TEXMFROOT)/tex/$(FORMAT)/$(NAME)
-DOCDIR = $(TEXMFROOT)/doc/$(FORMAT)/$(NAME)
-SRCDIR = $(TEXMFROOT)/source/$(FORMAT)/$(NAME)
-TEXMFROOT = $(shell kpsewhich --var-value TEXMFHOME)
-
-CTAN_ZIP = $(NAME).zip
-TDS_ZIP = $(NAME).tds.zip
-ZIPS = $(CTAN_ZIP) $(TDS_ZIP)
-
-DO_LATEX = xelatex --interaction=nonstopmode $<  $(REDIRECT)
-DO_LATEX_WRITE18 = xelatex --shell-escape --interaction=nonstopmode $< $(REDIRECT)
-DO_TEX = tex --interaction=nonstopmode $< $(REDIRECT)
-DO_MAKEINDEX = makeindex -s gind.ist $(subst .dtx,,$<) $(REDIRECT) 2>&1
-DO_SPLITINDEX = splitindex $(subst .dtx,,$<) $(REDIRECT) 2>&1
-DO_MAKECHANGES = makeindex -s gglo.ist -o $(NAME).gls $(NAME).glo $< $(REDIRECT) 2>&1
-
-all: $(GENERATED)
-doc: $(COMPILED)
-unpack: $(UNPACKED)
-ctan: $(CTAN_ZIP)
-tds: $(TDS_ZIP)
-world: all ctan
-
-resources: by.png by-nc.png
-
-by.png:
-	wget http://mirrors.creativecommons.org/presskit/buttons/80x15/png/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"
-	$(DO_LATEX_WRITE18)
-	$(DO_SPLITINDEX)
-	$(DO_MAKEINDEX)
-	$(DO_MAKECHANGES)
-	while ($(DO_LATEX_WRITE18) ; \
-	grep -q "Rerun to get" $(NAME).log ) do true; \
-	done
-
-COMMAND = command -v $(1) >/dev/null 2>&1
-preview: $(DOC)
-	($(COMMAND) evince && evince $(NAME).pdf) || ($(COMMAND) open && open $(NAME).pdf)
-
-$(DOC): $(DTX)
-	@echo "Compiling documentation"
-	$(DO_LATEX_WRITE18)
-	$(DO_MAKEINDEX)
-	$(DO_MAKECHANGES)
-	while ($(DO_LATEX_WRITE18) ; \
-	grep -q "Rerun to get" $(NAME).log ) do true; \
-	done
-
-
-$(UNPACKED): $(DTX)
-	@$(DO_TEX)
-
-$(CTAN_ZIP): $(CTAN_FILES)
-	@echo "Making $@ for CTAN upload."
-	@$(RM) -- $@
-	@mkdir -p $(NAME)/
-	@cp $^ $(NAME)/
-	@zip -9 -f $@ $(NAME)/* >/dev/null
-	@rm -rf $(NAME)/
-
-define run-install
-@mkdir -p $(RUNDIR) && cp $(RUNFILES) $(RUNDIR)
-@mkdir -p $(DOCDIR) && cp $(DOCFILES) $(DOCDIR)
-@mkdir -p $(SRCDIR) && cp $(SRCFILES) $(SRCDIR)
-endef
-
-define run-cls-install
-@mkdir -p $(RUNDIR) && cp $(RUNFILES) $(RUNDIR)
-endef
-
-$(TDS_ZIP): TEXMFROOT=./tmp-texmf
-$(TDS_ZIP): $(ALL_FILES)
-	@echo "Making TDS-ready archive $@."
-	@$(RM) -- $@
-	$(run-install)
-	@cd $(TEXMFROOT) && zip -9 ../$@ -r . >/dev/null
-	@$(RM) -r -- $(TEXMFROOT)
-
-# Rename the README for CTAN
-README: README.md
-	cp $< $@
-
-# Rename the LICENSE for CTAN
-LICENSE: LICENSE.md
-	cp $< $@
-
-.PHONY: install manifest clean mrproper
-
-install: $(ALL_FILES)
-	@if test ! -n "$(TEXMFROOT)" ; then \
-		echo "Cannot locate your home texmf tree. Specify manually with\n\n    make install TEXMFROOT=/path/to/texmf\n" ; \
-		false ; \
-	fi ;
-	@echo "Installing in '$(TEXMFROOT)'."
-	$(run-install)
-
-cls-install: $(RUNFILES)
-	@if test ! -n "$(TEXMFROOT)" ; then \
-		echo "Cannot locate your home texmf tree. Specify manually with\n\n    make install TEXMFROOT=/path/to/texmf\n" ; \
-		false ; \
-	fi ;
-	@echo "Installing in '$(TEXMFROOT)'."
-	$(run-install)
-
-manifest: 
-	@echo "Source files:"
-	@for f in $(SOURCE); do echo $$f; done
-	@echo ""
-	@echo "Derived files:"
-	@for f in $(GENERATED); do echo $$f; done
-
-clean:
-	@$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg *.glo *.gls *.example *.out
-	@$(RM) -- *.synctex* *.tmp *.cls *.sty *.ins *.pdf *.dvi README LICENSE *.lot
-	@$(RM) -- *.lod *.png
-	@$(RM) -- $(GENERATED) $(ZIPS)
-	@$(RM) -- $(builddir)/*
-
-
-#############
-# TESTSUITE #
-#############
-
-#### Needed to compile and make stuff ####
-
-builddir=build
-lprefix=L
-xprefix=X
-both=F
-
-COPY = cp -a
-MOVE = mv -f
-COMPARE_OPTS = -density 300x300 -metric ae -fuzz 35%
-
-LTXSOURCE = $(NAME).cls
diff --git a/Master/texmf-dist/doc/latex/contracard/README b/Master/texmf-dist/doc/latex/contracard/README
index 0c52a7b8808..1b964792188 100644
--- a/Master/texmf-dist/doc/latex/contracard/README
+++ b/Master/texmf-dist/doc/latex/contracard/README
@@ -1,39 +1,16 @@
 # Contra Card
 
 A LaTeX package for typesetting traditional contra and square dances, and a
-class which generates calling cards for the same.
+class which generates calling cards.
 
 ## Download
 
-Development of this package occurs primarily on
-[GitHub](https://github.com/SamWhited/contracard).
-Issues and pull requests should be submitted there.
+Development of this package occurs primarily at
+https://git.sr.ht/~samwhited/contracard.
+Patches should be submitted there.
 
 The current [release
 version](http://ctan.org/tex-archive/macros/latex/contrib/contracard) of
-**Contra Card** and associated
+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).
-
-## License
-
-Copyright 2012 Samuel Whited
-
-This file 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. The latest version of this license can be found at:
-
-http://www.latex-project.org/lppl.txt
-
-and version 1.3c or later is part of all distributions of LaTeX version
-2008/05/04 or later.
-
-This work has the LPPL maintenance status `maintained'.
-
-- Author:     Sam Whited
-- Maintainer: Sam Whited
-- Website:    https://blog.samwhited.com
-- Contact:    sam@samwhited.com
-
-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
deleted file mode 100644
index 0c52a7b8808..00000000000
--- a/Master/texmf-dist/doc/latex/contracard/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contra Card
-
-A LaTeX package for typesetting traditional contra and square dances, and a
-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.
-
-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).
-
-## License
-
-Copyright 2012 Samuel Whited
-
-This file 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. The latest version of this license can be found at:
-
-http://www.latex-project.org/lppl.txt
-
-and version 1.3c or later is part of all distributions of LaTeX version
-2008/05/04 or later.
-
-This work has the LPPL maintenance status `maintained'.
-
-- Author:     Sam Whited
-- Maintainer: Sam Whited
-- Website:    https://blog.samwhited.com
-- Contact:    sam@samwhited.com
-
-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
deleted file mode 100644
index f95fa926ad9..00000000000
--- a/Master/texmf-dist/doc/latex/contracard/contracard.lod
+++ /dev/null
@@ -1,9 +0,0 @@
-\contentsline {dance}{\numberline {1}\ignorespaces Monarch Grove\unskip }{1}{dance.1}
-\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 04b2277716a..3827df3fd62 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/Makefile b/Master/texmf-dist/source/latex/contracard/Makefile
new file mode 100644
index 00000000000..7a2d0196968
--- /dev/null
+++ b/Master/texmf-dist/source/latex/contracard/Makefile
@@ -0,0 +1,32 @@
+.POSIX:
+.SUFFIXES:
+
+# Standardize on local variables from NetBSD Make.
+.ALLSRC ?= $^
+
+REDIRECT = > /dev/null
+DO_LATEX_WRITE18 = xelatex --shell-escape --interaction=nonstopmode contracard.dtx $(REDIRECT)
+DO_SPLITINDEX = splitindex contracard $(REDIRECT) 2>&1
+DO_MAKEINDEX = makeindex -s gind.ist -o contracard.ind contracard $(REDIRECT) 2>&1
+DO_MAKECHANGES = makeindex -s gglo.ist -o contracard.gls contracard.glo $< $(REDIRECT) 2>&1
+
+contracard.pdf: contracard.sty contracard.cls contracard.dtx by-nc.png by.png
+	$(DO_LATEX_WRITE18)
+	$(DO_LATEX_WRITE18)
+	$(DO_SPLITINDEX)
+	$(DO_MAKEINDEX)
+	$(DO_MAKECHANGES)
+	while ($(DO_LATEX_WRITE18) ; \
+	grep -q "Rerun to get" contracard.log ) do true; \
+	done
+
+contracard.sty contracard.cls: contracard.dtx contracard.ins
+	xelatex --interaction=nonstopmode contracard.ins $(REDIRECT)
+
+contracard.zip: contracard.dtx contracard.ins contracard.pdf Makefile LICENSE
+	rm -f $@
+	mkdir -p contracard/
+	cp README.md contracard/README
+	cp $(.ALLSRC) contracard/
+	zip -9 -f $@ contracard/* >/dev/null
+	rm -rf contracard/
diff --git a/Master/texmf-dist/source/latex/contracard/contracard.dtx b/Master/texmf-dist/source/latex/contracard/contracard.dtx
index 37faf7bf617..fc501c72da0 100644
--- a/Master/texmf-dist/source/latex/contracard/contracard.dtx
+++ b/Master/texmf-dist/source/latex/contracard/contracard.dtx
@@ -1,110 +1,4 @@
 % \iffalse
-%<*internal>
-\iffalse
-%</internal>
-%<*readme>
-# Contra Card
-
-A LaTeX package for typesetting traditional contra and square dances, and a
-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.
-
-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).
-
-## License
-
-Copyright 2012 Samuel Whited
-
-This file 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. The latest version of this license can be found at:
-
-http://www.latex-project.org/lppl.txt
-
-and version 1.3c or later is part of all distributions of LaTeX version
-2008/05/04 or later.
-
-This work has the LPPL maintenance status `maintained'.
-
-- Author:     Sam Whited
-- Maintainer: Sam Whited
-- Website:    https://blog.samwhited.com
-- Contact:    sam@samwhited.com
-
-This work consists of this file contracard.dtx and the derived files
-`contracard.sty`, `contracard.cls`, `contracard.pdf`, `README.md`, and `README`.
-%</readme>
-%<*internal>
-\fi
-\begingroup
-\input docstrip.tex
-\keepsilent
-\usedir{tex/latex/contracard}
-\preamble
-
-  Copyright 2012 Samuel Whited
-
-  This file 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. The latest version of this license is in:
-
-  http://www.latex-project.org/lppl.txt
-
-  and version 1.3c or later is part of all distributions of
-  LaTeX version 2008/05/04 or later.
-
-  For the maintenance status and other document metadata,
-  see the end of this document.
-
-\endpreamble
-\postamble
-
-  ___________
-  This work has the LPPL maintenance status `maintained'.
-
-  Author:     Sam Whited
-  Maintainer: Sam Whited
-  Website:    https://samwhited.com
-  Contact:    sam@samwhited.com
-
-  This work consists of this file contracard.dtx
-            and the derived files contracard.sty
-                              and contracard.cls
-                              and contracard.pdf
-                              and README.md
-                              and README
-
-\endpostamble
-\askforoverwritefalse
-
-\generate{\file{contracard.sty}{\from{contracard.dtx}{contracard-pkg}}}
-\generate{\file{contracard.cls}{\from{contracard.dtx}{contracard-cls}}}
-\nopreamble\nopostamble
-\generate{\file{README.md}{\from{contracard.dtx}{readme}}}
-
-\obeyspaces
-\Msg{****************************************************}
-\Msg{*                                                  *}
-\Msg{* To finish the installation you have to move the  *}
-\Msg{* following file into a directory searched by TeX: *}
-\Msg{*                                                  *}
-\Msg{* contracard.sty                                   *}
-\Msg{* contracard.cls                                   *}
-\Msg{*                                                  *}
-\Msg{****************************************************}
-
-\endgroup
-%</internal>
 %
 %<*driver>
 \ProvidesFile{contracard.dtx}
@@ -112,11 +6,11 @@ This work consists of this file contracard.dtx and the derived files
 %
 %<*contracard-pkg>
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{contracard}[2013/09/16 Package for typesetting called dances]
+\ProvidesPackage{contracard}[2019/03/03 Package for typesetting called dances]
 %</contracard-pkg>
 %<*contracard-cls>
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesClass{contracard}[2013/09/16 Class for creating dance calling cards]
+\ProvidesClass{contracard}[2019/03/03 Class for creating dance calling cards]
 \AtEndOfClass{\LoadClass{article}}
 %</contracard-cls>
 %
@@ -137,6 +31,7 @@ This work consists of this file contracard.dtx and the derived files
 \usepackage[pdfborder=0, bookmarks, colorlinks=false, hidelinks]{hyperref}
 \usepackage[parfill]{parskip}
 \usepackage{bookmark}
+\usepackage[page,toc]{appendix}
 
 \fvset{gobble=2}
 
@@ -220,7 +115,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://git.sr.ht/~samwhited/contracard}.
 %
 % \subsection{License}
 %
@@ -254,15 +149,15 @@ This work consists of this file contracard.dtx and the derived files
 % \begin{contra}{Lament To Sarah}{Sam Whited}{Duple improper}
 %   \lines*[In your set, short]
 %   \move[4]{open up across}
-%   \rollawayhalfsashay
+%   \rollawaysashay
 %   \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
+%   \balanceand\petronella
+%   \balanceand\petronella
+%   \balanceand\petronella
 %   \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{%
@@ -442,8 +337,8 @@ This work consists of this file contracard.dtx and the derived files
 %   \dosido*[Neighbor]{8}
 %   \seesaw*[Partner]{8}
 %   \swing*[Shadow]{16}
-%   \balanceand\longpetronella
-%   \balanceand\longpetronella
+%   \balanceand\petronella
+%   \balanceand\petronella
 %   \swing*[Partner]{8}
 %   \rightandleftthrough*[Left diagonal:]
 %   \notes{The Neighbor dosido into a partner see saw should be one fluid
@@ -506,7 +401,7 @@ This work consists of this file contracard.dtx and the derived files
 % \begin{exampledance}
 % \showcountafter%
 % \begin{contra}{Whirling Dervish}{Sam Whited}{Duple improper}
-%   \gypsy[neighbor 1\textthreequarters]{8}
+%   \walkaround[neighbor 1\textthreequarters]{8}
 %   \move[8]{Men half hey ricochet while ladies cross%
 %   \unskip\moveindex{Hey for Four}%
 %   \unskip\moveindex{Half Hey}%
@@ -515,11 +410,11 @@ This work consists of this file contracard.dtx and the derived files
 %   }
 %   \swing[your partners all]{16}
 %   \move[8]{Spin like a Whirling Dervish\moveindex{Whirling Dervish}}
-%   \balanceand\longpetronella
-%   \balanceand\move[8]{gents roll neighbor away with a half sashay\moveindex{Half
+%   \balanceand\petronella
+%   \balanceand\move[4]{gents roll neighbor away with a half sashay\moveindex{Half
 %   Sashay}\moveindex{Roll Away}\moveindex{Roll Away\ldots Half Sashay}}
-%   \move[8]{Balance neighbor and gypsy left 1 time to new
-%   neighbors\moveindex{Balance}\moveindex{Gypsy}\moveindex{Gypsy Left}}
+%   \move[8]{Balance neighbor and left shoulder round 1 time to new
+%   neighbors\moveindex{Balance}\moveindex{Walk around}\moveindex{Left shoulder round}}
 %   \notes{A ``Whirling Dervish" is just a circle left in single file except
 %   that you should spin over your left shoulder the entire time you're doing
 %   it.}
@@ -740,13 +635,13 @@ This work consists of this file contracard.dtx and the derived files
 % result.
 %
 % \begin{Verbatim}
-% \setlength{\phrasevspace}{0em}
-% \renewcommand*{\partdelimiter}{:}
 % \begin{contra}{Untitled Blues \textnumero\ 1}{Seth Tepfer}{Duple minor im.}
-%   \gypsy*[Neighbor]{8}
-%   \gypsy*[Ladies]{8}
+%   \setlength{\phrasevspace}{0em}
+%   \renewcommand*{\partdelimiter}{:}
+%   \walkaround*[Neighbor]{8}
+%   \walkaround*[Ladies]{8}
 %   \newdancephrase
-%   \balanceand*[Partner]\swing{16}
+%   \balanceand*[Partner]\swing{12}
 %   \newdancephrase
 %   \ladieschain
 %   \starleft{8}
@@ -761,13 +656,13 @@ This work consists of this file contracard.dtx and the derived files
 % \end{Verbatim}
 %
 % \begin{exampledance}
-% \setlength{\phrasevspace}{0em}
-% \renewcommand*{\partdelimiter}{:}
 % \begin{contra}{Untitled Blues \textnumero\ 1}{Seth Tepfer}{Duple minor im.}
-%   \gypsy*[Neighbor]{8}
-%   \gypsy*[Ladies]{8}
+%   \setlength{\phrasevspace}{0em}
+%   \renewcommand*{\partdelimiter}{:}
+%   \walkaround*[Neighbor]{8}
+%   \walkaround*[Ladies]{8}
 %   \newdancephrase
-%   \balanceand*[Partner]\swing{16}
+%   \balanceand*[Partner]\swing{12}
 %   \newdancephrase
 %   \ladieschain
 %   \starleft{8}
@@ -783,13 +678,14 @@ This work consists of this file contracard.dtx and the derived files
 %
 % \clearpage
 % \begin{Verbatim}
-% \setlength{\phrasevspace}{0em}
-% \renewcommand*{\partdelimiter}{:}
-% \setcounter{dancephraselength}{16}
 % \begin{contra}{Untitled Blues \textnumero\ 2}{Seth Tepfer}{Duple minor im.}
-%   \gypsy*[Neighbor]{8}
+%   \setlength{\phrasevspace}{0em}
+%   \renewcommand*{\partdelimiter}{:}
+%   \setcounter{dancephraselength}{16}
+%
+%   \walkaround*[Neighbor]{8}
 %   \move[8]{Gents allemande\moveindex{Allemande} left 1\textonehalf}
-%   \balanceand*[Partner]\swing{16}
+%   \balanceand*[Partner]\swing{12}
 %   \move[8]{\textonehalf\ promenade\moveindex{Half Promenade}\moveindex{Promenade} across set}
 %   \ladieschain
 %   \vspace*{\fill}
@@ -803,13 +699,14 @@ This work consists of this file contracard.dtx and the derived files
 % \end{Verbatim}
 %
 % \begin{exampledance}
-% \setlength{\phrasevspace}{0em}
-% \renewcommand*{\partdelimiter}{:}
-% \setcounter{dancephraselength}{16}
 % \begin{contra}{Untitled Blues \textnumero\ 2}{Seth Tepfer}{Duple minor im.}
-%   \gypsy*[Neighbor]{8}
+%   \setlength{\phrasevspace}{0em}
+%   \renewcommand*{\partdelimiter}{:}
+%   \setcounter{dancephraselength}{16}
+%
+%   \walkaround*[Neighbor]{8}
 %   \move[8]{Gents allemande\moveindex{Allemande} left 1\textonehalf}
-%   \balanceand*[Partner]\swing{16}
+%   \balanceand*[Partner]\swing{12}
 %   \move[8]{\textonehalf\ promenade\moveindex{Half Promenade}\moveindex{Promenade} across set}
 %   \ladieschain
 %   \vspace*{\fill}
@@ -916,15 +813,19 @@ This work consists of this file contracard.dtx and the derived files
 % \changes{1.0.0}{2013/09/10}{Improve indentation and line spacing}
 % \begin{macro}{\move*}
 % The meat of the \pkg{contracard} package is contained in the
-% \code{\textbackslash move} command.  This command takes in a move to display,
-% and (optionally) the number of beats the move takes. If the count is not
-% specified, 8 is used as the default.
+% \code{\textbackslash move} command.
+% This command takes in a move to display, and (optionally) the number of beats
+% the move takes.
+% If the count is not specified, 8 is used as the default.
 %    \begin{macrocode}
 \newcommand*{\move}{\@ifstar\@moveStar\@moveNoStar}
 \newcommand*{\@moveStar}[2][8]{%
   \def\cc@moveStar{}\@moveNoStar[#1]{#2}\let\cc@moveStar\undefined%
 }
 \newlength{\cc@partsepwidth}%
+\newcommand*{\@balanceAnd}{\ignorespaces}%
+\newcommand*{\@extraCount}{0}%
+\newcounter{movecount}%
 \newcommand*{\@moveNoStar}[2][8]{%
   \setlength{\parindent}{0pt}%
   \setlength{\cc@partsepwidth}{\widthof{\Alph{dancephrase}\arabic{dancepart}%
@@ -943,21 +844,24 @@ This work consists of this file contracard.dtx and the derived files
   \ifthenelse{\value{partmovenum}=0}{%
     \Alph{dancephrase}\arabic{dancepart}\partdelimiter\ %
   }{}%
-  \addtocounter{dancecount}{#1}%
-  \addtocounter{phrasecount}{#1}%
-  \addtocounter{partcount}{#1}%
+  \setcounter{movecount}{0}%
+  \addtocounter{movecount}{#1}%
+  \addtocounter{movecount}{\@extraCount}%
+  \addtocounter{dancecount}{\value{movecount}}%
+  \addtocounter{phrasecount}{\value{movecount}}%
+  \addtocounter{partcount}{\value{movecount}}%
   \addtocounter{phrasemovenum}{1}%
   \addtocounter{partmovenum}{1}%
   \addtocounter{halfpartmovenum}{1}%
   \addtocounter{dancemovenum}{1}%
-  \ifthenelse{\isundefined{\@showcountbefore}\OR\(#1=0\)}{%
+  \ifthenelse{\isundefined{\@showcountbefore}\OR\(\value{movecount}=0\)}{%
     \relax%
-  }{\cc@countleftbracket\ignorespaces#1\unskip\cc@countrightbracket~}%
-  \ignorespaces#2\unskip%
-  \ifthenelse{\isundefined{\@showcountafter}\OR\(#1=0\)}{%
+  }{\cc@countleftbracket\ignorespaces\themovecount\unskip\cc@countrightbracket~}%
+  \@balanceAnd#2\unskip%
+  \ifthenelse{\isundefined{\@showcountafter}\OR\(\value{movecount}=0\)}{%
     \relax%
-  }{~\cc@countleftbracket\ignorespaces#1\unskip\cc@countrightbracket}%
-  \ifthenelse{\NOT\(#1=0\)}{%
+  }{~\cc@countleftbracket\ignorespaces\themovecount\unskip\cc@countrightbracket}%
+  \ifthenelse{\NOT\(\value{movecount}=0\)}{%
     \ifthenelse{\value{partcount}=\intcalcDiv{\value{dancepartlength}}{2}}{%
       \setcounter{halfpartmovenum}{0}%
     }{}%
@@ -971,6 +875,8 @@ This work consists of this file contracard.dtx and the derived files
       }%
     \fi%
   }{}%
+  \renewcommand*{\@balanceAnd}{\ignorespaces}%
+  \renewcommand*{\@extraCount}{0}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1011,14 +917,16 @@ This work consists of this file contracard.dtx and the derived files
 % \changes{1.0.0}{2013/09/05}{Add move shortcut}
 % \begin{macro}{\balanceand}
 % \changes{1.0.0}{2013/09/05}{Add move shortcut}
+% \changes{2.0.0}{2019/02/28}{Now modifies count and text of next move}
 % \begin{macro}{\balanceand*}
 % \changes{1.0.0}{2013/09/05}{Add move shortcut}
+% \changes{2.0.0}{2019/02/28}{Now modifies count and text of next move}
 % The \code{\textbackslash balance} macro takes a single optional argument and
 % prints it after (or before if you use \code{\textbackslash balance*}) the word
-% `balance'. Balances always take up 4 beats unless you use the
-% \code{\textbackslash balanceand} version of the command which takes up 0
-% logical counts.  This way you can follow it up with another command
-% (eg.~\code{\textbackslash balanceand*[Partner]\textbackslash swing}).
+% `balance'. Balances always take up 4 beats.
+% If \code{\textbackslash balanceand} or \code{\textbackslash balanceand*} is
+% used, the balance won't be counted as a separate move.
+% Instead, its count (and the text) will be added to the next move used.
 %    \begin{macrocode}
 \newcommand*{\balance}{%
   \moveindex{Balance}%
@@ -1037,11 +945,13 @@ This work consists of this file contracard.dtx and the derived files
   \@ifstar\@balanceandStar\@balanceandNoStar%
 }
 \newcommand*{\@balanceandNoStar}[1][]{%
-  \move*[0]{Balance and \ignorespaces#1\unskip\ \ \ignorespaces}%
+  \renewcommand*{\@balanceAnd}{Balance and \ignorespaces#1\unskip\ \expandafter\ignorespaces\expandafter\MakeLowercase}%
+  \renewcommand*{\@extraCount}{4}%
 }
 \newcommand*{\@balanceandStar}[1][%
   \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-  \move*[0]{\ignorespaces#1\unskip\ balance and\ \ \ignorespaces}%
+  \renewcommand*{\@balanceAnd}{\ignorespaces#1\unskip\ balance and\ \expandafter\ignorespaces\expandafter\MakeLowercase}%
+  \renewcommand*{\@extraCount}{4}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1170,52 +1080,56 @@ This work consists of this file contracard.dtx and the derived files
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\gypsy}
-% \changes{1.0.0}{2013/09/06}{Add move shortcut}
-% \begin{macro}{\gypsy*}
-% \changes{1.0.0}{2013/09/06}{Add move shortcut}
-% \begin{macro}{\gypsyleft}
-% \changes{1.0.0}{2013/09/06}{Add move shortcut}
-% \begin{macro}{\gypsyleft*}
-% \changes{1.0.0}{2013/09/06}{Add move shortcut}
-% \begin{macro}{\gypsyright}
-% \changes{1.0.0}{2013/09/06}{Add move shortcut}
-% \begin{macro}{\gypsyright*}
-% \changes{1.0.0}{2013/09/06}{Add move shortcut}
-% Several different macros exist for creating Gypsy's; while you can create
-% right and left gypsy's with the normal \code{\textbackslash gypsy} macro, the
-% \code{\textbackslash gypsyleft} and \code{\textbackslash gypsyright} macros
-% also index the move under the given direction.
+% \begin{macro}{\walkaround}
+% \changes{2.0.0}{2019/02/17}{Rename move}
+% \begin{macro}{\walkaround*}
+% \changes{2.0.0}{2019/02/17}{Rename move}
+% \begin{macro}{\walkaroundleft}
+% \changes{2.0.0}{2019/02/17}{Rename move}
+% \begin{macro}{\walkaroundleft*}
+% \changes{2.0.0}{2019/02/17}{Rename move}
+% \begin{macro}{\walkaroundright}
+% \changes{2.0.0}{2019/02/17}{Rename move}
+% \begin{macro}{\walkaroundright*}
+% \changes{2.0.0}{2019/02/17}{Rename move}
+% Several different macros exist for creating walk arounds (sometimes right or
+% left shoulder round).
+% You can create a direction agnostic version with the \code{\textbackslash
+% walkaround} macro, while the \code{\textbackslash walkaroundleft} and
+% \code{\textbackslash walkaroundright} macros use the ``shoulder round" variant
+% and include the direction, they also index the move under the given direction.
+%
+% For information about the terminology, see appendix \ref{appendix:notation}.
 %    \begin{macrocode}
-\newcommand*{\gypsy}{%
-  \moveindex{Gypsy}%
-  \@ifstar\@gypsyStar\@gypsyNoStar%
+\newcommand*{\walkaround}{%
+  \moveindex{Walk around}%
+  \@ifstar\@walkAroundStar\@walkAroundNoStar%
 }
-\newcommand*{\gypsyright}{%
-  \moveindex{Gypsy}%
-  \moveindex{Gypsy Right}%
+\newcommand*{\walkaroundright}{%
+  \moveindex{Walk around}%
+  \moveindex{Right shoulder round}%
   \def\cc@thedir{right}%
-  \@ifstar\@gypsyDirStar\@gypsyDirNoStar%
+  \@ifstar\@walkAroundDirStar\@walkAroundDirNoStar%
 }
-\newcommand*{\gypsyleft}{%
-  \moveindex{Gypsy}%
-  \moveindex{Gypsy Left}%
+\newcommand*{\walkaroundleft}{%
+  \moveindex{Walk around}%
+  \moveindex{Left shoulder round}%
   \def\cc@thedir{left}%
-  \@ifstar\@gypsyDirStar\@gypsyDirNoStar%
+  \@ifstar\@walkAroundDirStar\@walkAroundDirNoStar%
 }
-\newcommand*{\@gypsyNoStar}[2][\unskip]{%
-  \move[#2]{Gypsy \ignorespaces#1\unskip}
+\newcommand*{\@walkAroundNoStar}[2][\unskip]{%
+  \move[#2]{Walk around \ignorespaces#1\unskip}%
 }
-\newcommand*{\@gypsyStar}[2][%
+\newcommand*{\@walkAroundStar}[2][%
   \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-  \move[#2]{\ignorespaces#1\unskip\ gypsy}
+  \move[#2]{\ignorespaces#1\unskip\ walk around}%
 }
-\newcommand*{\@gypsyDirNoStar}[2][\unskip]{%
-  \move[#2]{Gypsy \cc@thedir\ \ignorespaces#1\unskip}
+\newcommand*{\@walkAroundDirNoStar}[2][\unskip]{%
+  \move[#2]{\cc@thedir\ shoulder round \ignorespaces#1\unskip}%
 }
-\newcommand*{\@gypsyDirStar}[2][%
+\newcommand*{\@walkAroundDirStar}[2][%
   \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-  \move[#2]{\ignorespaces#1\unskip\ \cc@thedir\ gypsy}
+  \move[#2]{\ignorespaces#1\unskip\ \cc@thedir\ shoulder round}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1241,9 +1155,13 @@ This work consists of this file contracard.dtx and the derived files
 % \changes{1.0.0}{2013/09/12}{Add move shortcut}
 % \begin{macro}{\fullhey*}
 % \changes{1.0.0}{2013/09/12}{Add move shortcut}
+% \begin{macro}{\fullheyricochet}
+% \changes{2.0.0}{2019/03/03}{Add move shortcut}
+% \begin{macro}{\fullheyricochet*}
+% \changes{2.0.0}{2019/03/03}{Add move shortcut}
 % These macros produce various kinds of hey. Though `hey for four' is often used
 % to indicate `half a hey` we define `hey for four` and `full hey' to be the
-% same thing for the purpose of these shortcut macros.
+% same thing.
 %    \begin{macrocode}
 \newcommand*{\heyforfour}{%
   \moveindex{Hey}%
@@ -1298,6 +1216,20 @@ This work consists of this file contracard.dtx and the derived files
   \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
   \move[16]{\ignorespaces#1\unskip\ full hey}
 }
+\newcommand*{\fullheyricochet}{%
+  \moveindex{Hey}%
+  \moveindex{Hey for Four}%
+  \moveindex{Full Hey}%
+  \moveindex{Full Hey Ricochet}%
+  \@ifstar\@fullheyricochetStar\@fullheyricochetNoStar%
+}
+\newcommand*{\@fullheyricochetNoStar}[1][\unskip]{%
+  \move[16]{Full hey ricochet \ignorespaces#1\unskip}
+}
+\newcommand*{\@fullheyricochetStar}[1][%
+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
+  \move[16]{\ignorespaces#1\unskip\ full hey ricochet}
+}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -1307,12 +1239,15 @@ This work consists of this file contracard.dtx and the derived files
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
+% \end{macro}
 %
 % \begin{exampledance}
 % \begin{contra}{East Meets West}{Martha Wild}{Duple improper}
 %   \longlines
-%   \move{Gypsy star \textthreequarters}\moveindex{Gypsy Star}
-%   \move[16]{Gypsy and swing partner}\moveindex{Gypsy}\moveindex{Swing}
+%   \move{Walk around star \textthreequarters}\moveindex{Walk Around Star}
+%   \move[16]{Right shoulder round and swing partner}\moveindex{Walk around}%
+%     \moveindex{Right shoulder round}\moveindex{Swing}
 %   \halfpromenade
 %   \move{Hey}\moveindex{Hey}\moveindex{Hey for Four}\moveindex{Full Hey}
 %   \move{(continue hey)}
@@ -1457,41 +1392,52 @@ This work consists of this file contracard.dtx and the derived files
 % \end{macro}
 % \end{macro}
 %
+% \begin{macro}{\madrobin}
+% \changes{2.0.0}{2018/07/24}{New macro}
+% \begin{macro}{\madrobin*}
+% \changes{2.0.0}{2018/07/24}{New macro}
+% The Mad Robin (sometimes called ``Sashay 'round") always takes up 8 full
+% beats.
+% The star version of the command inserts the optional argument before the text
+% ``mad robin" instead of after it.
+%    \begin{macrocode}
+\newcommand*{\madrobin}{%
+  \moveindex{Mad Robin}%
+  \@ifstar\@madrobinStar\@madrobinNoStar%
+}
+\newcommand*{\@madrobinNoStar}[1][\unskip]{%
+  \move[8]{Mad robin \ignorespaces#1\unskip}%
+}
+\newcommand*{\@madrobinStar}[1][%
+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
+  \move[8]{\ignorespaces#1\unskip\ mad robin}%
+}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
 % \begin{macro}{\petronella}
 % \changes{1.0.0}{2013/09/08}{Add move shortcut}
 % \begin{macro}{\petronella*}
 % \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}{\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
-% turning in a diamond pattern. Petronella's themselves take 4 beats, but they
-% are normally prefixed by a balance. Since the \code{\textbackslash balanceand}
-% macro takes up zero logical beats, we also provide \code{\textbackslash
-% 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
+% turning in a diamond pattern.
+% A petronella-nella has the same timing as a normal 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}
+%   \balanceand\swing[neighbor]{12}
+%   \balanceand\petronella
+%   \balanceand\petronellanella
+%   \balanceand\swing[partner]{12}
 %   \notes{nella-nella variant of Erik Weberg's Wasatch Wiggle}
 % \end{contra}
 % \end{exampledance}
@@ -1507,17 +1453,6 @@ This work consists of this file contracard.dtx and the derived files
   \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
   \move[4]{\ignorespaces#1\unskip\ petronella}%
 }
-\newcommand*{\longpetronella}{%
-  \moveindex{Petronella}%
-  \@ifstar\@longpetronellaStar\@longpetronellaNoStar%
-}
-\newcommand*{\@longpetronellaNoStar}[1][\unskip]{%
-  \move[8]{Petronella \ignorespaces#1\unskip}%
-}
-\newcommand*{\@longpetronellaStar}[1][%
-  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-  \move[8]{\ignorespaces#1\unskip\ petronella}%
-}
 \newcommand*{\petronellanella}{%
   \moveindex{Petronella}%
   \moveindex{Petronella-nella}%
@@ -1530,27 +1465,11 @@ This work consists of this file contracard.dtx and the derived files
   \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}
@@ -1631,61 +1550,54 @@ This work consists of this file contracard.dtx and the derived files
 %
 % \begin{macro}{\rollaway}
 % \changes{1.0.0}{2013/09/10}{Add move shortcut}
+% \changes{2.0.0}{2018/07/25}{Breaking change to allow complex notation}
 % \begin{macro}{\rollaway*}
 % \changes{1.0.0}{2013/09/10}{Add move shortcut}
-% \begin{macro}{\rollawayhalfsashay}
-% \changes{1.0.0}{2013/09/10}{Add move shortcut}
-% \begin{macro}{\rollawayhalfsashay*}
-% \changes{1.0.0}{2013/09/10}{Add move shortcut}
-% \begin{macro}{\rawhs}
-% \changes{1.0.0}{2013/09/10}{Add move shortcut}
-% \begin{macro}{\rawhs*}
-% \changes{1.0.0}{2013/09/10}{Add move shortcut}
+% \changes{2.0.0}{2018/07/25}{Breaking change to allow complex notation}
+% \begin{macro}{\rollawaysashay}
+% \changes{2.0.0}{2018/07/25}{Renamed from ``\texttt{\textbackslash rollawayhalfsashay}''}
+% \begin{macro}{\rollawaysashay*}
+% \changes{2.0.0}{2018/07/25}{Renamed from ``\texttt{\textbackslash rollawayhalfsashay*}''}
 % ``Roll away" and ``roll away with a half sashay" may sound similar, but the
 % macros that produce them are a bit different. The \code{\textbackslash
 % rollaway} macro works exactly like most macros here: It takes a single
 % optional argument, and the star version rewords things a bit (it takes no
-% count argument since that's always 4 beats for this figure). The
-% \code{\textbackslash rollawaywithahalfsashay} macro (and its shorter alias:
-% \code{\textbackslash rawhs}) on the other hand, takes a single optional
-% argument unless you use the splat version in which case it takes a single
-% optional argument \emph{and} a required argument. This allows you to reword
-% things (just like the other commands) by leaving off the optional argument,
-% but also allows you to make more complicated roll aways such as
-% \code{\textbackslash rawhs*{[the gents]}\{Ladies\}} which would be typeset as:
-% ``Ladies roll the gents away with a half sashay".
+% count argument since that's always 4 beats for this figure).
+% The \code{\textbackslash rollawaysashay} macro on the other hand, takes a
+% single optional argument unless you use the splat version in which case it
+% takes a single optional argument \emph{and} a required argument.
+% This allows you to reword things (just like the other commands) by leaving off
+% the optional argument, but also allows you to make more complicated roll aways
+% such as \code{\textbackslash rollawaysashay*{[the gents]}\{Ladies\}} which
+% would be typeset as: ``Ladies roll the gents away with a half sashay".
 %    \begin{macrocode}
 \newcommand*{\rollaway}{%
   \moveindex{Roll away}%
   \@ifstar\@rollawayStar\@rollawayNoStar%
 }
-\newcommand*{\rawhs}{\rollawayhalfsashay}
-\newcommand*{\rollawayhalfsashay}{%
+\newcommand*{\rollawaysashay}{%
   \moveindex{Roll Away}%
   \moveindex{Roll Away with a Half Sashay}%
   \moveindex{Half Sashay}%
   \@ifstar\@rawhsStar\@rawhsNoStar%
 }
 \newcommand*{\@rollawayNoStar}[1][\unskip]{%
-  \move[4]{Roll away \ignorespaces#1\unskip}%
+	\move[4]{Roll \ignorespaces#1\unskip\ away}%
 }
-\newcommand*{\@rollawayStar}[1][%
-  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-  \move[4]{\ignorespaces#1\unskip\ roll away}%
+\newcommand*{\@rollawayStar}[3][\unskip]{%
+  \move[4]{\ignorespaces#2\unskip\ roll \ignorespaces#3\unskip\ away \ignorespaces#1\unskip}%
 }
 \newcommand*{\@rawhsNoStar}[1][\unskip]{%
   \move[4]{Roll \ignorespaces#1\unskip\ away with a half sashay}%
 }
-\newcommand*{\@rawhsStar}[2][\unskip]{%
-  \move[4]{\ignorespaces#2\unskip\ roll \ignorespaces#1\unskip\ away with a half sashay}%
+\newcommand*{\@rawhsStar}[3][\unskip]{%
+  \move[4]{\ignorespaces#2\unskip\ roll \ignorespaces#3\unskip\ away with a half sashay \ignorespaces#1\unskip}%
 }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 % \end{macro}
 % \end{macro}
-% \end{macro}
-% \end{macro}
 %
 % \begin{macro}{\starleft}
 % \changes{1.0.0}{2013/09/09}{Add move shortcut}
@@ -1727,12 +1639,13 @@ This work consists of this file contracard.dtx and the derived files
 % \changes{1.0.0}{2013/09/10}{Add move shortcut}
 % \begin{macro}{\sashay*}
 % \changes{1.0.0}{2013/09/10}{Add move shortcut}
-% The sashay command, like \code{\textbackslash rawhs} takes a different number
-% of arguments if you use the starred version. The normal version takes an
-% optional argument and the required count, while the starred version takes the
-% same optional argument, the required count, and another required argument. For
-% instance, \code{\textbackslash sashay*{[down and back]}\{8\}\{Ladies\}} would
-% create the move: ``Ladies sashay down and back''.
+% The sashay command, like \code{\textbackslash rollawaysashay} takes a
+% different number of arguments if you use the starred version.
+% The normal version takes an optional argument and the required count, while
+% the starred version takes the same optional argument, the required count, and
+% another required argument.
+% For instance, \code{\textbackslash sashay*{[down and back]}\{8\}\{Ladies\}}
+% would create the move: ``Ladies sashay down and back''.
 %    \begin{macrocode}
 \newcommand*{\sashay}{%
   \moveindex{Sashay}%
@@ -2137,10 +2050,10 @@ This work consists of this file contracard.dtx and the derived files
 % For example: \code{\textbackslash timesaround\{4\}\{6\}} produces:
 % ``\timesaround{4}{6}".
 %    \begin{macrocode}
+\newcounter{timesaround}
+\newcounter{quartertimesaround}
 \newcommand*{\timesaround}[2]{%
-  \newcounter{timesaround}%
   \setcounter{timesaround}{\intcalcDiv{\intcalcNum{#2}}{\intcalcNum{#1}}}%
-  \newcounter{quartertimesaround}%
   \setcounter{quartertimesaround}{%
     \intcalcMod{\intcalcNum{#2}}{\intcalcNum{#1}}%
   }%
@@ -2330,6 +2243,100 @@ This work consists of this file contracard.dtx and the derived files
 %</contracard-cls>
 %    \end{macrocode}
 %
+% \cleardoublepage
+% \begin{appendices}
+% \section{On Notation}
+% \label{appendix:notation}
+%
+% \begin{macro}{\gypsy}
+% \changes{1.0.0}{2013/09/06}{Add move shortcut}
+% \begin{macro}{\gypsy*}
+% \changes{1.0.0}{2013/09/06}{Add move shortcut}
+% \begin{macro}{\gypsyleft}
+% \changes{1.0.0}{2013/09/06}{Add move shortcut}
+% \begin{macro}{\gypsyleft*}
+% \changes{1.0.0}{2013/09/06}{Add move shortcut}
+% \begin{macro}{\gypsyright}
+% \changes{1.0.0}{2013/09/06}{Add move shortcut}
+% \begin{macro}{\gypsyright*}
+% \changes{1.0.0}{2013/09/06}{Add move shortcut}
+% In some circles (pun intended) the move ``walk around" or ``right/left
+% shoulder round" (also ``spiral", ``gyre", ``eyes", etc.) is called a ``gypsy".
+% This is considered an ethnic slur by some groups of the Romani people.
+% While the contra term is not likely to have been derived from the slur, I see
+% no reason not to use an alternative.
+% In version 2 of this document---and in calling cards generated with this
+% package---I have chosen to use the term ``walk around" when no direction needs
+% to be specified, or ``right/left shoulder round" when it does.
+% This avoids creating an uncomfortable situation for a dancer hearing a word
+% that to them may be associated with hostility, and a lifetime of persecution.
+% It seems to me that providing a safe and welcoming dance environment is worth
+% the trivial inconvenience of having to learn a new move name.
+%
+% The commands listed in the margin have been renamed, for their alternatives
+% see \texttt{\textbackslash walkaround} and its variants.
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \section{Deprecated macros}
+% \label{appendix:deprecated}
+%
+% \begin{macro}{\longpetronella}
+% \changes{1.0.0}{2013/09/08}{Add move shortcut}
+% \changes{2.0.0}{2018/07/25}{Remove move}
+% \begin{macro}{\longpetronella*}
+% \changes{1.0.0}{2013/09/08}{Add move shortcut}
+% \changes{2.0.0}{2018/07/25}{Remove move}
+% \begin{macro}{\longpetronellanella}
+% \changes{1.1.0}{2018/07/21}{Add nella-nella petronella variants}
+% \changes{2.0.0}{2019/02/24}{Remove move}
+% \begin{macro}{\rollawayhalfsashay}
+% \changes{1.0.0}{2013/09/10}{Add move shortcut}
+% \changes{2.0.0}{2018/07/25}{Renamed to ``\texttt{\textbackslash rollawaysashay}''}
+% \begin{macro}{\rollawayhalfsashay*}
+% \changes{1.0.0}{2013/09/10}{Add move shortcut}
+% \changes{2.0.0}{2018/07/25}{Renamed to ``\texttt{\textbackslash rollawaysashay*}''}
+% \begin{macro}{\rawhs}
+% \changes{1.0.0}{2013/09/10}{Add move shortcut}
+% \changes{2.0.0}{2018/07/25}{Remove move}
+% \begin{macro}{\rawhs*}
+% \changes{1.0.0}{2013/09/10}{Add move shortcut}
+% \changes{2.0.0}{2018/07/25}{Remove move}
+% These macros (as well as the ones mentioned in appendix
+% \ref{appendix:notation}) have been removed from the package, resulting in a
+% major version bump.
+% If you were using any of these macros in your documents, you may wish to
+% continue using an older version of this package or update your documents
+% before upgrading.
+% For information about what version each macro was removed in see the change
+% log.
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \section{Upgrading from 1.x}
+%
+% Aside from removing deprecated macros, (see appendix
+% \ref{appendix:deprecated}), you will also want to search your dances for the
+% text \code{\textbackslash balanceand} and decrement the following move by 4
+% counts.
+% Previously, the \code{\textbackslash balanceand} macros took up 0 logical
+% counts of music, but in version 2.0 it adds 4 counts to the next move.
+% Several new move shortcuts were also added in version 2.0 of this package
+% which may be able to replace uses of the generic \code{\textbackslash move}
+% macro in your dances.
+% For a full list, see the change history at the end of this document.
+%
+% \end{appendices}
+%
 % \bookmarksetup{startatroot}
 % \addtocontents{toc}{\bigskip}
 % \clearpage
diff --git a/Master/texmf-dist/source/latex/contracard/contracard.ins b/Master/texmf-dist/source/latex/contracard/contracard.ins
new file mode 100644
index 00000000000..4bda64f2b42
--- /dev/null
+++ b/Master/texmf-dist/source/latex/contracard/contracard.ins
@@ -0,0 +1,55 @@
+%%  contracard.ins -- part of contracard
+
+\input l3docstrip.tex\relax
+
+\keepsilent
+\usedir{tex/latex/contracard}
+\let\MetaPrefix\relax
+\preamble
+
+  Copyright 2013 Sam Whited
+
+  This file 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. The latest version of this license is in:
+
+  http://www.latex-project.org/lppl.txt
+
+  and version 1.3c or later is part of all distributions of
+  LaTeX version 2008/05/04 or later.
+
+  For the maintenance status and other document metadata,
+  see the end of this document.
+
+\endpreamble
+\postamble
+
+  ___________
+  This work has the LPPL maintenance status `maintained'.
+
+  Author:     Sam Whited
+  Maintainer: Sam Whited
+  Website:    https://blog.samwhited.com
+  Contact:    sam@samwhited.com
+
+\endpostamble
+\askforoverwritefalse
+
+\let\MetaPrefix\DoubleperCent
+\generate{\file{contracard.sty}{\from{contracard.dtx}{contracard-pkg}}}
+\generate{\file{contracard.cls}{\from{contracard.dtx}{contracard-cls}}}
+
+\endbatchfile
+\endinput
+
+%%
+%%   ___________
+%%   This work has the LPPL maintenance status `maintained'.
+%%
+%%   Author:     Sam Whited
+%%   Maintainer: Sam Whited
+%%   Website:    https://blog.samwhited.com
+%%   Contact:    sam@samwhited.com
+%%
+%% End of file `contracard.ins'.
diff --git a/Master/texmf-dist/tex/latex/contracard/contracard.cls b/Master/texmf-dist/tex/latex/contracard/contracard.cls
index eb2087471bf..a2096da619f 100644
--- a/Master/texmf-dist/tex/latex/contracard/contracard.cls
+++ b/Master/texmf-dist/tex/latex/contracard/contracard.cls
@@ -6,7 +6,7 @@
 %%
 %% contracard.dtx  (with options: `contracard-cls')
 %% 
-%%   Copyright 2012 Samuel Whited
+%%   Copyright 2013 Sam Whited
 %% 
 %%   This file may be distributed and/or modified under the
 %%   conditions of the LaTeX Project Public License, either
@@ -22,7 +22,7 @@
 %%   see the end of this document.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesClass{contracard}[2013/09/16 Class for creating dance calling cards]
+\ProvidesClass{contracard}[2019/03/03 Class for creating dance calling cards]
 \AtEndOfClass{\LoadClass{article}}
 \AtEndOfClass{\RequirePackage{geometry}}
 \AtEndOfClass{\RequirePackage[compact]{titlesec}}
@@ -77,15 +77,8 @@
 %% 
 %%   Author:     Sam Whited
 %%   Maintainer: Sam Whited
-%%   Website:    https://samwhited.com
+%%   Website:    https://blog.samwhited.com
 %%   Contact:    sam@samwhited.com
 %% 
-%%   This work consists of this file contracard.dtx
-%%             and the derived files contracard.sty
-%%                               and contracard.cls
-%%                               and contracard.pdf
-%%                               and README.md
-%%                               and README
-%% 
 %%
 %% End of file `contracard.cls'.
diff --git a/Master/texmf-dist/tex/latex/contracard/contracard.sty b/Master/texmf-dist/tex/latex/contracard/contracard.sty
index aebcb58e3bc..046453a0d1a 100644
--- a/Master/texmf-dist/tex/latex/contracard/contracard.sty
+++ b/Master/texmf-dist/tex/latex/contracard/contracard.sty
@@ -6,7 +6,7 @@
 %%
 %% contracard.dtx  (with options: `contracard-pkg')
 %% 
-%%   Copyright 2012 Samuel Whited
+%%   Copyright 2013 Sam Whited
 %% 
 %%   This file may be distributed and/or modified under the
 %%   conditions of the LaTeX Project Public License, either
@@ -22,7 +22,7 @@
 %%   see the end of this document.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{contracard}[2013/09/16 Package for typesetting called dances]
+\ProvidesPackage{contracard}[2019/03/03 Package for typesetting called dances]
 \RequirePackage{calc,intcalc}
 \RequirePackage{ifthen}
 \RequirePackage{tocloft}
@@ -165,6 +165,9 @@
   \def\cc@moveStar{}\@moveNoStar[#1]{#2}\let\cc@moveStar\undefined%
 }
 \newlength{\cc@partsepwidth}%
+\newcommand*{\@balanceAnd}{\ignorespaces}%
+\newcommand*{\@extraCount}{0}%
+\newcounter{movecount}%
 \newcommand*{\@moveNoStar}[2][8]{%
   \setlength{\parindent}{0pt}%
   \setlength{\cc@partsepwidth}{\widthof{\Alph{dancephrase}\arabic{dancepart}%
@@ -183,21 +186,24 @@
   \ifthenelse{\value{partmovenum}=0}{%
     \Alph{dancephrase}\arabic{dancepart}\partdelimiter\ %
   }{}%
-  \addtocounter{dancecount}{#1}%
-  \addtocounter{phrasecount}{#1}%
-  \addtocounter{partcount}{#1}%
+  \setcounter{movecount}{0}%
+  \addtocounter{movecount}{#1}%
+  \addtocounter{movecount}{\@extraCount}%
+  \addtocounter{dancecount}{\value{movecount}}%
+  \addtocounter{phrasecount}{\value{movecount}}%
+  \addtocounter{partcount}{\value{movecount}}%
   \addtocounter{phrasemovenum}{1}%
   \addtocounter{partmovenum}{1}%
   \addtocounter{halfpartmovenum}{1}%
   \addtocounter{dancemovenum}{1}%
-  \ifthenelse{\isundefined{\@showcountbefore}\OR\(#1=0\)}{%
+  \ifthenelse{\isundefined{\@showcountbefore}\OR\(\value{movecount}=0\)}{%
     \relax%
-  }{\cc@countleftbracket\ignorespaces#1\unskip\cc@countrightbracket~}%
-  \ignorespaces#2\unskip%
-  \ifthenelse{\isundefined{\@showcountafter}\OR\(#1=0\)}{%
+  }{\cc@countleftbracket\ignorespaces\themovecount\unskip\cc@countrightbracket~}%
+  \@balanceAnd#2\unskip%
+  \ifthenelse{\isundefined{\@showcountafter}\OR\(\value{movecount}=0\)}{%
     \relax%
-  }{~\cc@countleftbracket\ignorespaces#1\unskip\cc@countrightbracket}%
-  \ifthenelse{\NOT\(#1=0\)}{%
+  }{~\cc@countleftbracket\ignorespaces\themovecount\unskip\cc@countrightbracket}%
+  \ifthenelse{\NOT\(\value{movecount}=0\)}{%
     \ifthenelse{\value{partcount}=\intcalcDiv{\value{dancepartlength}}{2}}{%
       \setcounter{halfpartmovenum}{0}%
     }{}%
@@ -211,6 +217,8 @@
       }%
     \fi%
   }{}%
+  \renewcommand*{\@balanceAnd}{\ignorespaces}%
+  \renewcommand*{\@extraCount}{0}%
 }
 \newcommand*{\allemande}{%
   \moveindex{Allemande}%
@@ -240,11 +248,13 @@
   \@ifstar\@balanceandStar\@balanceandNoStar%
 }
 \newcommand*{\@balanceandNoStar}[1][]{%
-  \move*[0]{Balance and \ignorespaces#1\unskip\ \ \ignorespaces}%
+  \renewcommand*{\@balanceAnd}{Balance and \ignorespaces#1\unskip\ \expandafter\ignorespaces\expandafter\MakeLowercase}%
+  \renewcommand*{\@extraCount}{4}%
 }
 \newcommand*{\@balanceandStar}[1][%
   \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-  \move*[0]{\ignorespaces#1\unskip\ balance and\ \ \ignorespaces}%
+  \renewcommand*{\@balanceAnd}{\ignorespaces#1\unskip\ balance and\ \expandafter\ignorespaces\expandafter\MakeLowercase}%
+  \renewcommand*{\@extraCount}{4}%
 }
 \newcommand*{\butterflywhirl}{%
   \moveindex{Butterfly Whirl}%
@@ -307,35 +317,35 @@
   \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
   \move[#2]{\ignorespaces#1\unskip\ see saw}%
 }
-\newcommand*{\gypsy}{%
-  \moveindex{Gypsy}%
-  \@ifstar\@gypsyStar\@gypsyNoStar%
+\newcommand*{\walkaround}{%
+  \moveindex{Walk around}%
+  \@ifstar\@walkAroundStar\@walkAroundNoStar%
 }
-\newcommand*{\gypsyright}{%
-  \moveindex{Gypsy}%
-  \moveindex{Gypsy Right}%
+\newcommand*{\walkaroundright}{%
+  \moveindex{Walk around}%
+  \moveindex{Right shoulder round}%
   \def\cc@thedir{right}%
-  \@ifstar\@gypsyDirStar\@gypsyDirNoStar%
+  \@ifstar\@walkAroundDirStar\@walkAroundDirNoStar%
 }
-\newcommand*{\gypsyleft}{%
-  \moveindex{Gypsy}%
-  \moveindex{Gypsy Left}%
+\newcommand*{\walkaroundleft}{%
+  \moveindex{Walk around}%
+  \moveindex{Left shoulder round}%
   \def\cc@thedir{left}%
-  \@ifstar\@gypsyDirStar\@gypsyDirNoStar%
+  \@ifstar\@walkAroundDirStar\@walkAroundDirNoStar%
 }
-\newcommand*{\@gypsyNoStar}[2][\unskip]{%
-  \move[#2]{Gypsy \ignorespaces#1\unskip}
+\newcommand*{\@walkAroundNoStar}[2][\unskip]{%
+  \move[#2]{Walk around \ignorespaces#1\unskip}%
 }
-\newcommand*{\@gypsyStar}[2][%
+\newcommand*{\@walkAroundStar}[2][%
   \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-  \move[#2]{\ignorespaces#1\unskip\ gypsy}
+  \move[#2]{\ignorespaces#1\unskip\ walk around}%
 }
-\newcommand*{\@gypsyDirNoStar}[2][\unskip]{%
-  \move[#2]{Gypsy \cc@thedir\ \ignorespaces#1\unskip}
+\newcommand*{\@walkAroundDirNoStar}[2][\unskip]{%
+  \move[#2]{\cc@thedir\ shoulder round \ignorespaces#1\unskip}%
 }
-\newcommand*{\@gypsyDirStar}[2][%
+\newcommand*{\@walkAroundDirStar}[2][%
   \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-  \move[#2]{\ignorespaces#1\unskip\ \cc@thedir\ gypsy}
+  \move[#2]{\ignorespaces#1\unskip\ \cc@thedir\ shoulder round}%
 }
 \newcommand*{\heyforfour}{%
   \moveindex{Hey}%
@@ -390,6 +400,20 @@
   \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
   \move[16]{\ignorespaces#1\unskip\ full hey}
 }
+\newcommand*{\fullheyricochet}{%
+  \moveindex{Hey}%
+  \moveindex{Hey for Four}%
+  \moveindex{Full Hey}%
+  \moveindex{Full Hey Ricochet}%
+  \@ifstar\@fullheyricochetStar\@fullheyricochetNoStar%
+}
+\newcommand*{\@fullheyricochetNoStar}[1][\unskip]{%
+  \move[16]{Full hey ricochet \ignorespaces#1\unskip}
+}
+\newcommand*{\@fullheyricochetStar}[1][%
+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
+  \move[16]{\ignorespaces#1\unskip\ full hey ricochet}
+}
 \newcommand*{\ladieschain}{%
   \moveindex{Ladies Chain}%
   \def\cc@who{ladies}%
@@ -462,6 +486,17 @@
 \newcommand*{\@longlinesStar}{%
   \lines*[Long]%
 }
+\newcommand*{\madrobin}{%
+  \moveindex{Mad Robin}%
+  \@ifstar\@madrobinStar\@madrobinNoStar%
+}
+\newcommand*{\@madrobinNoStar}[1][\unskip]{%
+  \move[8]{Mad robin \ignorespaces#1\unskip}%
+}
+\newcommand*{\@madrobinStar}[1][%
+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
+  \move[8]{\ignorespaces#1\unskip\ mad robin}%
+}
 \newcommand*{\petronella}{%
   \moveindex{Petronella}%
   \@ifstar\@petronellaStar\@petronellaNoStar%
@@ -473,17 +508,6 @@
   \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
   \move[4]{\ignorespaces#1\unskip\ petronella}%
 }
-\newcommand*{\longpetronella}{%
-  \moveindex{Petronella}%
-  \@ifstar\@longpetronellaStar\@longpetronellaNoStar%
-}
-\newcommand*{\@longpetronellaNoStar}[1][\unskip]{%
-  \move[8]{Petronella \ignorespaces#1\unskip}%
-}
-\newcommand*{\@longpetronellaStar}[1][%
-  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-  \move[8]{\ignorespaces#1\unskip\ petronella}%
-}
 \newcommand*{\petronellanella}{%
   \moveindex{Petronella}%
   \moveindex{Petronella-nella}%
@@ -496,18 +520,6 @@
   \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%
@@ -552,25 +564,23 @@
   \moveindex{Roll away}%
   \@ifstar\@rollawayStar\@rollawayNoStar%
 }
-\newcommand*{\rawhs}{\rollawayhalfsashay}
-\newcommand*{\rollawayhalfsashay}{%
+\newcommand*{\rollawaysashay}{%
   \moveindex{Roll Away}%
   \moveindex{Roll Away with a Half Sashay}%
   \moveindex{Half Sashay}%
   \@ifstar\@rawhsStar\@rawhsNoStar%
 }
 \newcommand*{\@rollawayNoStar}[1][\unskip]{%
-  \move[4]{Roll away \ignorespaces#1\unskip}%
+\move[4]{Roll \ignorespaces#1\unskip\ away}%
 }
-\newcommand*{\@rollawayStar}[1][%
-  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-  \move[4]{\ignorespaces#1\unskip\ roll away}%
+\newcommand*{\@rollawayStar}[3][\unskip]{%
+  \move[4]{\ignorespaces#2\unskip\ roll \ignorespaces#3\unskip\ away \ignorespaces#1\unskip}%
 }
 \newcommand*{\@rawhsNoStar}[1][\unskip]{%
   \move[4]{Roll \ignorespaces#1\unskip\ away with a half sashay}%
 }
-\newcommand*{\@rawhsStar}[2][\unskip]{%
-  \move[4]{\ignorespaces#2\unskip\ roll \ignorespaces#1\unskip\ away with a half sashay}%
+\newcommand*{\@rawhsStar}[3][\unskip]{%
+  \move[4]{\ignorespaces#2\unskip\ roll \ignorespaces#3\unskip\ away with a half sashay \ignorespaces#1\unskip}%
 }
 \newcommand*{\starleft}{%
   \moveindex{Star}%
@@ -735,10 +745,10 @@
   }{}%
 }
 
+\newcounter{timesaround}
+\newcounter{quartertimesaround}
 \newcommand*{\timesaround}[2]{%
-  \newcounter{timesaround}%
   \setcounter{timesaround}{\intcalcDiv{\intcalcNum{#2}}{\intcalcNum{#1}}}%
-  \newcounter{quartertimesaround}%
   \setcounter{quartertimesaround}{%
     \intcalcMod{\intcalcNum{#2}}{\intcalcNum{#1}}%
   }%
@@ -788,15 +798,8 @@
 %% 
 %%   Author:     Sam Whited
 %%   Maintainer: Sam Whited
-%%   Website:    https://samwhited.com
+%%   Website:    https://blog.samwhited.com
 %%   Contact:    sam@samwhited.com
 %% 
-%%   This work consists of this file contracard.dtx
-%%             and the derived files contracard.sty
-%%                               and contracard.cls
-%%                               and contracard.pdf
-%%                               and README.md
-%%                               and README
-%% 
 %%
 %% End of file `contracard.sty'.