diff options
author | Karl Berry <karl@freefriends.org> | 2019-03-03 22:14:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-03-03 22:14:15 +0000 |
commit | 816af3360c21dfc27120a101c940d5691ff1e22b (patch) | |
tree | 48b6d2c10cf7370f6471d3b1beec1ac004ea70bb /Master/texmf-dist/tex | |
parent | 43b684ab018cff8b896e1cb8e3e5d6476c3bd427 (diff) |
contracard (3mar19)
git-svn-id: svn://tug.org/texlive/trunk@50217 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/contracard/contracard.cls | 13 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/contracard/contracard.sty | 149 |
2 files changed, 79 insertions, 83 deletions
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'. |