acmart (18may16)

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

19 files changed, 28 insertions, 123 deletions

diff --git a/Master/texmf-dist/doc/latex/acmart/README b/Master/texmf-dist/doc/latex/acmart/README
index aba65b70c63..3b70196537b 100644
--- a/Master/texmf-dist/doc/latex/acmart/README
+++ b/Master/texmf-dist/doc/latex/acmart/README
@@ -3,4 +3,6 @@ Association for Computing Machinery.
 
 Changes
 
-version 1.08    SIGPLAN reformatting (Matthew Fluet); bug fixes
\ No newline at end of file
+version 1.08    SIGPLAN reformatting (Matthew Fluet); bug fixes
+
+version 1.09    SIGPLAN: revert caption rules (Matthew Fluet)
diff --git a/Master/texmf-dist/doc/latex/acmart/acmart.pdf b/Master/texmf-dist/doc/latex/acmart/acmart.pdf
index 20fcf971b58..1c8744aa8ed 100644
--- a/Master/texmf-dist/doc/latex/acmart/acmart.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/acmart.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/flies-eps-converted-to.pdf b/Master/texmf-dist/doc/latex/acmart/flies-eps-converted-to.pdf
index 0c044de9525..dab14238d1d 100644
--- a/Master/texmf-dist/doc/latex/acmart/flies-eps-converted-to.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/flies-eps-converted-to.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/fly-eps-converted-to.pdf b/Master/texmf-dist/doc/latex/acmart/fly-eps-converted-to.pdf
index a4e1035bb35..b9cf9ab53c0 100644
--- a/Master/texmf-dist/doc/latex/acmart/fly-eps-converted-to.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/fly-eps-converted-to.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/mouse-eps-converted-to.pdf b/Master/texmf-dist/doc/latex/acmart/mouse-eps-converted-to.pdf
index c330b5a8091..780fe1546e2 100644
--- a/Master/texmf-dist/doc/latex/acmart/mouse-eps-converted-to.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/mouse-eps-converted-to.pdf
@@ -40,17 +40,17 @@ endobj
 endobj
 9 0 obj
 <</Type/Metadata
-/Subtype/XML/Length 1489>>stream
+/Subtype/XML/Length 1495>>stream
 <?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
 <?adobe-xap-filters esc="CRLF"?>
 <x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
 <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
-<rdf:Description rdf:about='f34ff4d1-5223-11f1-0000-6130e7753adf' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 8.71'/>
-<rdf:Description rdf:about='f34ff4d1-5223-11f1-0000-6130e7753adf' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2016-05-14T15:09:37-04:00</xmp:ModifyDate>
-<xmp:CreateDate>2016-05-14T15:09:37-04:00</xmp:CreateDate>
-<xmp:CreatorTool>Adobe Illustrator(M)for Windows, version 4.0</xmp:CreatorTool></rdf:Description>
-<rdf:Description rdf:about='f34ff4d1-5223-11f1-0000-6130e7753adf' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='f34ff4d1-5223-11f1-0000-6130e7753adf'/>
-<rdf:Description rdf:about='f34ff4d1-5223-11f1-0000-6130e7753adf' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>(OUSE.AI)</rdf:li></rdf:Alt></dc:title><dc:creator><rdf:Seq><rdf:li>(iepo Drop                              )(tudio Bitmuis                          )</rdf:li></rdf:Seq></dc:creator></rdf:Description>
+<rdf:Description rdf:about='3e489f47-44be-11f1-0000-6130e7753adf' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.02'/>
+<rdf:Description rdf:about='3e489f47-44be-11f1-0000-6130e7753adf' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2016-04-27T13:58:49-04:00</xmp:ModifyDate>
+<xmp:CreateDate>2016-04-27T13:58:49-04:00</xmp:CreateDate>
+<xmp:CreatorTool>Adobe Illustrator(TM) for Windows, version 4.0</xmp:CreatorTool></rdf:Description>
+<rdf:Description rdf:about='3e489f47-44be-11f1-0000-6130e7753adf' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='3e489f47-44be-11f1-0000-6130e7753adf'/>
+<rdf:Description rdf:about='3e489f47-44be-11f1-0000-6130e7753adf' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>(MOUSE.AI)</rdf:li></rdf:Alt></dc:title><dc:creator><rdf:Seq><rdf:li>(Siepo Drop                              ) (Studio Bitmuis                          )</rdf:li></rdf:Seq></dc:creator></rdf:Description>
 </rdf:RDF>
 </x:xmpmeta>
                                                                         
@@ -59,9 +59,9 @@ endobj
 endstream
 endobj
 2 0 obj
-<</Producer(GPL Ghostscript 8.71)
-/CreationDate(D:20160514150937-04'00')
-/ModDate(D:20160514150937-04'00')
+<</Producer(GPL Ghostscript 9.02)
+/CreationDate(D:20160427135849-04'00')
+/ModDate(D:20160427135849-04'00')
 /Creator(Adobe Illustrator\(TM\) for Windows, version 4.0)
 /Author(\(Siepo Drop                              \) \(Studio Bitmuis                          \))
 /Title(\(MOUSE.AI\))>>endobj
@@ -69,7 +69,7 @@ xref
 0 10
 0000000000 65535 f 
 0000000747 00000 n 
-0000002446 00000 n 
+0000002452 00000 n 
 0000000688 00000 n 
 0000000557 00000 n 
 0000000015 00000 n 
@@ -79,8 +79,8 @@ xref
 0000000881 00000 n 
 trailer
 << /Size 10 /Root 1 0 R /Info 2 0 R
-/ID [<49B9522A46A6043AE44A96E39B26A7BE><49B9522A46A6043AE44A96E39B26A7BE>]
+/ID [<F54CE37642C4529AE267CD93C7D615DF><F54CE37642C4529AE267CD93C7D615DF>]
 >>
 startxref
-2748
+2754
 %%EOF
diff --git a/Master/texmf-dist/doc/latex/acmart/rosette-eps-converted-to.pdf b/Master/texmf-dist/doc/latex/acmart/rosette-eps-converted-to.pdf
index 5d32b1554e2..9e49eb1fb4a 100644
--- a/Master/texmf-dist/doc/latex/acmart/rosette-eps-converted-to.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/rosette-eps-converted-to.pdf
@@ -44,12 +44,12 @@ endobj
 <?adobe-xap-filters esc="CRLF"?>
 <x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
 <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
-<rdf:Description rdf:about='f8ad3f51-5223-11f1-0000-e57098484f26' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 8.71'/>
-<rdf:Description rdf:about='f8ad3f51-5223-11f1-0000-e57098484f26' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2016-05-14T15:09:46-04:00</xmp:ModifyDate>
-<xmp:CreateDate>2016-05-14T15:09:46-04:00</xmp:CreateDate>
+<rdf:Description rdf:about='499bcac7-44be-11f1-0000-e57098484f26' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.02'/>
+<rdf:Description rdf:about='499bcac7-44be-11f1-0000-e57098484f26' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2016-04-27T13:59:08-04:00</xmp:ModifyDate>
+<xmp:CreateDate>2016-04-27T13:59:08-04:00</xmp:CreateDate>
 <xmp:CreatorTool>UnknownApplication</xmp:CreatorTool></rdf:Description>
-<rdf:Description rdf:about='f8ad3f51-5223-11f1-0000-e57098484f26' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='f8ad3f51-5223-11f1-0000-e57098484f26'/>
-<rdf:Description rdf:about='f8ad3f51-5223-11f1-0000-e57098484f26' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description>
+<rdf:Description rdf:about='499bcac7-44be-11f1-0000-e57098484f26' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='499bcac7-44be-11f1-0000-e57098484f26'/>
+<rdf:Description rdf:about='499bcac7-44be-11f1-0000-e57098484f26' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description>
 </rdf:RDF>
 </x:xmpmeta>
                                                                         
@@ -58,9 +58,9 @@ endobj
 endstream
 endobj
 2 0 obj
-<</Producer(GPL Ghostscript 8.71)
-/CreationDate(D:20160514150946-04'00')
-/ModDate(D:20160514150946-04'00')>>endobj
+<</Producer(GPL Ghostscript 9.02)
+/CreationDate(D:20160427135908-04'00')
+/ModDate(D:20160427135908-04'00')>>endobj
 xref
 0 10
 0000000000 65535 f 
@@ -75,7 +75,7 @@ xref
 0000001038 00000 n 
 trailer
 << /Size 10 /Root 1 0 R /Info 2 0 R
-/ID [<F37E4FB2D4D10AAA6995B1EFA88D66F2><F37E4FB2D4D10AAA6995B1EFA88D66F2>]
+/ID [<27FFEE371E447DBF31C0814450606A79><27FFEE371E447DBF31C0814450606A79>]
 >>
 startxref
 2556
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf
index 0b19ce4c0c5..6805ac51151 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf
index 857b6003a4f..54c99dc33d4 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf
index 688424c79bc..2164b17459a 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf
index cba6cbcc59c..fb751aaf514 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf
index 0aa4523f072..346d7722d8d 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf
index a4db1441cf4..80e514d7912 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf
index 4264b892580..cb634d79612 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf b/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf
index 428d2d00e21..78e5554a64a 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf
index 8f3ed4b79fe..0c90ce21a16 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex
index 7af55ec3bcf..7a3d3808283 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex
@@ -139,12 +139,9 @@ ACM SIG Proceedings.
   \label{fig:teaser}
 \end{teaserfigure}
 
-\captionruleoff % Switching off the rule for teaser
 
 \maketitle
 
-\captionruleon % Switching on the rule for other figures and tables
-
 \input{samplebody-conf}
 
 \bibliographystyle{ACM-Reference-Format-Journals}
diff --git a/Master/texmf-dist/doc/latex/acmart/samplebody-conf.tex b/Master/texmf-dist/doc/latex/acmart/samplebody-conf.tex
index 0879b5ee624..fa1cf0535df 100644
--- a/Master/texmf-dist/doc/latex/acmart/samplebody-conf.tex
+++ b/Master/texmf-dist/doc/latex/acmart/samplebody-conf.tex
@@ -168,7 +168,6 @@ in the printed output of this document.
 
 \begin{table*}
   \centering
-  \nocaptionrule % SIGPLAN only; does not do anything in other formats
   \caption{Some Typical Commands}
   \label{tab:commands}
   \begin{tabular}{ccl}
@@ -229,7 +228,6 @@ with \textbf{figure*}, not \textbf{figure}!
 \begin{figure*}
 \centering
 \includegraphics{flies}
-\nocaptionrule % SIGPLAN only; does not do anything in other formats
 \caption{A sample black and white graphic
 that needs to span two columns of text.}
 \end{figure*}
diff --git a/Master/texmf-dist/source/latex/acmart/acmart.dtx b/Master/texmf-dist/source/latex/acmart/acmart.dtx
index 71070c7c321..6b0c7a49afa 100644
--- a/Master/texmf-dist/source/latex/acmart/acmart.dtx
+++ b/Master/texmf-dist/source/latex/acmart/acmart.dtx
@@ -868,16 +868,6 @@
 % \item[margintable:] a table on the margin
 % \end{description}
 %
-% \DescribeMacro{\nocaptionrule}%
-% \DescribeMacro{\captionruleoff}%
-% \DescribeMacro{\captionruleon}%
-% SIGPLAN format uses rules between captions and float bodies.  In
-% some cases these rules interfere with the material.  The command
-% \cs{nocaptionrule} before the caption (but inside figure or table)
-% switches the rule off.  The command \cs{captionruleoff} switches off
-% caption rules for all subsequent figures, while the command
-% \cs{captionruleon} switches them on.  In other formats this command
-% does not make any difference.
 %
 %\subsection{Theorems}
 %\label{sec:ug_theorems}
@@ -1007,7 +997,7 @@
 \ProvidesFile{acmart.dtx}
 %</gobble>
 %<class>\ProvidesClass{acmart}
-[2016/05/14 v1.08 Typesetting articles for Association of
+[2016/05/18 v1.09 Typesetting articles for Association of
 Computing Machinery]
 %    \end{macrocode}
 %
@@ -1031,6 +1021,7 @@ Computing Machinery]
 % acmsiggraph and doi numbers for sigproc.bib}
 % \changes{v1.08}{2016/05/13}{SIGPLAN reformatting by Matthew Fluet}
 % \changes{v1.08}{2016/05/13}{Typos corrected (Tobias Pape)}
+% \changes{v1.09}{2016/05/18}{Revert SIGPLAN caption rules}
 %
 %
 % And the driver code:
@@ -1757,73 +1748,6 @@ Computing Machinery]
 %    \begin{macrocode}
 \RequirePackage{caption, float}
 \captionsetup[table]{position=top}
-%    \end{macrocode}
-% 
-%
-%
-% \begin{macro}{\if@ACM@captionrule}
-% \changes{v1.08}{2016/05/14}{Introduced macro}
-%   Whether to use caption rules in SIGPLAN.  We define it here, so
-%   caption rule commands do not produce errors with other
-%   formats. Fortunately, other formats do not use rules.
-%    \begin{macrocode}
-\newif\if@ACM@captionrule
-\@ACM@captionruletrue
-%    \end{macrocode}
-% \end{macro}
-%
-%
-% \begin{macro}{\nocaptionrule}
-% \changes{v1.08}{2016/05/14}{Introduced macro}
-%   Locally delete caption rule
-%    \begin{macrocode}
-\def\nocaptionrule{\@ACM@captionrulefalse}
-%    \end{macrocode}
-%   
-% \end{macro}
-%
-% \begin{macro}{\captionruleoff}
-% \changes{v1.08}{2016/05/14}{Introduced macro}
-%   Globally switching rules off
-%    \begin{macrocode}
-\def\captionruleoff{\global\@ACM@captionrulefalse}
-%    \end{macrocode}
-%   
-% \end{macro}
-%
-% \begin{macro}{\captionruleon}
-% \changes{v1.08}{2016/05/14}{Introduced macro}
-%   Globally switching rules on
-%    \begin{macrocode}
-\def\captionruleon{\global\@ACM@captionruletrue}
-%    \end{macrocode}
-%   
-% \end{macro}
-%
-% \begin{macro}{@ACM@capfmtWithRuleAbove}
-% \changes{v1.08}{2016/05/14}{Introduced macro}
-%   The SIGPLAN ruled caption for figures
-%    \begin{macrocode}
-\DeclareCaptionFormat{@ACM@capfmtWithRuleAbove}{%
-  \if@ACM@captionrule\hrulefill\par\noindent\fi#1#2#3\par}
-%    \end{macrocode}
-%   
-% \end{macro}
-%
-% \begin{macro}{@ACM@capfmtWithRuleBelow}
-% \changes{v1.08}{2016/05/14}{Introduced macro}
-%   The SIGPLAN ruled caption for tables
-%    \begin{macrocode}
-\DeclareCaptionFormat{@ACM@capfmtWithRuleBelow}{%
-  #1#2#3\if@ACM@captionrule\par\vspace{-.5\baselineskip}%
-  \noindent\hrulefill\fi\par}
-%    \end{macrocode}
-%   
-% \end{macro}
-%
-%
-% And the actual setup
-%    \begin{macrocode}
 \if@ACM@journal
   \captionsetup{labelfont={sf, small},
     textfont={sf, small},  margin=\z@}
@@ -1840,9 +1764,6 @@ Computing Machinery]
   \or % siggraph
     \captionsetup{textfont={it}}
   \or % sigplan
-    \setlength\abovecaptionskip{4\p@}
-    \captionsetup[figure]{format=@ACM@capfmtWithRuleAbove}
-    \captionsetup[table]{format=@ACM@capfmtWithRuleBelow}
     \captionsetup{labelfont={bf},
       textfont={normalfont}, labelsep=period, margin=\z@}
   \or % sigchi
diff --git a/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls
index 36f1109af94..a321236edcc 100644
--- a/Master/texmf-dist/tex/latex/acmart/acmart.cls
+++ b/Master/texmf-dist/tex/latex/acmart/acmart.cls
@@ -37,7 +37,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{acmart}
-[2016/05/14 v1.08 Typesetting articles for Association of
+[2016/05/18 v1.09 Typesetting articles for Association of
 Computing Machinery]
 \def\@classname{acmart}
 \RequirePackage{xkeyval}
@@ -518,16 +518,6 @@ Computing Machinery]
 \fi
 \RequirePackage{caption, float}
 \captionsetup[table]{position=top}
-\newif\if@ACM@captionrule
-\@ACM@captionruletrue
-\def\nocaptionrule{\@ACM@captionrulefalse}
-\def\captionruleoff{\global\@ACM@captionrulefalse}
-\def\captionruleon{\global\@ACM@captionruletrue}
-\DeclareCaptionFormat{@ACM@capfmtWithRuleAbove}{%
-  \if@ACM@captionrule\hrulefill\par\noindent\fi#1#2#3\par}
-\DeclareCaptionFormat{@ACM@capfmtWithRuleBelow}{%
-  #1#2#3\if@ACM@captionrule\par\vspace{-.5\baselineskip}%
-  \noindent\hrulefill\fi\par}
 \if@ACM@journal
   \captionsetup{labelfont={sf, small},
     textfont={sf, small},  margin=\z@}
@@ -544,9 +534,6 @@ Computing Machinery]
   \or % siggraph
     \captionsetup{textfont={it}}
   \or % sigplan
-    \setlength\abovecaptionskip{4\p@}
-    \captionsetup[figure]{format=@ACM@capfmtWithRuleAbove}
-    \captionsetup[table]{format=@ACM@capfmtWithRuleBelow}
     \captionsetup{labelfont={bf},
       textfont={normalfont}, labelsep=period, margin=\z@}
   \or % sigchi