merge

.travis.yml

@@ -6,5 +6,7 @@ notifications:
     recipients:
       - rintze.zelle@gmail.com
       - i@nukshuk.io
+      - karcher@u.northwestern.edu
+      - charles.parnot@gmail.com
     on_success: change
     on_failure: always

CONTRIBUTING.md

@@ -0,0 +1,72 @@
+# Submitting Styles
+
+Before submitting a style for inclusion in the style repository, make sure that
+your (modified) style
+[validates](https://github.com/citation-style-language/styles/wiki/Validation)
+and meets all our [style
+requirements](https://github.com/citation-style-language/styles/wiki/Style-Requirements).
+
+There are three ways to submit styles. When you want to submit corrections or
+improvements to an existing style, please create a pull request using either the
+GitHub website (option A) or a git client (option B; for advanced users). If you
+have difficulty figuring out options A and B, you can create a gist instead
+(option C). When submitting a new style, use option C or, preferably, B.
+
+We use an automated system for quality control of the style repository (for
+details, see
+[Test-Environment](https://github.com/citation-style-language/styles/wiki/Test-Environment)).
+After each commit, the [Travis
+CI](http://travis-ci.org/#!/citation-style-language/styles) service checks all
+the styles in the repository. Checks include validation against the CSL schema,
+but also cover additional requirements specific to our style repository (such as
+the license under which styles are released). Whenever you create a pull request
+(via options A or B), Travis CI will automatically test the pull request (even
+before it gets merged) and include the test results in the pull request (see the
+[Travis announcement]
+(http://about.travis-ci.org/blog/2012-09-04-pull-requests-just-got-even-more-awesome/)).
+
+## (A) Edit a Style using the GitHub Website
+_Note that this method is only suited for corrections or improvements of
+existing styles. When you want to submit a new style - even if it contains only
+small modifications relative to the style it was derived from - see (B) or (C)
+below._
+
+1. Create a GitHub.com account and sign in.
+2. Go to https://github.com/citation-style-language/styles, and find the style
+you want to change (dependent styles are stored in the "dependent" directory)
+3. Click on the style name, which will bring you to a page like
+https://github.com/citation-style-language/styles/blob/master/apa.csl
+4. Click the "Fork and edit this file" button. This will open a code editor,
+allowing you to make your changes (e.g. you can copy and paste your modified
+style into this window).
+5. Once you have made your changes in the "Code" tab, and previewed them in the
+"Preview" tab, click the "Propose File Change" button.
+6. In the next window, provide a description of the changes you've made. When
+finished, click "Send pull request".
+
+Based on your GitHub notification settings, you will now automatically receive
+updates when your changes have been accepted, or when the CSL team has comments
+or questions about your changes.
+
+See also https://github.com/blog/844-forking-with-the-edit-button
+
+## (B) Use a git Client
+
+Start by [forking](http://help.github.com/fork-a-repo/) the [style
+repository](https://github.com/citation-style-language/styles). Commit your
+changes, and create a [pull
+request](http://help.github.com/send-pull-requests/). You can use your git
+client of choice, such as [GitHub for Mac](http://mac.github.com/), [GitHub for
+Windows](http://windows.github.com/), or
+[SmartGit](http://www.syntevo.com/smartgit/index.html).
+
+## (C) Create a 'gist'
+
+Visit http://gist.github.com, and paste the style code into the text box. Give
+the style a name ("name this file...") and click the "Create Public Gist"
+button. Copy the URL of the gist (e.g. https://gist.github.com/1320111), and
+include it in your message to us. You can either start a new discussion in the
+[Citation Styles section of the Zotero forums](http://forums.zotero.org/11/), or
+[create a new GitHub
+issue](https://github.com/citation-style-language/styles/issues/new) in the
+_styles_ repository.

Gemfile

@@ -4,4 +4,4 @@ gem 'rake'
 gem 'rspec'
 gem 'fuubar'
 gem 'nokogiri'
-gem 'csl', '1.0.0.pre9'
+gem 'csl', '1.0.0.pre11'

acm-sig-proceedings-long-author-list.csl

@@ -4,6 +4,7 @@
     <title>ACM SIG Proceedings With Long Author List</title>
     <id>http://www.zotero.org/styles/acm-sig-proceedings-long-author-list</id>
     <link href="http://www.zotero.org/styles/acm-sig-proceedings-long-author-list" rel="self"/>
+    <link href="http://www.acm.org/sigs/publications/proceedings-templates" rel="documentation"/>
     <author>
       <name>Naeem Esfahani</name>
       <email>nesfaha2@gmu.edu</email>
@@ -13,12 +14,11 @@
       <name>Chris Horn</name>
       <email>chris.horn@securedecisions.com</email>
     </contributor>
+    <category citation-format="numeric"/>
     <category field="science"/>
     <category field="engineering"/>
-    <category citation-format="numeric"/>
     <updated>2012-01-01T00:00:00+00:00</updated>
-    <link href="http://www.acm.org/sigs/publications/proceedings-templates" rel="documentation"/>
-    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
     <choose>

acm-sig-proceedings.csl

@@ -4,6 +4,7 @@
     <title>ACM SIG Proceedings</title>
     <id>http://www.zotero.org/styles/acm-sig-proceedings</id>
     <link href="http://www.zotero.org/styles/acm-sig-proceedings" rel="self"/>
+    <link href="http://www.acm.org/sigs/publications/proceedings-templates" rel="documentation"/>
     <author>
       <name>Naeem Esfahani</name>
       <email>nesfaha2@gmu.edu</email>
@@ -13,12 +14,11 @@
       <name>Chris Horn</name>
       <email>chris.horn@securedecisions.com</email>
     </contributor>
+    <category citation-format="numeric"/>
     <category field="science"/>
     <category field="engineering"/>
-    <category citation-format="numeric"/>
     <updated>2012-01-01T00:00:00+00:00</updated>
-    <link href="http://www.acm.org/sigs/publications/proceedings-templates" rel="documentation"/>
-    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
     <choose>

acm-sigchi-proceedings.csl

@@ -21,10 +21,10 @@
       <name>Lilly Irani</name>
       <email>lirani@ics.uci.edu</email>
     </contributor>
-    <category field="engineering"/>
     <category citation-format="numeric"/>
+    <category field="engineering"/>
     <updated>2010-09-08T06:21:30+00:00</updated>
-    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
     <group suffix=".">

acm-siggraph.csl

@@ -4,15 +4,15 @@
     <title>ACM SIGGRAPH</title>
     <id>http://www.zotero.org/styles/acm-siggraph</id>
     <link href="http://www.zotero.org/styles/acm-siggraph" rel="self"/>
-    <link href="http://www.siggraph.org/publications/instructions.pdf" rel="documentation"/>
     <link href="http://www.zotero.org/styles/acm-sigchi-proceedings" rel="template"/>
+    <link href="http://www.siggraph.org/publications/instructions.pdf" rel="documentation"/>
     <author>
       <name>Sebastian Karcher</name>
     </author>
-    <category field="engineering"/>
     <category citation-format="author-date"/>
+    <category field="engineering"/>
     <updated>2010-09-08T06:21:30+00:00</updated>
-    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
     <names variable="author">

acs-chemical-biology.csl

@@ -4,18 +4,18 @@
     <title>ACS Chemical Biology</title>
     <id>http://www.zotero.org/styles/acs-chemical-biology</id>
     <link href="http://www.zotero.org/styles/acs-chemical-biology" rel="self"/>
+    <link href="http://pubs.acs.org/journals/acbcct/publishing/InfoForAuthors.pdf" rel="documentation"/>
     <author>
       <name>Rintze Zelle</name>
       <uri>http://twitter.com/rintzezelle</uri>
     </author>
     <category citation-format="numeric"/>
     <category field="chemistry"/>
     <category field="biology"/>
-    <updated>2008-10-29T20:22:16+00:00</updated>
-    <summary>A style for the ACS publication "ACS Chemical Biology"</summary>
     <issn>1554-8929</issn>
-    <link href="http://pubs.acs.org/journals/acbcct/publishing/InfoForAuthors.pdf" rel="documentation"/>
-    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+    <summary>A style for the ACS publication "ACS Chemical Biology"</summary>
+    <updated>2008-10-29T20:22:16+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
     <names variable="author">

acs-nano.csl

@@ -5,6 +5,7 @@
     <id>http://www.zotero.org/styles/acs-nano</id>
     <link href="http://www.zotero.org/styles/acs-nano" rel="self"/>
     <link href="http://www.zotero.org/styles/american-chemical-society-with-titles" rel="template"/>
+    <link href="http://pubs.acs.org/paragonplus/submission/ancac3/ancac3_authguide.pdf" rel="documentation"/>
     <author>
       <name>Gaston Corthey</name>
       <email>gcorthey@gmail.com</email>
@@ -13,10 +14,9 @@
     <category field="chemistry"/>
     <issn>1936-0851</issn>
     <issn>1936-086X</issn>
-    <updated>2012-01-23T19:50:03+00:00</updated>
     <summary>The ACS Nano style, adapted from The American Chemical Society style with article titles</summary>
-    <link href="http://pubs.acs.org/paragonplus/submission/ancac3/ancac3_authguide.pdf" rel="documentation"/>
-    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+    <updated>2012-01-23T19:50:03+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor">
     <names variable="editor">

acta-materialia.csl

@@ -4,6 +4,7 @@
     <title>Acta Materialia</title>
     <id>http://www.zotero.org/styles/acta-materialia</id>
     <link href="http://www.zotero.org/styles/acta-materialia" rel="self"/>
+    <link href="http://www.elsevier.com/wps/find/journaldescription.cws_home/221/authorinstructions#Refs" rel="documentation"/>
     <author>
       <name>Richard Karnesky</name>
       <email>karnesky+zotero@gmail.com</email>
@@ -13,14 +14,13 @@
       <name>Eric Payton</name>
       <email>eric.payton@rub.de</email>
     </contributor>
+    <category citation-format="numeric"/>
     <category field="engineering"/>
     <!--<category term="materials science"/>-->
-    <category citation-format="numeric"/>
-    <updated>2012-02-17T16:51:04+00:00</updated>
-    <summary>A style for Elsevier's journal "Acta Materialia"</summary>
     <issn>1359-6454</issn>
-    <link href="http://www.elsevier.com/wps/find/journaldescription.cws_home/221/authorinstructions#Refs" rel="documentation"/>
-    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+    <summary>A style for Elsevier's journal "Acta Materialia"</summary>
+    <updated>2012-02-17T16:51:04+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
     <names variable="author">

acta-naturae.csl

@@ -5,6 +5,7 @@
     <id>http://www.zotero.org/styles/acta-naturae</id>
     <link href="http://www.zotero.org/styles/acta-naturae" rel="self"/>
     <link href="http://www.zotero.org/styles/vancouver" rel="template"/>
+    <link href="http://actanaturae.ru/add_article.aspx" rel="documentation"/>
     <author>
       <name>Dmitrijs Lvovs</name>
       <email>dmitrijs.lvovs@gmail.com</email>
@@ -13,13 +14,12 @@
       <name>Alexander Favorov</name>
       <email>favorov@sensi.org</email>
     </contributor>
-    <category field="biology"/>
     <category citation-format="numeric"/>
+    <category field="biology"/>
     <issn>2075-8251</issn>
-    <updated>2012-06-07T19:46:04-04:00</updated>
     <summary>Style for Acta Naturae journal</summary>
-    <link href="http://actanaturae.ru/add_article.aspx" rel="documentation"/>
-    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+    <updated>2012-06-07T19:46:04-04:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
     <names variable="author" suffix=". ">