csl-styles 1.0.1.6 → 1.0.1.7

data/vendor/styles/diagnostico-prenatal.csl

@@ -0,0 +1,218 @@
+<?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="es-ES">
+  <info>
+    <title>Diagnóstico Prenatal (Spanish)</title>
+    <title-short>DIAPRE</title-short>
+    <id>http://www.zotero.org/styles/diagnostico-prenatal</id>
+    <link href="http://www.zotero.org/styles/diagnostico-prenatal" rel="self"/>
+    <link href="http://www.zotero.org/styles/elsevier-vancouver" rel="template"/>
+    <link href="http://www.elsevier.com/journals/diagnostico-prenatal/2173-4127/guide-for-authors" rel="documentation"/>
+    <author>
+      <name>Sankar</name>
+      <email>s.murugesan@elsevier.com</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2173-4127</issn>
+    <eissn>2174-5544</eissn>
+    <summary>A style for some Elsevier journals, resembles Vancouver style</summary>
+    <updated>2015-05-20T10:00:00+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="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi: "/>
+      </if>
+      <else-if type="webpage post-weblog" match="any">
+        <choose>
+          <if variable="URL">
+            <group delimiter=" ">
+              <text term="available at" suffix=": " text-case="capitalize-first"/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="access-date">
+    <group delimiter=" ">
+      <text term="accessed"/>
+      <date variable="accessed" delimiter=" ">
+        <date-part name="day"/>
+        <date-part name="month"/>
+        <date-part name="year"/>
+      </date>
+    </group>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name suffix="." form="long" initialize="true" initialize-with="" delimiter=", " delimiter-precedes-et-al="always" delimiter-precedes-last="contextual" name-as-sort-order="all" sort-separator=" "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name form="long" initialize="true" initialize-with="" delimiter=", " delimiter-precedes-et-al="never" delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
+      <label form="long" prefix=", " plural="contextual" suffix="."/>
+    </names>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year" form="long" range-delimiter="&#8211;"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="journal-location">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <text variable="volume" form="long"/>
+        <text variable="issue" prefix="(" suffix=")"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <group delimiter=": ">
+        <text variable="publisher-place"/>
+        <text variable="publisher"/>
+      </group>
+      <text macro="year-date"/>
+    </group>
+  </macro>
+  <macro name="publisher_thesis">
+    <group delimiter=", ">
+      <text variable="publisher" form="long"/>
+      <text variable="publisher-place" form="long"/>
+    </group>
+  </macro>
+  <macro name="edition_book">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="long"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition_chapter">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number" sort="ascending"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" second-field-align="flush" et-al-min="7" et-al-use-first="6">
+    <layout suffix=".">
+      <text variable="citation-number" suffix="."/>
+      <text macro="author" suffix=" "/>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <group delimiter=". ">
+            <text variable="title" form="long"/>
+            <group delimiter=" ">
+              <text term="volume" form="short"/>
+              <text variable="volume"/>
+            </group>
+            <text variable="volume" prefix="vol. " form="long"/>
+            <text macro="edition_book"/>
+            <text macro="publisher"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=". ">
+            <group delimiter=". ">
+              <text variable="title" form="long"/>
+              <group delimiter=" ">
+                <text term="in" text-case="capitalize-first" suffix=":"/>
+                <text macro="editor"/>
+              </group>
+              <group delimiter=", ">
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <text term="volume" form="short"/>
+                  <text variable="volume"/>
+                </group>
+              </group>
+              <text macro="edition_chapter"/>
+            </group>
+            <text macro="publisher"/>
+            <group delimiter=" ">
+              <label variable="page" form="short" plural="never"/>
+              <text variable="page" form="short"/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="patent">
+          <group delimiter=", ">
+            <group delimiter=". ">
+              <text variable="title" form="long"/>
+              <text variable="number" form="long"/>
+            </group>
+            <text macro="year-date"/>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=" ">
+            <text variable="title" form="long" suffix="."/>
+            <text variable="genre" form="long" suffix=","/>
+            <text macro="publisher_thesis" suffix="," text-case="title"/>
+            <text macro="year-date"/>
+          </group>
+        </else-if>
+        <else-if type="webpage">
+          <group delimiter=". ">
+            <text variable="title" form="long"/>
+            <text variable="container-title" form="long" suffix="." text-case="title"/>
+            <text macro="access-date" prefix="[" suffix="]"/>
+            <text macro="access"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=":">
+            <group delimiter=". ">
+              <group delimiter=". ">
+                <text variable="title" form="long"/>
+                <text variable="container-title" form="short" text-case="title" strip-periods="true"/>
+              </group>
+              <group delimiter=";">
+                <text macro="year-date"/>
+                <text macro="journal-location"/>
+              </group>
+            </group>
+            <text variable="page" form="short"/>
+          </group>
+          <text macro="access" prefix=", "/>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>

data/vendor/styles/dialisis-y-trasplante.csl

@@ -0,0 +1,218 @@
+<?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="es-ES">
+  <info>
+    <title>Dialisis y Trasplante (Spanish)</title>
+    <title-short>DIALIS</title-short>
+    <id>http://www.zotero.org/styles/dialisis-y-trasplante</id>
+    <link href="http://www.zotero.org/styles/dialisis-y-trasplante" rel="self"/>
+    <link href="http://www.zotero.org/styles/elsevier-vancouver" rel="template"/>
+    <link href="http://www.elsevier.com/journals/dialisis-y-trasplante/1886-2845/guide-for-authors" rel="documentation"/>
+    <author>
+      <name>Sankar</name>
+      <email>s.murugesan@elsevier.com</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1886-2845</issn>
+    <eissn>1886-7278</eissn>
+    <summary>A style for some Elsevier journals, resembles Vancouver style</summary>
+    <updated>2015-05-20T10:00:00+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="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi: "/>
+      </if>
+      <else-if type="webpage post-weblog" match="any">
+        <choose>
+          <if variable="URL">
+            <group delimiter=" ">
+              <text term="available at" suffix=": " text-case="capitalize-first"/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="access-date">
+    <group delimiter=" ">
+      <text term="accessed"/>
+      <date variable="accessed" delimiter=" ">
+        <date-part name="day"/>
+        <date-part name="month"/>
+        <date-part name="year"/>
+      </date>
+    </group>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name suffix="." form="long" initialize="true" initialize-with="" delimiter=", " delimiter-precedes-et-al="always" delimiter-precedes-last="contextual" name-as-sort-order="all" sort-separator=" "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name form="long" initialize="true" initialize-with="" delimiter=", " delimiter-precedes-et-al="never" delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
+      <label form="long" prefix=", " plural="contextual" suffix="."/>
+    </names>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year" form="long" range-delimiter="&#8211;"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="journal-location">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <text variable="volume" form="long"/>
+        <text variable="issue" prefix="(" suffix=")"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <group delimiter=": ">
+        <text variable="publisher-place"/>
+        <text variable="publisher"/>
+      </group>
+      <text macro="year-date"/>
+    </group>
+  </macro>
+  <macro name="publisher_thesis">
+    <group delimiter=", ">
+      <text variable="publisher" form="long"/>
+      <text variable="publisher-place" form="long"/>
+    </group>
+  </macro>
+  <macro name="edition_book">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="long"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition_chapter">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number" sort="ascending"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" second-field-align="flush" et-al-min="7" et-al-use-first="6">
+    <layout suffix=".">
+      <text variable="citation-number" suffix="."/>
+      <text macro="author" suffix=" "/>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <group delimiter=". ">
+            <text variable="title" form="long"/>
+            <group delimiter=" ">
+              <text term="volume" form="short"/>
+              <text variable="volume"/>
+            </group>
+            <text variable="volume" prefix="vol. " form="long"/>
+            <text macro="edition_book"/>
+            <text macro="publisher"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=". ">
+            <group delimiter=". ">
+              <text variable="title" form="long"/>
+              <group delimiter=" ">
+                <text term="in" text-case="capitalize-first" suffix=":"/>
+                <text macro="editor"/>
+              </group>
+              <group delimiter=", ">
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <text term="volume" form="short"/>
+                  <text variable="volume"/>
+                </group>
+              </group>
+              <text macro="edition_chapter"/>
+            </group>
+            <text macro="publisher"/>
+            <group delimiter=" ">
+              <label variable="page" form="short" plural="never"/>
+              <text variable="page" form="short"/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="patent">
+          <group delimiter=", ">
+            <group delimiter=". ">
+              <text variable="title" form="long"/>
+              <text variable="number" form="long"/>
+            </group>
+            <text macro="year-date"/>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=" ">
+            <text variable="title" form="long" suffix="."/>
+            <text variable="genre" form="long" suffix=","/>
+            <text macro="publisher_thesis" suffix="," text-case="title"/>
+            <text macro="year-date"/>
+          </group>
+        </else-if>
+        <else-if type="webpage">
+          <group delimiter=". ">
+            <text variable="title" form="long"/>
+            <text variable="container-title" form="long" suffix="." text-case="title"/>
+            <text macro="access-date" prefix="[" suffix="]"/>
+            <text macro="access"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=":">
+            <group delimiter=". ">
+              <group delimiter=". ">
+                <text variable="title" form="long"/>
+                <text variable="container-title" form="short" text-case="title" strip-periods="true"/>
+              </group>
+              <group delimiter=";">
+                <text macro="year-date"/>
+                <text macro="journal-location"/>
+              </group>
+            </group>
+            <text variable="page" form="short"/>
+          </group>
+          <text macro="access" prefix=", "/>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>

data/vendor/styles/documents-d-archeologie-francaise.csl

@@ -11,21 +11,28 @@
       <name>Francois Capron</name>
       <email>f.capron37@gmail.com</email>
     </author>
+    <contributor>
+      <name>Nicolas Monteix</name>
+      <email>nicolas.monteix@univ-rouen.fr</email>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="history"/>
     <category field="anthropology"/>
     <issn>0769-010X</issn>
-    <summary>Style based on ISO-690 (author-date, no abstract, French) from Pierre-Amiel Giraud version.</summary>
-    <updated>2015-02-07T19:23:46+00:00</updated>
+    <summary>Pour les recommandations d'usage, et en particulier pour les rares problèmes d'adéquation entre les normes et le présent style, voir https://zoteroarcheologie.wordpress.com</summary>
+    <updated>2016-01-19T05:13:24+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>
     <terms>
-      <term name="anonymous"/>
+      <term name="collection-editor" form="short">
+        <single>dir.</single>
+        <multiple>dir.</multiple>
+      </term>
       <term name="no date">[sans date]</term>
       <term name="in">in</term>
       <term name="online">en&#160;ligne</term>
-      <term name="accessed">lien valide au </term>
+      <term name="accessed">lien valide au</term>
       <term name="from">URL</term>
       <term name="page" form="short">
         <single>p.</single>
@@ -35,7 +42,7 @@
   </locale>
   <macro name="author">
     <names variable="author">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " initialize-with=". " delimiter-precedes-last="never">
+      <name name-as-sort-order="all" sort-separator=" " delimiter=", " initialize-with=". ">
         <name-part name="family" font-variant="small-caps"/>
         <name-part name="given"/>
       </name>
@@ -45,28 +52,25 @@
     <choose>
       <if variable="author">
         <names variable="author">
-          <name form="short" delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" " et-al-min="3" et-al-use-first="1" font-weight="bold">
-      </name>
+          <name form="short" font-weight="bold" et-al-min="3" et-al-use-first="1"/>
           <label form="short" prefix=", " suffix=". " text-case="uppercase" strip-periods="true"/>
           <et-al font-weight="bold"/>
         </names>
       </if>
       <else-if variable="editor">
         <names variable="editor">
-          <name form="short" delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" " et-al-min="3" et-al-use-first="1" font-weight="bold">
-      </name>
+          <name form="short" font-weight="bold" et-al-min="3" et-al-use-first="1"/>
           <et-al font-weight="bold"/>
         </names>
       </else-if>
       <else-if variable="collection-editor">
         <names variable="collection-editor">
-          <name form="short" delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" " et-al-min="3" et-al-use-first="1" font-weight="bold">
-      </name>
+          <name form="short" font-weight="bold" et-al-min="3" et-al-use-first="1"/>
           <et-al font-weight="bold"/>
         </names>
       </else-if>
       <else-if type="book">
-        <text variable="title-short" font-weight="bold" suffix=" ..."/>
+        <text variable="title-short" font-weight="bold"/>
       </else-if>
       <else-if type="map">
         <text variable="title-short" font-weight="bold"/>
@@ -78,7 +82,7 @@
   </macro>
   <macro name="editor">
     <names variable="editor">
-      <name name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never">
+      <name name-as-sort-order="all" sort-separator=" " delimiter=", " initialize-with=". ">
         <name-part name="family" font-variant="small-caps"/>
         <name-part name="given"/>
       </name>
@@ -86,17 +90,19 @@
     </names>
   </macro>
   <macro name="collection-editor">
-    <names variable="collection-editor">
-      <name name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never">
-        <name-part name="family" font-variant="small-caps"/>
-        <name-part name="given"/>
-      </name>
-      <label suffix=".)"/>
-    </names>
+    <group>
+      <names variable="collection-editor">
+        <name>
+          <name-part name="family" font-variant="small-caps"/>
+          <name-part name="given"/>
+        </name>
+      </names>
+      <text term="collection-editor" form="short" prefix=" (" suffix=".)"/>
+    </group>
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never">
+      <name>
         <name-part name="family" text-case="uppercase"/>
         <name-part name="given"/>
       </name>
@@ -105,7 +111,13 @@
   </macro>
   <macro name="responsability">
     <choose>
-      <if variable="author editor translator collection-editor" match="any">
+      <if variable="version">
+        <group delimiter=" ">
+          <text macro="author"/>
+          <text term="editor" form="short" prefix="(" suffix=")"/>
+        </group>
+      </if>
+      <else-if variable="author editor translator collection-editor" match="any">
         <choose>
           <if variable="author">
             <text macro="author"/>
@@ -114,18 +126,13 @@
             <text macro="editor"/>
           </else-if>
           <else-if variable="collection-editor">
-            <group prefix="" suffix=" (dir.)">
-              <text macro="collection-editor"/>
-            </group>
+            <text macro="collection-editor"/>
           </else-if>
           <else>
             <text macro="translator"/>
           </else>
         </choose>
-      </if>
-      <else>
-        <text term="anonymous" text-case="uppercase"/>
-      </else>
+      </else-if>
     </choose>
   </macro>
   <macro name="author-citation">
@@ -141,7 +148,7 @@
         </names>
       </if>
       <else>
-        <text term="anonymous" text-case="uppercase"/>
+        <text variable="title" form="short"/>
       </else>
     </choose>
   </macro>
@@ -155,24 +162,22 @@
   </macro>
   <macro name="container-responsability">
     <choose>
-      <if variable="container-author editor translator" match="any">
+      <if variable="container-author editor translator collection-editor" match="any">
         <choose>
           <if variable="container-author">
-            <group prefix="" suffix=" (dir.)">
-              <text macro="container-author"/>
-            </group>
+            <text macro="container-author"/>
           </if>
           <else-if variable="editor">
             <text macro="editor"/>
           </else-if>
+          <else-if variable="collection-editor">
+            <text macro="collection-editor"/>
+          </else-if>
           <else>
             <text macro="translator"/>
           </else>
         </choose>
       </if>
-      <else>
-        <text term="anonymous" text-case="uppercase"/>
-      </else>
     </choose>
   </macro>
   <macro name="year-date">
@@ -192,55 +197,32 @@
       <if type="book thesis map motion_picture song manuscript" match="any">
         <text variable="title" font-style="italic"/>
       </if>
-      <else-if type="paper-conference speech chapter article-magazine article-newspaper post-weblog post broadcast" match="any">
-        <text variable="title" prefix="« " suffix=" », "/>
-        <text term="in" suffix=" "/>
-        <choose>
-          <if variable="container-author editor translator" match="any">
-            <text macro="container-responsability"/>
-            <choose>
-              <if variable="container-title event" match="any">
-                <text value=", "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
-        <choose>
-          <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
-          </if>
-          <else>
-            <text variable="event" font-style="italic"/>
-          </else>
-        </choose>
+      <else-if type="chapter paper-conference broadcast entry-dictionary entry-encyclopedia" match="any">
+        <group delimiter=" ">
+          <text variable="title" quotes="true" suffix=","/>
+          <choose>
+            <if variable="container-author editor translator collection-editor" match="any">
+              <group delimiter=" ">
+                <text term="in"/>
+                <text macro="container-responsability" suffix=","/>
+              </group>
+            </if>
+            <else>
+              <text term="in"/>
+            </else>
+          </choose>
+          <text variable="container-title" font-style="italic"/>
+        </group>
       </else-if>
       <else-if type="report">
         <text variable="title" font-style="italic"/>
         <text variable="number" prefix=", "/>
       </else-if>
-      <else-if type="patent">
-        <text variable="title"/>
-      </else-if>
-      <else-if type="article-journal">
-        <text variable="title" prefix="« " suffix=" », "/>
-        <choose>
-          <if variable="container-author editor translator" match="any">
-            <text macro="container-responsability"/>
-            <choose>
-              <if variable="container-title event" match="any">
-                <text value=", "/>
-              </if>
-            </choose>
-          </if>
-        </choose>
-        <choose>
-          <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
-          </if>
-          <else>
-            <text variable="event" font-style="italic"/>
-          </else>
-        </choose>
+      <else-if type="article-journal speech article-magazine article-newspaper post-weblog post">
+        <group delimiter=", ">
+          <text variable="title" quotes="true"/>
+          <text variable="container-title" form="short" font-style="italic"/>
+        </group>
       </else-if>
       <else>
         <text variable="title" font-style="italic"/>
@@ -252,9 +234,6 @@
       </if>
     </choose>
   </macro>
-  <macro name="number">
-    <text variable="number"/>
-  </macro>
   <macro name="medium">
     <text variable="medium"/>
   </macro>
@@ -287,39 +266,28 @@
     </choose>
   </macro>
   <macro name="edition">
-    <text variable="edition" form="long"/>
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" text-case="lowercase" strip-periods="true" suffix="."/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
   </macro>
   <macro name="publisher-place">
     <choose>
-      <if type="patent manuscript article-newspaper broadcast motion_picture song" match="any">
-        <choose>
-          <if variable="publisher-place">
-            <text variable="publisher-place"/>
-          </if>
-        </choose>
+      <if variable="publisher-place">
+        <text variable="publisher-place"/>
       </if>
       <else>
-        <choose>
-          <if variable="publisher-place">
-            <text variable="publisher-place"/>
-          </if>
-          <else>
-            <text value="s.l."/>
-          </else>
-        </choose>
+        <text value="s.l."/>
       </else>
     </choose>
   </macro>
-  <macro name="issue">
-    <group delimiter=", ">
-      <text variable="volume"/>
-      <text variable="issue"/>
-    <group>
-    <label variable="page" form="short" suffix=". " text-case="lowercase"/>
-<text variable="page"/>
-    </group>
-    </group>
-  </macro>
   <macro name="publisher">
     <choose>
       <if type="broadcast motion_picture song report" match="any">
@@ -341,10 +309,26 @@
       </else>
     </choose>
   </macro>
+  <macro name="publi_place">
+    <group delimiter="&#160;: ">
+      <text macro="publisher-place"/>
+      <text macro="publisher"/>
+    </group>
+  </macro>
+  <macro name="issue">
+    <group delimiter=", ">
+      <text variable="volume"/>
+      <text variable="issue"/>
+      <group delimiter="&#160;">
+        <label variable="page" form="short" text-case="lowercase"/>
+        <text variable="page"/>
+      </group>
+    </group>
+  </macro>
   <macro name="accessed">
     <choose>
       <if variable="URL">
-        <group prefix=" [" suffix="]">
+        <group prefix="[" suffix="]">
           <text term="accessed"/>
           <date variable="accessed">
             <date-part name="day" prefix="&#160;"/>
@@ -356,33 +340,25 @@
     </choose>
   </macro>
   <macro name="collection">
-    <group delimiter=", ">
-      <text variable="collection-title"/>
-      <text variable="collection-number"/>
-    </group>
+    <text variable="collection-title" prefix="coll. " quotes="true"/>
+    <text variable="collection-number" prefix=", "/>
   </macro>
   <macro name="page">
     <choose>
       <if type="book thesis manuscript" match="any">
         <text variable="number-of-pages" suffix="&#160;p"/>
       </if>
-      <else-if type="chapter paper-conference article-newspaper" match="any">
-    <group>
-    <label variable="page" form="short" suffix=". " text-case="lowercase"/>
-<text variable="page" />
-    </group>
+      <else-if type="chapter paper-conference article-newspaper entry-dictionary entry-encyclopedia" match="any">
+        <group delimiter="&#160;">
+          <label variable="page" form="short" text-case="lowercase"/>
+          <text variable="page"/>
+        </group>
       </else-if>
       <else-if type="report patent" match="any">
         <text variable="page" suffix="&#160;p"/>
       </else-if>
     </choose>
   </macro>
-  <macro name="isbn">
-    <text variable="ISBN" prefix="ISBN&#160;"/>
-  </macro>
-  <macro name="doi">
-    <text variable="DOI" prefix="DOI&#160;"/>
-  </macro>
   <macro name="url">
     <choose>
       <if variable="URL">
@@ -393,27 +369,31 @@
       </if>
     </choose>
   </macro>
+  <macro name="URLaccess">
+    <group delimiter=" ">
+      <text macro="url"/>
+      <text macro="accessed"/>
+    </group>
+  </macro>
   <macro name="archive">
     <choose>
       <if type="map" match="any">
-        <text variable="archive" prefix=", "/>
+        <text variable="archive"/>
       </if>
-      <else>
+      <else-if type="report">
         <text variable="archive" prefix=" (" suffix=")"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="archive_location">
-    <choose>
-      <if variable="archive_location">
-        <text variable="archive_location"/>
-      </if>
+      </else-if>
       <else>
-        <text variable="call-number"/>
+        <text variable="archive"/>
       </else>
     </choose>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="&#160;; ">
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="&#160;; " name-delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" ">
+    <sort>
+      <key variable="issued"/>
+      <key macro="author-short"/>
+      <key macro="title"/>
+    </sort>
     <layout prefix="(" suffix=")" delimiter="&#160;; ">
       <group delimiter="&#160;: ">
         <group delimiter="&#160;">
@@ -426,213 +406,164 @@
   </citation>
   <bibliography>
     <sort>
-      <key macro="responsability"/>
+      <key macro="author-short"/>
       <key macro="year-date"/>
       <key macro="title"/>
     </sort>
     <layout>
-      <group prefix="" suffix="" delimiter=" ">
+      <group suffix="&#9;" delimiter=" ">
         <text macro="author-short"/>
         <text macro="year-date" font-weight="bold"/>
-        <text variable="year-suffix" prefix=" "/>
       </group>
-      <group display="block" delimiter="" prefix="" suffix=".">
+      <group display="block" suffix=".&#9;">
         <choose>
-          <if type="book map" match="any">
-            <group>
-              <text macro="responsability" suffix=", "/>
+          <if type="book">
+            <group delimiter=", ">
+              <text macro="responsability"/>
               <text macro="title"/>
-              <text macro="genre" prefix=" "/>
-              <text macro="edition" prefix=", "/>
-              <text variable="scale" prefix=", éch. "/>
-              <text macro="publisher-place" prefix=", "/>
-              <text macro="publisher" prefix="&#160;: "/>
-              <text macro="url" prefix=". "/>
-              <text macro="accessed" prefix=", "/>
-              <text macro="collection" prefix=", coll. « " suffix=" »."/>
-              <text variable="volume" prefix=", "/>
-              <text variable="number-of-volumes" prefix=", "/>
-              <text macro="isbn" prefix=". "/>
-              <text variable="note" prefix=". "/>
+              <text variable="note"/>
+              <text variable="volume"/>
+              <text macro="edition"/>
+              <text macro="publi_place"/>
+              <choose>
+                <if variable="version" match="none">
+                  <text macro="collection"/>
+                </if>
+              </choose>
               <text macro="archive"/>
+              <text macro="URLaccess"/>
             </group>
           </if>
+          <else-if type="map">
+            <group delimiter=", ">
+              <text macro="responsability"/>
+              <group delimiter=" ">
+                <text macro="title"/>
+                <text macro="genre"/>
+              </group>
+              <text variable="volume"/>
+              <text macro="edition"/>
+              <text variable="scale" prefix="éch. "/>
+              <text variable="note"/>
+              <text macro="publi_place"/>
+              <text macro="collection"/>
+              <text macro="archive"/>
+              <text variable="call-number"/>
+              <text macro="URLaccess"/>
+            </group>
+          </else-if>
           <else-if type="article-journal article-magazine" match="any">
-            <group>
-              <text macro="responsability" suffix=", "/>
-              <text macro="title" suffix=", "/>
-              <text macro="edition" suffix=". "/>
+            <group delimiter=", ">
+              <text macro="responsability"/>
+              <text macro="title"/>
+              <text macro="edition"/>
               <text macro="issue"/>
-              <text macro="accessed" suffix=". "/>
-              <text macro="doi" suffix=". "/>
-              <text macro="url" suffix=". "/>
+              <text macro="URLaccess"/>
               <text macro="archive"/>
             </group>
           </else-if>
           <else-if type="article-newspaper">
-            <group>
-              <text macro="responsability" suffix=", "/>
-              <text macro="year-date" suffix=". "/>
-              <text macro="title" suffix=". "/>
-              <text macro="edition" suffix=". "/>
-              <text macro="publisher-place" suffix=", "/>
-              <text macro="date" suffix=". "/>
-              <text macro="page" suffix=". "/>
-              <text macro="accessed" suffix=". "/>
-              <text macro="isbn" suffix=". "/>
-              <text macro="url" suffix=". "/>
+            <group delimiter=", ">
+              <text macro="responsability"/>
+              <text macro="year-date"/>
+              <text macro="title"/>
+              <text macro="edition"/>
+              <text macro="publisher-place"/>
+              <text macro="date"/>
+              <text macro="page"/>
+              <text macro="URLaccess"/>
               <text macro="archive"/>
             </group>
           </else-if>
-          <else-if type="chapter entry entry-dictionary entry-encyclopedia" match="any">
-            <group>
-              <text macro="responsability" suffix=", "/>
-              <text macro="title" suffix=", "/>
-              <text macro="edition" suffix=". "/>
-              <text macro="publisher-place" suffix="&#160;: "/>
-              <text macro="publisher" suffix=", "/>
-              <text macro="collection" suffix=". "/>
-              <text macro="archive" suffix=", "/>
+          <else-if type="paper-conference chapter entry entry-dictionary entry-encyclopedia" match="any">
+            <group delimiter=", ">
+              <text macro="responsability"/>
+              <text macro="title"/>
+              <text variable="note"/>
+              <text macro="edition"/>
+              <group delimiter=" ">
+                <label variable="volume" form="short"/>
+                <text variable="volume"/>
+              </group>
+              <text macro="publi_place"/>
+              <text macro="collection"/>
               <text macro="page"/>
-              <text macro="collection" prefix=", coll. « " suffix=" »."/>
-              <text variable="volume" prefix=", "/>
-              <text variable="number-of-volumes" prefix=", "/>
-              <text macro="accessed" suffix=". "/>
-              <text macro="isbn" suffix=". "/>
-              <text macro="url" suffix=". "/>
+              <text macro="archive"/>
+              <text macro="URLaccess"/>
             </group>
           </else-if>
           <else-if type="speech">
-            <group>
-              <text macro="responsability" suffix=", "/>
-              <text macro="year-date" suffix=". "/>
-              <text macro="title" suffix=". "/>
-              <text macro="genre" suffix=". "/>
-              <text macro="publisher-place" suffix=". "/>
-              <text macro="date" suffix=". "/>
-              <text macro="accessed" suffix=". "/>
-              <text macro="page" suffix=". "/>
-              <text macro="url" suffix=". "/>
-            </group>
-          </else-if>
-          <else-if type="paper-conference">
-            <group>
-              <text macro="responsability" suffix=", "/>
-              <text macro="year-date" suffix=". "/>
-              <text macro="title" suffix=". "/>
-              <text macro="genre" suffix=". "/>
-              <text macro="publisher-place" suffix="&#160;: "/>
-              <text macro="publisher" suffix=". "/>
-              <text macro="date" suffix=". "/>
-              <text macro="page" suffix=". "/>
-              <text macro="accessed" suffix=". "/>
-              <text macro="url" suffix=". "/>
+            <group delimiter=", ">
+              <text macro="responsability"/>
+              <text macro="title"/>
+              <text macro="genre"/>
+              <text macro="publisher-place"/>
+              <text macro="date"/>
             </group>
           </else-if>
           <else-if type="thesis">
-            <group>
-              <text macro="responsability" suffix=", "/>
-              <text macro="title" suffix=", "/>
-              <text macro="genre" suffix=", "/>
-              <text macro="publisher" prefix="(" suffix=")"/>
+            <group delimiter=", ">
+              <text macro="responsability"/>
+              <group delimiter=", ">
+                <text macro="title"/>
+                <group delimiter=" ">
+                  <text macro="genre"/>
+                  <group prefix="(" suffix=")" delimiter=", ">
+                    <text macro="publisher-place"/>
+                    <text macro="publisher"/>
+                  </group>
+                </group>
+              </group>
+              <text macro="URLaccess"/>
               <text macro="archive"/>
             </group>
           </else-if>
           <else-if type="post-weblog post webpage" match="any">
-            <group>
-              <text macro="responsability" suffix=", "/>
-              <text variable="title" prefix="« " suffix=" », "/>
-              <text variable="container-title" font-style="italic"/>
-              <text term="online" prefix=" [" suffix="], "/>
-              <text variable="note" suffix=", "/>
-              <text macro="url"/>
-              <text macro="accessed" suffix=". "/>
+            <group delimiter=", ">
+              <text macro="responsability"/>
+              <group>
+                <text variable="title" quotes="true"/>
+                <text variable="container-title" font-style="italic" prefix=", "/>
+                <text term="online" prefix=" [" suffix="]"/>
+              </group>
+              <text macro="URLaccess"/>
             </group>
           </else-if>
           <else-if type="broadcast motion_picture song" match="any">
-            <group>
-              <text macro="responsability" suffix=", "/>
-              <text macro="year-date" suffix=". "/>
-              <text macro="title" suffix=". "/>
-              <text macro="medium" suffix=". "/>
-              <text macro="publisher-place" suffix="&#160;: "/>
-              <text macro="publisher" suffix=". "/>
-              <text macro="date" suffix=". "/>
-              <text macro="accessed" suffix=". "/>
-              <text macro="collection" suffix=". "/>
-              <text macro="isbn" suffix=". "/>
-              <text macro="url" suffix=". "/>
+            <group delimiter=", ">
+              <text macro="responsability"/>
+              <text macro="title"/>
+              <text macro="publi_place"/>
+              <text macro="URLaccess"/>
             </group>
           </else-if>
           <else-if type="report">
-            <group>
-              <text macro="responsability" suffix=", "/>
-              <text macro="title" suffix=", "/>
-              <text macro="genre" suffix=", "/>
-              <text macro="edition" suffix=". "/>
-              <text macro="publisher-place" suffix="&#160;: "/>
-              <text macro="publisher" suffix=""/>
-              <text macro="accessed" suffix=". "/>
-              <text macro="collection" suffix=". "/>
-              <text macro="url" suffix=". "/>
-              <text macro="archive"/>
-            </group>
-          </else-if>
-          <else-if type="manuscript">
-            <group>
-              <text macro="responsability" suffix=", "/>
-              <text macro="year-date" suffix=". "/>
-              <text macro="title" suffix=". "/>
-              <text macro="genre" suffix=". "/>
+            <group delimiter=", ">
+              <text macro="responsability"/>
+              <text macro="title"/>
+              <text macro="genre"/>
               <text macro="edition" suffix=". "/>
-              <text macro="publisher-place" suffix=". "/>
-              <text macro="accessed" suffix=". "/>
-              <text macro="collection" suffix=". "/>
-              <text macro="url" suffix=". "/>
-            </group>
-          </else-if>
-          <else-if type="patent">
-            <group>
-              <text macro="responsability" suffix=", "/>
-              <text macro="year-date" suffix=". "/>
-              <text macro="title" suffix=". "/>
-              <text macro="number" suffix=". "/>
-              <text macro="date" suffix=". "/>
-              <text macro="publisher-place" suffix=". "/>
-              <text macro="accessed" suffix=". "/>
-              <text macro="collection" suffix=". "/>
-              <text macro="url" suffix=". "/>
+              <group delimiter=" ">
+                <text macro="publi_place"/>
+                <text macro="archive"/>
+              </group>
+              <text macro="URLaccess"/>
             </group>
           </else-if>
           <else>
-            <group suffix="." delimiter=", ">
+            <group delimiter=", ">
               <text macro="responsability"/>
-              <group delimiter=". ">
-                <text macro="year-date"/>
-                <text macro="title"/>
-                <text macro="medium"/>
-                <text macro="genre"/>
-                <text macro="date"/>
-                <text macro="edition"/>
-                <group delimiter="&#160;: ">
-                  <text macro="publisher-place"/>
-                  <text macro="publisher"/>
-                </group>
-                <text macro="accessed"/>
-                <text macro="collection"/>
-                <text macro="page"/>
-                <text macro="isbn"/>
-                <text macro="url"/>
-                <text macro="archive" prefix="(" suffix=")"/>
-              </group>
+              <text macro="title"/>
+              <text macro="medium"/>
+              <text macro="edition"/>
+              <text macro="publi_place"/>
+              <text macro="collection"/>
+              <text macro="page"/>
+              <text macro="URLaccess"/>
+              <text macro="archive" prefix="(" suffix=")"/>
             </group>
           </else>
         </choose>
-        <group>
-          <group display="block">
-            <text macro="archive_location"/>
-          </group>
-        </group>
       </group>
     </layout>
   </bibliography>