[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[texlive-nonbin] 01/03: texlive-extra patch cleanup



This is an automated email from the git hooks/post-receive script.

preining pushed a commit to branch master
in repository texlive-nonbin.

commit 1c0ba1dea29a37eecf1eb27a27b1042757016f70
Author: Norbert Preining <preining@debian.org>
Date:   Mon Oct 30 16:09:59 2017 +0900

    texlive-extra patch cleanup
---
 texlive-extra/debian/patches/fix-perl526-noise     |  205 ---
 texlive-extra/debian/patches/latex2man-mktemp      |   12 +-
 texlive-extra/debian/patches/series                |    2 -
 .../debian/patches/upstream-fix-contracard         | 1587 --------------------
 4 files changed, 6 insertions(+), 1800 deletions(-)

diff --git a/texlive-extra/debian/patches/fix-perl526-noise b/texlive-extra/debian/patches/fix-perl526-noise
deleted file mode 100644
index 961f544..0000000
--- a/texlive-extra/debian/patches/fix-perl526-noise
+++ /dev/null
@@ -1,205 +0,0 @@
-Fix various Perl 5.26 noise about unescaped braces
-- latex2man (patch thanks to Gregor Herrmann)
----
- texmf-dist/scripts/latex2man/latex2man |   56 ++++++++++++++++-----------------
- 1 file changed, 28 insertions(+), 28 deletions(-)
-
---- texlive-extra-2017.20170801.orig/texmf-dist/scripts/latex2man/latex2man
-+++ texlive-extra-2017.20170801/texmf-dist/scripts/latex2man/latex2man
-@@ -1324,7 +1324,7 @@
- 					    last SWITCH;
- 					};
-        # LaTeX macros with two arguments
--       /\\([a-zA-Z]+){([^}]*)}{([^}]*)}/
-+       /\\([a-zA-Z]+)\{([^}]*)}\{([^}]*)}/
-  				     && do {$s=$`;$m=$1;$a1=$2;$a2=$3;$r=$';	#'
-                                             check_Macro2 $m;
-                                             interpret_word $s;
-@@ -1338,7 +1338,7 @@
- 					    last SWITCH;
- 					};
-        # Special Handling of Email and URL LaTeX macros with one argument
--       /\\(URL|Email){([^}]*)}/ && ($opt_H)
-+       /\\(URL|Email)\{([^}]*)}/ && ($opt_H)
-  				     && do {$s=$`;$m=$1;$a1=$2;$r=$';	#'
- 					    interpret_word $s;
- 					    PrintM $Macro2a->{$m};
-@@ -1351,7 +1351,7 @@
- 					    last SWITCH;
- 					};
-        # LaTeX macros with one argument
--       /\\([a-zA-Z]+){([^}]*)}/      && do {$s=$`;$m=$1;$a1=$2;$r=$';	#'
-+       /\\([a-zA-Z]+)\{([^}]*)}/      && do {$s=$`;$m=$1;$a1=$2;$r=$';	#'
- 					    check_Macro1 $m;
- 					    interpret_word $s;
- 					    PrintM $Macro1a->{$m};
-@@ -1518,7 +1518,7 @@
- 		    $join = $cnt % 2 != 0;
- 		    $kind = 3;
- 		} else {
--		    my @x = $_ =~ /[^\\]{/g;
-+		    my @x = $_ =~ /[^\\]\{/g;
- 		    my @y = $_ =~ /[^\\]}/g;
- 		    $join = $#x != $#y;
- 		    $kind = 2;
-@@ -1679,7 +1679,7 @@
- 	    my $line = $_; chop $line;
- 	    print "--- \`$line'\n";
- 	}
--	if (/^\s*\\input{([^}]*)}\s*/) {
-+	if (/^\s*\\input\{([^}]*)}\s*/) {
- 	    # handle \input{fn}
- 	    my $fn = $1;
- 	    printf DEST "%%%%%%%%%%%%%%%%%% start of \\input{%s}\n", $fn;
-@@ -1731,7 +1731,7 @@
- 	    my $line = $_; chop $line;
- 	    print "--- \`$line'\n";
- 	}
--	if (/^\s*\\input{([^}]*)}\s*/) {
-+	if (/^\s*\\input\{([^}]*)}\s*/) {
- 	    # handle \input{fn}
- 	    my $fn = $1;
- 	    if ($opt_M) {
-@@ -1760,7 +1760,7 @@
- 	next if ($skip[-1] == 1);
- 
- 	if ($inside_verb) {
--	    if (/^\s*\\end{verbatim}/) {
-+	    if (/^\s*\\end\{verbatim}/) {
- 		if ($started == 1) {
- 		    &{$Prefix . "VerbatimEnd"};
- 		    $inside_verb = 0;
-@@ -1789,19 +1789,19 @@
- 		$rcs_date,$rcs_time,$rcs_owner,$rcs_status,$rcs_locker) = split(/\s/,$1);
- 	    $date = date2str ($rcs_date);
- 	    $Macro->{'today'}  = $date;
--	} elsif (/^\s*\\setDate{\\rcsInfoLongDate}/) {
-+	} elsif (/^\s*\\setDate\{\\rcsInfoLongDate}/) {
- 	    $Macro->{'Date'} = $date;
--	} elsif (/^\s*\\setDate{\\today}/) {
-+	} elsif (/^\s*\\setDate\{\\today}/) {
- 	    $Macro->{'Date'} = $date;
--	} elsif (/^\s*\\setDate{([^}]*)}/) {
-+	} elsif (/^\s*\\setDate\{([^}]*)}/) {
- 	    $date = $1;
- 	    $date =~ s/~/$Macro->{'~'}/g;
- 	    $Macro->{'Date'} = $date;
--	} elsif (/^\s*\\setVersion{([^}]*)}/) {
-+	} elsif (/^\s*\\setVersion\{([^}]*)}/) {
- 	    $version            = $1;
- 	    $versin             =~ s/~/$Macro->{'~'}/g;
- 	    $Macro->{'Version'} = $version;
--	} elsif (/^\s*\\begin{Name}{([^}]*)}{([^}]*)}{([^}]*)}{([^}]*)}{([^}]*)}/) {
-+	} elsif (/^\s*\\begin\{Name}\{([^}]*)}\{([^}]*)}\{([^}]*)}\{([^}]*)}\{([^}]*)}/) {
- 	    $section = "Name";
- 	    $chapter = $1;
- 	    $name    = $2;
-@@ -1815,9 +1815,9 @@
- 	    $section_cnt = 0;
- 	    &{$Prefix . "Start"}     ($name, $chapter, $author, $tool, $title);
- 	    &{$Prefix . "NameStart"} ($name, $chapter, $author, $tool, $title);
--	} elsif (/^\s*\\end{Name}/) {
-+	} elsif (/^\s*\\end\{Name}/) {
- 	    &{$Prefix . "NameEnd"} ($name, $chapter, $author, $tool);
--	} elsif (/^\s*\\begin{Table}(\[([^]]*)\])?{([^}]*)}/) {
-+	} elsif (/^\s*\\begin\{Table}(\[([^]]*)\])?\{([^}]*)}/) {
- 	    # \begin{Table}[width]{columns}
- 	    if ($started == 1) {
- 		$columns      = $3;
-@@ -1826,74 +1826,74 @@
- 		$first_column = 1;
- 		&{$Prefix . "TableStart"} ($columns, $2);
- 	    }
--	} elsif (/^\s*\\end{Table}/) {
-+	} elsif (/^\s*\\end\{Table}/) {
- 	    if ($started == 1) {
- 		$inside_table = 0;
- 		$first_column = 0;
- 		&{$Prefix . "TableEnd"} ($columns);
- 	    }
--	} elsif (/^\s*\\begin{Description}(\[[^]]*\])?/) {
-+	} elsif (/^\s*\\begin\{Description}(\[[^]]*\])?/) {
- 	    if ($started == 1) {
- 		$list_nest++;
- 		$cur_list[$list_nest] = 'descr';
- 		$item_nr[$list_nest]  = 0;
- 		&{$Prefix . "DescriptionStart"};
- 	    }
--	} elsif (/^\s*\\end{Description}/) {
-+	} elsif (/^\s*\\end\{Description}/) {
- 	    if ($started == 1) {
- 		&{$Prefix . "DescriptionEnd"};
- 		$list_nest--;
- 	    }
--	} elsif (/^\s*\\begin{description}/) {
-+	} elsif (/^\s*\\begin\{description}/) {
- 	    if ($started == 1) {
- 		$list_nest++;
- 		$cur_list[$list_nest] = 'descr';
- 		$item_nr[$list_nest]  = 0;
- 		&{$Prefix . "DescriptionStart"};
- 	    }
--	} elsif (/^\s*\\end{description}/) {
-+	} elsif (/^\s*\\end\{description}/) {
- 	    if ($started == 1) {
- 		&{$Prefix . "DescriptionEnd"};
- 		$list_nest--;
- 	    }
--	} elsif (/^\s*\\begin{center}/) {
-+	} elsif (/^\s*\\begin\{center}/) {
- 	    if ($started == 1) {
- 		&{$Prefix . "CenterStart"};
- 	    }
--	} elsif (/^\s*\\end{center}/) {
-+	} elsif (/^\s*\\end\{center}/) {
- 	    if ($started == 1) {
- 		&{$Prefix . "CenterEnd"};
- 	    }
--	} elsif (/^\s*\\begin{enumerate}/) {
-+	} elsif (/^\s*\\begin\{enumerate}/) {
- 	    if ($started == 1) {
- 		$list_nest++;
- 		$cur_list[$list_nest] = 'enum';
- 		$item_nr[$list_nest]  = 0;
- 		&{$Prefix . "EnumStart"} ;
- 	    }
--	} elsif (/^\s*\\end{enumerate}/) {
-+	} elsif (/^\s*\\end\{enumerate}/) {
- 	    if ($started == 1) {
- 		&{$Prefix . "EnumEnd"} ;
- 		$list_nest--;
- 	    }
--	} elsif (/^\s*\\begin{itemize}/) {
-+	} elsif (/^\s*\\begin\{itemize}/) {
- 	    if ($started == 1) {
- 		$list_nest++;
- 		$cur_list[$list_nest] = 'item';
- 		$item_nr[$list_nest]  = 0;
- 		&{$Prefix . "ItemStart"} ;
- 	    }
--	} elsif (/^\s*\\end{itemize}/) {
-+	} elsif (/^\s*\\end\{itemize}/) {
- 	    if ($started == 1) {
- 		&{$Prefix . "ItemEnd"} ;
- 		$list_nest--;
- 	    }
--	} elsif (/^\s*\\begin{verbatim}/) {
-+	} elsif (/^\s*\\begin\{verbatim}/) {
- 	    if ($started == 1) {
- 		&{$Prefix . "VerbatimStart"};
- 		$inside_verb = 1;
- 	    }
--	} elsif (/^\s*\\(subsubsection|subsection|section){([^}]*)}/) {
-+	} elsif (/^\s*\\(subsubsection|subsection|section)\{([^}]*)}/) {
- 	    $kind    = $1;
- 	    $section = $2;
- 	    $section_cnt ++;
-@@ -1904,7 +1904,7 @@
- 	    }
- 	} elsif (/^\s*\\LatexManEnd/) {
- 	    last;
--	} elsif (/^\s*((\\begin{Name|Table|Description})|(\\(sub)?section))/) {
-+	} elsif (/^\s*((\\begin\{Name|Table|Description})|(\\(sub)?section))/) {
- 	    die "$CMD: in line $.\n           " .
- 		"Arguments of $1 are not contained in a single " .
- 		"line.\n           " .
diff --git a/texlive-extra/debian/patches/latex2man-mktemp b/texlive-extra/debian/patches/latex2man-mktemp
index 554b30f..c011cbd 100644
--- a/texlive-extra/debian/patches/latex2man-mktemp
+++ b/texlive-extra/debian/patches/latex2man-mktemp
@@ -5,18 +5,18 @@ Debian bug #668779
  texmf-dist/scripts/latex2man/latex2man |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- texlive-extra-2017.20170525.orig/texmf-dist/scripts/latex2man/latex2man
-+++ texlive-extra-2017.20170525/texmf-dist/scripts/latex2man/latex2man
-@@ -29,8 +29,6 @@
- $VERSION = "1.25";
- $DATE    = date2str ('$Date: 2017/04/13 14:25:56 $' =~ m|(\d+/\d+/\d+)|);
+--- texlive-extra-2017.20171030.orig/texmf-dist/scripts/latex2man/latex2man
++++ texlive-extra-2017.20171030/texmf-dist/scripts/latex2man/latex2man
+@@ -30,8 +30,6 @@
+ $VERSION = "1.26";
+ $DATE    = date2str ('$Date: 2017/10/06 17:19:31 $' =~ m|(\d+/\d+/\d+)|);
  
 -$tmp = "/tmp/$CMD.$$";
 -
  ##################################################################
  # check option and arguments
  ##################################################################
-@@ -2012,6 +2010,8 @@
+@@ -2016,6 +2014,8 @@
  
  open (my $SRC, "<$SrcFile") || die "$CMD: Can't open file \`$SrcFile' for reading.\n";
  if ($opt_H || $opt_T) {
diff --git a/texlive-extra/debian/patches/series b/texlive-extra/debian/patches/series
index 3c2d2c7..66c1558 100644
--- a/texlive-extra/debian/patches/series
+++ b/texlive-extra/debian/patches/series
@@ -6,6 +6,4 @@ fix-invoice.sty
 fix-perl522-noise
 sympytex-path
 fix-gbrief-multiple
-upstream-fix-contracard
-fix-perl526-noise
 mhelvens-pkg-update
diff --git a/texlive-extra/debian/patches/upstream-fix-contracard b/texlive-extra/debian/patches/upstream-fix-contracard
deleted file mode 100644
index a8a1cd2..0000000
--- a/texlive-extra/debian/patches/upstream-fix-contracard
+++ /dev/null
@@ -1,1587 +0,0 @@
----
- texmf-dist/doc/latex/contracard/contracard.sty |  779 -------------------------
- texmf-dist/tex/latex/contracard/contracard.sty |  779 +++++++++++++++++++++++++
- tlpkg/texlive.tlpdb                            |    2 
- 3 files changed, 780 insertions(+), 780 deletions(-)
-
---- texlive-extra-2017.20170722.orig/texmf-dist/doc/latex/contracard/contracard.sty
-+++ /dev/null
-@@ -1,779 +0,0 @@
--%%
--%% This is file `contracard.sty',
--%% generated with the docstrip utility.
--%%
--%% The original source files were:
--%%
--%% contracard.dtx  (with options: `contracard-pkg')
--%% 
--%%   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.
--%% 
--\NeedsTeXFormat{LaTeX2e}[1995/12/01]
--\ProvidesPackage{contracard}[2013/09/16 Package for typesetting called dances]
--\RequirePackage{calc,intcalc}
--\RequirePackage{ifthen}
--\RequirePackage{tocloft}
--\RequirePackage{textcomp}
--\DeclareOption{showcountafter}{\showcountafter}
--\DeclareOption{showcountbefore}{\showcountbefore}
--\DeclareOption{enableidx}{\AtEndOfPackage{\enableidx}}
--\newcommand*{\defaultcontraenv}{flushleft}
--\newcommand*{\dancetitleenv}{flushleft}
--\newcommand*{\dancetitleformat}{\section*}
--\newcommand*{\danceauthorformat}{\subsection*}
--\newcommand*{\danceformformat}{\hspace{\fill}}
--\newcommand*{\movedelimiter}{,}
--\newcommand*{\partdelimiter}{.}
--\newcommand*{\midpartdelimiter}{;}
--\newlength{\phrasevspace}
--\setlength{\phrasevspace}{1em}
--\newcommand*{\phraseseparator}{\vspace{\phrasevspace}}
--\newcommand*{\showcountbefore}{\def\@showcountbefore{}}
--\newcommand*{\showcountafter}{\def\@showcountafter{}}
--\newcommand*{\hidecountbefore}{\let\@showcountbefore\undefined}
--\newcommand*{\hidecountafter}{\let\@showcountafter\undefined}
--
--\def\cc@countleftbracket{(}
--\def\cc@countrightbracket{)}
--\newcommand*{\countleftbracket}[1]{\def\cc@countleftbracket{#1}}
--\newcommand*{\countrightbracket}[1]{\def\cc@countrightbracket{#1}}
--\def\cc@defaultnotesenv{flushleft}
--\newcommand*{\setdefaultnotesenv}[1]{\def\cc@defaultnotesenv{#1}}
--\newlength{\prenotevspace}
--\setlength{\prenotevspace}{\fill}
--\newcounter{dancecount}
--\newcounter{partcount}
--\newcounter{phrasecount}
--\newcounter{dancepart}
--\newcounter{dancephrase}
--\newcounter{dancepartlength}
--\newcounter{dancephraselength}
--\newcommand*{\resetdancepartlength}{\setcounter{dancepartlength}{16}}
--\newcommand*{\resetdancephraselength}{\setcounter{dancephraselength}{32}}
--\resetdancepartlength
--\resetdancephraselength
--\newcommand*{\resetdancephrase}{%
--  \ifthenelse{\value{partcount}=16}{\newline}{}%
--  \@ifstar{\@resetdancephraseStar}{\@resetdancephraseNoStar}%
--}
--\newcommand*{\@resetdancephraseStar}{%
--  \setcounter{dancephrase}{1}%
--  \setcounter{phrasecount}{0}%
--  \setcounter{phrasemovenum}{0}%
--  \resetdancepart*%
--}
--\newcommand*{\@resetdancephraseNoStar}{%
--  \ifthenelse{\value{dancephrase}=1}{}{%
--    \setcounter{dancephrase}{1}%
--    \setcounter{phrasecount}{0}%
--    \setcounter{phrasemovenum}{0}%
--    \resetdancepart%
--  }%
--}
--\newcommand*{\resetdancepart}{%
--  \@ifstar{\@resetdancepartStar}{\@resetdancepartNoStar}%
--}
--\newcommand*{\@resetdancepartStar}{%
--  \setcounter{dancepart}{1}%
--  \setcounter{partcount}{0}%
--  \setcounter{partmovenum}{0}%
--  \setcounter{halfpartmovenum}{0}%
--}
--\newcommand*{\@resetdancepartNoStar}{%
--  \ifthenelse{\value{dancepart}=1}{}{%
--    \setcounter{dancepart}{1}%
--    \setcounter{partcount}{0}%
--    \setcounter{partmovenum}{0}%
--    \setcounter{halfpartmovenum}{0}%
--  }%
--}
--\newcommand*{\newdancephrase}{%
--  \ifthenelse{\NOT\value{phrasecount}=0}{\par\phraseseparator\par}{}%
--  \addtocounter{dancephrase}{1}%
--  \setcounter{phrasecount}{0}%
--  \setcounter{phrasemovenum}{0}%
--  \resetdancepart*%
--}
--\newcommand*{\newdancepart}{%
--  \par\nopagebreak%
--  \addtocounter{dancepart}{1}%
--  \setcounter{partcount}{0}%
--  \setcounter{partmovenum}{0}%
--  \setcounter{halfpartmovenum}{0}%
--}
--
--\newcounter{phrasemovenum}
--\newcounter{partmovenum}
--\newcounter{halfpartmovenum}
--\newcounter{dancemovenum}
--\setcounter{phrasemovenum}{0}
--\setcounter{partmovenum}{0}
--\setcounter{halfpartmovenum}{0}
--\setcounter{dancemovenum}{0}
--\newenvironment{contra}[4][\defaultcontraenv]{%
--  \global\def\dancetitle{\ignorespaces#2\unskip}
--  \global\def\danceauthor{\ignorespaces#3\unskip}
--  \global\def\danceform{\ignorespaces#4\unskip}
--  \setlength{\parskip}{0.3em plus 0.2em minus 0.3em}
--  \refstepcounter{dance}
--  \addcontentsline{lod}{dance}{\protect\numberline{\thedance}\ignorespaces#2\unskip}
--  \setcounter{dancecount}{0}
--  \setcounter{dancemovenum}{0}
--  \resetdancepart*
--  \resetdancephrase*
--  \ifdefined\@ccisclass\clearpage\fi%
--  \ifthenelse{\isundefined{\imki@wrindexentry}}{%
--    \index{\ignorespaces#4\unskip}
--  }{%
--    \index[dbt]{\ignorespaces#4\unskip}
--    \index[dba]{\ignorespaces#3\unskip}
--  }%
--  \begin{\dancetitleenv}
--    \ifdefined\@ccisclass%
--      \pagestyle{myheadings}
--      \thispagestyle{myheadings}
--      \markboth{}{\danceformformat{\ignorespaces#4\unskip}}
--    \else%
--      {\danceformformat{\ignorespaces#4\unskip}}%
--    \fi%
--    {\dancetitleformat{\ignorespaces#2\unskip}}%
--    {\danceauthorformat{\ignorespaces#3\unskip}}%
--  \end{\dancetitleenv}
--  \newcommand*{\@contraenv}{#1}
--  \begin{\@contraenv}
--  \catcode10=9\relax % New line
--  \catcode11=9\relax % Vertical Tab
--  \catcode12=9\relax % Form Feed
--}{%
--  \end{\@contraenv}
--}
--\newcommand*{\move}{\@ifstar\@moveStar\@moveNoStar}
--\newcommand*{\@moveStar}[2][8]{%
--  \def\cc@moveStar{}\@moveNoStar[#1]{#2}\let\cc@moveStar\undefined%
--}
--\newlength{\cc@partsepwidth}%
--\newcommand*{\@moveNoStar}[2][8]{%
--  \setlength{\parindent}{0pt}%
--  \setlength{\cc@partsepwidth}{\widthof{\Alph{dancephrase}\arabic{dancepart}%
--    \partdelimiter\ }}%
--  \setlength{\hangindent}{\cc@partsepwidth}%
--  \ifthenelse{\value{phrasecount}=\value{dancephraselength}}{%
--    \ifthenelse{\NOT\(#1=0\)}{%
--      \newdancephrase%
--    }{}%
--  }{%
--    \ifthenelse{\(\value{partcount}=\value{dancepartlength}\)%
--      \AND\NOT\(#1=0\)}{%
--      \newdancepart%
--    }{}%
--  }%
--  \ifthenelse{\value{partmovenum}=0}{%
--    \Alph{dancephrase}\arabic{dancepart}\partdelimiter\ %
--  }{}%
--  \addtocounter{dancecount}{#1}%
--  \addtocounter{phrasecount}{#1}%
--  \addtocounter{partcount}{#1}%
--  \addtocounter{phrasemovenum}{1}%
--  \addtocounter{partmovenum}{1}%
--  \addtocounter{halfpartmovenum}{1}%
--  \addtocounter{dancemovenum}{1}%
--  \ifthenelse{\isundefined{\@showcountbefore}\OR\(#1=0\)}{%
--    \relax%
--  }{\cc@countleftbracket\ignorespaces#1\unskip\cc@countrightbracket~}%
--  \ignorespaces#2\unskip%
--  \ifthenelse{\isundefined{\@showcountafter}\OR\(#1=0\)}{%
--    \relax%
--  }{~\cc@countleftbracket\ignorespaces#1\unskip\cc@countrightbracket}%
--  \ifthenelse{\NOT\(#1=0\)}{%
--    \ifthenelse{\value{partcount}=\intcalcDiv{\value{dancepartlength}}{2}}{%
--      \setcounter{halfpartmovenum}{0}%
--    }{}%
--    \ifx\cc@moveStar\undefined%
--      \ifthenelse{\value{partcount}=\intcalcDiv{\value{dancepartlength}}{2}}{%
--        \midpartdelimiter\looseness=-1\linebreak[1]\space\nopagebreak\ignorespaces%
--      }{%
--        \ifthenelse{\NOT\value{partcount}=\value{dancepartlength}}{%
--          \movedelimiter\nolinebreak[2]\space\nopagebreak\ignorespaces%
--        }{}%
--      }%
--    \fi%
--  }{}%
--}
--\newcommand*{\allemande}{%
--  \moveindex{Allemande}%
--  \@ifstar\@allemandeStar\@allemandeNoStar%
--}
--\newcommand*{\@allemandeNoStar}[3][\unskip]{%
--  \move[#2]{Allemande \ignorespaces#3\unskip\ \ignorespaces#1\unskip}%
--}
--\newcommand*{\@allemandeStar}[3][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[#2]{\ignorespaces#1\unskip\ allemande \ignorespaces#3\unskip}%
--}
--\newcommand*{\balance}{%
--  \moveindex{Balance}%
--  \@ifstar\@balanceStar\@balanceNoStar%
--}
--\newcommand*{\@balanceNoStar}[1][\unskip]{%
--  \move[4]{Balance \ignorespaces#1\unskip}%
--}
--\newcommand*{\@balanceStar}[1][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[4]{\ignorespaces#1\unskip\ balance}%
--}
--\newcommand*{\balanceand}{%
--  \cc@checkphrasestart%
--  \moveindex{Balance}%
--  \@ifstar\@balanceandStar\@balanceandNoStar%
--}
--\newcommand*{\@balanceandNoStar}[1][]{%
--  \move*[0]{Balance and \ignorespaces#1\unskip\ \ \ignorespaces}%
--}
--\newcommand*{\@balanceandStar}[1][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move*[0]{\ignorespaces#1\unskip\ balance and\ \ \ignorespaces}%
--}
--\newcommand*{\butterflywhirl}{%
--  \moveindex{Butterfly Whirl}%
--  \@ifstar\@butterflyStar\@butterflyNoStar%
--}
--\newcommand*{\@butterflyNoStar}[2][\unskip]{%
--  \move[#2]{Butterfly whirl \ignorespaces#1\unskip}%
--}
--\newcommand*{\@butterflyStar}[2][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[#2]{\ignorespaces#1\unskip\ butterfly whirl}%
--}
--\newcommand*{\circleleft}{%
--  \moveindex{Circle Left}%
--  \def\cc@dir{left}%
--  \@ifstar\@circleStar\@circleNoStar%
--}
--\newcommand*{\circleright}{%
--  \moveindex{Circle Right}%
--  \def\cc@dir{right}%
--  \@ifstar\@circleStar\@circleNoStar%
--}
--\newcommand*{\@circleNoStar}[2][\unskip]{%
--  \move[#2]{Circle \cc@dir\ \ignorespaces#1\unskip}%
--}
--\newcommand*{\@circleStar}[2][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[#2]{\ignorespaces#1\unskip\ circle \cc@dir}%
--}
--\newcommand*{\courtesyturn}{%
--  \moveindex{Courtesy Turn}%
--  \@ifstar\@courtesyturnStar\@courtesyturnNoStar%
--}
--\newcommand*{\@courtesyturnNoStar}[2][\unskip]{%
--  \move[#2]{Courtesy turn \ignorespaces#1\unskip}%
--}
--\newcommand*{\@courtesyturnStar}[2][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[#2]{\ignorespaces#1\unskip\ courtesy turn}%
--}
--\newcommand*{\dosido}{%
--  \moveindex{\spellDosido}%
--  \@ifstar\@dosidoStar\@dosidoNoStar%
--}
--\newcommand*{\@dosidoNoStar}[2][\unskip]{%
--  \move[#2]{\spellDosido\ \ignorespaces#1\unskip}%
--}
--\newcommand*{\@dosidoStar}[2][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[#2]{\ignorespaces#1\unskip\ \spelldosido}%
--}
--\newcommand*{\seesaw}{%
--  \moveindex{See Saw}%
--  \@ifstar\@seesawStar\@seesawNoStar%
--}
--\newcommand*{\@seesawNoStar}[2][\unskip]{%
--  \move[#2]{See saw \ignorespaces#1\unskip}%
--}
--\newcommand*{\@seesawStar}[2][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[#2]{\ignorespaces#1\unskip\ see saw}%
--}
--\newcommand*{\gypsy}{%
--  \moveindex{Gypsy}%
--  \@ifstar\@gypsyStar\@gypsyNoStar%
--}
--\newcommand*{\gypsyright}{%
--  \moveindex{Gypsy}%
--  \moveindex{Gypsy Right}%
--  \def\cc@thedir{right}%
--  \@ifstar\@gypsyDirStar\@gypsyDirNoStar%
--}
--\newcommand*{\gypsyleft}{%
--  \moveindex{Gypsy}%
--  \moveindex{Gypsy Left}%
--  \def\cc@thedir{left}%
--  \@ifstar\@gypsyDirStar\@gypsyDirNoStar%
--}
--\newcommand*{\@gypsyNoStar}[2][\unskip]{%
--  \move[#2]{Gypsy \ignorespaces#1\unskip}
--}
--\newcommand*{\@gypsyStar}[2][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[#2]{\ignorespaces#1\unskip\ gypsy}
--}
--\newcommand*{\@gypsyDirNoStar}[2][\unskip]{%
--  \move[#2]{Gypsy \cc@thedir\ \ignorespaces#1\unskip}
--}
--\newcommand*{\@gypsyDirStar}[2][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[#2]{\ignorespaces#1\unskip\ \cc@thedir\ gypsy}
--}
--\newcommand*{\heyforfour}{%
--  \moveindex{Hey}%
--  \moveindex{Hey for Four}%
--  \moveindex{Full Hey}%
--  \@ifstar\@heyforfourStar\@heyforfourNoStar%
--}
--\newcommand*{\@heyforfourNoStar}[1][\unskip]{%
--  \move[16]{Hey for four \ignorespaces#1\unskip}
--}
--\newcommand*{\@heyforfourStar}[1][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[16]{\ignorespaces#1\unskip\ hey for four}
--}
--\newcommand*{\halfhey}{%
--  \moveindex{Hey}%
--  \moveindex{Hey for Four}%
--  \moveindex{Half Hey}%
--  \@ifstar\@halfheyStar\@halfheyNoStar%
--}
--\newcommand*{\@halfheyNoStar}[1][\unskip]{%
--  \move[8]{Half a hey \ignorespaces#1\unskip}
--}
--\newcommand*{\@halfheyStar}[1][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[8]{\ignorespaces#1\unskip\ half a hey}
--}
--\newcommand*{\halfheyricochet}{%
--  \moveindex{Hey}%
--  \moveindex{Hey for Four}%
--  \moveindex{Half Hey}%
--  \moveindex{Half Hey Ricochet}%
--  \@ifstar\@halfheyricochetStar\@halfheyricochetNoStar%
--}
--\newcommand*{\@halfheyricochetNoStar}[1][\unskip]{%
--  \move[8]{Half hey ricochet \ignorespaces#1\unskip}
--}
--\newcommand*{\@halfheyricochetStar}[1][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[8]{\ignorespaces#1\unskip\ half hey ricochet}
--}
--\newcommand*{\fullhey}{%
--  \moveindex{Hey}%
--  \moveindex{Hey for Four}%
--  \moveindex{Full Hey}%
--  \@ifstar\@fullheyStar\@fullheyNoStar%
--}
--\newcommand*{\@fullheyNoStar}[1][\unskip]{%
--  \move[16]{Full hey \ignorespaces#1\unskip}
--}
--\newcommand*{\@fullheyStar}[1][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[16]{\ignorespaces#1\unskip\ full hey}
--}
--\newcommand*{\ladieschain}{%
--  \moveindex{Ladies Chain}%
--  \def\cc@who{ladies}%
--  \@ifstar\@chainStar\@chainNoStar%
--}
--\newcommand*{\menchain}{%
--  \moveindex{Men Chain}%
--  \def\cc@who{men}%
--  \@ifstar\@chainStar\@chainNoStar%
--}
--\newcommand*{\@chainNoStar}[1][\unskip]{%
--  \move[8]{\expandafter\MakeUppercase\cc@who\ chain \ignorespaces#1\unskip}%
--}
--\newcommand*{\@chainStar}[1][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[8]{\ignorespaces#1\unskip\ \cc@who\ chain}%
--}
--\newcommand*{\halfladieschain}{%
--  \moveindex{Half Ladies Chain}%
--  \def\cc@who{ladies}%
--  \@ifstar\@halfchainStar\@halfchainNoStar%
--}
--\newcommand*{\halfmenchain}{%
--  \moveindex{Half Men Chain}%
--  \def\cc@who{men}%
--  \@ifstar\@halfchainStar\@halfchainNoStar%
--}
--\newcommand*{\@halfchainNoStar}[1][\unskip]{%
--  \move[8]{\expandafter\MakeUppercase\cc@who\ half chain \ignorespaces#1\unskip}%
--}
--\newcommand*{\@halfchainStar}[1][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[8]{\ignorespaces#1\unskip\ \cc@who\ half chain}%
--}
--\newcommand*{\fullladieschain}{%
--  \moveindex{Full Ladies Chain}%
--  \def\cc@who{ladies}%
--  \@ifstar\@fullchainStar\@fullchainNoStar%
--}
--\newcommand*{\fullmenchain}{%
--  \moveindex{Full Men Chain}%
--  \def\cc@who{men}%
--  \@ifstar\@fullchainStar\@fullchainNoStar%
--}
--\newcommand*{\@fullchainNoStar}[1][\unskip]{%
--  \move[16]{\expandafter\MakeUppercase\cc@who\ full chain \ignorespaces#1\unskip}%
--}
--\newcommand*{\@fullchainStar}[1][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[16]{\ignorespaces#1\unskip\ \cc@who\ full chain}%
--}
--\newcommand*{\lines}{%
--  \moveindex{Lines Forward and Back}%
--  \@ifstar\@linesStar\@linesNoStar%
--}
--\newcommand*{\@linesNoStar}[1][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[8]{\ignorespaces#1\unskip\ lines forward and back}%
--}
--\newcommand*{\@linesStar}[1][lines]{%
--  \move[4]{\ignorespaces#1\unskip\ lines forward}%
--}
--\newcommand*{\longlines}{%
--  \moveindex{Long Lines Forward and Back\ \seealso{Lines Forward and Back}{X}}%
--  \@ifstar\@longlinesStar\@longlinesNoStar%
--}
--\newcommand*{\@longlinesNoStar}{%
--  \lines[Long]%
--}
--\newcommand*{\@longlinesStar}{%
--  \lines*[Long]%
--}
--\newcommand*{\petronella}{%
--  \moveindex{Petronella}%
--  \@ifstar\@petronellaStar\@petronellaNoStar%
--}
--\newcommand*{\@petronellaNoStar}[1][\unskip]{%
--  \move[4]{Petronella \ignorespaces#1\unskip}%
--}
--\newcommand*{\@petronellaStar}[1][%
--  \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*{\promenade}{%
--  \moveindex{Promenade}
--  \@ifstar\@promenadeStar\@promenadeNoStar%
--}
--\newcommand*{\@promenadeNoStar}[2][\unskip]{%
--  \move[#2]{Promenade \ignorespaces#1\unskip}%
--}
--\newcommand*{\@promenadeStar}[2][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[#2]{\ignorespaces#1\unskip\ promenade}%
--}
--\newcommand*{\halfpromenade}{%
--  \moveindex{Promenade}%
--  \moveindex{Half Promenade}%
--  \@ifstar\@halfpromenadeStar\@halfpromenadeNoStar%
--}
--\newcommand*{\@halfpromenadeNoStar}[1][\unskip]{%
--  \move[8]{Half promenade \ignorespaces#1\unskip}%
--}
--\newcommand*{\@halfpromenadeStar}[1][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[8]{\ignorespaces#1\unskip\ half promenade}%
--}
--\newcommand*{\rightandleftthrough}{%
--  \moveindex{Right and left through}%
--  \moveindex{Rights and lefts|seealso{Right and left through}}%
--  \@ifstar\@rlStar\@rlNoStar%
--}
--\newcommand*{\rightsandlefts}{%
--  \moveindex{Right and left through}%
--  \moveindex{Rights and lefts|seealso{Right and left through}}%
--  \@ifstar\@rlStar\@rlNoStar%
--}
--\newcommand*{\@rlNoStar}[1][\unskip]{%
--  \move[8]{Right and left through \ignorespaces#1\unskip}%
--}
--\newcommand*{\@rlStar}[1][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[8]{\ignorespaces#1\unskip\ right and left through}%
--}
--\newcommand*{\rollaway}{%
--  \moveindex{Roll away}%
--  \@ifstar\@rollawayStar\@rollawayNoStar%
--}
--\newcommand*{\rawhs}{\rollawayhalfsashay}
--\newcommand*{\rollawayhalfsashay}{%
--  \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}%
--}
--\newcommand*{\@rollawayStar}[1][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[4]{\ignorespaces#1\unskip\ roll away}%
--}
--\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*{\starleft}{%
--  \moveindex{Star}%
--  \moveindex{Left hand star}%
--  \def\cc@dir{Left}%
--  \@ifstar\@starStar\@starNoStar%
--}
--\newcommand*{\starright}{%
--  \moveindex{Star}%
--  \moveindex{Right hand star}%
--  \def\cc@dir{right}%
--  \@ifstar\@starStar\@starNoStar%
--}
--\newcommand*{\@starNoStar}[1]{%
--  \move[#1]{\cc@dir\ hand star}%
--}
--\newcommand*{\@starStar}[1]{%
--  \move[#1]{Star \cc@dir}%
--}
--\newcommand*{\sashay}{%
--  \moveindex{Sashay}%
--  \@ifstar\@sashayStar\@sashayNoStar%
--}
--\newcommand*{\@sashayNoStar}[2][\unskip]{%
--  \move[#2]{Sashay \ignorespaces#1\unskip}%
--}
--\newcommand*{\@sashayStar}[3][\unskip]{%
--  \move[#2]{\ignorespaces#3\unskip\ sashay \ignorespaces#1\unskip}%
--}
--\newcommand*{\swing}{%
--  \moveindex{Swing}%
--  \@ifstar\@swingStar\@swingNoStar%
--}
--\newcommand*{\@swingNoStar}[2][\unskip]{%
--  \move[#2]{Swing \ignorespaces#1\unskip}%
--}
--\newcommand*{\@swingStar}[2][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[#2]{\ignorespaces#1\unskip\ swing}%
--}
--\newcommand*{\turnalone}{%
--  \moveindex{Turn Alone}%
--  \def\cc@who{alone}%
--  \@ifstar\@turnStar\@turnNoStar%
--}
--\newcommand*{\turncouple}{%
--  \moveindex{Turn as a Couple}%
--  \moveindex{Turn Together|see{Turn as a Couple}}%
--  \def\cc@who{as a couple}%
--  \@ifstar\@turnStar\@turnNoStar%
--}
--\newcommand*{\turntogether}{%
--  \moveindex{Turn as a Couple}%
--  \moveindex{Turn Together|see{Turn as a Couple}}%
--  \def\cc@who{together}%
--  \@ifstar\@turnStar\@turnNoStar%
--}
--\newcommand*{\@turnNoStar}[1][\unskip]{%
--  \cc@checkphrasestart%
--  \move*[0]{Turn \cc@who\ \ignorespaces#1\unskip\ \ \ignorespaces}%
--}
--\newcommand*{\@turnStar}[2][\unskip]{%
--  \move[#2]{Turn \cc@who\ \ignorespaces#1\unskip}%
--}
--\newcommand*{\twirltoswap}{%
--  \moveindex{Twirl to Swap}%
--  \move[4]{Twirl to swap}%
--}
--\newcommand*{\californiatwirl}{%
--  \moveindex{California Twirl}%
--  \move[4]{California twirl}%
--}
--\newcommand*{\starthrough}{%
--  \moveindex{Star Through}%
--  \move[4]{Star through}%
--}
--\newcommand*{\starthru}{%
--  \moveindex{Star Thru|see{Star Through}}%
--  \moveindex{Star Through}%
--  \move[4]{Star thru}%
--}
--\newcommand*{\boxthegnat}{%
--  \moveindex{Box the Gnat}%
--  \move[4]{Box the gnat}%
--}
--\newcommand*{\swattheflea}{%
--  \moveindex{Swat the Flea}%
--  \move[4]{Swat the flea}%
--}
--\newcommand*{\jerseytwirl}{%
--  \moveindex{Jersey Twirl}%
--  \move[4]{Jersey twirl}%
--}
--\newcommand*{\arizonatwirl}{%
--  \moveindex{Arizona Twirl}%
--  \move[4]{Arizona twirl}%
--}
--\newcommand*{\downthehall}{%
--  \moveindex{Down the Hall}%
--  \def\cc@dir{down}%
--  \@ifstar\@walkthehallStar\@walkthehallNoStar%
--}
--\newcommand*{\upthehall}{%
--  \moveindex{Up the Hall}%
--  \def\cc@dir{up}%
--  \@ifstar\@walkthehallStar\@walkthehallNoStar%
--}
--\newcommand*{\@walkthehallNoStar}[2][\unskip]{%
--  \move[#2]{\expandafter\MakeUppercase\cc@dir\ the hall\ \ignorespaces#1\unskip}%
--}
--\newcommand*{\@walkthehallStar}[2][%
--  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
--  \move[#2]{\ignorespaces#1\unskip\ \cc@dir\ the hall}%
--}
--\newcommand*{\dancetitle}{}
--\newcommand*{\danceauthor}{}
--\newcommand*{\danceform}{}
--\newlistof{dance}{lod}{\cfttoctitlefont\lodtitle}
--\newcommand*{\listofdances}{\listofdance}
--\newcommand*{\lodtitle}{List of Dances}
--\newcommand*{\enableidx}{%
--  \PassOptionsToPackage{splitindex}{imakeidx}
--  \RequirePackage{imakeidx}
--  \cc@createindices
--}%
--\newcommand*{\cc@createindices}{%
--  \makeindex[name=\cc@dbt,title=\dbtname]
--  \makeindex[name=\cc@dba,title=\dbaname]
--  \makeindex[name=\cc@mvp,title=\mvpname]
--  \makeindex[name=\cc@mvd,title=\mvdname]
--}%
--\newcommand*{\pauseindexing}{\def\cc@indexingpaused{}}
--\newcommand*{\resumeindexing}{\let\cc@indexingpaused\undefined}
--\newcommand*{\cc@dbt}{dbt}
--\newcommand*{\cc@dba}{dba}
--\newcommand*{\cc@mvp}{mvp}
--\newcommand*{\cc@mvd}{mvd}
--\newcommand*{\dbtname}{Dances by Type}
--\newcommand*{\dbaname}{Dances by Author}
--\newcommand*{\mvpname}{Moves by Page}
--\newcommand*{\mvdname}{Moves by Dance}
--\newcommand*{\moveindex}{\@ifstar\moveindexStar\moveindexNoStar}
--\newcommand*{\moveindexStar}[1]{%
--  #1%
--  \ifthenelse{\isundefined{\cc@indexingpaused}}{%
--    \ifthenelse{\isundefined{\imki@wrindexentry}}{%
--      \index{#1}%
--    }{%
--      \index[mvp]{#1}%
--      \imki@wrindexentry{mvd}{#1}{\arabic{dance}}%
--    }%
--  }{}%
--}
--\newcommand*{\moveindexNoStar}[1]{%
--  \ifthenelse{\isundefined{\cc@indexingpaused}}{%
--    \ifthenelse{\isundefined{\imki@wrindexentry}}{%
--      \index{#1}%
--    }{%
--      \index[mvp]{#1}%
--      \imki@wrindexentry{mvd}{#1}{\arabic{dance}}%
--    }%
--  }{}%
--}
--
--\newcommand*{\timesaround}[2]{%
--  \newcounter{timesaround}%
--  \setcounter{timesaround}{\intcalcDiv{\intcalcNum{#2}}{\intcalcNum{#1}}}%
--  \newcounter{quartertimesaround}%
--  \setcounter{quartertimesaround}{%
--    \intcalcMod{\intcalcNum{#2}}{\intcalcNum{#1}}%
--  }%
--  \ifthenelse{\value{timesaround}>0}{\arabic{timesaround}}{}%
--  \ifthenelse{\value{quartertimesaround}=1}{\textonequarter}{%
--    \ifthenelse{\value{quartertimesaround}=2}{\textonehalf}{%
--      \ifthenelse{\value{quartertimesaround}=3}{\textthreequarters}{}%
--    }%
--  }%
--  \ifthenelse{%
--    \value{timesaround}>1\OR%
--    \(\value{timesaround}=1\AND\NOT\value{quartertimesaround}=0\)%
--  }{\ times}{%
--    \ifthenelse{\value{timesaround}=1}{\ time}{}%
--  }%
--}%
--\newcommand*{\notes}[2][\cc@defaultnotesenv]{%
--  \par\nopagebreak\vspace*{\prenotevspace}
--  \begin{\cc@defaultnotesenv}
--    \setlength{\baselineskip}{1.1em plus 0.1em minus 0.2em}
--    \def\cc@notestitle{\textbf{\ignorespaces Notes\unskip}}%
--    \setlength{\parindent}{0pt}%
--    \setlength{\cc@partsepwidth}{\widthof{\footnotesize \cc@notestitle~}}%
--    \setlength{\hangindent}{\cc@partsepwidth}%
--    {\footnotesize \cc@notestitle~\ignorespaces#2\unskip}%
--  \end{\cc@defaultnotesenv}
--}
--\def\spelldosido{do-si-do}
--\def\spellDosido{Do-si-do}
--\newcommand*{\setdosidospelling}[1]{%
--  \protected@edef\spelldosido{\expandafter\MakeLowercase#1}
--  \protected@edef\spellDosido{\expandafter\MakeUppercase#1}
--}
--\newcommand*{\cc@checkphrasestart}{%
--  \ifthenelse{\value{phrasecount}=\value{dancephraselength}}{%
--    \newdancephrase%
--  }{%
--    \ifthenelse{\(\value{partcount}=\value{dancepartlength}\)}{%
--     \newdancepart%
--    }{}%
--  }%
--}
--\ProcessOptions\relax
--%% 
--%%   ___________
--%%   This work has the LPPL maintenance status `maintained'.
--%% 
--%%   Author:     Sam Whited
--%%   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
--%%                               and contracard.cls
--%%                               and contracard.pdf
--%%                               and README.md
--%%                               and README
--%% 
--%%
--%% End of file `contracard.sty'.
---- /dev/null
-+++ texlive-extra-2017.20170722/texmf-dist/tex/latex/contracard/contracard.sty
-@@ -0,0 +1,779 @@
-+%%
-+%% This is file `contracard.sty',
-+%% generated with the docstrip utility.
-+%%
-+%% The original source files were:
-+%%
-+%% contracard.dtx  (with options: `contracard-pkg')
-+%% 
-+%%   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.
-+%% 
-+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-+\ProvidesPackage{contracard}[2013/09/16 Package for typesetting called dances]
-+\RequirePackage{calc,intcalc}
-+\RequirePackage{ifthen}
-+\RequirePackage{tocloft}
-+\RequirePackage{textcomp}
-+\DeclareOption{showcountafter}{\showcountafter}
-+\DeclareOption{showcountbefore}{\showcountbefore}
-+\DeclareOption{enableidx}{\AtEndOfPackage{\enableidx}}
-+\newcommand*{\defaultcontraenv}{flushleft}
-+\newcommand*{\dancetitleenv}{flushleft}
-+\newcommand*{\dancetitleformat}{\section*}
-+\newcommand*{\danceauthorformat}{\subsection*}
-+\newcommand*{\danceformformat}{\hspace{\fill}}
-+\newcommand*{\movedelimiter}{,}
-+\newcommand*{\partdelimiter}{.}
-+\newcommand*{\midpartdelimiter}{;}
-+\newlength{\phrasevspace}
-+\setlength{\phrasevspace}{1em}
-+\newcommand*{\phraseseparator}{\vspace{\phrasevspace}}
-+\newcommand*{\showcountbefore}{\def\@showcountbefore{}}
-+\newcommand*{\showcountafter}{\def\@showcountafter{}}
-+\newcommand*{\hidecountbefore}{\let\@showcountbefore\undefined}
-+\newcommand*{\hidecountafter}{\let\@showcountafter\undefined}
-+
-+\def\cc@countleftbracket{(}
-+\def\cc@countrightbracket{)}
-+\newcommand*{\countleftbracket}[1]{\def\cc@countleftbracket{#1}}
-+\newcommand*{\countrightbracket}[1]{\def\cc@countrightbracket{#1}}
-+\def\cc@defaultnotesenv{flushleft}
-+\newcommand*{\setdefaultnotesenv}[1]{\def\cc@defaultnotesenv{#1}}
-+\newlength{\prenotevspace}
-+\setlength{\prenotevspace}{\fill}
-+\newcounter{dancecount}
-+\newcounter{partcount}
-+\newcounter{phrasecount}
-+\newcounter{dancepart}
-+\newcounter{dancephrase}
-+\newcounter{dancepartlength}
-+\newcounter{dancephraselength}
-+\newcommand*{\resetdancepartlength}{\setcounter{dancepartlength}{16}}
-+\newcommand*{\resetdancephraselength}{\setcounter{dancephraselength}{32}}
-+\resetdancepartlength
-+\resetdancephraselength
-+\newcommand*{\resetdancephrase}{%
-+  \ifthenelse{\value{partcount}=16}{\newline}{}%
-+  \@ifstar{\@resetdancephraseStar}{\@resetdancephraseNoStar}%
-+}
-+\newcommand*{\@resetdancephraseStar}{%
-+  \setcounter{dancephrase}{1}%
-+  \setcounter{phrasecount}{0}%
-+  \setcounter{phrasemovenum}{0}%
-+  \resetdancepart*%
-+}
-+\newcommand*{\@resetdancephraseNoStar}{%
-+  \ifthenelse{\value{dancephrase}=1}{}{%
-+    \setcounter{dancephrase}{1}%
-+    \setcounter{phrasecount}{0}%
-+    \setcounter{phrasemovenum}{0}%
-+    \resetdancepart%
-+  }%
-+}
-+\newcommand*{\resetdancepart}{%
-+  \@ifstar{\@resetdancepartStar}{\@resetdancepartNoStar}%
-+}
-+\newcommand*{\@resetdancepartStar}{%
-+  \setcounter{dancepart}{1}%
-+  \setcounter{partcount}{0}%
-+  \setcounter{partmovenum}{0}%
-+  \setcounter{halfpartmovenum}{0}%
-+}
-+\newcommand*{\@resetdancepartNoStar}{%
-+  \ifthenelse{\value{dancepart}=1}{}{%
-+    \setcounter{dancepart}{1}%
-+    \setcounter{partcount}{0}%
-+    \setcounter{partmovenum}{0}%
-+    \setcounter{halfpartmovenum}{0}%
-+  }%
-+}
-+\newcommand*{\newdancephrase}{%
-+  \ifthenelse{\NOT\value{phrasecount}=0}{\par\phraseseparator\par}{}%
-+  \addtocounter{dancephrase}{1}%
-+  \setcounter{phrasecount}{0}%
-+  \setcounter{phrasemovenum}{0}%
-+  \resetdancepart*%
-+}
-+\newcommand*{\newdancepart}{%
-+  \par\nopagebreak%
-+  \addtocounter{dancepart}{1}%
-+  \setcounter{partcount}{0}%
-+  \setcounter{partmovenum}{0}%
-+  \setcounter{halfpartmovenum}{0}%
-+}
-+
-+\newcounter{phrasemovenum}
-+\newcounter{partmovenum}
-+\newcounter{halfpartmovenum}
-+\newcounter{dancemovenum}
-+\setcounter{phrasemovenum}{0}
-+\setcounter{partmovenum}{0}
-+\setcounter{halfpartmovenum}{0}
-+\setcounter{dancemovenum}{0}
-+\newenvironment{contra}[4][\defaultcontraenv]{%
-+  \global\def\dancetitle{\ignorespaces#2\unskip}
-+  \global\def\danceauthor{\ignorespaces#3\unskip}
-+  \global\def\danceform{\ignorespaces#4\unskip}
-+  \setlength{\parskip}{0.3em plus 0.2em minus 0.3em}
-+  \refstepcounter{dance}
-+  \addcontentsline{lod}{dance}{\protect\numberline{\thedance}\ignorespaces#2\unskip}
-+  \setcounter{dancecount}{0}
-+  \setcounter{dancemovenum}{0}
-+  \resetdancepart*
-+  \resetdancephrase*
-+  \ifdefined\@ccisclass\clearpage\fi%
-+  \ifthenelse{\isundefined{\imki@wrindexentry}}{%
-+    \index{\ignorespaces#4\unskip}
-+  }{%
-+    \index[dbt]{\ignorespaces#4\unskip}
-+    \index[dba]{\ignorespaces#3\unskip}
-+  }%
-+  \begin{\dancetitleenv}
-+    \ifdefined\@ccisclass%
-+      \pagestyle{myheadings}
-+      \thispagestyle{myheadings}
-+      \markboth{}{\danceformformat{\ignorespaces#4\unskip}}
-+    \else%
-+      {\danceformformat{\ignorespaces#4\unskip}}%
-+    \fi%
-+    {\dancetitleformat{\ignorespaces#2\unskip}}%
-+    {\danceauthorformat{\ignorespaces#3\unskip}}%
-+  \end{\dancetitleenv}
-+  \newcommand*{\@contraenv}{#1}
-+  \begin{\@contraenv}
-+  \catcode10=9\relax % New line
-+  \catcode11=9\relax % Vertical Tab
-+  \catcode12=9\relax % Form Feed
-+}{%
-+  \end{\@contraenv}
-+}
-+\newcommand*{\move}{\@ifstar\@moveStar\@moveNoStar}
-+\newcommand*{\@moveStar}[2][8]{%
-+  \def\cc@moveStar{}\@moveNoStar[#1]{#2}\let\cc@moveStar\undefined%
-+}
-+\newlength{\cc@partsepwidth}%
-+\newcommand*{\@moveNoStar}[2][8]{%
-+  \setlength{\parindent}{0pt}%
-+  \setlength{\cc@partsepwidth}{\widthof{\Alph{dancephrase}\arabic{dancepart}%
-+    \partdelimiter\ }}%
-+  \setlength{\hangindent}{\cc@partsepwidth}%
-+  \ifthenelse{\value{phrasecount}=\value{dancephraselength}}{%
-+    \ifthenelse{\NOT\(#1=0\)}{%
-+      \newdancephrase%
-+    }{}%
-+  }{%
-+    \ifthenelse{\(\value{partcount}=\value{dancepartlength}\)%
-+      \AND\NOT\(#1=0\)}{%
-+      \newdancepart%
-+    }{}%
-+  }%
-+  \ifthenelse{\value{partmovenum}=0}{%
-+    \Alph{dancephrase}\arabic{dancepart}\partdelimiter\ %
-+  }{}%
-+  \addtocounter{dancecount}{#1}%
-+  \addtocounter{phrasecount}{#1}%
-+  \addtocounter{partcount}{#1}%
-+  \addtocounter{phrasemovenum}{1}%
-+  \addtocounter{partmovenum}{1}%
-+  \addtocounter{halfpartmovenum}{1}%
-+  \addtocounter{dancemovenum}{1}%
-+  \ifthenelse{\isundefined{\@showcountbefore}\OR\(#1=0\)}{%
-+    \relax%
-+  }{\cc@countleftbracket\ignorespaces#1\unskip\cc@countrightbracket~}%
-+  \ignorespaces#2\unskip%
-+  \ifthenelse{\isundefined{\@showcountafter}\OR\(#1=0\)}{%
-+    \relax%
-+  }{~\cc@countleftbracket\ignorespaces#1\unskip\cc@countrightbracket}%
-+  \ifthenelse{\NOT\(#1=0\)}{%
-+    \ifthenelse{\value{partcount}=\intcalcDiv{\value{dancepartlength}}{2}}{%
-+      \setcounter{halfpartmovenum}{0}%
-+    }{}%
-+    \ifx\cc@moveStar\undefined%
-+      \ifthenelse{\value{partcount}=\intcalcDiv{\value{dancepartlength}}{2}}{%
-+        \midpartdelimiter\looseness=-1\linebreak[1]\space\nopagebreak\ignorespaces%
-+      }{%
-+        \ifthenelse{\NOT\value{partcount}=\value{dancepartlength}}{%
-+          \movedelimiter\nolinebreak[2]\space\nopagebreak\ignorespaces%
-+        }{}%
-+      }%
-+    \fi%
-+  }{}%
-+}
-+\newcommand*{\allemande}{%
-+  \moveindex{Allemande}%
-+  \@ifstar\@allemandeStar\@allemandeNoStar%
-+}
-+\newcommand*{\@allemandeNoStar}[3][\unskip]{%
-+  \move[#2]{Allemande \ignorespaces#3\unskip\ \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@allemandeStar}[3][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[#2]{\ignorespaces#1\unskip\ allemande \ignorespaces#3\unskip}%
-+}
-+\newcommand*{\balance}{%
-+  \moveindex{Balance}%
-+  \@ifstar\@balanceStar\@balanceNoStar%
-+}
-+\newcommand*{\@balanceNoStar}[1][\unskip]{%
-+  \move[4]{Balance \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@balanceStar}[1][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[4]{\ignorespaces#1\unskip\ balance}%
-+}
-+\newcommand*{\balanceand}{%
-+  \cc@checkphrasestart%
-+  \moveindex{Balance}%
-+  \@ifstar\@balanceandStar\@balanceandNoStar%
-+}
-+\newcommand*{\@balanceandNoStar}[1][]{%
-+  \move*[0]{Balance and \ignorespaces#1\unskip\ \ \ignorespaces}%
-+}
-+\newcommand*{\@balanceandStar}[1][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move*[0]{\ignorespaces#1\unskip\ balance and\ \ \ignorespaces}%
-+}
-+\newcommand*{\butterflywhirl}{%
-+  \moveindex{Butterfly Whirl}%
-+  \@ifstar\@butterflyStar\@butterflyNoStar%
-+}
-+\newcommand*{\@butterflyNoStar}[2][\unskip]{%
-+  \move[#2]{Butterfly whirl \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@butterflyStar}[2][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[#2]{\ignorespaces#1\unskip\ butterfly whirl}%
-+}
-+\newcommand*{\circleleft}{%
-+  \moveindex{Circle Left}%
-+  \def\cc@dir{left}%
-+  \@ifstar\@circleStar\@circleNoStar%
-+}
-+\newcommand*{\circleright}{%
-+  \moveindex{Circle Right}%
-+  \def\cc@dir{right}%
-+  \@ifstar\@circleStar\@circleNoStar%
-+}
-+\newcommand*{\@circleNoStar}[2][\unskip]{%
-+  \move[#2]{Circle \cc@dir\ \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@circleStar}[2][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[#2]{\ignorespaces#1\unskip\ circle \cc@dir}%
-+}
-+\newcommand*{\courtesyturn}{%
-+  \moveindex{Courtesy Turn}%
-+  \@ifstar\@courtesyturnStar\@courtesyturnNoStar%
-+}
-+\newcommand*{\@courtesyturnNoStar}[2][\unskip]{%
-+  \move[#2]{Courtesy turn \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@courtesyturnStar}[2][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[#2]{\ignorespaces#1\unskip\ courtesy turn}%
-+}
-+\newcommand*{\dosido}{%
-+  \moveindex{\spellDosido}%
-+  \@ifstar\@dosidoStar\@dosidoNoStar%
-+}
-+\newcommand*{\@dosidoNoStar}[2][\unskip]{%
-+  \move[#2]{\spellDosido\ \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@dosidoStar}[2][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[#2]{\ignorespaces#1\unskip\ \spelldosido}%
-+}
-+\newcommand*{\seesaw}{%
-+  \moveindex{See Saw}%
-+  \@ifstar\@seesawStar\@seesawNoStar%
-+}
-+\newcommand*{\@seesawNoStar}[2][\unskip]{%
-+  \move[#2]{See saw \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@seesawStar}[2][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[#2]{\ignorespaces#1\unskip\ see saw}%
-+}
-+\newcommand*{\gypsy}{%
-+  \moveindex{Gypsy}%
-+  \@ifstar\@gypsyStar\@gypsyNoStar%
-+}
-+\newcommand*{\gypsyright}{%
-+  \moveindex{Gypsy}%
-+  \moveindex{Gypsy Right}%
-+  \def\cc@thedir{right}%
-+  \@ifstar\@gypsyDirStar\@gypsyDirNoStar%
-+}
-+\newcommand*{\gypsyleft}{%
-+  \moveindex{Gypsy}%
-+  \moveindex{Gypsy Left}%
-+  \def\cc@thedir{left}%
-+  \@ifstar\@gypsyDirStar\@gypsyDirNoStar%
-+}
-+\newcommand*{\@gypsyNoStar}[2][\unskip]{%
-+  \move[#2]{Gypsy \ignorespaces#1\unskip}
-+}
-+\newcommand*{\@gypsyStar}[2][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[#2]{\ignorespaces#1\unskip\ gypsy}
-+}
-+\newcommand*{\@gypsyDirNoStar}[2][\unskip]{%
-+  \move[#2]{Gypsy \cc@thedir\ \ignorespaces#1\unskip}
-+}
-+\newcommand*{\@gypsyDirStar}[2][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[#2]{\ignorespaces#1\unskip\ \cc@thedir\ gypsy}
-+}
-+\newcommand*{\heyforfour}{%
-+  \moveindex{Hey}%
-+  \moveindex{Hey for Four}%
-+  \moveindex{Full Hey}%
-+  \@ifstar\@heyforfourStar\@heyforfourNoStar%
-+}
-+\newcommand*{\@heyforfourNoStar}[1][\unskip]{%
-+  \move[16]{Hey for four \ignorespaces#1\unskip}
-+}
-+\newcommand*{\@heyforfourStar}[1][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[16]{\ignorespaces#1\unskip\ hey for four}
-+}
-+\newcommand*{\halfhey}{%
-+  \moveindex{Hey}%
-+  \moveindex{Hey for Four}%
-+  \moveindex{Half Hey}%
-+  \@ifstar\@halfheyStar\@halfheyNoStar%
-+}
-+\newcommand*{\@halfheyNoStar}[1][\unskip]{%
-+  \move[8]{Half a hey \ignorespaces#1\unskip}
-+}
-+\newcommand*{\@halfheyStar}[1][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[8]{\ignorespaces#1\unskip\ half a hey}
-+}
-+\newcommand*{\halfheyricochet}{%
-+  \moveindex{Hey}%
-+  \moveindex{Hey for Four}%
-+  \moveindex{Half Hey}%
-+  \moveindex{Half Hey Ricochet}%
-+  \@ifstar\@halfheyricochetStar\@halfheyricochetNoStar%
-+}
-+\newcommand*{\@halfheyricochetNoStar}[1][\unskip]{%
-+  \move[8]{Half hey ricochet \ignorespaces#1\unskip}
-+}
-+\newcommand*{\@halfheyricochetStar}[1][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[8]{\ignorespaces#1\unskip\ half hey ricochet}
-+}
-+\newcommand*{\fullhey}{%
-+  \moveindex{Hey}%
-+  \moveindex{Hey for Four}%
-+  \moveindex{Full Hey}%
-+  \@ifstar\@fullheyStar\@fullheyNoStar%
-+}
-+\newcommand*{\@fullheyNoStar}[1][\unskip]{%
-+  \move[16]{Full hey \ignorespaces#1\unskip}
-+}
-+\newcommand*{\@fullheyStar}[1][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[16]{\ignorespaces#1\unskip\ full hey}
-+}
-+\newcommand*{\ladieschain}{%
-+  \moveindex{Ladies Chain}%
-+  \def\cc@who{ladies}%
-+  \@ifstar\@chainStar\@chainNoStar%
-+}
-+\newcommand*{\menchain}{%
-+  \moveindex{Men Chain}%
-+  \def\cc@who{men}%
-+  \@ifstar\@chainStar\@chainNoStar%
-+}
-+\newcommand*{\@chainNoStar}[1][\unskip]{%
-+  \move[8]{\expandafter\MakeUppercase\cc@who\ chain \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@chainStar}[1][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[8]{\ignorespaces#1\unskip\ \cc@who\ chain}%
-+}
-+\newcommand*{\halfladieschain}{%
-+  \moveindex{Half Ladies Chain}%
-+  \def\cc@who{ladies}%
-+  \@ifstar\@halfchainStar\@halfchainNoStar%
-+}
-+\newcommand*{\halfmenchain}{%
-+  \moveindex{Half Men Chain}%
-+  \def\cc@who{men}%
-+  \@ifstar\@halfchainStar\@halfchainNoStar%
-+}
-+\newcommand*{\@halfchainNoStar}[1][\unskip]{%
-+  \move[8]{\expandafter\MakeUppercase\cc@who\ half chain \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@halfchainStar}[1][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[8]{\ignorespaces#1\unskip\ \cc@who\ half chain}%
-+}
-+\newcommand*{\fullladieschain}{%
-+  \moveindex{Full Ladies Chain}%
-+  \def\cc@who{ladies}%
-+  \@ifstar\@fullchainStar\@fullchainNoStar%
-+}
-+\newcommand*{\fullmenchain}{%
-+  \moveindex{Full Men Chain}%
-+  \def\cc@who{men}%
-+  \@ifstar\@fullchainStar\@fullchainNoStar%
-+}
-+\newcommand*{\@fullchainNoStar}[1][\unskip]{%
-+  \move[16]{\expandafter\MakeUppercase\cc@who\ full chain \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@fullchainStar}[1][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[16]{\ignorespaces#1\unskip\ \cc@who\ full chain}%
-+}
-+\newcommand*{\lines}{%
-+  \moveindex{Lines Forward and Back}%
-+  \@ifstar\@linesStar\@linesNoStar%
-+}
-+\newcommand*{\@linesNoStar}[1][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[8]{\ignorespaces#1\unskip\ lines forward and back}%
-+}
-+\newcommand*{\@linesStar}[1][lines]{%
-+  \move[4]{\ignorespaces#1\unskip\ lines forward}%
-+}
-+\newcommand*{\longlines}{%
-+  \moveindex{Long Lines Forward and Back\ \seealso{Lines Forward and Back}{X}}%
-+  \@ifstar\@longlinesStar\@longlinesNoStar%
-+}
-+\newcommand*{\@longlinesNoStar}{%
-+  \lines[Long]%
-+}
-+\newcommand*{\@longlinesStar}{%
-+  \lines*[Long]%
-+}
-+\newcommand*{\petronella}{%
-+  \moveindex{Petronella}%
-+  \@ifstar\@petronellaStar\@petronellaNoStar%
-+}
-+\newcommand*{\@petronellaNoStar}[1][\unskip]{%
-+  \move[4]{Petronella \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@petronellaStar}[1][%
-+  \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*{\promenade}{%
-+  \moveindex{Promenade}
-+  \@ifstar\@promenadeStar\@promenadeNoStar%
-+}
-+\newcommand*{\@promenadeNoStar}[2][\unskip]{%
-+  \move[#2]{Promenade \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@promenadeStar}[2][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[#2]{\ignorespaces#1\unskip\ promenade}%
-+}
-+\newcommand*{\halfpromenade}{%
-+  \moveindex{Promenade}%
-+  \moveindex{Half Promenade}%
-+  \@ifstar\@halfpromenadeStar\@halfpromenadeNoStar%
-+}
-+\newcommand*{\@halfpromenadeNoStar}[1][\unskip]{%
-+  \move[8]{Half promenade \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@halfpromenadeStar}[1][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[8]{\ignorespaces#1\unskip\ half promenade}%
-+}
-+\newcommand*{\rightandleftthrough}{%
-+  \moveindex{Right and left through}%
-+  \moveindex{Rights and lefts|seealso{Right and left through}}%
-+  \@ifstar\@rlStar\@rlNoStar%
-+}
-+\newcommand*{\rightsandlefts}{%
-+  \moveindex{Right and left through}%
-+  \moveindex{Rights and lefts|seealso{Right and left through}}%
-+  \@ifstar\@rlStar\@rlNoStar%
-+}
-+\newcommand*{\@rlNoStar}[1][\unskip]{%
-+  \move[8]{Right and left through \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@rlStar}[1][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[8]{\ignorespaces#1\unskip\ right and left through}%
-+}
-+\newcommand*{\rollaway}{%
-+  \moveindex{Roll away}%
-+  \@ifstar\@rollawayStar\@rollawayNoStar%
-+}
-+\newcommand*{\rawhs}{\rollawayhalfsashay}
-+\newcommand*{\rollawayhalfsashay}{%
-+  \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}%
-+}
-+\newcommand*{\@rollawayStar}[1][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[4]{\ignorespaces#1\unskip\ roll away}%
-+}
-+\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*{\starleft}{%
-+  \moveindex{Star}%
-+  \moveindex{Left hand star}%
-+  \def\cc@dir{Left}%
-+  \@ifstar\@starStar\@starNoStar%
-+}
-+\newcommand*{\starright}{%
-+  \moveindex{Star}%
-+  \moveindex{Right hand star}%
-+  \def\cc@dir{right}%
-+  \@ifstar\@starStar\@starNoStar%
-+}
-+\newcommand*{\@starNoStar}[1]{%
-+  \move[#1]{\cc@dir\ hand star}%
-+}
-+\newcommand*{\@starStar}[1]{%
-+  \move[#1]{Star \cc@dir}%
-+}
-+\newcommand*{\sashay}{%
-+  \moveindex{Sashay}%
-+  \@ifstar\@sashayStar\@sashayNoStar%
-+}
-+\newcommand*{\@sashayNoStar}[2][\unskip]{%
-+  \move[#2]{Sashay \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@sashayStar}[3][\unskip]{%
-+  \move[#2]{\ignorespaces#3\unskip\ sashay \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\swing}{%
-+  \moveindex{Swing}%
-+  \@ifstar\@swingStar\@swingNoStar%
-+}
-+\newcommand*{\@swingNoStar}[2][\unskip]{%
-+  \move[#2]{Swing \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@swingStar}[2][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[#2]{\ignorespaces#1\unskip\ swing}%
-+}
-+\newcommand*{\turnalone}{%
-+  \moveindex{Turn Alone}%
-+  \def\cc@who{alone}%
-+  \@ifstar\@turnStar\@turnNoStar%
-+}
-+\newcommand*{\turncouple}{%
-+  \moveindex{Turn as a Couple}%
-+  \moveindex{Turn Together|see{Turn as a Couple}}%
-+  \def\cc@who{as a couple}%
-+  \@ifstar\@turnStar\@turnNoStar%
-+}
-+\newcommand*{\turntogether}{%
-+  \moveindex{Turn as a Couple}%
-+  \moveindex{Turn Together|see{Turn as a Couple}}%
-+  \def\cc@who{together}%
-+  \@ifstar\@turnStar\@turnNoStar%
-+}
-+\newcommand*{\@turnNoStar}[1][\unskip]{%
-+  \cc@checkphrasestart%
-+  \move*[0]{Turn \cc@who\ \ignorespaces#1\unskip\ \ \ignorespaces}%
-+}
-+\newcommand*{\@turnStar}[2][\unskip]{%
-+  \move[#2]{Turn \cc@who\ \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\twirltoswap}{%
-+  \moveindex{Twirl to Swap}%
-+  \move[4]{Twirl to swap}%
-+}
-+\newcommand*{\californiatwirl}{%
-+  \moveindex{California Twirl}%
-+  \move[4]{California twirl}%
-+}
-+\newcommand*{\starthrough}{%
-+  \moveindex{Star Through}%
-+  \move[4]{Star through}%
-+}
-+\newcommand*{\starthru}{%
-+  \moveindex{Star Thru|see{Star Through}}%
-+  \moveindex{Star Through}%
-+  \move[4]{Star thru}%
-+}
-+\newcommand*{\boxthegnat}{%
-+  \moveindex{Box the Gnat}%
-+  \move[4]{Box the gnat}%
-+}
-+\newcommand*{\swattheflea}{%
-+  \moveindex{Swat the Flea}%
-+  \move[4]{Swat the flea}%
-+}
-+\newcommand*{\jerseytwirl}{%
-+  \moveindex{Jersey Twirl}%
-+  \move[4]{Jersey twirl}%
-+}
-+\newcommand*{\arizonatwirl}{%
-+  \moveindex{Arizona Twirl}%
-+  \move[4]{Arizona twirl}%
-+}
-+\newcommand*{\downthehall}{%
-+  \moveindex{Down the Hall}%
-+  \def\cc@dir{down}%
-+  \@ifstar\@walkthehallStar\@walkthehallNoStar%
-+}
-+\newcommand*{\upthehall}{%
-+  \moveindex{Up the Hall}%
-+  \def\cc@dir{up}%
-+  \@ifstar\@walkthehallStar\@walkthehallNoStar%
-+}
-+\newcommand*{\@walkthehallNoStar}[2][\unskip]{%
-+  \move[#2]{\expandafter\MakeUppercase\cc@dir\ the hall\ \ignorespaces#1\unskip}%
-+}
-+\newcommand*{\@walkthehallStar}[2][%
-+  \expandafter\expandafter\expandafter\MakeUppercase\@gobbletwo]{%
-+  \move[#2]{\ignorespaces#1\unskip\ \cc@dir\ the hall}%
-+}
-+\newcommand*{\dancetitle}{}
-+\newcommand*{\danceauthor}{}
-+\newcommand*{\danceform}{}
-+\newlistof{dance}{lod}{\cfttoctitlefont\lodtitle}
-+\newcommand*{\listofdances}{\listofdance}
-+\newcommand*{\lodtitle}{List of Dances}
-+\newcommand*{\enableidx}{%
-+  \PassOptionsToPackage{splitindex}{imakeidx}
-+  \RequirePackage{imakeidx}
-+  \cc@createindices
-+}%
-+\newcommand*{\cc@createindices}{%
-+  \makeindex[name=\cc@dbt,title=\dbtname]
-+  \makeindex[name=\cc@dba,title=\dbaname]
-+  \makeindex[name=\cc@mvp,title=\mvpname]
-+  \makeindex[name=\cc@mvd,title=\mvdname]
-+}%
-+\newcommand*{\pauseindexing}{\def\cc@indexingpaused{}}
-+\newcommand*{\resumeindexing}{\let\cc@indexingpaused\undefined}
-+\newcommand*{\cc@dbt}{dbt}
-+\newcommand*{\cc@dba}{dba}
-+\newcommand*{\cc@mvp}{mvp}
-+\newcommand*{\cc@mvd}{mvd}
-+\newcommand*{\dbtname}{Dances by Type}
-+\newcommand*{\dbaname}{Dances by Author}
-+\newcommand*{\mvpname}{Moves by Page}
-+\newcommand*{\mvdname}{Moves by Dance}
-+\newcommand*{\moveindex}{\@ifstar\moveindexStar\moveindexNoStar}
-+\newcommand*{\moveindexStar}[1]{%
-+  #1%
-+  \ifthenelse{\isundefined{\cc@indexingpaused}}{%
-+    \ifthenelse{\isundefined{\imki@wrindexentry}}{%
-+      \index{#1}%
-+    }{%
-+      \index[mvp]{#1}%
-+      \imki@wrindexentry{mvd}{#1}{\arabic{dance}}%
-+    }%
-+  }{}%
-+}
-+\newcommand*{\moveindexNoStar}[1]{%
-+  \ifthenelse{\isundefined{\cc@indexingpaused}}{%
-+    \ifthenelse{\isundefined{\imki@wrindexentry}}{%
-+      \index{#1}%
-+    }{%
-+      \index[mvp]{#1}%
-+      \imki@wrindexentry{mvd}{#1}{\arabic{dance}}%
-+    }%
-+  }{}%
-+}
-+
-+\newcommand*{\timesaround}[2]{%
-+  \newcounter{timesaround}%
-+  \setcounter{timesaround}{\intcalcDiv{\intcalcNum{#2}}{\intcalcNum{#1}}}%
-+  \newcounter{quartertimesaround}%
-+  \setcounter{quartertimesaround}{%
-+    \intcalcMod{\intcalcNum{#2}}{\intcalcNum{#1}}%
-+  }%
-+  \ifthenelse{\value{timesaround}>0}{\arabic{timesaround}}{}%
-+  \ifthenelse{\value{quartertimesaround}=1}{\textonequarter}{%
-+    \ifthenelse{\value{quartertimesaround}=2}{\textonehalf}{%
-+      \ifthenelse{\value{quartertimesaround}=3}{\textthreequarters}{}%
-+    }%
-+  }%
-+  \ifthenelse{%
-+    \value{timesaround}>1\OR%
-+    \(\value{timesaround}=1\AND\NOT\value{quartertimesaround}=0\)%
-+  }{\ times}{%
-+    \ifthenelse{\value{timesaround}=1}{\ time}{}%
-+  }%
-+}%
-+\newcommand*{\notes}[2][\cc@defaultnotesenv]{%
-+  \par\nopagebreak\vspace*{\prenotevspace}
-+  \begin{\cc@defaultnotesenv}
-+    \setlength{\baselineskip}{1.1em plus 0.1em minus 0.2em}
-+    \def\cc@notestitle{\textbf{\ignorespaces Notes\unskip}}%
-+    \setlength{\parindent}{0pt}%
-+    \setlength{\cc@partsepwidth}{\widthof{\footnotesize \cc@notestitle~}}%
-+    \setlength{\hangindent}{\cc@partsepwidth}%
-+    {\footnotesize \cc@notestitle~\ignorespaces#2\unskip}%
-+  \end{\cc@defaultnotesenv}
-+}
-+\def\spelldosido{do-si-do}
-+\def\spellDosido{Do-si-do}
-+\newcommand*{\setdosidospelling}[1]{%
-+  \protected@edef\spelldosido{\expandafter\MakeLowercase#1}
-+  \protected@edef\spellDosido{\expandafter\MakeUppercase#1}
-+}
-+\newcommand*{\cc@checkphrasestart}{%
-+  \ifthenelse{\value{phrasecount}=\value{dancephraselength}}{%
-+    \newdancephrase%
-+  }{%
-+    \ifthenelse{\(\value{partcount}=\value{dancepartlength}\)}{%
-+     \newdancepart%
-+    }{}%
-+  }%
-+}
-+\ProcessOptions\relax
-+%% 
-+%%   ___________
-+%%   This work has the LPPL maintenance status `maintained'.
-+%% 
-+%%   Author:     Sam Whited
-+%%   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
-+%%                               and contracard.cls
-+%%                               and contracard.pdf
-+%%                               and README.md
-+%%                               and README
-+%% 
-+%%
-+%% End of file `contracard.sty'.
---- texlive-extra-2017.20170722.orig/tlpkg/texlive.tlpdb
-+++ texlive-extra-2017.20170722/tlpkg/texlive.tlpdb
-@@ -62436,13 +62436,13 @@
-  RELOC/doc/latex/contracard/README.md
-  RELOC/doc/latex/contracard/contracard.lod
-  RELOC/doc/latex/contracard/contracard.pdf details="Package documentation"
-- RELOC/doc/latex/contracard/contracard.sty
- srccontainersize 16760
- srccontainerchecksum 91ee1d9d668902ab1970150211c4d5caaec7dc11d683b697df673b6544c53f7adc0f994650482367ae4918fb104d152901dba8f53285b4b79285cb916d88ff39
- srcfiles size=20
-  RELOC/source/latex/contracard/contracard.dtx
- runfiles size=1
-  RELOC/tex/latex/contracard/contracard.cls
-+ RELOC/tex/latex/contracard/contracard.sty
- catalogue-ctan /macros/latex/contrib/contracard
- catalogue-date 2016-06-24 19:18:15 +0200
- catalogue-license lppl1.3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-nonbin.git


Reply to: