contracard (18feb13)

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

6 files changed, 214 insertions, 19 deletions

diff --git a/Master/texmf-dist/doc/latex/contracard/README b/Master/texmf-dist/doc/latex/contracard/README
index e1d6c28aac3..cdb282ba00e 100644
--- a/Master/texmf-dist/doc/latex/contracard/README
+++ b/Master/texmf-dist/doc/latex/contracard/README
@@ -1,3 +1,12 @@
 # Contra Card
 
-A TeX package designed to generate calling cards for contra and square dances.
+A TeX class for contra and square dances calls.
+
+## Download
+
+Development of this package occurs primarily on
+[GitHub](https://github.com/SamWhited/contra-card). Issues and pull requests
+should be submitted there.
+
+The current release version of **Contra Card** is available from
+[CTAN](http://ctan.org/pkg/contracard).
diff --git a/Master/texmf-dist/doc/latex/contracard/contracard-style.sty b/Master/texmf-dist/doc/latex/contracard/contracard-style.sty
new file mode 100644
index 00000000000..335d953dc7a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/contracard/contracard-style.sty
@@ -0,0 +1,54 @@
+%%
+%% This is file `contracard-style.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% contracard.dtx  (with options: `doc-style')
+%% 
+%%   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.
+%% 
+\ProvidesPackage{contracard-style}
+\usepackage{fancyvrb,hologo,framed,multicol,url}
+\usepackage[pdfborder=0, bookmarks, colorlinks=false, hidelinks]{hyperref}
+\usepackage[parfill]{parskip}
+
+\fvset{gobble=2}
+
+\newcommand*{\gittag}{%
+  \immediate\write18{%
+    rm gittag.tex 2> /dev/null; (git describe --tags --dirty || echo "v0.0") 2> /dev/null > gittag.tex
+  }%
+  \InputIfFileExists{gittag.tex}{}{}\unskip%
+  \immediate\write18{%
+    rm gittag.tex 2> /dev/null
+  }%
+}
+
+\newcommand*\name[1]{\textsc{#1}}
+\newcommand*\fname[1]{\textsf{#1}}
+\newcommand*\pkg[1]{\textsf{#1}}
+\newcommand*\code[1]{\texttt{#1}}
+%% 
+%%   ___________
+%%   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.cls
+%%                               and contracard.pdf
+%% 
+%%
+%% End of file `contracard-style.sty'.
diff --git a/Master/texmf-dist/doc/latex/contracard/contracard.pdf b/Master/texmf-dist/doc/latex/contracard/contracard.pdf
index fe4f590ab4e..9b0c5603973 100644
--- a/Master/texmf-dist/doc/latex/contracard/contracard.pdf
+++ b/Master/texmf-dist/doc/latex/contracard/contracard.pdf
diff --git a/Master/texmf-dist/source/latex/contracard/contracard.dtx b/Master/texmf-dist/source/latex/contracard/contracard.dtx
index aa0fb35c2a8..2c5088ec48e 100644
--- a/Master/texmf-dist/source/latex/contracard/contracard.dtx
+++ b/Master/texmf-dist/source/latex/contracard/contracard.dtx
@@ -55,8 +55,8 @@
 %</driver>
 %
 %<*contracard>
-\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesClass{contracard}[2013/02/07]
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesClass{contracard}[2013/02/17]
 \AtEndOfClass{\LoadClass{article}}
 %</contracard>%
 %
@@ -131,7 +131,7 @@
 \AtEndOfClass{\RequirePackage{hyperref}}
 \AtEndOfClass{\RequirePackage{ifthen}}
 \AtEndOfClass{\RequirePackage{geometry}}
-\AtEndOfClass{\usepackage{fancyhdr}}
+\AtEndOfClass{\RequirePackage{fancyhdr}}
 \AtEndOfClass{\RequirePackage[compact]{titlesec}}
 %    \end{macrocode}
 % Once you have all the required packages, building \pkg{contracard} from source
@@ -207,10 +207,31 @@
 %    \end{macrocode}
 %
 % \begin{macro}{dancecount}
-% Next, we'll create the \code{dancecount} counter that will help us keep track
-% of timing in the dance:
+% \begin{macro}{partcount}
+% \changes{0.2}{2013/02/15}{Create a counter for the current musical part}
+% \begin{macro}{phrasecount}
+% \changes{0.2}{2013/02/15}{Create a counter for the current musical phrase}
+% Next, we'll create some counters that will help us keep track the counts (or
+% `steps') in the dance. The \code{dancecount} is reset at the start of each new
+% dance, the \code{partcount} is reset at the begining of each part (eg. \code{%
+% A1} or \code{B1}), and the \code{phrasecount} is reset every time the part
+% changes (eg. from \code{A} to \code{B}).
 %    \begin{macrocode}
 \newcounter{dancecount}
+\newcounter{partcount}
+\newcounter{phrasecount}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\progressed}
+% \changes{0.2}{2013/02/15}{Allow the user to reset the phrase}
+% The phrase will continue to increment (\code{A}, \code{B}, \code{C}) unless
+% the user resets it by calling \code{\textbackslash progressed}. This does not
+% strictly indicate progression, but it will be intuitive for most callers.
+%    \begin{macrocode}
+\newcommand*{\progressed}{\setcounter{phrasecount}{1}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -238,11 +259,13 @@
 % \begin{macro}{contra}
 % \changes{0.1}{2013/02/14}{Create contra environment}
 % The contra environment is pretty simple. It clears the page, resets the
-% \code{dancecount} and displays some information about the dance.
+% various counters, and displays some information about the dance.
 %    \begin{macrocode}
 \newenvironment{contra}[4][\defaultcontraenv]{%
   \clearpage
   \setcounter{dancecount}{0}
+  \setcounter{partcount}{1}
+  \setcounter{phrasecount}{1}
   \thispagestyle{fancy}
   \rhead{#4}
   \section*{#2}
@@ -260,26 +283,23 @@
 % \begin{macro}{\move}
 % \changes{0.1}{2013/02/14}{Add move command}
 % The next thing we need to define is the \code{\textbackslash move} command.
-% This command takes in a move to display, and (optionally) the number of beats
-% the move takes. If no beats are specified, it is assumed it takes up a full
-% 16.
+% This command takes in a move to display, and (optionally) the number of counts
+% the move takes. If the count is not specified, 16 is used as the default.
 %    \begin{macrocode}
 \newcommand*{\move}[2][16]{%
-  \ifthenelse{\intcalcMod{\value{dancecount}}{64}=0}{A1.\ }{%
-    \ifthenelse{\intcalcMod{\value{dancecount}-16}{64}=0}{A2.\ }{%
-      \ifthenelse{\intcalcMod{\value{dancecount}-32}{64}=0}{B1.\ }{%
-        \ifthenelse{\intcalcMod{\value{dancecount}-48}{64}=0}{B2.\ }{}%
-      }%
-    }%
-  }%
+  \ifthenelse{\intcalcMod{\value{dancecount}}{16}=0}{%
+    \Alph{phrasecount}\arabic{partcount}.\ %
+  }{}%
   \addtocounter{dancecount}{#1}%
   #2%
   \ifthenelse{\intcalcMod{\value{dancecount}}{8}=0
     \and\not\intcalcMod{\value{dancecount}}{16}=0}{;}{\nopagebreak}%
   \ifthenelse{\not\intcalcMod{\value{dancecount}}{8}=0}{,}{\nopagebreak}%
   \ifthenelse{\intcalcMod{\value{dancecount}}{32}=0}{%
-    \pagebreak[1]\vspace{1em}}{}%
-  \ifthenelse{\intcalcMod{\value{dancecount}}{16}=0}{\newline}{}%
+    \addtocounter{phrasecount}{1}\setcounter{partcount}{0}\pagebreak[1]%
+    \vspace{1em}}{}%
+  \ifthenelse{\intcalcMod{\value{dancecount}}{16}=0}{%
+    \addtocounter{partcount}{1}\newline}{}%
 }
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/tex/latex/contracard/contracard.cls b/Master/texmf-dist/tex/latex/contracard/contracard.cls
new file mode 100644
index 00000000000..e473f047bfe
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/contracard/contracard.cls
@@ -0,0 +1,110 @@
+%%
+%% This is file `contracard.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% contracard.dtx  (with options: `contracard')
+%% 
+%%   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.
+%% 
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesClass{contracard}[2013/02/17]
+\AtEndOfClass{\LoadClass{article}}
+\AtEndOfClass{\RequirePackage{intcalc}}
+\AtEndOfClass{\RequirePackage{hyperref}}
+\AtEndOfClass{\RequirePackage{ifthen}}
+\AtEndOfClass{\RequirePackage{geometry}}
+\AtEndOfClass{\RequirePackage{fancyhdr}}
+\AtEndOfClass{\RequirePackage[compact]{titlesec}}
+\DeclareOption{small}{%
+  \AtBeginDocument{%
+    \titleformat{\section}{\normalsize\bfseries}{\thesection}{1em}{}%
+  }
+  \PassOptionsToPackage{%
+    margin=0.25in,top=0.75in,paperwidth=5in,paperheight=3in%
+  }{geometry}%
+}
+\DeclareOption{medium}{%
+  \AtBeginDocument{\large}
+  \PassOptionsToPackage{%
+    margin=0.5in,top=0.75in,paperwidth=6in,paperheight=4in%
+  }{geometry}%
+}
+\DeclareOption{large}{%
+  \AtBeginDocument{\Large}
+  \PassOptionsToPackage{%
+    margin=0.75in,top=1in,paperwidth=8in,paperheight=5in%
+  }{geometry}%
+}
+\DeclareOption{a7paper}{%
+  \AtBeginDocument{%
+    \titleformat{\section}{\normalsize\bfseries}{\thesection}{1em}{}%
+  }
+  \PassOptionsToPackage{%
+    margin=5mm,top=15mm,paperwidth=105mm,paperheight=74mm%
+  }{geometry}%
+}
+\DeclareOption*{%
+  \PassOptionsToClass{\CurrentOption}{article}%
+}
+\AtBeginDocument{\renewcommand{\headrulewidth}{0pt}}
+\AtBeginDocument{\pagestyle{empty}}
+\newcounter{dancecount}
+\newcounter{partcount}
+\newcounter{phrasecount}
+\newcommand*{\progressed}{\setcounter{phrasecount}{1}}
+\newcommand*{\defaultcontraenv}{flushleft}
+\newenvironment{contra}[4][\defaultcontraenv]{%
+  \clearpage
+  \setcounter{dancecount}{0}
+  \setcounter{partcount}{1}
+  \setcounter{phrasecount}{1}
+  \thispagestyle{fancy}
+  \rhead{#4}
+  \section*{#2}
+  {#3}
+  \newcommand*{\@contraenv}{#1}
+  \begin{\@contraenv}
+}{%
+  \end{\@contraenv}
+}
+\newcommand*{\move}[2][16]{%
+  \ifthenelse{\intcalcMod{\value{dancecount}}{16}=0}{%
+    \Alph{phrasecount}\arabic{partcount}.\ %
+  }{}%
+  \addtocounter{dancecount}{#1}%
+  #2%
+  \ifthenelse{\intcalcMod{\value{dancecount}}{8}=0
+    \and\not\intcalcMod{\value{dancecount}}{16}=0}{;}{\nopagebreak}%
+  \ifthenelse{\not\intcalcMod{\value{dancecount}}{8}=0}{,}{\nopagebreak}%
+  \ifthenelse{\intcalcMod{\value{dancecount}}{32}=0}{%
+    \addtocounter{phrasecount}{1}\setcounter{partcount}{0}\pagebreak[1]%
+    \vspace{1em}}{}%
+  \ifthenelse{\intcalcMod{\value{dancecount}}{16}=0}{%
+    \addtocounter{partcount}{1}\newline}{}%
+}
+\ProcessOptions\relax
+%% 
+%%   ___________
+%%   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.cls
+%%                               and contracard.pdf
+%% 
+%%
+%% End of file `contracard.cls'.
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 292301ab55d..9a48492adcd 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1281,6 +1281,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
  'colortab',	'colortab\.tex|' . $standardtex,
  'components-of-TeX',	'NULL',
  'concepts',	'concepts\.sty',
+ 'contracard',	"$package.cls",
  'contour',	'\.cfg|\.sty|\.cnt',
  'csplain',	'\.tex',
  'ctib',	'\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|ctib\.tex',
@@ -1937,6 +1938,7 @@ $standardsource='\.(bat|c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh';
  'chronology',	'chronology.dtx',
  'cmbright',	'NULL',
  'codicefiscaleitaliano', 'codicefiscaleitaliano.dtx',
+ 'contracard',	"$package.dtx",
  'cprotect',	"$package.dtx",
  'curve2e',	'curve2e.dtx',
  'dotseqn',	'dotseqn.dtx',