csl-styles 1.0.1.6 → 1.0.1.7

data/vendor/styles/{human-pathology.csl → recent-patents-on-drug-delivery-and-formulation.csl}

@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" page-range-format="minimal" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
+<style class="in-text" version="1.0" et-al-min="19" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-US" xmlns="http://purl.org/net/xbiblio/csl">
+<!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
   <info>
-    <title>Human Pathology</title>
-    <id>http://www.zotero.org/styles/human-pathology</id>
-    <link href="http://www.zotero.org/styles/human-pathology-case" rel="self"/>
-    <link href="http://www.zotero.org/styles/elsevier-vancouver" rel="template"/>
-    <link href="http://www.humanpathol.com/content/authorinfo#idp1392704" rel="documentation"/>
+    <title>Recent Patents on Drug Delivery &amp; Formulation</title>
+    <id>http://www.zotero.org/styles/recent-patents-on-drug-delivery-and-formulation</id>
+    <link href="http://www.zotero.org/styles/recent-patents-on-drug-delivery-and-formulation" rel="self"/>
+    <link href="http://www.zotero.org/styles/journal-of-adolescent-health" rel="template"/>
+    <link href="http://benthamscience.com/journals/recent-patents-on-drug-delivery-and-formulation/author-guidelines" rel="documentation"/>
     <category citation-format="numeric"/>
-    <category field="medicine"/>
-    <issn>0046-8177</issn>
-    <summary>Elsevier Vancouver with 7/3 et-al</summary>
-    <updated>2014-05-17T12:00:00+00:00</updated>
+    <issn>1872-2113</issn>
+    <eissn>2212-4039</eissn>
+    <summary>Bentham Publishers</summary>
+    <updated>2016-04-05T23:00:11+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">
-      <name initialize-with="" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
+      <name delimiter=";" delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
       <label form="long" prefix=", "/>
       <substitute>
         <names variable="editor"/>
@@ -67,7 +68,7 @@
       <text variable="citation-number"/>
     </layout>
   </citation>
-  <bibliography entry-spacing="0" second-field-align="flush" et-al-min="7" et-al-use-first="3">
+  <bibliography et-al-min="15" et-al-use-first="3" second-field-align="flush" entry-spacing="0">
     <layout suffix=".">
       <text variable="citation-number" prefix="[" suffix="]"/>
       <text macro="author" suffix=". "/>
@@ -138,13 +139,13 @@
           </group>
         </else-if>
         <else>
-          <group delimiter=":">
+          <group delimiter=",">
             <group delimiter=" ">
               <group delimiter=". ">
                 <text variable="title"/>
-                <text variable="container-title" form="short" text-case="title" strip-periods="true"/>
+                <text variable="container-title" form="short" text-case="title" strip-periods="true" suffix=","/>
               </group>
-              <group delimiter=";">
+              <group delimiter=",">
                 <text macro="year-date"/>
                 <text variable="volume"/>
               </group>

data/vendor/styles/reports-of-practical-oncology-and-radiotherapy.csl

@@ -55,7 +55,7 @@
     <choose>
       <if variable="issued">
         <date variable="issued">
-          <date-part name="year" form="long" range-delimiter="–"/>
+          <date-part name="year" form="long" range-delimiter="&#8211;"/>
         </date>
       </if>
       <else>

data/vendor/styles/reviews-of-modern-physics-with-titles.csl

@@ -27,8 +27,8 @@
   </locale>
   <macro name="secondary-contributors">
     <choose>
-      <if type="chapter paper-conference" match="none">
-        <group delimiter=". ">
+      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
+        <group delimiter=", ">
           <names variable="editor translator">
             <label form="verb" text-case="capitalize-first" suffix=" " plural="never"/>
             <name and="text" delimiter=", "/>
@@ -39,7 +39,7 @@
   </macro>
   <macro name="container-contributors">
     <choose>
-      <if type="chapter paper-conference" match="any">
+      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
         <group prefix=", " delimiter=", ">
           <names variable="container-author editor" delimiter=", ">
             <label form="verb" suffix=" " plural="never"/>
@@ -68,7 +68,7 @@
     </names>
   </macro>
   <macro name="contributors">
-    <group delimiter=". ">
+    <group delimiter=", ">
       <names variable="author">
         <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
         <label form="short" text-case="capitalize-first" prefix=", "/>
@@ -98,19 +98,19 @@
     </names>
   </macro>
   <macro name="archive">
-    <group delimiter=". ">
+    <group delimiter=", ">
       <text variable="archive_location" text-case="capitalize-first"/>
       <text variable="archive"/>
       <text variable="archive-place"/>
     </group>
   </macro>
   <macro name="access">
-    <group delimiter=". ">
+    <group delimiter=", ">
       <choose>
         <if type="graphic report" match="any">
           <text macro="archive"/>
         </if>
-        <else-if type="article-magazine article-newspaper bill book chapter graphic legal_case legislation motion_picture paper-conference report song thesis" match="none">
+        <else-if type="article-magazine article-newspaper article bill book chapter graphic legal_case legislation motion_picture paper-conference report song thesis entry-dictionary entry-encyclopedia" match="none">
           <text macro="archive"/>
         </else-if>
       </choose>
@@ -154,6 +154,16 @@
       <else-if type="bill book graphic legal_case legislation motion_picture song" match="any">
         <text variable="title" text-case="title" font-style="italic"/>
       </else-if>
+      <else-if type="paper-conference" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text variable="title" text-case="title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" text-case="title" quotes="true"/>
+          </else>
+        </choose>
+      </else-if>
       <else>
         <text variable="title" text-case="title" quotes="true"/>
       </else>
@@ -164,17 +174,17 @@
       <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
         <choose>
           <if is-numeric="edition">
-            <group delimiter=" " prefix=". ">
+            <group delimiter=" " prefix=", ">
               <number variable="edition" form="ordinal"/>
-              <text term="edition" form="short" strip-periods="true"/>
+              <text term="edition" form="short"/>
             </group>
           </if>
           <else>
-            <text variable="edition" prefix=". "/>
+            <text variable="edition" prefix=", "/>
           </else>
         </choose>
       </if>
-      <else-if type="chapter  paper-conference" match="any">
+      <else-if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
         <choose>
           <if is-numeric="edition">
             <group delimiter=" " prefix=", ">
@@ -191,7 +201,7 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal">
+      <if type="article-journal review review-book" match="any">
         <text variable="volume" prefix=" " font-weight="bold"/>
       </if>
       <else-if type="legal_case">
@@ -200,7 +210,7 @@
         <text variable="page" prefix=" "/>
       </else-if>
       <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <group prefix=". " delimiter=". ">
+        <group prefix=", " delimiter=", ">
           <group>
             <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
             <number variable="volume" form="numeric"/>
@@ -211,8 +221,8 @@
           </group>
         </group>
       </else-if>
-      <else-if type="chapter paper-conference" match="any">
-        <group prefix=". ">
+      <else-if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+        <group prefix=", ">
           <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
           <number variable="volume" form="numeric"/>
         </group>
@@ -233,10 +243,10 @@
           </group>
         </group>
       </if>
-      <else-if type="article-journal">
+      <else-if type="article-journal article-magazine article review review-book" match="any">
         <text variable="page" prefix=", "/>
       </else-if>
-      <else-if type="paper-conference chapter" match="any">
+      <else-if type="paper-conference chapter entry-dictionary entry-encyclopedia" match="any">
         <group prefix=", " delimiter=" ">
           <label variable="page" form="short"/>
           <text variable="page"/>
@@ -278,16 +288,20 @@
     </choose>
   </macro>
   <macro name="container-prefix">
-    <text term="in"/>
+    <choose>
+      <if variable="container-title">
+        <text term="in"/>
+      </if>
+    </choose>
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="chapter paper-conference" match="any">
+      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
         <text macro="container-prefix" suffix=" "/>
       </if>
     </choose>
     <choose>
-      <if type="article-journal">
+      <if type="article-journal article-magazine article-newspaper article review review-book" match="any">
         <text variable="container-title" form="short"/>
       </if>
       <else-if type="legal_case" match="none">
@@ -334,20 +348,20 @@
   <macro name="description">
     <choose>
       <if type="interview">
-        <group delimiter=". ">
+        <group delimiter=", ">
           <text macro="interviewer"/>
           <text variable="medium" text-case="capitalize-first"/>
         </group>
       </if>
       <else>
-        <text variable="medium" text-case="capitalize-first" prefix=". "/>
+        <text variable="medium" text-case="capitalize-first" prefix=", "/>
       </else>
     </choose>
     <choose>
       <if variable="title" match="none"/>
       <else-if type="thesis personal_communication" match="any"/>
       <else>
-        <group delimiter=" " prefix=". ">
+        <group delimiter=" " prefix=", ">
           <text variable="genre" text-case="capitalize-first"/>
           <choose>
             <if type="report">
@@ -366,7 +380,7 @@
   <macro name="issue">
     <choose>
       <if type="legal_case">
-        <text variable="authority" prefix=". "/>
+        <text variable="authority" prefix=", "/>
       </if>
       <else-if type="speech">
         <group prefix=" " delimiter=", ">
@@ -375,7 +389,7 @@
           <text variable="event-place"/>
         </group>
       </else-if>
-      <else-if type="article-newspaper article-magazine personal_communication" match="any">
+      <else-if type="article-newspaper article-magazine personal_communication article" match="any">
         <text macro="day-month" prefix=", "/>
       </else-if>
       <else>
@@ -416,12 +430,12 @@
       <text macro="secondary-contributors" prefix=", "/>
       <text macro="container-title" prefix=", "/>
       <text macro="container-contributors"/>
+      <text macro="collection-title" prefix=", "/>
+      <text macro="issue"/>
       <text macro="edition"/>
       <text macro="locators"/>
-      <text macro="collection-title" prefix=". "/>
-      <text macro="issue"/>
       <text macro="locators-article"/>
-      <text macro="access" prefix=". "/>
+      <text macro="access" prefix=", "/>
     </layout>
   </bibliography>
 </style>

data/vendor/styles/revista-brasileira-de-ciencia-do-solo.csl

@@ -5,34 +5,34 @@
     <title-short>RBCS</title-short>
     <id>http://www.zotero.org/styles/revista-brasileira-de-ciencia-do-solo</id>
     <link href="http://www.zotero.org/styles/revista-brasileira-de-ciencia-do-solo" rel="self"/>
-    <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas" rel="template"/>
+    <link href="http://www.zotero.org/styles/vancouver-author-date" rel="template"/>
     <link href="http://www.scielo.br/revistas/rbcs/iinstruc.htm" rel="documentation"/>
-    <issn>0100-0683</issn>
-    <eissn>1806-9657</eissn>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>  
     <author>
       <name>Fábio Satoshi Higashikawa</name>
       <email>rioleste@gmail.com</email>
     </author>
     <category citation-format="author-date"/>
     <category field="science"/>
-    <summary>Brazilian Soil Science Journal style based on ABNT style and focused on article-journal citation</summary>
+    <issn>0100-0683</issn>
+    <eissn>1806-9657</eissn>
+    <summary>Brazilian Soil Science Journal style based on Vancouver-author-date style</summary>
     <updated>2015-02-16T16:50:41+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>
   <locale xml:lang="pt-BR">
     <terms>
-      <term name="month-01" form="short">jan.</term>
-      <term name="month-02" form="short">fev.</term>
-      <term name="month-03" form="short">mar.</term>
-      <term name="month-04" form="short">abr.</term>
+      <term name="month-01" form="short">jan</term>
+      <term name="month-02" form="short">fev</term>
+      <term name="month-03" form="short">mar</term>
+      <term name="month-04" form="short">abr</term>
       <term name="month-05" form="short">maio</term>
-      <term name="month-06" form="short">jun.</term>
-      <term name="month-07" form="short">jul.</term>
-      <term name="month-08" form="short">ago.</term>
-      <term name="month-09" form="short">set.</term>
-      <term name="month-10" form="short">out.</term>
-      <term name="month-11" form="short">nov.</term>
-      <term name="month-12" form="short">dez.</term>
+      <term name="month-06" form="short">jun</term>
+      <term name="month-07" form="short">jul</term>
+      <term name="month-08" form="short">ago</term>
+      <term name="month-09" form="short">set</term>
+      <term name="month-10" form="short">out</term>
+      <term name="month-11" form="short">nov</term>
+      <term name="month-12" form="short">dez</term>
       <term name="editor" form="short">
         <single>ed</single>
         <multiple>eds</multiple>
@@ -47,458 +47,217 @@
       </term>
     </terms>
   </locale>
-  <macro name="container-contributors">
-    <choose>
-      <if type="chapter">
-        <names variable="container-author" delimiter=", ">
-          <name name-as-sort-order="all" sort-separator=", " initialize-with=". " delimiter="; " delimiter-precedes-last="always">
-            <name-part name="family" text-case="uppercase"/>
-            <name-part name="given" text-case="uppercase"/>
-          </name>
-          <label form="short" prefix=" (" suffix=".). " text-case="capitalize-first"/>
-          <substitute>
-            <names variable="editor"/>
-            <names variable="collection-editor"/>
-          </substitute>
-        </names>
-      </if>
-    </choose>
-  </macro>
-  <macro name="secondary-contributors">
-    <choose>
-      <if type="chapter" match="none">
-        <names variable="editor" delimiter="; " prefix=" (" suffix=")">
-          <name initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix="."/>
-        </names>
-      </if>
-    </choose>
-  </macro>
-  <macro name="translator">
-    <text value="Traducao "/>
-    <names variable="translator" delimiter="; ">
-      <name delimiter="; " sort-separator=" " delimiter-precedes-last="always">
-        <name-part name="given" text-case="capitalize-first"/>
-        <name-part name="family" text-case="capitalize-first"/>
-      </name>
-    </names>
-  </macro>
   <macro name="author">
     <names variable="author">
-      <name delimiter="; " and="symbol" delimiter-precedes-last="never" et-al-min="0" initialize-with="." name-as-sort-order="all">
-        <name-part name="family" text-case="uppercase"/>
-        <name-part name="given" text-case="uppercase"/>
-      </name>
-      <label form="short" prefix=" (" suffix=".)" text-case="uppercase"/>
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="long" prefix=", "/>
       <substitute>
         <names variable="editor"/>
-        <names variable="translator"/>
-        <text macro="title"/>
       </substitute>
     </names>
   </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" delimiter=" &amp; " delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all">
-        <name-part name="family" text-case="capitalize-first"/>
-        <name-part name="given" text-case="uppercase"/>
-      </name>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <choose>
-          <if type="book">
-            <text variable="title" form="short"/>
-          </if>
-          <else>
-            <text variable="title" form="short" quotes="true"/>
-          </else>
-        </choose>
-      </substitute>
-    </names>
+  <macro name="editor">
+    <group delimiter=": ">
+      <choose>
+        <if type="chapter paper-conference" match="any">
+          <text term="in" text-case="capitalize-first"/>
+        </if>
+      </choose>
+      <names variable="editor" suffix=".">
+        <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+        <label form="long" prefix=", "/>
+      </names>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": " suffix=";">
+      <choose>
+        <if type="thesis">
+          <text variable="publisher-place" prefix="[" suffix="]"/>
+        </if>
+        <else>
+          <text variable="publisher-place"/>
+        </else>
+      </choose>
+      <text variable="publisher"/>
+    </group>
   </macro>
   <macro name="access">
-    <text variable="URL" prefix="Disponível em: &lt;" suffix="&gt;"/>
-    <date variable="accessed" prefix=". Acesso em: ">
-      <date-part name="day" suffix=" "/>
-      <date-part name="month" form="short" suffix=". " text-case="lowercase"/>
-      <date-part name="year"/>
-    </date>
+    <choose>
+      <if variable="URL"/>
+    </choose>
   </macro>
-  <macro name="title">
+  <macro name="accessed-date">
     <choose>
-      <if type="chapter bill" match="any">
-        <text variable="title"/>
-      </if>
-      <else-if type="book thesis" match="any">
-        <text variable="title" font-weight="normal"/>
-      </else-if>
-      <else-if type="article-newspaper article-magazine article-journal" match="any">
-        <text variable="title"/>
-      </else-if>
-      <else>
-        <text variable="title" font-weight="bold"/>
-      </else>
+      <if variable="URL"/>
     </choose>
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="paper-conference" match="any">
-        <text variable="container-title" suffix=". "/>
-        <text value="Anais" font-weight="bold"/>
-        <text value="..."/>
+      <if type="article-journal article-magazine chapter paper-conference article-newspaper" match="any">
+        <group suffix="." delimiter=" ">
+          <text variable="container-title" form="short" strip-periods="true"/>
+          <choose>
+            <if variable="URL"/>
+          </choose>
+        </group>
+        <text macro="edition" prefix=" "/>
       </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <group delimiter=". ">
+            <text variable="container-title" form="short"/>
+            <group delimiter=" ">
+              <text term="section" form="short" text-case="capitalize-first"/>
+              <text variable="section"/>
+            </group>
+          </group>
+          <text variable="number"/>
+        </group>
+      </else-if>
       <else>
-        <text variable="container-title-short" font-weight="normal"/>
+        <text variable="container-title" suffix="." form="short"/>
       </else>
     </choose>
   </macro>
-  <macro name="publisher">
+  <macro name="title">
+    <text variable="title"/>
     <choose>
-      <if match="any" variable="publisher-place publisher">
+      <if type="article-journal article-magazine chapter paper-conference article-newspaper" match="none">
         <choose>
-          <if variable="publisher-place">
-            <text variable="publisher-place" suffix=": "/>
+          <if variable="URL">
+            <text term="internet" prefix=" [" suffix="]" text-case="capitalize-first"/>
           </if>
-          <else-if type="entry-encyclopedia"/>
-          <else>
-            <text value="[s.l.] "/>
-          </else>
-        </choose>
-        <choose>
-          <if variable="publisher">
-            <text variable="publisher" suffix=", "/>
-            <text macro="issued"/>
-          </if>
-          <else>
-            <text value="[s.n.]"/>
-          </else>
         </choose>
+        <text macro="edition" prefix=". "/>
       </if>
-      <else>
-        <text value="[s.l: s.n.]"/>
-      </else>
     </choose>
-  </macro>
-  <macro name="event">
     <choose>
-      <if variable="event">
-        <choose>
-          <if variable="genre" match="none">
-            <text term="in" text-case="capitalize-first" suffix=": "/>
-            <text variable="event" text-case="uppercase"/>
-          </if>
-          <else>
-            <group delimiter=" ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <text term="presented at"/>
-              <text variable="event"/>
-            </group>
-          </else>
-        </choose>
+      <if type="thesis">
+        <text variable="genre" prefix=" [" suffix="]"/>
       </if>
     </choose>
   </macro>
-  <macro name="issued">
+  <macro name="edition">
     <choose>
-      <if variable="issued" match="any">
-        <group>
-          <choose>
-            <if type="book chapter" match="none"/>
-          </choose>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
         </group>
       </if>
       <else>
-        <text value="[s.d.]"/>
+        <text variable="edition" suffix="."/>
       </else>
     </choose>
   </macro>
-  <macro name="issued-year">
+  <macro name="date">
     <choose>
-      <if variable="issued" match="any">
-        <date variable="issued">
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group suffix=";" delimiter=" ">
+          <date date-parts="year" form="text" variable="issued"/>
+          <text macro="accessed-date"/>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <date variable="issued" delimiter=" ">
+            <date-part name="month" form="short" strip-periods="true"/>
+            <date-part name="day"/>
+          </date>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="report">
+        <date variable="issued" delimiter=" ">
           <date-part name="year"/>
+          <date-part name="month" form="short" strip-periods="true"/>
         </date>
-      </if>
+      </else-if>
       <else>
-        <text value="[s.d.]"/>
+        <group suffix=".">
+          <date date-parts="year" form="numeric" variable="issued">
+            <date-part name="year"/>
+          </date>
+          <text macro="accessed-date" prefix=" "/>
+        </group>
       </else>
     </choose>
   </macro>
-  <macro name="edition">
+  <macro name="pages">
     <choose>
-      <if type="book chapter" match="any">
-        <choose>
-          <if is-numeric="edition">
-            <group delimiter=" ">
-              <number variable="edition" form="numeric" suffix="."/>
-              <text term="edition" form="short" suffix="."/>
-            </group>
-          </if>
-          <else>
-            <text variable="edition" suffix=" ed."/>
-          </else>
-        </choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text variable="page" prefix=":"/>
       </if>
+      <else>
+        <group prefix=" " delimiter=" ">
+          <label plural="never" variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else>
     </choose>
   </macro>
-  <macro name="locators">
+  <macro name="journal-location">
     <choose>
-      <if type="bill">
-        <group prefix=". " delimiter=", ">
-          <date variable="issued">
-            <date-part name="day"/>
-            <date-part prefix=" " name="month" form="short"/>
-            <date-part prefix=" " name="year"/>
-          </date>
-          <text variable="section" prefix="Sec. "/>
-          <text variable="page" prefix="p. " suffix="."/>
-        </group>
+      <if type="article-journal article-magazine" match="any">
+        <text variable="volume"/>
       </if>
-      <else-if match="any" type="article-journal article-magazine article-newspaper">
-        <group>
-          <group>
-            <text variable="volume" suffix=":"/>
-          </group>
-          <text variable="page"/>
-        </group>
-      </else-if>
-      <else-if match="any" type="book chapter">
-        <group delimiter=", ">
-          <group>
-            <text variable="volume" prefix="v. "/>
-            <text variable="page" prefix="p. "/>
-          </group>
-        </group>
-      </else-if>
     </choose>
   </macro>
-  <macro name="collection-title">
-    <text variable="collection-title"/>
-    <text variable="collection-number" prefix=" "/>
-  </macro>
-  <macro name="genre">
-    <text variable="genre"/>
-  </macro>
-  <macro name="citation-locator">
-    <group>
-      <label variable="locator" form="short"/>
-      <text variable="locator" prefix=" "/>
-    </group>
-  </macro>
-  <macro name="place">
+  <macro name="report-details">
     <choose>
-      <if match="any" variable="publisher-place">
-        <text variable="publisher-place"/>
+      <if type="report">
+        <text variable="number" prefix="Report No.: "/>
       </if>
     </choose>
   </macro>
-  <macro name="archive">
-    <group>
-      <text variable="archive" prefix=" "/>
-    </group>
+  <macro name="author-short">
+    <names variable="author" suffix=",">
+      <name form="short" delimiter=" e " sort-separator=","/>
+    </names>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="false" disambiguate-add-givenname="false" collapse="year-suffix">
+  <macro name="issued">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
     <sort>
-      <key macro="author"/>
-      <key variable="issued"/>
+      <key macro="issued"/>
+      <key macro="author-short"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
-      <group>
-        <text macro="author-short" text-case="capitalize-first" suffix=", "/>
-        <text macro="issued-year"/>
-        <text prefix=", " macro="citation-locator"/>
+      <group delimiter=" ">
+        <text macro="author-short"/>
+        <text macro="issued"/>
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="false" et-al-min="3" et-al-use-first="1" entry-spacing="1">
+  <bibliography entry-spacing="1" line-spacing="1">
     <sort>
       <key macro="author"/>
-      <key variable="issued"/>
+      <key macro="issued"/>
+      <key variable="title"/>
     </sort>
     <layout>
-      <choose>
-        <if type="bill">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text variable="number" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text variable="references" font-weight="bold"/>
-            <text variable="note"/>
-            <text macro="locators" suffix=". "/>
-          </group>
-        </if>
-        <else-if type="map">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=", "/>
-            <text macro="issued" suffix=". "/>
-            <text variable="note" suffix=". "/>
-          </group>
-        </else-if>
-        <else-if type="book" match="any">
-            <choose>
-            <if match="any" variable="edition">
-             <group delimiter=". " prefix=", ">
-              <text macro="edition"/>
-              <group delimiter=", ">
-                 <text macro="publisher"/>
-                 <choose>
-                   <if match="any" variable="number-of-pages">
-                     <text variable="number-of-pages" suffix=" p"/>
-                    </if>
-                    <else-if match="any" variable="page">
-                      <text variable="page" suffix=" p"/>
-                    </else-if>
-                  </choose>
-                </group>
-              </group>
-            </if>
-            <else>
-              <group delimiter=". " prefix=". ">
-                <text macro="edition"/>
-                <group delimiter=", ">
-                  <text macro="publisher"/>
-                 <choose>
-                    <if match="any" variable="number-of-pages">
-                      <text variable="number-of-pages" suffix=" p"/>
-                    </if>
-                    <else-if match="any" variable="page">
-                      <text variable="page" suffix=" p"/>
-                    </else-if>
-                  </choose>
-                </group>
-             </group>
-            </else>
-          </choose>
-        </else-if>
-        <else-if type="chapter">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="secondary-contributors" suffix=". "/>
-            <text term="in" text-case="capitalize-first" suffix=": "/>
-            <text macro="container-contributors" suffix=". "/>
-            <text macro="container-title" suffix=". "/>
-            <text variable="collection-title" suffix=". "/>
-            <text macro="translator" suffix=". "/>
-            <text macro="edition" suffix=". "/>
-            <text macro="publisher" suffix=". "/>
-            <text macro="locators" suffix=". "/>
-          </group>
-        </else-if>
-        <else-if type="article-newspaper article-magazine article-journal" match="any">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="container-title" suffix=", "/>
-            <text variable="collection-title" suffix=". "/>
-            <text macro="edition" suffix=", "/>
-            <text macro="locators" suffix=", "/>
-            <text macro="issued" suffix=". "/>
-          </group>
-        </else-if>
-        <else-if type="thesis">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="genre" suffix="—"/>
-            <text macro="publisher" suffix="."/>
-          </group>
-        </else-if>
-        <else-if type="manuscript">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="edition" suffix=". "/>
-            <text macro="place" suffix=", "/>
-            <text macro="issued" suffix=". "/>
-            <text macro="access" suffix=". "/>
-            <text macro="archive" suffix=". "/>
-          </group>
-        </else-if>
-        <else-if type="webpage">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="genre" suffix=". "/>
-            <text macro="access" suffix=". "/>
-          </group>
-        </else-if>
-        <else-if type="report">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
-            <text variable="collection-title" prefix=": "/>
-            <text macro="locators"/>
-            <text macro="event"/>
-            <text macro="publisher" prefix=". " suffix=". "/>
-            <text macro="access" suffix="."/>
-          </group>
-        </else-if>
-        <else-if type="entry-dictionary">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
-            <text variable="collection-title" prefix=": " suffix=". "/>
-            <text macro="locators"/>
-            <text macro="event"/>
-            <text macro="publisher" prefix=". " suffix=". "/>
-            <text macro="collection-title" prefix="(Texto para discussao, n. " suffix=")."/>
-            <text macro="access"/>
-          </group>
-        </else-if>
-        <else-if type="entry-encyclopedia">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text variable="publisher-place" prefix=". " suffix=": "/>
-            <text variable="publisher" suffix=", "/>
-            <text macro="issued" prefix=", " suffix=". (Nota técnica)."/>
-          </group>
-        </else-if>
-        <else-if type="paper-conference">
-          <text macro="author" suffix=". "/>
-          <text macro="title"/>
-          <text macro="container-contributors"/>
-          <text macro="secondary-contributors"/>
-          <text macro="container-title"/>
-          <text variable="collection-title" prefix=": " suffix="."/>
-          <text macro="locators"/>
-          <group delimiter=". " prefix=". " suffix=". ">
-            <text macro="event"/>
-          </group>
-          <text variable="publisher-place" suffix=": "/>
-          <text variable="publisher" suffix=", "/>
-          <text macro="issued"/>
-          <text macro="access"/>
-        </else-if>
-        <else>
-          <text macro="author" suffix=". "/>
-          <text macro="title"/>
-          <text macro="container-contributors"/>
-          <text macro="secondary-contributors"/>
-          <text macro="container-title"/>
-          <text variable="collection-title" prefix=": " suffix="."/>
-          <text macro="locators"/>
-          <group delimiter=". " prefix=". " suffix=". ">
-            <text macro="event"/>
-          </group>
-          <text variable="publisher-place"/>
-          <text variable="publisher" suffix=", "/>
-          <text macro="issued" prefix=", " suffix=". "/>
-          <text macro="access"/>
-        </else>
-      </choose>
+      <group delimiter=". " suffix=". ">
+        <text macro="author"/>
+        <text macro="title"/>
+      </group>
+      <group delimiter=" " suffix=". ">
+        <text macro="editor"/>
+        <text macro="container-title"/>
+        <text macro="publisher"/>
+        <group>
+          <text macro="date"/>
+          <text macro="journal-location"/>
+          <text macro="pages"/>
+        </group>
+      </group>
+      <text macro="report-details" suffix=". "/>
+      <text macro="access"/>
     </layout>
   </bibliography>
 </style>