contracard (24sep13)

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

5 files changed, 42 insertions, 50 deletions

diff --git a/Master/texmf-dist/doc/latex/contracard/README b/Master/texmf-dist/doc/latex/contracard/README
index dcf24dfc6fe..5df2be4b14c 100644
--- a/Master/texmf-dist/doc/latex/contracard/README
+++ b/Master/texmf-dist/doc/latex/contracard/README
@@ -1,6 +1,7 @@
 # Contra Card
 
-A LaTeX package for contra and square dance calls.
+A LaTeX package for typesetting traditional contra and square dances, and a
+class which generates calling cards for the same.
 
 ## Download
 
@@ -12,7 +13,8 @@ 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).
+[PDF] is available from [CTAN](http://ctan.org/pkg/contracard) or
+[GitHub](https://github.com/SamWhited/contracard/releases).
 
 ## License
 
@@ -20,7 +22,7 @@ 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:
+any later version. The latest version of this license can be found at:
 
 http://www.latex-project.org/lppl.txt
 
@@ -29,15 +31,11 @@ and version 1.3c or later is part of all distributions of LaTeX version
 
 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
+- 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`, `contracard.cls`, `contracard.pdf`, `README.md`, and `README`.
diff --git a/Master/texmf-dist/doc/latex/contracard/README.md b/Master/texmf-dist/doc/latex/contracard/README.md
index dcf24dfc6fe..5df2be4b14c 100644
--- a/Master/texmf-dist/doc/latex/contracard/README.md
+++ b/Master/texmf-dist/doc/latex/contracard/README.md
@@ -1,6 +1,7 @@
 # Contra Card
 
-A LaTeX package for contra and square dance calls.
+A LaTeX package for typesetting traditional contra and square dances, and a
+class which generates calling cards for the same.
 
 ## Download
 
@@ -12,7 +13,8 @@ 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).
+[PDF] is available from [CTAN](http://ctan.org/pkg/contracard) or
+[GitHub](https://github.com/SamWhited/contracard/releases).
 
 ## License
 
@@ -20,7 +22,7 @@ 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:
+any later version. The latest version of this license can be found at:
 
 http://www.latex-project.org/lppl.txt
 
@@ -29,15 +31,11 @@ and version 1.3c or later is part of all distributions of LaTeX version
 
 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
+- 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`, `contracard.cls`, `contracard.pdf`, `README.md`, and `README`.
diff --git a/Master/texmf-dist/doc/latex/contracard/contracard.pdf b/Master/texmf-dist/doc/latex/contracard/contracard.pdf
index 7790381be20..8cff5084e22 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
index 1a1a44f2e8a..9e50d2fea3b 100644
--- a/Master/texmf-dist/doc/latex/contracard/contracard.sty
+++ b/Master/texmf-dist/doc/latex/contracard/contracard.sty
@@ -203,11 +203,10 @@
     }{}%
     \ifx\cc@moveStar\undefined%
       \ifthenelse{\value{partcount}=\intcalcDiv{\value{dancepartlength}}{2}}{%
-        \midpartdelimiter\nopagebreak\ \nopagebreak\ignorespaces%
+        \midpartdelimiter\looseness=-1\linebreak[1]\space\nopagebreak\ignorespaces%
       }{%
         \ifthenelse{\NOT\value{partcount}=\value{dancepartlength}}{%
-          \movedelimiter\nopagebreak\nolinebreak[2]\ %
-          \nopagebreak\nolinebreak[2]\ignorespaces%
+          \movedelimiter\nolinebreak[2]\space\nopagebreak\ignorespaces%
         }{}%
       }%
     \fi%
diff --git a/Master/texmf-dist/source/latex/contracard/contracard.dtx b/Master/texmf-dist/source/latex/contracard/contracard.dtx
index 0a3b21bedd3..80bfae7ed3e 100644
--- a/Master/texmf-dist/source/latex/contracard/contracard.dtx
+++ b/Master/texmf-dist/source/latex/contracard/contracard.dtx
@@ -5,7 +5,8 @@
 %<*readme>
 # Contra Card
 
-A LaTeX package for contra and square dance calls.
+A LaTeX package for typesetting traditional contra and square dances, and a
+class which generates calling cards for the same.
 
 ## Download
 
@@ -17,7 +18,8 @@ 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).
+[PDF] is available from [CTAN](http://ctan.org/pkg/contracard) or
+[GitHub](https://github.com/SamWhited/contracard/releases).
 
 ## License
 
@@ -25,7 +27,7 @@ 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:
+any later version. The latest version of this license can be found at:
 
 http://www.latex-project.org/lppl.txt
 
@@ -34,18 +36,14 @@ and version 1.3c or later is part of all distributions of LaTeX version
 
 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
+- 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
+This work consists of this file contracard.dtx and the derived files
+`contracard.sty`, `contracard.cls`, `contracard.pdf`, `README.md`, and `README`.
 %</readme>
 %<*internal>
 \fi
@@ -945,11 +943,10 @@ This work consists of this file contracard.dtx
     }{}%
     \ifx\cc@moveStar\undefined%
       \ifthenelse{\value{partcount}=\intcalcDiv{\value{dancepartlength}}{2}}{%
-        \midpartdelimiter\nopagebreak\ \nopagebreak\ignorespaces%
+        \midpartdelimiter\looseness=-1\linebreak[1]\space\nopagebreak\ignorespaces%
       }{%
         \ifthenelse{\NOT\value{partcount}=\value{dancepartlength}}{%
-          \movedelimiter\nopagebreak\nolinebreak[2]\ %
-          \nopagebreak\nolinebreak[2]\ignorespaces%
+          \movedelimiter\nolinebreak[2]\space\nopagebreak\ignorespaces%
         }{}%
       }%
     \fi%