summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-09-26 20:52:14 +0000
committerKarl Berry <karl@freefriends.org>2016-09-26 20:52:14 +0000
commit4732f49acacd10b08ae1dc07e4db851c44fb3114 (patch)
tree1d77f8a44f3d48d386749e6cc65c92f737874eb2
parentbd713db34dad79c8efbc6a9c8bf3da575a090dc2 (diff)
acmart (26sep16)
git-svn-id: svn://tug.org/texlive/trunk@42151 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst121
-rw-r--r--Master/texmf-dist/doc/latex/acmart/Makefile1
-rw-r--r--Master/texmf-dist/doc/latex/acmart/README3
-rw-r--r--Master/texmf-dist/doc/latex/acmart/acmart.pdfbin691859 -> 679940 bytes
-rw-r--r--Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdfbin619848 -> 610281 bytes
-rw-r--r--Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdfbin626732 -> 625820 bytes
-rw-r--r--Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdfbin586040 -> 585079 bytes
-rw-r--r--Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdfbin655720 -> 655426 bytes
-rw-r--r--Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdfbin1285445 -> 1299120 bytes
-rw-r--r--Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdfbin1061352 -> 1069516 bytes
-rw-r--r--Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdfbin600221 -> 608554 bytes
-rw-r--r--Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdfbin1033369 -> 1041528 bytes
-rw-r--r--Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdfbin960673 -> 969062 bytes
-rw-r--r--Master/texmf-dist/source/latex/acmart/acmart.dtx3
-rw-r--r--Master/texmf-dist/tex/latex/acmart/acmart.cls2
15 files changed, 85 insertions, 45 deletions
diff --git a/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst b/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst
index f83cc7e08e0..e3343e72abe 100644
--- a/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst
+++ b/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst
@@ -472,6 +472,16 @@ FUNCTION { output.check }
if$
}
+FUNCTION { bibinfo.output.check }
+{ % like output.check, adding bibinfo field
+ 't :=
+ duplicate$ empty.or.unknown
+ { pop$ "empty " t * " in " * cite$ * warning$ }
+ { "\bibinfo{" t "}{" * * swap$ * "}" *
+ output.nonnull }
+ if$
+}
+
FUNCTION { output.check.dot.space }
{ % like output.dot.space, but warn if key name on top-of-stack is not set
't :=
@@ -1351,7 +1361,8 @@ FUNCTION { format.btitle }
{ title emphasize }
{ title empty.or.unknown
{ title emphasize } % jtb: what is this supposed to do ?!?
- { "{\em " title * "\/} (" * edition "l" change.case$ * " ed.)" * } % jtb: no parens for ed.
+ { "{\em " title * "\/} (\bibinfo{edition}{" * edition "l" change.case$ *
+ "} ed.)" * } % jtb: no parens for ed.
if$
}
if$
@@ -1365,7 +1376,8 @@ FUNCTION { format.emphasize.booktitle }
{ booktitle emphasize }
{ booktitle empty.or.unknown
{ "" }
- { "{\em " booktitle * "} (" * edition "l" change.case$ * " ed.)" * }
+ { "{\em " booktitle * "} (\bibinfo{edition}{" *
+ edition "l" change.case$ * "} ed.)" * }
if$
}
if$
@@ -1424,13 +1436,12 @@ FUNCTION { format.bvolume }
volume empty.or.unknown
{ "" }
{
- "\bibinfo{volume}{"
series empty.or.unknown
- { "Vol." volume tie.or.space.connect}
- { series ", " * "Vol." volume tie.or.space.connect *}
+ { "Vol.~\bibinfo{volume}{" volume "}" * *}
+ { "\bibinfo{series}{" series "}, " * *
+ "Vol.~\bibinfo{volume}{" volume "}" * * *}
if$
"volume and number" number either.or.check
- * "}" *
}
if$
}
@@ -1439,15 +1450,8 @@ FUNCTION { format.bvolume.noseries }
{
volume empty.or.unknown
{ "" }
- {
- "\bibinfo{volume}{"
- series empty.or.unknown
- { "Vol." volume tie.or.space.connect}
- { "Vol." volume tie.or.space.connect}
-% { series ", " * "Vol." volume tie.or.space.connect *}
- if$
+ { "Vol.~\bibinfo{volume}{" volume "}" * *
"volume and number" number either.or.check
- * "}" *
}
if$
}
@@ -1456,7 +1460,7 @@ FUNCTION { format.series }
{
series empty.or.unknown
{""}
- {" \bibinfo{series}{{\em (" * series ")}}" *}
+ {" {\em (\bibinfo{series}{" * series "})}" *}
if$
}
@@ -1471,7 +1475,7 @@ FUNCTION { format.number.series }
{
series empty.or.unknown
{ "" }
- { " \bibinfo{series}{(" series * ")}" * }
+ { " (\bibinfo{series}{" series * "})" * }
if$
}
if$
@@ -1587,7 +1591,7 @@ FUNCTION { format.page.count }
{ "numpages field, but no articleno field, in " cite$ * warning$ }
{ }
if$
- page.count "pages" tie.or.space.connect
+ "\bibinfo{numpages}{" page.count * "}~pages" *
}
if$
}
@@ -2084,9 +2088,10 @@ FUNCTION { format.journal.volume.number.day.month.year }
volume empty.or.unknown
{
"unusual to have number, but no volume, for " cite$ * warning$
- " \bibinfo{volume}{" * number * "}" *
+ " \bibinfo{number}{" * number * "}" *
}
- { " \bibinfo{volume}{" * volume comma " " * number * * "}" *}
+ { " \bibinfo{volume}{" * volume * "}, \bibinfo{number}{" *
+ number * "}" *}
if$
}
if$
@@ -2154,11 +2159,12 @@ FUNCTION { format.thesis.type }
FUNCTION { format.tr.number }
{
+ "\bibinfo{type}{"
type empty.or.unknown
-% { "Tech. Rep." }
- { "{T}echnical {R}eport" } % ACM wants it explicit (Gerry 9/28)
+ { "{T}echnical {R}eport" }
'type
if$
+ "}" * *
number empty.or.unknown
{ "t" change.case$ }
%% LOOKS BAD: { "." * number tie.or.space.connect }
@@ -2491,7 +2497,10 @@ FUNCTION { article }
new.block
format.articletitle "title" output.check
new.block
- howpublished output
+ howpublished empty.or.unknown
+ { }
+ { "\bibinfo{howpublished}{" howpublished "}" * * output }
+ if$
crossref missing$
{ format.journal.volume.number.day.month.year }
@@ -2530,8 +2539,8 @@ FUNCTION { book }
new.block
format.number.series output
new.sentence
- publisher "publisher" output.check
- address "address" output.check % jtb: require address
+ publisher "publisher" bibinfo.output.check
+ address "address" bibinfo.output.check % jtb: require address
fin.sentence
pages empty.or.unknown
{ format.bookpages } % use bookpages when pages empty
@@ -2557,7 +2566,10 @@ FUNCTION { booklet }
new.block
format.title "title" output.check
new.block
- howpublished output
+ howpublished empty.or.unknown
+ { }
+ { "\bibinfo{howpublished}{" howpublished "}" * * output }
+ if$
address output
fin.block
output.issue.doi.coden.isxn.lccn.url.eprint.note
@@ -2587,8 +2599,8 @@ FUNCTION { inbook }
new.block
format.number.series output
new.sentence
- publisher "publisher" output.check
- address "address" output.check % jtb: require address
+ publisher "publisher" bibinfo.output.check
+ address "address" bibinfo.output.check % jtb: require address
format.bookpages output
format.chapter.pages
"chapter and pages" output.check % jtb: moved from before publisher
@@ -2620,8 +2632,8 @@ FUNCTION { incollection }
format.bvolume output
format.number.series output
new.sentence
- publisher "publisher" output.check
- address "address" output.check % jtb: require address
+ publisher "publisher" bibinfo.output.check
+ address "address" bibinfo.output.check % jtb: require address
format.bookpages output
format.chapter.pages output % gnp - was special.output.nonnull
% left out comma before page numbers
@@ -2645,7 +2657,10 @@ FUNCTION { inproceedings }
output.year.check % added
new.block
format.articletitle "title" output.check
- howpublished output.dot.space
+ howpublished empty.or.unknown
+ { }
+ { "\bibinfo{howpublished}{" howpublished "}" * * output.dot.space }
+ if$
crossref missing$
{
journal missing$ % jtb: proceedings appearing in journals
@@ -2655,8 +2670,8 @@ FUNCTION { inproceedings }
format.bvolume.noseries output
new.sentence
organization output
- publisher "publisher" output.check % jtb: require publisher (?)
- address "address" output.check % jtb: require address
+ publisher "publisher" bibinfo.output.check % jtb: require publisher (?)
+ address "address" bibinfo.output.check % jtb: require address
format.bookpages output
}
{
@@ -2716,9 +2731,13 @@ FUNCTION { mastersthesis }
new.block
format.title emphasize "title" output.check % NB: ACM style requires emphasized thesis title
new.block
- "Master's\ thesis" format.thesis.type output new.sentence % Added dot. BV 2011/09/27
- school "school" output.check
- address output
+ "\bibinfo{thesistype}{Master's\ thesis}" format.thesis.type output
+ new.sentence
+ school "school" bibinfo.output.check
+ address empty.or.unknown
+ { }
+ { "\bibinfo{address}{" address * "}" * output }
+ if$
new.block
format.advisor output
fin.block
@@ -2735,7 +2754,10 @@ FUNCTION { misc }
title howpublished new.block.checkb
format.title output
new.block
- howpublished output
+ howpublished empty.or.unknown
+ { }
+ { "\bibinfo{howpublished}{" howpublished "}" * * output }
+ if$
"" output.nonnull.dot.space
output.day.month.year
fin.block
@@ -2757,9 +2779,13 @@ FUNCTION { phdthesis }
new.block
format.title emphasize "title" output.check % NB: ACM style requires emphasized thesis title
new.block
- "Ph.D. Dissertation" format.thesis.type output new.sentence % Added dot. BV 2011/09/27
- school "school" output.check
- address output
+ "\bibinfo{thesistype}{Ph.D. Dissertation}" format.thesis.type output
+ new.sentence
+ school "school" bibinfo.output.check
+ address empty.or.unknown
+ { }
+ { "\bibinfo{address}{" address * "}" * output }
+ if$
new.block
format.advisor output
fin.block
@@ -2849,8 +2875,14 @@ FUNCTION { proceedings }
new.sentence
organization output
% jtb: normal order: publisher, address
- publisher output
- address output
+ publisher empty.or.unknown
+ { }
+ { "\bibinfo{publisher}{" publisher * "}" * output }
+ if$
+ address empty.or.unknown
+ { }
+ { "\bibinfo{address}{" address * "}" * output }
+ if$
fin.block
output.issue.doi.coden.isxn.lccn.url.eprint.note
fin.entry
@@ -2867,8 +2899,11 @@ FUNCTION { techreport }
new.block
% format.tr.number output % jtb: moved month ...
format.tr.number output new.sentence % Gerry - need dot 2011/09/28
- institution "institution" output.check
- address output
+ institution "institution" bibinfo.output.check
+ address empty.or.unknown
+ { }
+ { "\bibinfo{address}{" address "}" * * output }
+ if$
new.sentence
format.named.pages output
% ACM omits year at end in transactions style
diff --git a/Master/texmf-dist/doc/latex/acmart/Makefile b/Master/texmf-dist/doc/latex/acmart/Makefile
index 97b03d12763..390cd4b01ad 100644
--- a/Master/texmf-dist/doc/latex/acmart/Makefile
+++ b/Master/texmf-dist/doc/latex/acmart/Makefile
@@ -43,6 +43,7 @@ all: ${PDF}
pdflatex $<
- bibtex $*
pdflatex $<
+ pdflatex $<
while ( grep -q '^LaTeX Warning: Label(s) may have changed' $*.log) \
do pdflatex $<; done
diff --git a/Master/texmf-dist/doc/latex/acmart/README b/Master/texmf-dist/doc/latex/acmart/README
index b32604b06f4..feebfa9e3a2 100644
--- a/Master/texmf-dist/doc/latex/acmart/README
+++ b/Master/texmf-dist/doc/latex/acmart/README
@@ -41,3 +41,6 @@ version 1.19 Include 'Abstract', 'Acknowledgements', and 'References'
version 1.20 Bug fixes, documentation updates
version 1.21 Bibliography changes: added arXiv, some cleanup
+
+version 1.22 Bibliography changes for Aptara backend; should be
+ invisible for the users.
diff --git a/Master/texmf-dist/doc/latex/acmart/acmart.pdf b/Master/texmf-dist/doc/latex/acmart/acmart.pdf
index 406bd744396..005eedae719 100644
--- a/Master/texmf-dist/doc/latex/acmart/acmart.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/acmart.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf
index bbf31db062b..1d7b2995416 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf
index cf399b7a904..e97ffac1c38 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf
index d95faf2fa0d..7048cfdc94e 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf
index 81f4c6a3216..43c5d84b575 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf
Binary files differ
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 cde83c320b7..409041840c7 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf
index 6f418f1a675..6e21570e5dd 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf
index a3e05b10dfc..2e67b95bf79 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf b/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf
index dc34e521bd7..697c0bda7c9 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf
index e3f7acffc0c..4bd116ae30c 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/acmart/acmart.dtx b/Master/texmf-dist/source/latex/acmart/acmart.dtx
index d00f22bdcb2..20c9876eaef 100644
--- a/Master/texmf-dist/source/latex/acmart/acmart.dtx
+++ b/Master/texmf-dist/source/latex/acmart/acmart.dtx
@@ -1270,7 +1270,7 @@
\ProvidesFile{acmart.dtx}
%</gobble>
%<class>\ProvidesClass{acmart}
-[2016/09/04 v1.21 Typesetting articles for Association of
+[2016/09/25 v1.22 Typesetting articles for Association of
Computing Machinery]
% \end{macrocode}
%
@@ -1306,6 +1306,7 @@ Computing Machinery]
% \changes{v1.19}{2016/07/28}{Include 'Abstract', 'Acknowledgements',
% and 'References' in PDF bookmarks (Matthew Fluet)}
% \changes{v1.20}{2016/08/06}{Bug fixes for bst}
+% \changes{v1.22}{2016/09/25}{More bibliography changes for Aptara}
%
%
% And the driver code:
diff --git a/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls
index 2346d823e9c..7b982031f72 100644
--- a/Master/texmf-dist/tex/latex/acmart/acmart.cls
+++ b/Master/texmf-dist/tex/latex/acmart/acmart.cls
@@ -38,7 +38,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{acmart}
-[2016/09/04 v1.21 Typesetting articles for Association of
+[2016/09/25 v1.22 Typesetting articles for Association of
Computing Machinery]
\def\@classname{acmart}
\RequirePackage{xkeyval}