Merge branch 'master' into development

citation-style-language · Aug 12, 2012 · ea2f270 · ea2f270
2 parents a02ed61 + d1b2bc8
commit ea2f270
Show file tree

Hide file tree

Showing 18 changed files with 1,078 additions and 25 deletions.
diff --git a/biochemistry.csl b/biochemistry.csl
@@ -14,7 +14,6 @@
     <issn>1520-4995</issn>
     <updated>2008-10-29T20:22:16+00:00</updated>
     <summary>A style for the ACS publication "Biochemistry"</summary>
-    <issn>0006-2960</issn>
     <link href="http://pubs.acs.org/paragonplus/submission/bichaw/bichaw_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>
   </info>

diff --git a/bioconjugate-chemistry.csl b/bioconjugate-chemistry.csl
@@ -15,7 +15,6 @@
     <issn>1520-4812</issn>
     <updated>2008-10-29T20:22:16+00:00</updated>
     <summary>A style for the ACS publication "Bioconjugate Chemistry"</summary>
-    <issn>1043-1802</issn>
     <link href="http://pubs.acs.org/paragonplus/submission/bcches/bcches_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>
   </info>

diff --git a/brain.csl b/brain.csl
@@ -14,7 +14,6 @@
     <issn>1460-2156</issn>
     <updated>2008-09-16T00:00:00+00:00</updated>
     <link href="http://www.oxfordjournals.org/our_journals/brainj/for_authors/general.html" rel="documentation"/>
-    <issn>0006-8950</issn>
     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
   </info>
   <macro name="author-short">

diff --git a/chemical-research-in-toxicology.csl b/chemical-research-in-toxicology.csl
@@ -15,7 +15,6 @@
     <issn>1520-5010</issn>
     <updated>2008-10-29T20:22:16+00:00</updated>
     <summary>A style for the ACS publication "Chemical Research in Toxicology"</summary>
-    <issn>0893-228X</issn>
     <link href="http://pubs.acs.org/paragonplus/submission/crtoec/crtoec_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>
   </info>

diff --git a/dependent/journal-of-experimental-algorithmics.csl b/dependent/journal-of-experimental-algorithmics.csl
@@ -8,7 +8,6 @@
     <link href="http://www.acm.org/publications/word_style/word-style-toc/" rel="documentation"/>
     <category citation-format="author-date"/>
     <category field="engineering"/>
-    <issn>1084-6654</issn>   <!-- Print -->
     <issn>1084-6654</issn>   <!-- Electronic -->
     <updated>2012-07-18T12:00:00+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>

diff --git a/dependent/journal-of-medicinal-chemistry.csl b/dependent/journal-of-medicinal-chemistry.csl
@@ -3,7 +3,7 @@
   <info>
     <title>Journal of Medicinal Chemistry</title>
     <id>http://www.zotero.org/styles/journal-of-medicinal-chemistry</id>
-    <link href="http://www.zotero.org/styles/american-chemical-society" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/american-chemical-society-with-titles" rel="independent-parent"/>
     <category citation-format="numeric"/>
     <category field="chemistry"/>
     <updated>2012-01-01T00:00:00+00:00</updated>

diff --git a/international-union-of-crystallography.csl b/international-union-of-crystallography.csl
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" default-locale="en-US" demote-non-dropping-particle="sort-only" page-range-format="expanded">
+  <!-- INFO -->
+  <info>
+    <title>International Union of Crystallography (IUCr) Journals</title>
+    <id>http://www.zotero.org/styles/international-union-of-crystallography</id>
+    <link href="http://www.zotero.org/styles/international-union-of-crystallography" rel="self"/>
+    <author>
+      <name>James Stroud</name>
+      <email>jstroud@mbi.ucla.edu</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="chemistry"/>
+    <updated>2012-08-10T08:04:30-06:00</updated>
+    <link href="http://journals.iucr.org/d/issues/2012/02/00/me0456/index.html" 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>
+  </info>
+  <!-- MACROS -->
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" initialize-with=". " and="symbol" delimiter-precedes-last="contextual"/>
+    </names>
+  </macro>
+  <macro name="issued">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="or">
+    <names variable="editor">
+      <name initialize-with="." and="symbol" delimiter-precedes-last="always"/>
+      <label form="verb" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
+    </names>
+  </macro>
+  <!-- CITATION -->
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year-suffix">
+    <sort>
+      <key macro="issued"/>
+      <key macro="author"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="issued"/>
+      </group>
+    </layout>
+  </citation>
+  <!-- BIBLIOGRAPHY -->
+  <bibliography et-al-min="11" et-al-use-first="10">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+        <text macro="author"/>
+        <text macro="issued" prefix="(" suffix=")."/>
+        <choose>
+          <if type="article article-magazine article-newspaper article-journal review" match="any">
+            <text variable="container-title" form="short" font-style="italic" text-case="title" suffix="."/>
+            <text variable="volume" font-weight="bold" suffix=","/>
+            <text variable="page" suffix="."/>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <text variable="container-title" suffix="," text-case="title" font-style="italic"/>
+            <text macro="editor" suffix=", "/>
+            <label variable="page" suffix="." form="short" strip-periods="true"/>
+            <text variable="page" suffix="."/>
+            <text macro="publisher" suffix="."/>
+          </else-if>
+          <else-if type="thesis">
+            <text variable="title" suffix="."/>
+            <text variable="genre" suffix="."/>
+            <text variable="publisher" suffix="."/>
+          </else-if>
+          <else>
+            <text variable="title"/>
+            <text macro="publisher" suffix="."/>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/journal-of-the-american-academy-of-orthopaedic-surgeons.csl b/journal-of-the-american-academy-of-orthopaedic-surgeons.csl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
   <info>
-    <title>Journal of the American Academy of Orthopaedic Surgeons</title>
+    <title>Journal of the American Academy of Orthopaedic Surgeons (JAAOS)</title>
     <id>http://www.zotero.org/styles/journal-of-the-american-academy-of-orthopaedic-surgeons</id>
     <link href="http://www.zotero.org/styles/journal-of-the-american-academy-of-orthopaedic-surgeons" rel="self"/>
     <link href="http://www.zotero.org/styles/nature" rel="template"/>
@@ -14,7 +14,6 @@
     <category field="medicine"/>
     <category citation-format="numeric"/>
     <issn>1067-151X</issn> <!-- Print -->
-    <issn>1535-4970</issn> <!-- Online -->
     <updated>2012-07-12T12:00:00+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>
   </info>

diff --git a/law1-de.csl b/law1-de.csl
@@ -22,7 +22,7 @@
     </contributor>
     <summary>Law generic style, german variant, based on Chicago format with short notes and
             full bibliography</summary>
-    <category field="generic-base"/>
+    <category field="law"/>
     <category citation-format="numeric"/>
     <updated>2008-01-01T11:11:11+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>

diff --git a/oxford-brookes-university-faculty-of-health-and-life-sciences.csl b/oxford-brookes-university-faculty-of-health-and-life-sciences.csl
@@ -28,7 +28,6 @@
       <name and="text" name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter-precedes-last="never" delimiter=", "/>
       <label form="short" prefix=" " suffix="." text-case="lowercase" strip-periods="true"/>
       <substitute>
-        <text macro="editor"/>
         <text macro="anon"/>
       </substitute>
     </names>