contracard (22feb13)

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

5 files changed, 159 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/latex/contracard/Makefile b/Master/texmf-dist/doc/latex/contracard/Makefile
index 963e13c200c..0ba7eaad186 100644
--- a/Master/texmf-dist/doc/latex/contracard/Makefile
+++ b/Master/texmf-dist/doc/latex/contracard/Makefile
@@ -74,7 +74,16 @@ ctan: $(CTAN_ZIP)
 tds: $(TDS_ZIP)
 world: all ctan
 
-gendoc: $(DTX)
+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: $(DTX) resources
 	@echo "Compiling documentation"
 	$(DO_LATEX_WRITE18)
 	$(DO_MAKEINDEX)
@@ -160,7 +169,7 @@ manifest:
 	@for f in $(GENERATED); do echo $$f; done
 
 clean:
-	@$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg *.glo *.gls *.example *.out *.synctex* *.tmp *.cls *.sty *.ins *.pdf *.dvi README LICENSE *.lot
+	@$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg *.glo *.gls *.example *.out *.synctex* *.tmp *.cls *.sty *.ins *.pdf *.dvi README LICENSE *.lot *.png
 	@$(RM) -- $(GENERATED) $(ZIPS)
 	@$(RM) -- $(builddir)/*
 
diff --git a/Master/texmf-dist/doc/latex/contracard/README b/Master/texmf-dist/doc/latex/contracard/README
index cdb282ba00e..0acf3d9ccde 100644
--- a/Master/texmf-dist/doc/latex/contracard/README
+++ b/Master/texmf-dist/doc/latex/contracard/README
@@ -8,5 +8,7 @@ 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).
+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).
diff --git a/Master/texmf-dist/doc/latex/contracard/contracard-style.sty b/Master/texmf-dist/doc/latex/contracard/contracard-style.sty
index 335d953dc7a..1dd0b6dda29 100644
--- a/Master/texmf-dist/doc/latex/contracard/contracard-style.sty
+++ b/Master/texmf-dist/doc/latex/contracard/contracard-style.sty
@@ -19,12 +19,20 @@
 %%   LaTeX version 2008/05/04 or later.
 %% 
 \ProvidesPackage{contracard-style}
-\usepackage{fancyvrb,hologo,framed,multicol,url}
+\usepackage[utf8x]{inputenc}
+\usepackage{fancyvrb,hologo,framed,multicol,url,textcomp,cclicenses,graphicx,contracard}
 \usepackage[pdfborder=0, bookmarks, colorlinks=false, hidelinks]{hyperref}
 \usepackage[parfill]{parskip}
 
 \fvset{gobble=2}
 
+\newenvironment*{exampledance}{%
+  \begin{minipage}{\textwidth}
+  \vspace{3em}
+}{%
+  \end{minipage}
+}
+
 \newcommand*{\gittag}{%
   \immediate\write18{%
     rm gittag.tex 2> /dev/null; (git describe --tags --dirty || echo "v0.0") 2> /dev/null > gittag.tex
@@ -47,7 +55,8 @@
 %%   Public key: 0xEC2C9934
 %% 
 %%   This work consists of this file contracard.dtx
-%%             and the derived files contracard.cls
+%%             and the derived files contracard.sty
+%%                               and contracard.cls
 %%                               and contracard.pdf
 %% 
 %%
diff --git a/Master/texmf-dist/doc/latex/contracard/contracard.pdf b/Master/texmf-dist/doc/latex/contracard/contracard.pdf
index 9b0c5603973..eec6bf00b45 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/doc/latex/contracard/contracard.sty b/Master/texmf-dist/doc/latex/contracard/contracard.sty
new file mode 100644
index 00000000000..527e696423c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/contracard/contracard.sty
@@ -0,0 +1,133 @@
+%%
+%% 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.
+%% 
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesPackage{contracard}[2013/02/20]
+\RequirePackage{intcalc}
+\RequirePackage{ifthen}
+\newcommand*{\defaultcontraenv}{flushleft}
+\newcommand*{\dancetitleenv}{flushleft}
+\newcommand*{\dancetitleformat}{\section*}
+\newcommand*{\danceauthorformat}{\subsection*}
+\newcommand*{\danceformformat}{\hfill}
+\newcommand*{\movedelimiter}{,}
+\newcommand*{\partdelimiter}{.}
+\newcommand*{\midpartdelimiter}{;}
+\newcounter{dancecount}
+\newcounter{partcount}
+\newcounter{phrasecount}
+\newcounter{dancepart}
+\newcounter{dancephrase}
+\newcommand*{\resetdancephrase}{%
+  \ifthenelse{\value{partcount}=16}{\newline}{}%
+  \@ifstar{\@resetdancephraseStar}{\@resetdancephraseNoStar}%
+}
+\newcommand*{\@resetdancephraseStar}{%
+  \setcounter{dancephrase}{1}%
+  \setcounter{phrasecount}{0}%
+  \resetdancepart*
+}
+\newcommand*{\@resetdancephraseNoStar}{%
+  \ifthenelse{\value{dancephrase}=1}{}{%
+    \setcounter{dancephrase}{1}%
+    \setcounter{phrasecount}{0}%
+    \resetdancepart
+  }%
+}
+\newcommand*{\resetdancepart}{%
+  \@ifstar{\@resetdancepartStar}{\@resetdancepartNoStar}%
+}
+\newcommand*{\@resetdancepartStar}{%
+  \setcounter{dancepart}{1}%
+  \setcounter{partcount}{0}%
+}
+\newcommand*{\@resetdancepartNoStar}{%
+  \ifthenelse{\value{dancepart}=1}{}{%
+    \setcounter{dancepart}{1}%
+    \setcounter{partcount}{0}%
+  }%
+}
+\newcommand*{\newdancephrase}{%
+  \ifthenelse{\not\value{phrasecount}=0\and\not\value{phrasecount}=32}{\newline}{}%
+  \addtocounter{dancephrase}{1}%
+  \setcounter{phrasecount}{0}%
+  \resetdancepart*
+}
+\newcommand*{\newdancepart}{%
+  \addtocounter{dancepart}{1}%
+  \setcounter{partcount}{0}%
+}
+\newenvironment{contra}[4][\defaultcontraenv]{%
+  \setcounter{dancecount}{0}
+  \resetdancepart*
+  \resetdancephrase*
+  \ifdefined\@ccisclass\clearpage\fi%
+  \begin{\dancetitleenv}
+    \ifdefined\@ccisclass%
+      \pagestyle{myheadings}
+      \thispagestyle{myheadings}
+      \markboth{}{\danceformformat{#4}}
+    \else%
+      {\danceformformat{#4}}%
+    \fi%
+    {\dancetitleformat{#2}}%
+    {\danceauthorformat{#3}}%
+  \end{\dancetitleenv}
+  \newcommand*{\@contraenv}{#1}
+  \begin{\@contraenv}
+}{%
+  \end{\@contraenv}
+}
+\newcommand*{\move}[2][16]{%
+  \ifthenelse{\value{partcount}=16}{\newline}{}%
+  \ifthenelse{\value{phrasecount}=32}{%
+    \newdancephrase%
+  }{%
+    \ifthenelse{\value{partcount}=16}{%
+     \newdancepart%
+    }{}%
+  }
+  \ifthenelse{\intcalcMod{\value{dancecount}}{16}=0}{%
+    \Alph{dancephrase}\arabic{dancepart}\partdelimiter\ %
+  }{}%
+  \addtocounter{dancecount}{#1}%
+  \addtocounter{phrasecount}{#1}%
+  \addtocounter{partcount}{#1}%
+  #2%
+  \ifthenelse{\value{phrasecount}=32}{%
+    \pagebreak[1]\vspace{1em}%
+  }{}%
+  \ifthenelse{\value{partcount}=8}{\midpartdelimiter\nopagebreak}{%
+    \ifthenelse{\not\value{partcount}=16}{\movedelimiter\nopagebreak\nolinebreak[2]}{}}%
+}
+%% 
+%%   ___________
+%%   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
+%% 
+%%
+%% End of file `contracard.sty'.