texlive[44651] Master/texmf-dist: acmart (20jun17)
commits+karl at tug.org
commits+karl at tug.org
Wed Jun 21 00:16:50 CEST 2017
Revision: 44651
http://tug.org/svn/texlive?view=revision&revision=44651
Author: karl
Date: 2017-06-21 00:16:49 +0200 (Wed, 21 Jun 2017)
Log Message:
-----------
acmart (20jun17)
Modified Paths:
--------------
trunk/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst
trunk/Master/texmf-dist/doc/latex/acmart/Makefile
trunk/Master/texmf-dist/doc/latex/acmart/README
trunk/Master/texmf-dist/doc/latex/acmart/acmart.bib
trunk/Master/texmf-dist/doc/latex/acmart/acmart.pdf
trunk/Master/texmf-dist/doc/latex/acmart/acmguide.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.tex
trunk/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.tex
trunk/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex
trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography.bib
trunk/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex
trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi.tex
trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex
trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex
trunk/Master/texmf-dist/doc/latex/acmart/samplebody-conf.tex
trunk/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex
trunk/Master/texmf-dist/source/latex/acmart/acmart.dtx
trunk/Master/texmf-dist/tex/latex/acmart/acmart.cls
Modified: trunk/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst 2017-06-20 22:16:49 UTC (rev 44651)
@@ -2,11 +2,10 @@
%%% ====================================================================
%%% @BibTeX-style-file{
%%% author = "Nelson H. F. Beebe, Boris Veytsman and Gerald Murray",
-%%% version = "1.18",
-%%% date = "10 July 2016",
+%%% version = "2.1",
+%%% date = "14 June 2017",
%%% filename = "ACM-Reference-Format.bst",
-%%% email = "beebe at math.utah.edu, beebe at acm.org,
-%%% beebe at computer.org, borisv at lk.net, murray at hq.acm.org",
+%%% email = "borisv at lk.net, boris at varphi.com",
%%% codetable = "ISO/ASCII",
%%% keywords = "ACM Transactions bibliography style; BibTeX",
%%% license = "public domain",
@@ -15,149 +14,8 @@
%%% }
%%% ====================================================================
-% ACM BibTeX style, ACM-Reference-Format.bst
-% for BibTeX version 0.99c, LaTeX version 3.141
-% ACM extensions with code cleaned up, extended, and debugged 10--15-Nov-2008
-% Revised 17-APRIL-2008 (Nelson)
-% Revised 13-MARCH-2011 (Boris/Gerry)
-% Revised 23-MARCH-2011 (Boris/Gerry)
-% Revised 27-MARCH-2011 (Boris/Gerry)
-% Revised 15-APRIL-2011 (Boris/Gerry)
-% Revised 27-SEPTEMBER-2011 (Boris)
-% Revised 10-JULY-2016 (Boris)
-% Revised 04-FEB-2017 (Boris)
-%
-%
-% History (by Nelson)
-%
-% Based on 'acmtrans' (for ACM Journals)
-% Date: 28th April 2008
-%
-% 1. Avoid 'repeating' the 'month' values.
-% 2. Avoid incorrectly italicizing the volume number.
-% 3. Avoid non italicizing certain titles (book, inproceedings etc).
-% 4. NO series if there is NO volume.
-% 5. Sorting of reference with first surname.
-% 6. Article no added for Inproceedings.
-%
-% Date: 07th May 2008
-%
-% 1. Abbreviation list added
-%
-% Citation format: [author-last-name year]
-% [author-last-name and author-last-name year]
-% [author-last-name, author-last-name, and author-last-name year]
-% [author-last-name et al. year]
-% [author-last-name]
-% author-last-name [year]
-% [author-last-name and author-last-name]
-% [author-last-name et al.]
-% [year] or [year,year]
-% year or year,year
-%
-% Reference list ordering: alphabetical by author or whatever passes
-% for author in the absence of one.
-%
-% Features of the old acmtrans.bst:
-% =================================
-%
-% - all authors appear last name first.
-% - all pages are listed xx-xx, (no pp.) and are at the end of the reference
-% - publishers are identified as publisher, address
-% - conferences papers (inproceedings) may give city of conference,
-% date of conference, and journal that the proceedings appear in.
-% - months abbreviated to max four letters (eg. Mar.)
-% - volume of a series indicated after the title of the series
-% - editors appear after edited title and are identified by a trailing "Eds."
-% not in parentheses. Editor names are not given in small caps.
-% (unless there is no author line)
-% - names terminated with a period even if there is no first name.
-% - editions are indicated trailing after the work, not in parentheses.
-% - "et al." citations have a protected period to avoid bad spacing (jrh)
-% - "address" required when publisher given
-% - series (roman) and volume are in a sentence separate from (book-)title
-%
-%
-% Features of chicago.bst:
-% =======================
-%
-% - full names used in citations, but abbreviated citations are available
-% (see above)
-% - if an entry has a "month", then the month and year are also printed
-% as part of that bibitem.
-% - all conjunctions use "and" instead of "\&"
-% - major modification from Chicago Manual of Style (13th ed.) is that
-% only the first author in a reference appears last name first-
-% additional authors appear as J. Q. Public.
-% - pages are listed as "pp. xx-xx" in all entry types except
-% article entries.
-% - book, inbook, and manual use "location: publisher" (or organization)
-% for address and publisher. All other types list publishers separately.
-% - "pp." are used to identify page numbers for all entry types except
-% articles.
-% - organization is used as a citation label if neither author nor editor
-% is present (for manuals).
-% - "et al." is used for long author and editor lists, or when "others"
-% is used.
-%
-% Modifications and bug fixes from newapa.bst:
-% ===========================================
-%
-% - added month, year to bib entries if month is present
-% - fixed bug with In proceedings, added necessary comma after title
-% - all conjunctions changed to "and" from "\&"
-% - fixed bug with author labels in my.full.label: "et al." now is
-% generated when "others" is an author name
-% - major modification from Chicago Manual of Style (13th ed.) is that
-% only the first author in a reference appears last name first-
-% additional authors appear as J. Q. Public.
-% - pages are listed as "pp. xx-xx" in all entry types except
-% article entries. Unnecessary (IMHO) "()" around page numbers
-% were removed, and page numbers now don't end with a period.
-% - created chicago.sty for use with this bibstyle (required).
-% - fixed bugs in FUNCTION {format.vol.num.pages} for missing volume,
-% number, and /or pages. Renamed to format.journal.volume.number.
-% - fixed bug in formatting booktitles: additional period an error if
-% book has a volume.
-% - fixed bug: editors usually given redundant period before next clause
-% (format.editors.dot) removed.
-% - added label support for organizations, if both author and editor
-% are missing (from alpha.bst). If organization is too long, then
-% the key field is used for abbreviated citations.
-% - In proceedings or books of several volumes, no comma was written
-% between the "Volume x" and the page numbers (this was intentional
-% in newapa.bst). Fixed.
-% - Some journals may not have volumes/numbers, only month/year (eg.
-% IEEE Computer). Fixed bug in article style that assumed volume/number
-% was always present.
-%
-% Original documentation for newapa.sty:
-% =====================================
-%
-% This version was made by modifying the master file made by
-% Oren Patashnik (PATASHNIK at SCORE.STANFORD.EDU), and the 'named' BibTeX
-% style of Peter F. Patel-Schneider.
-%
-% Copyright (C) 1985, all rights reserved.
-% Copying of this file is authorized only if either
-% (1) you make absolutely no changes to your copy, including name, or
-% (2) if you do make changes, you name it something other than 'newapa.bst'.
-% There are undoubtably bugs in this style. If you make bug fixes,
-% improvements, etc. please let me know. My e-mail address is:
-% spencer at cgrg.ohio.state.edu or 71160.3141 at compuserve.com
-%
-% This style was made from 'plain.bst', 'named.bst', and 'apalike.bst',
-% with lots of tweaking to make it look like APA style, along with tips
-% from Young Ryu and Brian Reiser's modifications of 'apalike.bst'.
-%
-%
-% Start of ACM-Reference-Format-Journals.bst
-%
-% Note: Many of the new bibentry 'fields' will only work with the
-% 'ACM-Reference-Format-Journals.bst' file. Legacy .bib files (which will, in all probability,
-% NOT contain these new fields) will _still_ work with the ACM-Reference-Format-Journals.bst.
-%
-%
+%%% Revision history: see source in git
+
ENTRY
{ address
advisor
@@ -165,8 +23,8 @@
author
booktitle
chapter
- city % jtb: added
- date % jtb: added
+ city
+ date
edition
editor
eprint
@@ -204,7 +62,7 @@
lccn % UTAH
}
{}
- { label.year extra.label sort.year sort.label }
+ { label.year extra.label sort.year sort.label basic.label.year}
INTEGERS { output.state before.all mid.sentence after.sentence after.block }
@@ -224,6 +82,7 @@
STRINGS { p1 p2 p3 page.count }
+
FUNCTION { not }
{
{ #0 }
@@ -587,12 +446,12 @@
}
FUNCTION { format.year }
-{ % push year string or "????" onto output stack
+{ % push year string or "[n. d.]" onto output stack
%% Because year is a mandatory field, we always force SOMETHING
%% to be output
"\bibinfo{year}{"
year empty.or.unknown
- { "????" }
+ { "[n. d.]" }
{ year }
if$
* "}" *
@@ -893,9 +752,14 @@
}
FUNCTION { output.year.check }
-{ % warn if year empty, else output top string and leave " YEAR<label>" on stack in mid-sentence
+{ % warn if year empty, output top string and leave " YEAR<label>" on stack in mid-sentence
year empty.or.unknown
- { "empty year in " cite$ * warning$ }
+ { "empty year in " cite$ * warning$
+ write$
+ " \bibinfo{year}{[n. d.]}"
+ "\natexlab{" extra.label * "}" * *
+ mid.sentence 'output.state :=
+ }
{ write$
" \bibinfo{year}{" year * "}" *
"\natexlab{" extra.label * "}" * *
@@ -1126,6 +990,8 @@
if$
}
+
+
FUNCTION { emphasize }
{ % emphasize a non-empty top string on the stack (WITHOUT italic correction)
duplicate$ empty.or.unknown
@@ -2394,6 +2260,7 @@
if$
}
+% Calculate label and leave it on stack
FUNCTION { calc.basic.label }
{
type$ "book" =
@@ -2414,6 +2281,13 @@
if$
}
if$
+ duplicate$
+ year empty.or.unknown
+ { "[n. d.]" }
+ { year field.or.null purify$ #-1 #4 substring$}
+ if$
+ *
+ 'basic.label.year :=
}
FUNCTION { calc.label }
@@ -2456,7 +2330,10 @@
%
% save the year for sort processing afterwards (adding a, b, c, etc.)
%
- year field.or.null purify$ #-1 #4 substring$
+ year empty.or.unknown
+ { "[n. d.]" }
+ { year field.or.null purify$ #-1 #4 substring$}
+ if$
'label.year :=
}
@@ -2805,7 +2682,7 @@
FUNCTION { misc }
{
output.bibitem
- format.authors output
+ format.authors "author" output.check
author format.key output % added
output.year.check % added
title howpublished new.block.checkb
@@ -3019,132 +2896,6 @@
MACRO {dec} {"Dec."}
-%%% ====================================================================
-%%% I M P O R T A N T C H A N G E
-%%%
-%%% For the 2009 release of the official acm-*.bst files, there are to
-%%% be NO predefined journal abbreviations in those style files.
-%%%
-%%% ACM may later develop an official list of mappings of full journal
-%%% names of commonly-cited journals to ACM-preferred abbreviations, but
-%%% authors should consider that use of any of these commented-out
-%%% abbreviations is DEPRECATED unless the BibTeX file itself provides
-%%% its own @String{name = "value"} definitions.
-%%%
-%%% Use of journal (and publisher and address) @String{...}
-%%% abbreviations, as opposed to explicit value assignments such as
-%%% journal = "J. ACM" and publisher = "IEEE", is preferred in
-%%% bibliographic databases, because it makes it easier for journal
-%%% production staff to replace those definitions by publisher-preferred
-%%% abbreviations when articles are typeset for publication.
-%%%
-%%% For historical reasons, and because some of these abbreviations are
-%%% used in other (non-ACM) bibliography style files, they are preserved
-%%% here in comments. Future releases of the acm*-.bst files are likely
-%%% to remove them entirely.
-%%% ====================================================================
-%%%
-%%% DEPRECATED: MACRO {acmcs} {"ACM Comput. Surv."} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {acmlett} {"ACM Lett. Program. Lang. Syst."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {acta} {"Acta Inf."} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ai} {"Artificial Intelligence"}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {al} {"Ada Lett."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {acr} {"Adv. Comput. Res."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {bit} {"Bit"}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {cacm} {"Commun. ACM"} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {cj} {"Comput. J."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {cn} {"Comput. Netw."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {cl} {"Comput. Lang."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ibmjrd} {"IBM J. Res. and Development"} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ibmsj} {"IBM Systems Journal"} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ict} {"Inf. Contr."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ieebcs} {"IEE/BCS Softw. Eng. J."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ieees} {"IEEE Softw."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ieeese} {"IEEE Trans. Softw. Eng."} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ieeetc} {"IEEE Trans. Comput."} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ieeetcad} {"IEEE Transactions on Computer-Aided Design of Integrated Circuits"} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ieeetpds} {"IEEE Trans. Parall. Distrib. Syst."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ieeetit} {"IEEE Trans. Inf. Theory"}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ipl} {"Inf. Process. Lett."} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {icp} {"Inf. Comput."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ist} {"Inf. Softw. Tech."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ijsa} {"Int. J. Supercomput. Appl."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ijpp} {"Int. J. Parallel Program."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {jacm} {"J. ACM"} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: % MACRO {jcss} {"Journal of Computer and System Sciences"} % original BibTeX
-%%% DEPRECATED: MACRO {jcss} {"J. Comput. Syst. Sci."} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {jlp} {"J. Logic Program."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {jfp} {"J. Funct. Program."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {jsmrp} {"J. Softw. Maint. Res. Pract."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {jss} {"J. Syst. Softw."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {jlc} {"J. Logic and Comput."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {jlsc} {"J. Lisp Symb. Comput."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {lpls} {"Lett. Program. Lang. Syst."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {mor} {"Math. Oper. Res."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {mscs} {"Math. Struct. Comput. Sci."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {mst} {"Math. Syst. Theor."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {ngc} {"New Gen. Comput."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {scp} {"Sci. Comput. Program."} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {sicomp} {"SIAM J. Comput."} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {spe} {"Softw. Pract. Exper."}
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {tocs} {"ACM Trans. Comput. Syst."} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {tods} {"ACM Trans. Database Syst."} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {tog} {"ACM Trans. Graphics"} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {toms} {"ACM Trans. Math. Softw."} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {toois} {"ACM Trans. Office Inf. Syst."} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {toplas} {"ACM Trans. Program. Lang. Syst."} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {tcs} {"Theor. Comput. Sci."} % original BibTeX
-%%% DEPRECATED:
-%%% DEPRECATED: MACRO {tr} {"Tech. Rep."}
-%%% ====================================================================
READ
@@ -3176,7 +2927,6 @@
{ " " * }
'skip$
if$
- % s nameptr "{ff{ } }{ll{ }}{ vv{ }}{ jj{ }}" format.name$ 't :=
s nameptr "{vv{ } }{ll{ }}{ f{ }}{ jj{ }}" format.name$ 't :=
nameptr numnames = t "others" = and
{ " et~al" * }
@@ -3287,7 +3037,15 @@
% including organizations as the sort key; the following is stolen from
% alpha.bst.
- calc.label sortify % recalculate bibitem label
+ calc.label
+ basic.label.year
+ swap$
+ " "
+ swap$
+ * *
+ " "
+ *
+ sortify
year field.or.null purify$ #-1 #4 substring$ * % add year
" "
*
@@ -3322,6 +3080,8 @@
'sort.key$ :=
}
+
+
ITERATE { presort }
SORT % by label, year, author/editor, title
Modified: trunk/Master/texmf-dist/doc/latex/acmart/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/Makefile 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/doc/latex/acmart/Makefile 2017-06-20 22:16:49 UTC (rev 44651)
@@ -86,3 +86,6 @@
zip: all clean
zip -r $(PACKAGE).zip * -x '*~' -x '*.tgz' -x '*.zip' -x CVS -x 'CVS/*'
+
+documents.zip: all
+ zip $@ acmart.pdf acmguide.pdf sample-*.pdf
Modified: trunk/Master/texmf-dist/doc/latex/acmart/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/README 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/doc/latex/acmart/README 2017-06-20 22:16:49 UTC (rev 44651)
@@ -117,3 +117,10 @@
Version 1.39 Added \authornotemark commmand
+Version 1.40 Bibliography changes
+ Added processing of one-compoment ccsdesc nodes
+ Bug fixes.
+ Made the height a multiple of \baselineskip + \topskip
+ Added cleveref
+ We no longer print street address in SIGs
+
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/acmart/acmart.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/acmart.bib 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/doc/latex/acmart/acmart.bib 2017-06-20 22:16:49 UTC (rev 44651)
@@ -78,3 +78,11 @@
month = jun,
note = {\url{http://www.ctan.org/pkg/subcaption}}
}
+
+ at Manual{Carlisle04:Textcase,
+ title = {The \textsl{textcase} package},
+ author = {David Carlisle},
+ month = oct,
+ year = 2004,
+ note = {\url{http://www.ctan.org/pkg/textcase}}}
+
Modified: trunk/Master/texmf-dist/doc/latex/acmart/acmart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/acmguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.tex 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.tex 2017-06-20 22:16:49 UTC (rev 44651)
@@ -47,6 +47,7 @@
% Title portion
\title{A Multifrequency MAC Specially Designed for Wireless Sensor
Network Applications}
+
\author{Gang Zhou}
\orcid{1234-5678-9012-3456}
\affiliation{%
@@ -56,8 +57,34 @@
\state{VA}
\postcode{23185}
\country{USA}}
-\author{Yafeng Wu}
+\author{Valerie B\'eranger}
\affiliation{%
+ \institution{Inria Paris-Rocquencourt}
+ \city{Rocquencourt}
+ \country{France}
+}
+\author{Aparna Patel}
+\affiliation{%
+ \institution{Rajiv Gandhi University}
+ \streetaddress{Rono-Hills}
+ \city{Doimukh}
+ \state{Arunachal Pradesh}
+ \country{India}}
+\author{Huifen Chan}
+\affiliation{%
+ \institution{Tsinghua University}
+ \streetaddress{30 Shuangqing Rd}
+ \city{Haidian Qu}
+ \state{Beijing Shi}
+ \country{China}
+}
+\author{Ting Yan}
+\affiliation{%
+ \institution{Eaton Innovation Center}
+ \city{Prague}
+ \country{Czech Republic}}
+\author{Tian He}
+\affiliation{%
\institution{University of Virginia}
\department{School of Engineering}
\city{Charlottesville}
@@ -65,13 +92,7 @@
\postcode{22903}
\country{USA}
}
-\author{Ting Yan}
\affiliation{%
- \institution{Eaton Innovation Center}
- \city{Prague}
- \country{Czech Republic}}
-\author{Tian He}
-\affiliation{%
\institution{University of Minnesota}
\country{USA}}
\author{Chengdu Huang}
@@ -156,12 +177,16 @@
\thanks{This work is supported by the National Science Foundation,
under grant CNS-0435060, grant CCR-0325197 and grant EN-CS-0329609.
- Author's addresses: G. Zhou, Computer Science Department, College of
- William and Mary; Y. Wu {and} J. A. Stankovic, Computer Science
- Department, University of Virginia; T. Yan, Eaton Innovation Center;
- T. He, Computer Science Department, University of Minnesota; C.
- Huang, Google; T. F. Abdelzaher, (Current address) NASA Ames
- Research Center, Moffett Field, California 94035.}
+ Authors' addresses: G.~Zhou, Computer Science Department, College of
+ William and Mary, 104 Jameson Rd, Williamsburg, PA 23185, US;
+ V.~B\'eranger, Inria Paris-Rocquencourt, Rocquencourt, France;
+ A.~Patel, Rajiv Gandhi University, Rono-Hills, Doimukh, Arunachal
+ Pradesh, India; H.~Chan, Tsinghua University, 30 Shuangqing Rd,
+ Haidian Qu, Beijing Shi, China; T.~Yan, Eaton Innovation Center,
+ Prague, Czech Republic; T.~He, C.~Huang, J.~A.~Stankovic University
+ of Virginia, School of Engineering Charlottesville, VA 22903, USA;
+ T. F. Abdelzaher, (Current address) NASA Ames Research Center,
+ Moffett Field, California 94035.}
\maketitle
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.tex 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.tex 2017-06-20 22:16:49 UTC (rev 44651)
@@ -44,6 +44,7 @@
% Title portion. Note the short title for running heads
\title[A Multifrequency MAC for Wireless Sensor]{A Multifrequency MAC
Specially Designed for Wireless Sensor Network Applications}
+
\author{Gang Zhou}
\orcid{1234-5678-9012-3456}
\affiliation{%
@@ -53,8 +54,34 @@
\state{VA}
\postcode{23185}
\country{USA}}
-\author{Yafeng Wu}
+\author{Valerie B\'eranger}
\affiliation{%
+ \institution{Inria Paris-Rocquencourt}
+ \city{Rocquencourt}
+ \country{France}
+}
+\author{Aparna Patel}
+\affiliation{%
+ \institution{Rajiv Gandhi University}
+ \streetaddress{Rono-Hills}
+ \city{Doimukh}
+ \state{Arunachal Pradesh}
+ \country{India}}
+\author{Huifen Chan}
+\affiliation{%
+ \institution{Tsinghua University}
+ \streetaddress{30 Shuangqing Rd}
+ \city{Haidian Qu}
+ \state{Beijing Shi}
+ \country{China}
+}
+\author{Ting Yan}
+\affiliation{%
+ \institution{Eaton Innovation Center}
+ \city{Prague}
+ \country{Czech Republic}}
+\author{Tian He}
+\affiliation{%
\institution{University of Virginia}
\department{School of Engineering}
\city{Charlottesville}
@@ -62,13 +89,7 @@
\postcode{22903}
\country{USA}
}
-\author{Ting Yan}
\affiliation{%
- \institution{Eaton Innovation Center}
- \city{Prague}
- \country{Czech Republic}}
-\author{Tian He}
-\affiliation{%
\institution{University of Minnesota}
\country{USA}}
\author{Chengdu Huang}
@@ -83,6 +104,7 @@
\country{USA}
}
+
\begin{abstract}
Multifrequency media access control has been well understood in
general wireless ad hoc networks, while in wireless sensor networks,
@@ -148,12 +170,16 @@
\thanks{This work is supported by the National Science Foundation,
under grant CNS-0435060, grant CCR-0325197 and grant EN-CS-0329609.
- Author's addresses: G. Zhou, Computer Science Department, College of
- William and Mary; Y. Wu {and} J. A. Stankovic, Computer Science
- Department, University of Virginia; T. Yan, Eaton Innovation Center;
- T. He, Computer Science Department, University of Minnesota; C.
- Huang, Google; T. F. Abdelzaher, (Current address) NASA Ames
- Research Center, Moffett Field, California 94035.}
+ Authors' addresses: G.~Zhou, Computer Science Department, College of
+ William and Mary, 104 Jameson Rd, Williamsburg, PA 23185, US;
+ V.~B\'eranger, Inria Paris-Rocquencourt, Rocquencourt, France;
+ A.~Patel, Rajiv Gandhi University, Rono-Hills, Doimukh, Arunachal
+ Pradesh, India; H.~Chan, Tsinghua University, 30 Shuangqing Rd,
+ Haidian Qu, Beijing Shi, China; T.~Yan, Eaton Innovation Center,
+ Prague, Czech Republic; T.~He, C.~Huang, J.~A.~Stankovic University
+ of Virginia, School of Engineering Charlottesville, VA 22903, USA;
+ T. F. Abdelzaher, (Current address) NASA Ames Research Center,
+ Moffett Field, California 94035.}
\maketitle
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex 2017-06-20 22:16:49 UTC (rev 44651)
@@ -47,6 +47,7 @@
% Title portion
\title{A Multifrequency MAC Specially Designed for Wireless Sensor
Network Applications}
+
\author{Gang Zhou}
\orcid{1234-5678-9012-3456}
\affiliation{%
@@ -56,15 +57,27 @@
\state{VA}
\postcode{23185}
\country{USA}}
-\author{Yafeng Wu}
+\author{Valerie B\'eranger}
\affiliation{%
- \institution{University of Virginia}
- \department{School of Engineering}
- \city{Charlottesville}
- \state{VA}
- \postcode{22903}
- \country{USA}
+ \institution{Inria Paris-Rocquencourt}
+ \city{Rocquencourt}
+ \country{France}
}
+\author{Aparna Patel}
+\affiliation{%
+ \institution{Rajiv Gandhi University}
+ \streetaddress{Rono-Hills}
+ \city{Doimukh}
+ \state{Arunachal Pradesh}
+ \country{India}}
+\author{Huifen Chan}
+\affiliation{%
+ \institution{Tsinghua University}
+ \streetaddress{30 Shuangqing Rd}
+ \city{Haidian Qu}
+ \state{Beijing Shi}
+ \country{China}
+}
\author{Ting Yan}
\affiliation{%
\institution{Eaton Innovation Center}
@@ -165,14 +178,17 @@
\thanks{This work is supported by the National Science Foundation,
under grant CNS-0435060, grant CCR-0325197 and grant EN-CS-0329609.
- Author's addresses: G. Zhou, Computer Science Department, College of
- William and Mary; Y. Wu {and} J. A. Stankovic, Computer Science
- Department, University of Virginia; T. Yan, Eaton Innovation Center;
- T. He, Computer Science Department, University of Minnesota; C.
- Huang, Google; T. F. Abdelzaher, (Current address) NASA Ames
- Research Center, Moffett Field, California 94035.}
+ Authors' addresses: G.~Zhou, Computer Science Department, College of
+ William and Mary, 104 Jameson Rd, Williamsburg, PA 23185, US;
+ V.~B\'eranger, Inria Paris-Rocquencourt, Rocquencourt, France;
+ A.~Patel, Rajiv Gandhi University, Rono-Hills, Doimukh, Arunachal
+ Pradesh, India; H.~Chan, Tsinghua University, 30 Shuangqing Rd,
+ Haidian Qu, Beijing Shi, China; T.~Yan, Eaton Innovation Center,
+ Prague, Czech Republic; T.~He, C.~Huang, J.~A.~Stankovic University
+ of Virginia, School of Engineering Charlottesville, VA 22903, USA;
+ T. F. Abdelzaher, (Current address) NASA Ames Research Center,
+ Moffett Field, California 94035.}
-
\maketitle
\input{samplebody-journals}
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography.bib 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography.bib 2017-06-20 22:16:49 UTC (rev 44651)
@@ -900,6 +900,7 @@
% grinder
@inproceedings{2004:ITE:1009386.1010128,
+ key = {IEEE},
title = {IEEE TCSC Executive Committee},
booktitle = {Proceedings of the IEEE International Conference on Web Services},
series = {ICWS '04},
@@ -1520,17 +1521,17 @@
title = {A multifrequency MAC specially designed for wireless sensor network applications},
journal = {ACM Trans. Embed. Comput. Syst.},
issue_date = {March 2010},
- volume = {9},
- number = {4},
+ volume = 9,
+ number = 4,
month = {April},
- year = {2010},
+ year = 2010,
issn = {1539-9087},
pages = {39:1--39:41},
- articleno = {39},
- numpages = {41},
+ articleno = 39,
+ numpages = 41,
url = {http://doi.acm.org/10.1145/1721695.1721705},
doi = {10.1145/1721695.1721705},
- acmid = {1721705},
+ acmid = 1721705,
publisher = {ACM},
address = {New York, NY, USA},
keywords = {Wireless sensor networks, media access control, multi-channel, radio interference, time synchronization},
@@ -1537,3 +1538,17 @@
}
+ at online{TUGInstmem,
+ key = {TUG},
+ year = 2017,
+ title = "Institutional members of the {\TeX} Users Group",
+ url = "http://wwtug.org/instmem.html",
+ lastaccessed = "May 27, 2017",
+}
+
+ at online{CTANacmart,
+ author = {Boris Veytsman},
+ title = {acmart---{C}lass for typesetting publications of {ACM}},
+ url = {http://www.ctan.org/pkg/acmart},
+ lastaccessed = {May 27, 2017}
+ }
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex 2017-06-20 22:16:49 UTC (rev 44651)
@@ -38,21 +38,37 @@
\titlenote{This is a titlenote}
\subtitle{This is a subtitle}
\subtitlenote{Subtitle note}
+
\author{Gang Zhou}
-\authornote{The corresponding author}
\orcid{1234-5678-9012-3456}
-\email{zhou at uva.edu}
-\author{Yafeng Wu}
-\email{ywu at uva.edu}
-\author{John A. Stankovic}
\affiliation{%
- \institution{University of Virginia}
- \department{School of Engineering}
- \city{Charlottesville}
+ \institution{College of William and Mary}
+ \streetaddress{104 Jamestown Rd}
+ \city{Williamsburg}
\state{VA}
- \postcode{22903}
- \country{USA}
+ \postcode{23185}
+ \country{USA}}
+\author{Valerie B\'eranger}
+\affiliation{%
+ \institution{Inria Paris-Rocquencourt}
+ \city{Rocquencourt}
+ \country{France}
}
+\author{Aparna Patel}
+\affiliation{%
+ \institution{Rajiv Gandhi University}
+ \streetaddress{Rono-Hills}
+ \city{Doimukh}
+ \state{Arunachal Pradesh}
+ \country{India}}
+\author{Huifen Chan}
+\affiliation{%
+ \institution{Tsinghua University}
+ \streetaddress{30 Shuangqing Rd}
+ \city{Haidian Qu}
+ \state{Beijing Shi}
+ \country{China}
+}
\author{Ting Yan}
\affiliation{%
\institution{Eaton Innovation Center}
@@ -60,13 +76,6 @@
\country{Czech Republic}}
\author{Tian He}
\affiliation{%
- \institution{University of Minnesota}
- \country{USA}}
-\author{Chengdu Huang}
-\affiliation{%
- \institution{Google}
- \country{USA}}
-\affiliation{%
\institution{University of Virginia}
\department{School of Engineering}
\city{Charlottesville}
@@ -74,10 +83,12 @@
\postcode{22903}
\country{USA}
}
-\author{Tarek F. Abdelzaher}
\affiliation{%
- \institution{University of Illinois at Urbana-Champaign}
+ \institution{University of Minnesota}
\country{USA}}
+\author{Chengdu Huang}
+\author{John A. Stankovic}
+\author{Tarek F. Abdelzaher}
\affiliation{%
\institution{University of Virginia}
\department{School of Engineering}
@@ -86,10 +97,9 @@
\postcode{22903}
\country{USA}
}
-\affiliation{%
- \institution{Google}
- \country{USA}}
+\renewcommand\shortauthors{Zhou, G. et al}
+
\begin{abstract}
Multifrequency media access control has been well understood in
general wireless ad hoc networks, while in wireless sensor networks,
@@ -159,12 +169,16 @@
\thanks{This work is supported by the National Science Foundation,
under grant CNS-0435060, grant CCR-0325197 and grant EN-CS-0329609.
- Author's addresses: G. Zhou, Computer Science Department, College of
- William and Mary; Y. Wu {and} J. A. Stankovic, Computer Science
- Department, University of Virginia; T. Yan, Eaton Innovation Center;
- T. He, Computer Science Department, University of Minnesota; C.
- Huang, Google; T. F. Abdelzaher, (Current address) NASA Ames
- Research Center, Moffett Field, California 94035.}
+ Authors' addresses: G.~Zhou, Computer Science Department, College of
+ William and Mary, 104 Jameson Rd, Williamsburg, PA 23185, US;
+ V.~B\'eranger, Inria Paris-Rocquencourt, Rocquencourt, France;
+ A.~Patel, Rajiv Gandhi University, Rono-Hills, Doimukh, Arunachal
+ Pradesh, India; H.~Chan, Tsinghua University, 30 Shuangqing Rd,
+ Haidian Qu, Beijing Shi, China; T.~Yan, Eaton Innovation Center,
+ Prague, Czech Republic; T.~He, C.~Huang, J.~A.~Stankovic University
+ of Virginia, School of Engineering Charlottesville, VA 22903, USA;
+ T. F. Abdelzaher, (Current address) NASA Ames Research Center,
+ Moffett Field, California 94035.}
\maketitle
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi.tex 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi.tex 2017-06-20 22:16:49 UTC (rev 44651)
@@ -7,13 +7,14 @@
%\setcopyright{none}
%\setcopyright{acmcopyright}
%\setcopyright{acmlicensed}
-\setcopyright{rightsretained}
+%\setcopyright{rightsretained}
%\setcopyright{usgov}
%\setcopyright{usgovmixed}
%\setcopyright{cagov}
+\setcopyright{licensedcagov}
%\setcopyright{cagovmixed}
+%\setcopyright{licensedothergov}
-
% DOI
\acmDOI{10.475/123_4}
@@ -70,19 +71,26 @@
\country{Iceland}}
\email{larst at affiliation.org}
-\author{Lawrence P. Leipuner}
-\affiliation{
- \institution{Brookhaven Laboratories}
- \streetaddress{P.O. Box 5000}}
-\email{lleipuner at researchlabs.org}
-
-\author{Sean Fogarty}
+\author{Valerie B\'eranger}
\affiliation{%
- \institution{NASA Ames Research Center}
- \city{Moffett Field}
- \state{California}
- \postcode{94035}}
-\email{fogartys at amesres.org}
+ \institution{Inria Paris-Rocquencourt}
+ \city{Rocquencourt}
+ \country{France}
+}
+\author{Aparna Patel}
+\affiliation{%
+ \institution{Rajiv Gandhi University}
+ \streetaddress{Rono-Hills}
+ \city{Doimukh}
+ \state{Arunachal Pradesh}
+ \country{India}}
+\author{Huifen Chan}
+\affiliation{%
+ \institution{Tsinghua University}
+ \streetaddress{30 Shuangqing Rd}
+ \city{Haidian Qu}
+ \state{Beijing Shi}
+ \country{China}}
\author{Charles Palmer}
\affiliation{%
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex 2017-06-20 22:16:49 UTC (rev 44651)
@@ -71,19 +71,27 @@
\country{Iceland}}
\email{larst at affiliation.org}
-\author{Lawrence P. Leipuner}
-\affiliation{
- \institution{Brookhaven Laboratories}
- \streetaddress{P.O. Box 5000}}
-\email{lleipuner at researchlabs.org}
-
-\author{Sean Fogarty}
+\author{Valerie B\'eranger}
\affiliation{%
- \institution{NASA Ames Research Center}
- \city{Moffett Field}
- \state{California}
- \postcode{94035}}
-\email{fogartys at amesres.org}
+ \institution{Inria Paris-Rocquencourt}
+ \city{Rocquencourt}
+ \country{France}
+}
+\author{Aparna Patel}
+\affiliation{%
+ \institution{Rajiv Gandhi University}
+ \streetaddress{Rono-Hills}
+ \city{Doimukh}
+ \state{Arunachal Pradesh}
+ \country{India}}
+\author{Huifen Chan}
+\affiliation{%
+ \institution{Tsinghua University}
+ \streetaddress{30 Shuangqing Rd}
+ \city{Haidian Qu}
+ \state{Beijing Shi}
+ \country{China}
+}
\author{Charles Palmer}
\affiliation{%
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex 2017-06-20 22:16:49 UTC (rev 44651)
@@ -73,19 +73,26 @@
\country{Iceland}}
\email{larst at affiliation.org}
-\author{Lawrence P. Leipuner}
-\affiliation{
- \institution{Brookhaven Laboratories}
- \streetaddress{P.O. Box 5000}}
-\email{lleipuner at researchlabs.org}
-
-\author{Sean Fogarty}
+\author{Valerie B\'eranger}
\affiliation{%
- \institution{NASA Ames Research Center}
- \city{Moffett Field}
- \state{California}
- \postcode{94035}}
-\email{fogartys at amesres.org}
+ \institution{Inria Paris-Rocquencourt}
+ \city{Rocquencourt}
+ \country{France}
+}
+\author{Aparna Patel}
+\affiliation{%
+ \institution{Rajiv Gandhi University}
+ \streetaddress{Rono-Hills}
+ \city{Doimukh}
+ \state{Arunachal Pradesh}
+ \country{India}}
+\author{Huifen Chan}
+\affiliation{%
+ \institution{Tsinghua University}
+ \streetaddress{30 Shuangqing Rd}
+ \city{Haidian Qu}
+ \state{Beijing Shi}
+ \country{China}}
\author{Charles Palmer}
\affiliation{%
Modified: trunk/Master/texmf-dist/doc/latex/acmart/samplebody-conf.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/samplebody-conf.tex 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/doc/latex/acmart/samplebody-conf.tex 2017-06-20 22:16:49 UTC (rev 44651)
@@ -119,10 +119,37 @@
and exhaustive details in the \textit{\LaTeX\ User's
Guide} by Lamport~\shortcite{Lamport:LaTeX}.
-
This article shows only the plainest form
of the citation command, using \texttt{{\char'134}cite}.
+Some examples. A paginated journal article \cite{Abril07}, an enumerated
+journal article \cite{Cohen07}, a reference to an entire issue \cite{JCohen96},
+a monograph (whole book) \cite{Kosiur01}, a monograph/whole book in a series (see 2a in spec. document)
+\cite{Harel79}, a divisible-book such as an anthology or compilation \cite{Editor00}
+followed by the same example, however we only output the series if the volume number is given
+\cite{Editor00a} (so Editor00a's series should NOT be present since it has no vol. no.),
+a chapter in a divisible book \cite{Spector90}, a chapter in a divisible book
+in a series \cite{Douglass98}, a multi-volume work as book \cite{Knuth97},
+an article in a proceedings (of a conference, symposium, workshop for example)
+(paginated proceedings article) \cite{Andler79}, a proceedings article
+with all possible elements \cite{Smith10}, an example of an enumerated
+proceedings article \cite{VanGundy07},
+an informally published work \cite{Harel78}, a doctoral dissertation \cite{Clarkson85},
+a master's thesis: \cite{anisi03}, an online document / world wide web
+resource \cite{Thornburg01, Ablamowicz07, Poker06}, a video game (Case 1) \cite{Obama08} and (Case 2) \cite{Novak03}
+and \cite{Lee05} and (Case 3) a patent \cite{JoeScientist001},
+work accepted for publication \cite{rous08}, 'YYYYb'-test for prolific author
+\cite{SaeediMEJ10} and \cite{SaeediJETC10}. Other cites might contain
+'duplicate' DOI and URLs (some SIAM articles) \cite{Kirschmer:2010:AEI:1958016.1958018}.
+Boris / Barbara Beeton: multi-volume works as books
+\cite{MR781536} and \cite{MR781537}.
+
+A couple of citations with DOIs: \cite{2004:ITE:1009386.1010128,
+ Kirschmer:2010:AEI:1958016.1958018}.
+
+Online citations: \cite{TUGInstmem, Thornburg01, CTANacmart}.
+
+
\subsection{Tables}
Because tables cannot be split across pages, the best
placement for them is typically the top of the page
Modified: trunk/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex 2017-06-20 22:16:49 UTC (rev 44651)
@@ -283,7 +283,7 @@
% Start of "Sample References" section
-\section{Typical references in new ACM Reference Format}
+\section{Typical References in New ACM Reference Format}
A paginated journal article \cite{Abril07}, an enumerated
journal article \cite{Cohen07}, a reference to an entire issue \cite{JCohen96},
a monograph (whole book) \cite{Kosiur01}, a monograph/whole book in a series (see 2a in spec. document)
@@ -309,9 +309,11 @@
A couple of citations with DOIs: \cite{2004:ITE:1009386.1010128,
Kirschmer:2010:AEI:1958016.1958018}.
+Online citations: \cite{TUGInstmem, Thornburg01, CTANacmart}.
+
% Appendix
\appendix
-\section{Switching times}
+\section{Switching Times}
In this appendix, we measure the channel switching time of Micaz
\cite{CROSSBOW} sensor devices. In our experiments, one mote
@@ -328,7 +330,7 @@
By repeating the experiments 100 times, we get the average
channel-switching time of Micaz motes: 24.3\,$\mu$s.
-\section{Supplementary materials}
+\section{Supplementary Materials}
\begin{printonly}
@@ -336,7 +338,7 @@
\end{printonly}
\begin{screenonly}
-\subsection{This is an example of Appendix subsection head}
+\subsection{This is an Example of Appendix Subsection Head}
Channel-switching time is measured as the time length it takes for
motes to successfully switch from one channel to another. This
@@ -353,7 +355,7 @@
obvious changes. (In our experiments, all values are in the range of
23.6 $\mu$s to 24.9 $\mu$s.)
-\subsection{Appendix subsection head}
+\subsection{Appendix Subsection Head}
The primary consumer of energy in WSNs is idle listening. The key to
reduce idle listening is executing low duty-cycle on nodes. Two
Modified: trunk/Master/texmf-dist/source/latex/acmart/acmart.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/acmart/acmart.dtx 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/source/latex/acmart/acmart.dtx 2017-06-20 22:16:49 UTC (rev 44651)
@@ -162,6 +162,7 @@
% \item \textsl{comment}, \url{http://www.ctan.org/pkg/comment}
% \item \textsl{cm-super}, \url{http://www.ctan.org/pkg/cm-super}
% \item \textsl{cmap}, \url{http://www.ctan.org/pkg/cmap}
+% \item \textsl{cleveref}, \url{http://www.ctan.org/pkg/cleveref}
% \item \textsl{draftwatermark}, \url{http://www.ctan.org/pkg/draftwatermark}
% \item \textsl{environ}, \url{http://www.ctan.org/pkg/environ}
% \item \textsl{fancyhdr}, \url{http://www.ctan.org/pkg/fancyhdr}
@@ -173,7 +174,6 @@
% \item \textsl{ifluatex}, \url{http://www.ctan.org/pkg/ifluatex}
% \item \textsl{ifxetex}, \url{http://www.ctan.org/pkg/ifxetex}
% \item \textsl{inconsolata}, \url{http://www.ctan.org/pkg/inconsolata}
-% \item \textsl{latex-tools}, \url{http://www.ctan.org/pkg/latex-tools}
% \item \textsl{libertine}, \url{http://www.ctan.org/pkg/libertine}
% \item \textsl{manyfoot}, \url{http://www.ctan.org/pkg/manyfoot}
% \item \textsl{microtype}, \url{http://www.ctan.org/pkg/microtype}
@@ -186,6 +186,7 @@
% \item \textsl{oberdiek}, \url{http://www.ctan.org/pkg/oberdiek}
% \item \textsl{pdftex-def}, \url{http://www.ctan.org/pkg/pdftex-def}
% \item \textsl{setspace}, \url{http://www.ctan.org/pkg/setspace}
+% \item \textsl{textcase}, \url{http://www.ctan.org/pkg/textcase}
% \item \textsl{totpages}, \url{http://www.ctan.org/pkg/totpages}
% \item \textsl{trimspaces}, \url{http://www.ctan.org/pkg/trimspaces}
% \item \textsl{upquote}, \url{http://www.ctan.org/pkg/upquote}
@@ -240,7 +241,7 @@
% \midrule
% manuscript & A manuscript. This is the default \\
% acmsmall & Small single column format, used for CIE, CSUR, JACM, JDIQ, JEA, JERIC,
-% JETC, PACMPL, TAAS, TACCESS, TACO, TALG, TALLIP (formerly TALIP), TCPS,
+% JETC, PACMHCI, PACMPL, TAAS, TACCESS, TACO, TALG, TALLIP (formerly TALIP), TCPS,
% TEAC, TECS, TIIS, TISSEC, TIST, TKDD, TMIS, TOCE, TOCHI, TOCL,
% TOCS, TOCT, TODAES, TODS, TOIS, TOIT, TOMACS, TOMM (formerly
% TOMCCAP), TOMPECS, TOMS, TOPC, TOPLAS, TOPS,
@@ -247,7 +248,7 @@
% TOS, TOSEM, TOSN, TRETS,
% TSAS, TSC, TSLP, TWEB, including special issues. \\
% acmlarge & Large single column format, used for
-% IMWUT, JOCCH, PACMHCI, POMACS, TAP, including special issues. \\
+% IMWUT, JOCCH, POMACS, TAP, including special issues. \\
% acmtog & Large double column format, used for
% TOG, including special issues.\\
% sigconf & Proceedings format for most of ACM
@@ -663,7 +664,7 @@
% }
% \end{verbatim}
% However, the comma after postcode is unfortunate: the address will
-% be typeset (with a SIG format) as
+% be typeset (in some formats) as
% \begin{verbatim}
% Fluginstitut
% Sonenallee 17
@@ -933,6 +934,18 @@
% Government. \\
% \texttt{cagovmixed} & Some authors are employees of the Canadian
% Government. \\
+% \texttt{licensedusgovmixed} & Some authors are employees of the US
+% Government, and the publication rights are licensed to ACM\@. \\
+% \texttt{licensedcagov} & All the authors are employees of the Canadian
+% Government, and the publication rights are licensed to ACM\@. \\
+% \texttt{licensedcagovmixed} & Some authors are employees of the
+% Canadian
+% Government, and the publication rights are licensed to ACM\@. \\
+% \texttt{othergov} & Authors are employees of a
+% Government other than US or Canada. \\
+% \texttt{licensedothergov} & Authors are employees of a
+% Government other than US or Canada, and the publication rights
+% are licensed to ACM\@. \\
% \bottomrule
% \end{tabularx}
% \end{table}
@@ -1053,7 +1066,7 @@
%\subsection{Algorithms}
%\label{sec:ug_algorithms}
%
-% There now several good packages for typesetting
+% There are now several good packages for typesetting
% algorithms~\cite{Fiorio15, Brito09, Heinz15}, and the authors are
% now free to choose their favorite one.
%
@@ -1402,7 +1415,23 @@
% }
% \end{verbatim}
%
+% If you do not know the year of publication, the style will add
+% ``[n. d.]'' (for ``no date'') entry.
+%
+% If you do not know the author (this is often the case for online
+% entries), use |key| field to add a key for sorting and citations,
+% for example,
+% \begin{verbatim}
+% @online{TUGInstmem,
+% key = {TUG},
+% year = 2017,
+% title = "Institutional members of the {\TeX} Users Group",
+% url = "http://wwtug.org/instmem.html",
+% lastaccessed = "May 27, 2017",
+% }
+% \end{verbatim}
%
+%
%
%\subsection{Colors}
%\label{sec:ug_colors}
@@ -1478,8 +1507,11 @@
% problematic paragraph inside \texttt{sloppypar} environment might
% help---but beware the results might be, well, sloppy.
%
+% Note that the uppercasing in section titles is done using
+% \textsl{textcase} package~\cite{Carlisle04:Textcase}, so command
+% \cs{NoCaseChange} inside title may help to prevent extraneous
+% uppercasing.
%
-%
%\subsection{A note for wizards: \texttt{acmart-preload-hook.tex}}
%\label{sec:ug_preload}
%
@@ -1545,7 +1577,7 @@
\ProvidesFile{acmart.dtx}
%</gobble>
%<class>\ProvidesClass{acmart}
-[2017/05/14 v1.39 Typesetting articles for Association of
+[2017/06/15 v1.40 Typesetting articles for Association of
Computing Machinery]
% \end{macrocode}
%
@@ -1603,6 +1635,9 @@
% \changes{v1.37}{2017/05/13}{Set \cs{normalparindent}; Reduce list
% indentation (Matthew Fluet)}%
% \changes{v1.38}{2017/05/13}{Increase default font size for SIGPLAN}
+% \changes{v1.40}{2017/05/27}{Bibliography changes}
+% \changes{v1.40}{2017/06/15}{Added package cleveref}
+% \changes{v1.40}{2017/06/16}{Added new copyright version: licensedcagov}
%
%
% And the driver code:
@@ -1652,6 +1687,7 @@
% \begin{macrocode}
\RequirePackage{xstring}
% \end{macrocode}
+%
%
%
% \begin{macro}{format}
@@ -1948,6 +1984,13 @@
\fi
% \end{macrocode}
%
+% \changes{v1.40}{2017/06/05}{Added `textcase' package}
+% We need \textsl{textcase} for better upcasing
+% \begin{macrocode}
+\RequirePackage{textcase}
+% \end{macrocode}
+%
+%
% \changes{v1.19}{2016/07/28}{Include 'References' in PDF bookmarks
% (Matthew Fluet)}
% \changes{v1.14}{2016/06/09}{Patched \cs{citestyle}}
@@ -2203,7 +2246,15 @@
% \end{macro}
%
% \begin{macro}{\l at subsection}
-% \changes{v1.31}{2017/03/04}{Rededined macro}
+% \changes{v1.40}{2017/05/27}{Redefined macro}
+% Section spacing is more generous than for amsart
+% \begin{macrocode}
+\def\l at section{\@tocline{1}{0pt}{1pc}{2pc}{}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\l at subsection}
+% \changes{v1.31}{2017/03/04}{Redefined macro}
% Amsart has too large spacing
% \begin{macrocode}
\def\l at subsection{\@tocline{2}{0pt}{1pc}{3pc}{}}
@@ -2211,7 +2262,7 @@
%
% \end{macro}
% \begin{macro}{\l at subsubsection}
-% \changes{v1.31}{2017/03/04}{Rededined macro}
+% \changes{v1.31}{2017/03/04}{Redefined macro}
% Amsart has too large spacing
% \begin{macrocode}
\def\l at subsubsection{\@tocline{2}{0pt}{1pc}{5pc}{}}
@@ -2254,6 +2305,7 @@
\else
\hypersetup{hidelinks}
\fi
+\RequirePackage{cleveref}
% \end{macrocode}
%
% Bibliography mangling.
@@ -2335,6 +2387,7 @@
%
% \changes{v1.17}{2016/07/07}{Slightly decreased margins for sigs}
% \changes{v1.29}{2017/01/22}{Increased head to 13pt}
+% \changes{v1.40}{2017/07/15}{Added heightrounded to geometry}
% We use |geometry| for dimensions. Note the presently margins do not
% depend on the font size option - maybe we will need to change this.
% See
@@ -2344,13 +2397,13 @@
\ifcase\ACM at format@nr
\relax % manuscript
\geometry{letterpaper,head=13pt,
- marginparwidth=6pc}%
+ marginparwidth=6pc,heightrounded}%
\or % acmsmall
\geometry{twoside=true,
includeheadfoot, head=13pt, foot=2pc,
paperwidth=6.75in, paperheight=10in,
top=58pt, bottom=44pt, inner=46pt, outer=46pt,
- marginparwidth=2pc
+ marginparwidth=2pc,heightrounded
}%
\or % acmlarge
\geometry{twoside=true, head=13pt, foot=2pc,
@@ -2357,7 +2410,7 @@
paperwidth=8.5in, paperheight=11in,
includeheadfoot,
top=78pt, bottom=114pt, inner=81pt, outer=81pt,
- marginparwidth=4pc
+ marginparwidth=4pc,heightrounded
}%
\or % acmtog
\geometry{twoside=true, head=13pt, foot=2pc,
@@ -2364,7 +2417,7 @@
paperwidth=8.5in, paperheight=11in,
includeheadfoot, columnsep=24pt,
top=52pt, bottom=75pt, inner=52pt, outer=52pt,
- marginparwidth=2pc
+ marginparwidth=2pc,heightrounded
}%
\or % sigconf
\geometry{twoside=true, head=13pt,
@@ -2371,7 +2424,7 @@
paperwidth=8.5in, paperheight=11in,
includeheadfoot, columnsep=2pc,
top=57pt, bottom=73pt, inner=54pt, outer=54pt,
- marginparwidth=2pc
+ marginparwidth=2pc,heightrounded
}%
\or % siggraph
\geometry{twoside=true, head=13pt,
@@ -2378,7 +2431,7 @@
paperwidth=8.5in, paperheight=11in,
includeheadfoot, columnsep=2pc,
top=57pt, bottom=73pt, inner=54pt, outer=54pt,
- marginparwidth=2pc
+ marginparwidth=2pc,heightrounded
}%
\or % sigplan
\geometry{twoside=true, head=13pt,
@@ -2385,7 +2438,7 @@
paperwidth=8.5in, paperheight=11in,
includeheadfoot=false, columnsep=2pc,
top=1in, bottom=1in, inner=0.75in, outer=0.75in,
- marginparwidth=2pc
+ marginparwidth=2pc,heightrounded
}%
\or % sigchi
\geometry{twoside=true, head=13pt,
@@ -2392,7 +2445,7 @@
paperwidth=8.5in, paperheight=11in,
includeheadfoot, columnsep=2pc,
top=66pt, bottom=73pt, inner=54pt, outer=54pt,
- marginparwidth=2pc
+ marginparwidth=2pc,heightrounded
}%
\or % sigchi-a
\geometry{twoside=false, head=13pt,
@@ -2572,13 +2625,23 @@
% \changes{v1.12}{2016/05/30}{Added graceful behavior when libertine
% fonts are absent}
% \changes{v1.33}{2017/03/29}{Added cmap and glyphtounicode}
+% \changes{v1.40}{2017/05/27}{Added Ross Moore code for glyphtounicode}
%
% Somehow PDFTeX and XeTeX require different incantations to make PDF
% compliant with the current Acrobat bugs. Xpdf is much better.
+%
+% The code below is by Ross Moore.
% \begin{macrocode}
\RequirePackage{iftex}
\ifPDFTeX
\input{glyphtounicode}
+\pdfglyphtounicode{f_f}{FB00}
+\pdfglyphtounicode{f_f_i}{FB03}
+\pdfglyphtounicode{f_f_l}{FB04}
+\pdfglyphtounicode{f_i}{FB01}
+\pdfglyphtounicode{t_t}{00740074}
+\pdfglyphtounicode{f_t}{00660074}
+\pdfglyphtounicode{T_h}{00540068}
\pdfgentounicode=1
\fi
\RequirePackage{cmap}
@@ -3326,7 +3389,7 @@
% \begin{macro}{\orcid}
% \changes{v1.15}{2016/06/25}{Introduced macro}
% Right now we do not typeset orcids
-\let\orcid\@gobble
+\def\orcid#1{\unskip\ignorespaces}
% \end{macro}
%
% \begin{macro}{\@titlenotes}
@@ -3784,11 +3847,12 @@
% \end{macro}
%
% \begin{macro}{\ccsdesc}
+% \changes{v1.40}{2017/05/27}{Now we can parse |Significance~General| nodes}
% The first argument is the significance, the second is the
% concept(s)
% \begin{macrocode}
\newcommand\ccsdesc[2][100]{%
- \ccsdesc at parse#1~#2~}
+ \ccsdesc at parse#1~#2~~\ccsdesc at parse@end}
% \end{macrocode}
%
% \end{macro}
@@ -3798,23 +3862,43 @@
% \cs{textrightarrow} (Matteo Riondato)}
% \changes{v1.29}{2017/01/22}{Add spacing after bullet and around
% rightarrow; semicolon separators no longer in bold/italic (John Wickerson)}
+% \changes{v1.40}{2017/05/27}{Now we can parse |Significance~General| nodes}
% The parser of the expression |Significance~General~Specific| (we need
-% |textcomp| for |\\textrightarrow|):
+% |textcomp| for |\textrightarrow|). Note that |Specific| can be empty!
% \begin{macrocode}
\RequirePackage{textcomp}
\def\ccsdesc at parse#1~#2~#3~{%
- \expandafter\ifx\csname CCS@#2\endcsname\relax
- \expandafter\gdef\csname CCS@#2\endcsname{\textbullet\ \textbf{#2} \textrightarrow\ }%
- \g at addto@macro{\@concepts}{\csname CCS@#2\endcsname}\fi
- \expandafter\g at addto@macro\expandafter{\csname CCS@#2\endcsname}{%
- \ifnum#1>499\textbf{#3}; \else
- \ifnum#1>299\textit{#3}; \else
- #3; \fi\fi}}
+ \expandafter\ifx\csname CCS at General@#2\endcsname\relax
+ \expandafter\gdef\csname CCS at General@#2\endcsname{\textbullet\
+ \textbf{#2}}%
+ \expandafter\gdef\csname CCS at Punctuation@#2\endcsname{; }%
+ \expandafter\gdef\csname CCS at Specific@#2\endcsname{}%
+ \g at addto@macro{\@concepts}{\csname CCS at General@#2\endcsname
+ \csname CCS at Punctuation@#2\endcsname
+ \csname CCS at Specific@#2\endcsname}%
+ \fi
+ \ifx#3\relax\relax\else
+ \expandafter\gdef\csname CCS at Punctuation@#2\endcsname{
+ \textrightarrow\ }%
+ \expandafter\g at addto@macro\expandafter{\csname CCS at Specific@#2\endcsname}{%
+ \ifnum#1>499\textbf{#3}; \else
+ \ifnum#1>299\textit{#3}; \else
+ #3; \fi\fi}%
+ \fi
+\ccsdesc at parse@finish}
% \end{macrocode}
%
% \end{macro}
%
+% \begin{macro}{\ccdesc at parse@finish}
+% \changes{v1.40}{2017/05/27}{Added macro}
+% Gobble everything to |\ccsdesc at parse@end|
+% \begin{macrocode}
+\def\ccsdesc at parse@finish#1\ccsdesc at parse@end{}
+% \end{macrocode}
%
+% \end{macro}
+%
%\subsection{Copyright system}
%\label{sec:copyright}
%
@@ -3853,9 +3937,11 @@
% Keys:
% \begin{macrocode}
\define at choicekey*{ACM@}{acmcopyrightmode}[%
- \acm at copyrightinput\acm at copyrightmode]{none,acmcopyright,acmlicensed,%
- rightsretained,usgov,usgovmixed,cagov,cagovmixed,%
- licensedusgovmixed,licensedcagovmixed,othergov,licensedothergov}{%
+ \acm at copyrightinput\acm at copyrightmode]{none,%
+ acmcopyright,acmlicensed,rightsretained,%
+ usgov,usgovmixed,cagov,cagovmixed,%
+ licensedusgovmixed,%
+ licensedcagov,licensedcagovmixed,othergov,licensedothergov}{%
\@printpermissiontrue
\@printcopyrighttrue
\@acmownedtrue
@@ -3883,13 +3969,16 @@
\ifnum\acm at copyrightmode=8\relax % licensedusgovmixed
\@acmownedfalse
\fi
- \ifnum\acm at copyrightmode=9\relax % licensedcagovmixed
+ \ifnum\acm at copyrightmode=9\relax % licensedcagov
\@acmownedfalse
\fi
- \ifnum\acm at copyrightmode=10\relax % othergov
+ \ifnum\acm at copyrightmode=10\relax % licensedcagovmixed
+ \@acmownedfalse
+ \fi
+ \ifnum\acm at copyrightmode=11\relax % othergov
\@acmownedtrue
\fi
- \ifnum\acm at copyrightmode=11\relax % licensedothergov
+ \ifnum\acm at copyrightmode=12\relax % licensedothergov
\@acmownedfalse
\fi}
% \end{macrocode}
@@ -3905,6 +3994,7 @@
%
%
% \begin{macro}{\@copyrightowner}
+% \changes{v1.40}{2017/06/16}{Added new copyright version: licensedcagov}
% Here is the owner of the copyright
% \begin{macrocode}
\def\@copyrightowner{%
@@ -3926,6 +4016,9 @@
\or %licensedusgovmixed
Copyright held by the owner/author(s). Publication rights licensed to
Association for Computing Machinery.
+ \or % licensedcagov
+ Crown in Right of Canada. Publication rights licensed to
+ Association for Computing Machinery.
\or %licensedcagovmixed
Copyright held by the owner/author(s). Publication rights licensed to
Association for Computing Machinery.
@@ -3950,6 +4043,7 @@
% \end{macro}
%
% \begin{macro}{\@copyrightpermission}
+% \changes{v1.40}{2017/06/16}{Added new copyright version: licensedcagov}
% The canned permission block.
% \begin{macrocode}
\def\@copyrightpermission{%
@@ -4012,7 +4106,7 @@
Permission to make digital or hard copies for personal or classroom
use is granted. Copies must bear this notice and the full citation
on the first page. Copyrights for components of this work owned by
- others than the Canadain Government must be honored. To copy
+ others than the Canadian Government must be honored. To copy
otherwise, distribute, republish, or post, requires prior specific
permission and\hspace*{.5pt}/or a fee. Request permissions from
permissions at acm.org.
@@ -4035,6 +4129,20 @@
Government retains a nonexclusive, royalty-free right to publish or
reproduce this article, or to allow others to do so, for Government
purposes only.
+ \or % licensedcagov
+ This article was authored by employees of the Government of Canada.
+ As such, the Canadian government retains all interest in the
+ copyright to this work and grants to ACM a nonexclusive,
+ royalty-free right to publish or reproduce this article, or to allow
+ others to do so, provided that clear attribution is given both to
+ the authors and the Canadian government agency employing them.
+ Permission to make digital or hard copies for personal or classroom
+ use is granted. Copies must bear this notice and the full citation
+ on the first page. Copyrights for components of this work owned by
+ others than the Canadian Government must be honored. To copy
+ otherwise, distribute, republish, or post, requires prior specific
+ permission and\hspace*{.5pt}/or a fee. Request permissions from
+ permissions at acm.org.
\or % licensedcagovmixed
Publication rights licensed to ACM\@. ACM acknowledges that this
contribution was authored or co-authored by an employee, contractor
@@ -4567,18 +4675,23 @@
% \begin{macro}{\streetaddress}
% \changes{v1.15}{2016/07/03}{Added macro}
% \changes{v1.33}{2017/03/28}{Added obeypunctuation code}
+% \changes{v1.40}{2017/06/15}{We now do not print this even in SIG}
% \begin{macro}{\city}
% \changes{v1.15}{2016/07/03}{Added macro}
% \changes{v1.33}{2017/03/28}{Added obeypunctuation code}
+% \changes{v1.40}{2017/06/15}{We now do not print this even in SIG}
% \begin{macro}{\state}
% \changes{v1.15}{2016/07/03}{Added macro}
% \changes{v1.33}{2017/03/28}{Added obeypunctuation code}
+% \changes{v1.40}{2017/06/15}{We now do not print this even in SIG}
% \begin{macro}{\postcode}
% \changes{v1.15}{2016/07/03}{Added macro}
% \changes{v1.33}{2017/03/28}{Added obeypunctuation code}
+% \changes{v1.40}{2017/06/15}{We now do not print this even in SIG}
% \begin{macro}{\country}
% \changes{v1.15}{2016/07/03}{Added macro}
% \changes{v1.33}{2017/03/28}{Added obeypunctuation code}
+% \changes{v1.40}{2017/05/27}{Fixed bugs with extra spaces}
% Theoretically we can define the macros for \cs{affiliation} inside
% the \cs{@mkauthors}-style commands. However, this would lead to a
% strange error if an author uses them outside \cs{affiliation}. Of
@@ -4587,24 +4700,24 @@
% We follow the strange American tradtion of no comma before zip
% code.
% \begin{macrocode}
+\def\streetaddress#1{\unskip\ignorespaces}
+\def\postcode#1{\unskip\ignorespaces}
\if at ACM@journal
- \let\position\@gobble
- \def\institution#1{#1\ignorespaces}%
- \newcommand\department[2][0]{}%
- \let\streetaddress\@gobble
- \let\city\@gobble
- \let\state\@gobble
- \let\postcode\@gobble
- \let\country\@gobble
+ \def\position#1{\unskip\ignorespaces}
+ \def\institution#1{#1\ignorespaces}
+ \def\city#1{\unskip\ignorespaces}
+ \def\state#1{\unskip\ignorespaces}
+ \newcommand\department[2][0]{}
+ \def\country#1{\unskip\ignorespaces}
\else
\def\position#1{\if at ACM@affiliation at obeypunctuation#1\else#1\par\fi}%
\def\institution#1{\if at ACM@affiliation at obeypunctuation#1\else#1\par\fi}%
\newcommand\department[2][0]{\if at ACM@affiliation at obeypunctuation
#2\else#2\par\fi}%
- \def\streetaddress#1{\if at ACM@affiliation at obeypunctuation#1\else#1\par\fi}%
+% \def\streetaddress#1{\if at ACM@affiliation at obeypunctuation#1\else#1\par\fi}%
\let\city\@ACM at addtoaddress
\let\state\@ACM at addtoaddress
- \def\postcode#1{\if at ACM@affiliation at obeypunctuation#1\else\unskip\space#1\fi}%
+% \def\postcode#1{\if at ACM@affiliation at obeypunctuation#1\else\unskip\space#1\fi}%
\let\country\@ACM at addtoaddress
\fi
% \end{macrocode}
@@ -4718,6 +4831,7 @@
% \begin{macro}{\@mkauthors at i}
% \changes{v1.18}{2016/07/12}{Now we andify affiliations}
% \changes{v1.33}{2017/03/28}{Added obeypunctuation code}
+% \changes{v1.40}{2017/06/04}{Switched to MakeTextUppercase}
% This is version used in most journal formats. Note that \cs{and} between
% authors with the same affiliation becomes \verb*| and |:
% \begin{macrocode}
@@ -4727,9 +4841,9 @@
\global\let\and\@typeset at author@line
\def\@author##1{%
\ifx\@currentauthors\@empty
- \gdef\@currentauthors{\@authorfont\MakeUppercase{##1}}%
+ \gdef\@currentauthors{\@authorfont\MakeTextUppercase{##1}}%
\else
- \g at addto@macro{\@currentauthors}{\and\MakeUppercase{##1}}%
+ \g at addto@macro{\@currentauthors}{\and\MakeTextUppercase{##1}}%
\fi
\gdef\and{}}%
\def\email##1##2{}%
@@ -5084,6 +5198,8 @@
%
% \begin{macro}{\ACM at linecount@bx}
% \changes{v1.34}{2017/04/10}{Rulers now are continuous}
+% \changes{v1.40}{2017/05/27}{Work around a bug in xcolor: looks like
+% cmyk colors in boxes do not work}
% This is the box displayed in the review mode
% \begin{macrocode}
\if at ACM@review
@@ -5094,7 +5210,7 @@
\def\ACM at mk@linecount{%
\savebox{\ACM at linecount@bx}[4em][t]{\parbox[t]{4em}{%
\setlength{\ACM at linecount@bxht}{-\baselineskip}%
- \loop{\color{ACMRed}\scriptsize\the\ACM at linecount}\\
+ \loop{\color{red}\scriptsize\the\ACM at linecount}\\
\global\advance\ACM at linecount by \@ne
\addtolength{\ACM at linecount@bxht}{\baselineskip}%
\ifdim\ACM at linecount@bxht<\textheight\repeat}}}
@@ -5437,9 +5553,10 @@
% \begin{macro}{\@subsubsecfont}
% \begin{macro}{\@parfont}
% \changes{v1.12}{2016/05/30}{Moved to \cs{section at raggedright}}%
+% \changes{v1.40}{2017/06/04}{Switched to MakeTextUppercase}
% Fonts for sections etc. are different for different formats.
% \begin{macrocode}
-\def\@secfont{\sffamily\bfseries\section at raggedright\MakeUppercase}
+\def\@secfont{\sffamily\bfseries\section at raggedright\MakeTextUppercase}
\def\@subsecfont{\sffamily\bfseries\section at raggedright}
\def\@subsubsecfont{\sffamily\itshape}
\def\@parfont{\itshape}
@@ -5448,16 +5565,16 @@
\relax % manuscript
\or % acmsmall
\or % acmlarge
- \def\@secfont{\sffamily\large\section at raggedright\MakeUppercase}
+ \def\@secfont{\sffamily\large\section at raggedright\MakeTextUppercase}
\def\@subsecfont{\sffamily\large\section at raggedright}
\or % acmtog
- \def\@secfont{\sffamily\large\section at raggedright\MakeUppercase}
+ \def\@secfont{\sffamily\large\section at raggedright\MakeTextUppercase}
\def\@subsecfont{\sffamily\large\section at raggedright}
\or % sigconf
- \def\@secfont{\bfseries\Large\section at raggedright\MakeUppercase}
+ \def\@secfont{\bfseries\Large\section at raggedright\MakeTextUppercase}
\def\@subsecfont{\bfseries\Large\section at raggedright}
\or % siggraph
- \def\@secfont{\bfseries\sffamily\Large\section at raggedright\MakeUppercase}
+ \def\@secfont{\bfseries\sffamily\Large\section at raggedright\MakeTextUppercase}
\def\@subsecfont{\bfseries\sffamily\Large\section at raggedright}
\or % sigplan
\def\@secfont{\bfseries\Large\section at raggedright}
@@ -5479,11 +5596,11 @@
\def\@subparfont{\itshape}
\or % sigchi
\setcounter{secnumdepth}{1}
- \def\@secfont{\bfseries\sffamily\section at raggedright\MakeUppercase}
+ \def\@secfont{\bfseries\sffamily\section at raggedright\MakeTextUppercase}
\def\@subsecfont{\bfseries\sffamily\section at raggedright}
\or % sigchi-a
\setcounter{secnumdepth}{0}
- \def\@secfont{\bfseries\sffamily\section at raggedright\MakeUppercase}
+ \def\@secfont{\bfseries\sffamily\section at raggedright\MakeTextUppercase}
\def\@subsecfont{\bfseries\sffamily\section at raggedright}
\fi
% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/acmart/acmart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/acmart/acmart.cls 2017-06-20 01:56:21 UTC (rev 44650)
+++ trunk/Master/texmf-dist/tex/latex/acmart/acmart.cls 2017-06-20 22:16:49 UTC (rev 44651)
@@ -37,7 +37,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{acmart}
-[2017/05/14 v1.39 Typesetting articles for Association of
+[2017/06/15 v1.40 Typesetting articles for Association of
Computing Machinery]
\def\@classname{acmart}
\InputIfFileExists{acmart-preload-hook.tex}{%
@@ -196,6 +196,7 @@
\RequirePackage{setspace}
\onehalfspacing
\fi
+\RequirePackage{textcase}
\if at ACM@natbib
\RequirePackage{natbib}
\renewcommand{\bibsection}{%
@@ -395,6 +396,7 @@
\global\@nobreakfalse \endgroup
\addvspace{32\p@\@plus14\p@}%
}
+\def\l at section{\@tocline{1}{0pt}{1pc}{2pc}{}}
\def\l at subsection{\@tocline{2}{0pt}{1pc}{3pc}{}}
\def\l at subsubsection{\@tocline{2}{0pt}{1pc}{5pc}{}}
\let\@footnotemark at nolink\@footnotemark
@@ -429,6 +431,7 @@
\else
\hypersetup{hidelinks}
\fi
+\RequirePackage{cleveref}
\if at ACM@natbib
\let\citeN\cite
\let\cite\citep
@@ -476,13 +479,13 @@
\ifcase\ACM at format@nr
\relax % manuscript
\geometry{letterpaper,head=13pt,
- marginparwidth=6pc}%
+ marginparwidth=6pc,heightrounded}%
\or % acmsmall
\geometry{twoside=true,
includeheadfoot, head=13pt, foot=2pc,
paperwidth=6.75in, paperheight=10in,
top=58pt, bottom=44pt, inner=46pt, outer=46pt,
- marginparwidth=2pc
+ marginparwidth=2pc,heightrounded
}%
\or % acmlarge
\geometry{twoside=true, head=13pt, foot=2pc,
@@ -489,7 +492,7 @@
paperwidth=8.5in, paperheight=11in,
includeheadfoot,
top=78pt, bottom=114pt, inner=81pt, outer=81pt,
- marginparwidth=4pc
+ marginparwidth=4pc,heightrounded
}%
\or % acmtog
\geometry{twoside=true, head=13pt, foot=2pc,
@@ -496,7 +499,7 @@
paperwidth=8.5in, paperheight=11in,
includeheadfoot, columnsep=24pt,
top=52pt, bottom=75pt, inner=52pt, outer=52pt,
- marginparwidth=2pc
+ marginparwidth=2pc,heightrounded
}%
\or % sigconf
\geometry{twoside=true, head=13pt,
@@ -503,7 +506,7 @@
paperwidth=8.5in, paperheight=11in,
includeheadfoot, columnsep=2pc,
top=57pt, bottom=73pt, inner=54pt, outer=54pt,
- marginparwidth=2pc
+ marginparwidth=2pc,heightrounded
}%
\or % siggraph
\geometry{twoside=true, head=13pt,
@@ -510,7 +513,7 @@
paperwidth=8.5in, paperheight=11in,
includeheadfoot, columnsep=2pc,
top=57pt, bottom=73pt, inner=54pt, outer=54pt,
- marginparwidth=2pc
+ marginparwidth=2pc,heightrounded
}%
\or % sigplan
\geometry{twoside=true, head=13pt,
@@ -517,7 +520,7 @@
paperwidth=8.5in, paperheight=11in,
includeheadfoot=false, columnsep=2pc,
top=1in, bottom=1in, inner=0.75in, outer=0.75in,
- marginparwidth=2pc
+ marginparwidth=2pc,heightrounded
}%
\or % sigchi
\geometry{twoside=true, head=13pt,
@@ -524,7 +527,7 @@
paperwidth=8.5in, paperheight=11in,
includeheadfoot, columnsep=2pc,
top=66pt, bottom=73pt, inner=54pt, outer=54pt,
- marginparwidth=2pc
+ marginparwidth=2pc,heightrounded
}%
\or % sigchi-a
\geometry{twoside=false, head=13pt,
@@ -601,6 +604,13 @@
\RequirePackage{iftex}
\ifPDFTeX
\input{glyphtounicode}
+\pdfglyphtounicode{f_f}{FB00}
+\pdfglyphtounicode{f_f_i}{FB03}
+\pdfglyphtounicode{f_f_l}{FB04}
+\pdfglyphtounicode{f_i}{FB01}
+\pdfglyphtounicode{t_t}{00740074}
+\pdfglyphtounicode{f_t}{00660074}
+\pdfglyphtounicode{T_h}{00540068}
\pdfgentounicode=1
\fi
\RequirePackage{cmap}
@@ -1087,7 +1097,7 @@
\if at ACM@anonymous\else
\g at addto@macro\addresses{\email{#1}{#2}}%
\fi}
-\let\orcid\@gobble
+\def\orcid#1{\unskip\ignorespaces}
\def\@titlenotes{}
\def\titlenote#1{%
\g at addto@macro\@title{\footnotemark}%
@@ -1228,16 +1238,28 @@
\excludecomment{CCSXML}
\let\@concepts\@empty
\newcommand\ccsdesc[2][100]{%
- \ccsdesc at parse#1~#2~}
+ \ccsdesc at parse#1~#2~~\ccsdesc at parse@end}
\RequirePackage{textcomp}
\def\ccsdesc at parse#1~#2~#3~{%
- \expandafter\ifx\csname CCS@#2\endcsname\relax
- \expandafter\gdef\csname CCS@#2\endcsname{\textbullet\ \textbf{#2} \textrightarrow\ }%
- \g at addto@macro{\@concepts}{\csname CCS@#2\endcsname}\fi
- \expandafter\g at addto@macro\expandafter{\csname CCS@#2\endcsname}{%
- \ifnum#1>499\textbf{#3}; \else
- \ifnum#1>299\textit{#3}; \else
- #3; \fi\fi}}
+ \expandafter\ifx\csname CCS at General@#2\endcsname\relax
+ \expandafter\gdef\csname CCS at General@#2\endcsname{\textbullet\
+ \textbf{#2}}%
+ \expandafter\gdef\csname CCS at Punctuation@#2\endcsname{; }%
+ \expandafter\gdef\csname CCS at Specific@#2\endcsname{}%
+ \g at addto@macro{\@concepts}{\csname CCS at General@#2\endcsname
+ \csname CCS at Punctuation@#2\endcsname
+ \csname CCS at Specific@#2\endcsname}%
+ \fi
+ \ifx#3\relax\relax\else
+ \expandafter\gdef\csname CCS at Punctuation@#2\endcsname{
+ \textrightarrow\ }%
+ \expandafter\g at addto@macro\expandafter{\csname CCS at Specific@#2\endcsname}{%
+ \ifnum#1>499\textbf{#3}; \else
+ \ifnum#1>299\textit{#3}; \else
+ #3; \fi\fi}%
+ \fi
+\ccsdesc at parse@finish}
+\def\ccsdesc at parse@finish#1\ccsdesc at parse@end{}
\newif\if at printcopyright
\@printcopyrighttrue
\newif\if at printpermission
@@ -1245,9 +1267,11 @@
\newif\if at acmowned
\@acmownedtrue
\define at choicekey*{ACM@}{acmcopyrightmode}[%
- \acm at copyrightinput\acm at copyrightmode]{none,acmcopyright,acmlicensed,%
- rightsretained,usgov,usgovmixed,cagov,cagovmixed,%
- licensedusgovmixed,licensedcagovmixed,othergov,licensedothergov}{%
+ \acm at copyrightinput\acm at copyrightmode]{none,%
+ acmcopyright,acmlicensed,rightsretained,%
+ usgov,usgovmixed,cagov,cagovmixed,%
+ licensedusgovmixed,%
+ licensedcagov,licensedcagovmixed,othergov,licensedothergov}{%
\@printpermissiontrue
\@printcopyrighttrue
\@acmownedtrue
@@ -1275,13 +1299,16 @@
\ifnum\acm at copyrightmode=8\relax % licensedusgovmixed
\@acmownedfalse
\fi
- \ifnum\acm at copyrightmode=9\relax % licensedcagovmixed
+ \ifnum\acm at copyrightmode=9\relax % licensedcagov
\@acmownedfalse
\fi
- \ifnum\acm at copyrightmode=10\relax % othergov
+ \ifnum\acm at copyrightmode=10\relax % licensedcagovmixed
+ \@acmownedfalse
+ \fi
+ \ifnum\acm at copyrightmode=11\relax % othergov
\@acmownedtrue
\fi
- \ifnum\acm at copyrightmode=11\relax % licensedothergov
+ \ifnum\acm at copyrightmode=12\relax % licensedothergov
\@acmownedfalse
\fi}
\def\setcopyright#1{\setkeys{ACM@}{acmcopyrightmode=#1}}
@@ -1305,6 +1332,9 @@
\or %licensedusgovmixed
Copyright held by the owner/author(s). Publication rights licensed to
Association for Computing Machinery.
+ \or % licensedcagov
+ Crown in Right of Canada. Publication rights licensed to
+ Association for Computing Machinery.
\or %licensedcagovmixed
Copyright held by the owner/author(s). Publication rights licensed to
Association for Computing Machinery.
@@ -1375,7 +1405,7 @@
Permission to make digital or hard copies for personal or classroom
use is granted. Copies must bear this notice and the full citation
on the first page. Copyrights for components of this work owned by
- others than the Canadain Government must be honored. To copy
+ others than the Canadian Government must be honored. To copy
otherwise, distribute, republish, or post, requires prior specific
permission and\hspace*{.5pt}/or a fee. Request permissions from
permissions at acm.org.
@@ -1398,6 +1428,20 @@
Government retains a nonexclusive, royalty-free right to publish or
reproduce this article, or to allow others to do so, for Government
purposes only.
+ \or % licensedcagov
+ This article was authored by employees of the Government of Canada.
+ As such, the Canadian government retains all interest in the
+ copyright to this work and grants to ACM a nonexclusive,
+ royalty-free right to publish or reproduce this article, or to allow
+ others to do so, provided that clear attribution is given both to
+ the authors and the Canadian government agency employing them.
+ Permission to make digital or hard copies for personal or classroom
+ use is granted. Copies must bear this notice and the full citation
+ on the first page. Copyrights for components of this work owned by
+ others than the Canadian Government must be honored. To copy
+ otherwise, distribute, republish, or post, requires prior specific
+ permission and\hspace*{.5pt}/or a fee. Request permissions from
+ permissions at acm.org.
\or % licensedcagovmixed
Publication rights licensed to ACM\@. ACM acknowledges that this
contribution was authored or co-authored by an employee, contractor
@@ -1741,24 +1785,22 @@
\unskip\cleaders\copy\@ACM at commabox\hskip\wd\@ACM at commabox
\fi\fi
#1}
+\def\streetaddress#1{\unskip\ignorespaces}
+\def\postcode#1{\unskip\ignorespaces}
\if at ACM@journal
- \let\position\@gobble
- \def\institution#1{#1\ignorespaces}%
- \newcommand\department[2][0]{}%
- \let\streetaddress\@gobble
- \let\city\@gobble
- \let\state\@gobble
- \let\postcode\@gobble
- \let\country\@gobble
+ \def\position#1{\unskip\ignorespaces}
+ \def\institution#1{#1\ignorespaces}
+ \def\city#1{\unskip\ignorespaces}
+ \def\state#1{\unskip\ignorespaces}
+ \newcommand\department[2][0]{}
+ \def\country#1{\unskip\ignorespaces}
\else
\def\position#1{\if at ACM@affiliation at obeypunctuation#1\else#1\par\fi}%
\def\institution#1{\if at ACM@affiliation at obeypunctuation#1\else#1\par\fi}%
\newcommand\department[2][0]{\if at ACM@affiliation at obeypunctuation
#2\else#2\par\fi}%
- \def\streetaddress#1{\if at ACM@affiliation at obeypunctuation#1\else#1\par\fi}%
\let\city\@ACM at addtoaddress
\let\state\@ACM at addtoaddress
- \def\postcode#1{\if at ACM@affiliation at obeypunctuation#1\else\unskip\space#1\fi}%
\let\country\@ACM at addtoaddress
\fi
\def\@mkauthors{\begingroup
@@ -1826,9 +1868,9 @@
\global\let\and\@typeset at author@line
\def\@author##1{%
\ifx\@currentauthors\@empty
- \gdef\@currentauthors{\@authorfont\MakeUppercase{##1}}%
+ \gdef\@currentauthors{\@authorfont\MakeTextUppercase{##1}}%
\else
- \g at addto@macro{\@currentauthors}{\and\MakeUppercase{##1}}%
+ \g at addto@macro{\@currentauthors}{\and\MakeTextUppercase{##1}}%
\fi
\gdef\and{}}%
\def\email##1##2{}%
@@ -2023,7 +2065,7 @@
\def\ACM at mk@linecount{%
\savebox{\ACM at linecount@bx}[4em][t]{\parbox[t]{4em}{%
\setlength{\ACM at linecount@bxht}{-\baselineskip}%
- \loop{\color{ACMRed}\scriptsize\the\ACM at linecount}\\
+ \loop{\color{red}\scriptsize\the\ACM at linecount}\\
\global\advance\ACM at linecount by \@ne
\addtolength{\ACM at linecount@bxht}{\baselineskip}%
\ifdim\ACM at linecount@bxht<\textheight\repeat}}}
@@ -2241,7 +2283,7 @@
\rightskip\@rightskip
\leftskip\z at skip
\parindent\z@}
-\def\@secfont{\sffamily\bfseries\section at raggedright\MakeUppercase}
+\def\@secfont{\sffamily\bfseries\section at raggedright\MakeTextUppercase}
\def\@subsecfont{\sffamily\bfseries\section at raggedright}
\def\@subsubsecfont{\sffamily\itshape}
\def\@parfont{\itshape}
@@ -2250,16 +2292,16 @@
\relax % manuscript
\or % acmsmall
\or % acmlarge
- \def\@secfont{\sffamily\large\section at raggedright\MakeUppercase}
+ \def\@secfont{\sffamily\large\section at raggedright\MakeTextUppercase}
\def\@subsecfont{\sffamily\large\section at raggedright}
\or % acmtog
- \def\@secfont{\sffamily\large\section at raggedright\MakeUppercase}
+ \def\@secfont{\sffamily\large\section at raggedright\MakeTextUppercase}
\def\@subsecfont{\sffamily\large\section at raggedright}
\or % sigconf
- \def\@secfont{\bfseries\Large\section at raggedright\MakeUppercase}
+ \def\@secfont{\bfseries\Large\section at raggedright\MakeTextUppercase}
\def\@subsecfont{\bfseries\Large\section at raggedright}
\or % siggraph
- \def\@secfont{\bfseries\sffamily\Large\section at raggedright\MakeUppercase}
+ \def\@secfont{\bfseries\sffamily\Large\section at raggedright\MakeTextUppercase}
\def\@subsecfont{\bfseries\sffamily\Large\section at raggedright}
\or % sigplan
\def\@secfont{\bfseries\Large\section at raggedright}
@@ -2281,11 +2323,11 @@
\def\@subparfont{\itshape}
\or % sigchi
\setcounter{secnumdepth}{1}
- \def\@secfont{\bfseries\sffamily\section at raggedright\MakeUppercase}
+ \def\@secfont{\bfseries\sffamily\section at raggedright\MakeTextUppercase}
\def\@subsecfont{\bfseries\sffamily\section at raggedright}
\or % sigchi-a
\setcounter{secnumdepth}{0}
- \def\@secfont{\bfseries\sffamily\section at raggedright\MakeUppercase}
+ \def\@secfont{\bfseries\sffamily\section at raggedright\MakeTextUppercase}
\def\@subsecfont{\bfseries\sffamily\section at raggedright}
\fi
\def\@adddotafter#1{#1\@addpunct{.}}
More information about the tex-live-commits
mailing list