From 59482650cdec73af3998083dd2295d571ab903c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Appel?=
 <56739429+andreappel@users.noreply.github.com>
Date: Thu, 9 Apr 2020 22:58:46 -0300
Subject: [PATCH] =?UTF-8?q?Update=20instituto-brasileiro-de-informacao-em-?=
 =?UTF-8?q?ciencia-e-tecnologia-abn=E2=80=A6=20(#4683)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...nformacao-em-ciencia-e-tecnologia-abnt.csl | 429 +++++++++---------
 1 file changed, 209 insertions(+), 220 deletions(-)

diff --git a/instituto-brasileiro-de-informacao-em-ciencia-e-tecnologia-abnt.csl b/instituto-brasileiro-de-informacao-em-ciencia-e-tecnologia-abnt.csl
index cae0377ea27b..c6226cb1ff92 100644
--- a/instituto-brasileiro-de-informacao-em-ciencia-e-tecnologia-abnt.csl
+++ b/instituto-brasileiro-de-informacao-em-ciencia-e-tecnologia-abnt.csl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" demote-non-dropping-particle="never" default-locale="pt-BR">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" demote-non-dropping-particle="never">
   <info>
-    <title>Instituto Brasileiro de Informação em Ciência e Tecnologia - ABNT (autoria completa) (Portuguese - Brazil)</title>
+    <title>Instituto Brasileiro de Informação em Ciência e Tecnologia - ABNT (autoria completa)</title>
     <title-short>IBICT</title-short>
     <id>http://www.zotero.org/styles/instituto-brasileiro-de-informacao-em-ciencia-e-tecnologia-abnt</id>
     <link href="http://www.zotero.org/styles/instituto-brasileiro-de-informacao-em-ciencia-e-tecnologia-abnt" rel="self"/>
-    <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-ufmg-face-initials" rel="template"/>
+    <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-ufmg-face-full" rel="template"/>
     <link href="http://insumo.ibict.br/produtos/csl-ibict/" rel="documentation"/>
     <author>
       <name>André Luiz Appel</name>
@@ -26,26 +26,34 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>The Brazilian Standard Style by IBICT</summary>
-    <updated>2020-01-14T14:52:00+00:00</updated>
+    <updated>2020-04-09T14:38: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>
+  <locale xml:lang="en">
+    <terms>
+      <term name="at">on</term>
+    </terms>
+  </locale>
   <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-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="editor" form="short">ed</term>
-      <term name="editor" form="short">org</term>
-      <term name="collection-editor" form="short">org</term>
+      <term name="accessed">acesso</term>
+      <term name="issue" form="short">n.</term>
+      <term name="ordinal">.</term>
+      <term name="paragraph" form="short">par.</term>
+      <term name="volume" form="short">
+        <single>v.</single>
+        <multiple>v.</multiple>
+      </term>
+      <term name="collection-editor">
+        <single>editor</single>
+        <multiple>editores</multiple>
+      </term>
+      <term name="collection-editor" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
+      <term name="collection-editor" form="verb">editado por</term>
+      <term name="collection-editor" form="verb-short">ed.</term>
     </terms>
   </locale>
   <macro name="container-contributors">
@@ -72,7 +80,7 @@
     <choose>
       <if type="chapter" match="none">
         <names variable="editor" delimiter=", " prefix=" (" suffix=")">
-          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <name and="symbol" delimiter=", "/>
           <label form="short" prefix=", " suffix="."/>
         </names>
       </if>
@@ -90,22 +98,7 @@
   </macro>
   <macro name="author">
     <choose>
-      <if type="article-newspaper">
-        <names variable="author">
-          <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="always">
-            <name-part name="family" text-case="uppercase"/>
-            <name-part name="given"/>
-          </name>
-          <et-al font-style="italic"/>
-          <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first"/>
-          <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-            <text macro="title"/>
-          </substitute>
-        </names>
-      </if>
-      <else-if type="entry-dictionary entry-encyclopedia" match="any">
+      <if type="article-newspaper entry-dictionary entry-encyclopedia">
         <names variable="author">
           <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="always">
             <name-part name="family" text-case="uppercase"/>
@@ -115,11 +108,12 @@
           <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
+            <names variable="collection-editor"/>
             <names variable="translator"/>
             <text variable="title" text-case="uppercase"/>
           </substitute>
         </names>
-      </else-if>
+      </if>
       <else>
         <names variable="author">
           <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="always">
@@ -130,6 +124,7 @@
           <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
+            <names variable="collection-editor"/>
             <names variable="translator"/>
             <text variable="title" text-case="uppercase"/>
           </substitute>
@@ -160,22 +155,33 @@
   </macro>
   <macro name="access">
     <choose>
-      <if type="article article-magazine article-journal" match="any">
-        <text variable="URL" prefix="Disponível em: "/>
-        <date variable="accessed" prefix=". Acesso em: ">
+      <if variable="DOI URL accessed" match="all">
+        <text variable="DOI" prefix="DOI " suffix=". "/>
+        <text term="available at" text-case="capitalize-first" prefix=" " suffix=": "/>
+        <text variable="URL" suffix="."/>
+        <text term="accessed" text-case="capitalize-first" prefix=" " suffix=" "/>
+        <text term="at" text-case="lowercase" suffix=": "/>
+        <date variable="accessed">
           <date-part name="day" suffix=" "/>
-          <date-part name="month" form="short" suffix=" " text-case="lowercase"/>
+          <date-part name="month" form="short" suffix=" "/>
           <date-part name="year"/>
         </date>
       </if>
-      <else>
-        <text variable="URL" prefix="Disponível em: "/>
-        <date variable="accessed" prefix=". Acesso em: ">
+      <else-if variable="URL accessed" match="all">
+        <text term="available at" text-case="capitalize-first" prefix=" " suffix=": "/>
+        <text variable="URL" suffix="."/>
+        <text term="accessed" text-case="capitalize-first" prefix=" " suffix=" "/>
+        <text term="at" text-case="lowercase" suffix=": "/>
+        <date variable="accessed">
           <date-part name="day" suffix=" "/>
-          <date-part name="month" form="short" suffix=" " text-case="lowercase"/>
+          <date-part name="month" form="short" suffix=" "/>
           <date-part name="year"/>
         </date>
-      </else>
+      </else-if>
+      <else-if variable="accessed" match="none">
+        <text term="available at" text-case="capitalize-first" prefix=" " suffix=": "/>
+        <text variable="URL" suffix="."/>
+      </else-if>
     </choose>
   </macro>
   <macro name="title">
@@ -191,8 +197,8 @@
   <macro name="container-title">
     <choose>
       <if type="paper-conference" match="any">
-        <text value="Anais" font-weight="bold"/>
-        <text value=" [...]. "/>
+        <text variable="container-title" font-weight="bold"/>
+        <text value=" [...]"/>
       </if>
       <else-if type="entry-dictionary entry-encyclopedia" match="any">
         <text value="In" font-style="italic"/>
@@ -206,14 +212,14 @@
   </macro>
   <macro name="publisher">
     <choose>
-      <if match="any" variable="publisher-place publisher">
+      <if variable="publisher-place publisher" match="any">
         <group delimiter=": ">
           <choose>
             <if variable="publisher-place">
               <text variable="publisher-place"/>
             </if>
             <else>
-              <text value="[s.l.]"/>
+              <text value="S. l." font-style="italic" prefix="[" suffix="]"/>
             </else>
           </choose>
           <choose>
@@ -221,13 +227,16 @@
               <text variable="publisher"/>
             </if>
             <else>
-              <text value="[s.n.]"/>
+              <text value="s. n." font-style="italic" prefix="[" suffix="]"/>
             </else>
           </choose>
         </group>
       </if>
       <else>
-        <text value="[s.l.: s.n.]"/>
+        <group delimiter=": ">
+          <text value="S. l." font-style="italic" prefix="["/>
+          <text value="s. n." font-style="italic" suffix="]"/>
+        </group>
       </else>
     </choose>
   </macro>
@@ -262,7 +271,7 @@
         </group>
       </if>
       <else>
-        <text value="[s.d.]"/>
+        <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
       </else>
     </choose>
   </macro>
@@ -274,56 +283,69 @@
         </date>
       </if>
       <else>
-        <text value="[s.d.]"/>
+        <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
       </else>
     </choose>
   </macro>
   <macro name="edition">
     <choose>
-      <if type="book chapter entry-dictionary entry-encyclopedia" 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 is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <label variable="edition" form="short"/>
+        </group>
       </if>
+      <else>
+        <text variable="edition"/>
+      </else>
     </choose>
   </macro>
   <macro name="locators">
     <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 article-journal article-magazine article-newspaper" match="any">
+        <choose>
+          <if variable="volume" match="any">
+            <text term="volume" form="short"/>
+            <text variable="volume" prefix=" "/>
+          </if>
+        </choose>
+        <choose>
+          <if variable="issue" match="any">
+            <text term="issue" form="short" prefix=", "/>
+            <text variable="issue" prefix=" "/>
+          </if>
+        </choose>
+        <choose>
+          <if variable="edition" match="any">
+            <text variable="edition" prefix="n. " suffix=", "/>
+          </if>
+        </choose>
+        <choose>
+          <if variable="section" match="any">
+            <text term="section" form="short" prefix=", "/>
+            <text variable="section" prefix=" "/>
+          </if>
+        </choose>
+        <choose>
+          <if variable="page" match="any">
+            <text term="page" form="short" prefix=", "/>
+            <text variable="page" prefix=" "/>
+          </if>
+        </choose>
       </if>
-      <else-if match="any" type="article article-journal article-magazine article-newspaper">
-        <group delimiter=", ">
-          <group delimiter=", ">
-            <text variable="volume" prefix="v. "/>
-            <text variable="issue" prefix="n. "/>
-          </group>
-          <text variable="page" prefix="p. "/>
-        </group>
-      </else-if>
-      <else-if match="any" type="book chapter">
-        <group delimiter=", ">
-          <group>
-            <text variable="volume" prefix="v. " suffix=". "/>
-            <text variable="page" prefix="p. "/>
-          </group>
-        </group>
+      <else-if type="book chapter" match="any">
+        <choose>
+          <if variable="volume" match="any">
+            <text term="volume" form="short"/>
+            <text variable="volume" prefix=" " suffix=", "/>
+          </if>
+        </choose>
+        <choose>
+          <if variable="page" match="any">
+            <text term="page" form="short"/>
+            <text variable="page" prefix=" "/>
+          </if>
+        </choose>
       </else-if>
     </choose>
   </macro>
@@ -353,7 +375,7 @@
   </macro>
   <macro name="number">
     <group>
-      <text variable="number" suffix=". "/>
+      <text variable="number" prefix=", n. "/>
     </group>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year-suffix" givenname-disambiguation-rule="primary-name" year-suffix-delimiter=", ">
@@ -378,46 +400,54 @@
     </sort>
     <layout>
       <choose>
-        <if type="bill">
-          <group>
+        <if type="article article-journal article-magazine article-newspaper" match="any">
+          <group suffix=".">
             <text macro="author" suffix=". "/>
-            <text macro="number" suffix=". "/>
             <text macro="title" suffix=". "/>
-            <!-- use field 'history' for publisher -->
-            <text variable="references" suffix=", " font-weight="bold"/>
-            <!-- On Zotero, use field 'extra' for publication place -->
-            <text variable="note"/>
-            <text macro="locators" suffix=". "/>
-            <text macro="access" suffix=". "/>
+            <text macro="translator" suffix=". "/>
+            <text macro="container-title" suffix=", "/>
+            <text variable="collection-title" suffix=". "/>
+            <text macro="place" suffix=", "/>
+            <text macro="locators" suffix=", "/>
+            <text macro="issued" suffix=". "/>
+            <text macro="access"/>
           </group>
         </if>
-        <else-if type="map">
-          <group>
+        <else-if type="bill">
+          <group suffix=".">
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=", "/>
-            <text macro="issued" suffix=". "/>
-            <text variable="note" suffix=". "/>
-            <text macro="access" suffix=". "/>
+            <text macro="title" suffix=". "/>
+            <text variable="abstract" suffix=". "/>
+            <text macro="container-title" suffix=", "/>
+            <text variable="section" prefix="seç. " suffix=", "/>
+            <text variable="volume" prefix="n. " suffix=", "/>
+            <text variable="page" prefix="p. " suffix=", "/>
+            <text macro="issued" suffix="."/>
+            <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="book">
-          <group>
+        <else-if type="book map">
+          <group suffix=".">
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
             <text macro="translator" suffix=". "/>
             <text macro="edition" suffix=". "/>
             <text macro="publisher" suffix=", "/>
-            <text macro="issued-year" suffix=". "/>
-            <text macro="locators"/>
-            <text macro="access" suffix=". "/>
+            <text macro="issued-year"/>
+            <text macro="locators" prefix=". "/>
             <group prefix="(" suffix=").">
               <text variable="collection-title"/>
               <text variable="collection-number" prefix=", "/>
+              <text variable="genre" prefix=", "/>
+              <text variable="archive" prefix=", "/>
+              <text variable="page"/>
             </group>
+            <text macro="access"/>
+            <!-- On Zotero, use the field 'Extra' to insert DOI names for books.-->
           </group>
         </else-if>
         <else-if type="chapter">
-          <group>
+          <group suffix=".">
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
             <text macro="container-contributors"/>
@@ -427,60 +457,31 @@
             <text macro="translator" suffix=". "/>
             <text macro="edition" suffix=". "/>
             <text macro="publisher" suffix=", "/>
-            <text macro="issued" suffix=". "/>
-            <text macro="locators" suffix=". "/>
-            <text variable="DOI" prefix="DOI " suffix=". "/>
-            <text macro="access"/>
+            <text macro="issued"/>
+            <text macro="locators" prefix=". "/>
+            <text macro="access" prefix=". "/>
+            <!-- On Zotero, use the field 'Extra' to insert DOI names for book chapters.-->
           </group>
         </else-if>
-        <else-if type="article-newspaper" match="any">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="translator" suffix=". "/>
-            <text macro="container-title" suffix=", "/>
-            <text variable="collection-title" suffix=". "/>
-            <!-- On Zotero, use the field 'Extra' publication place -->
-            <text variable="note" suffix=", "/>
-            <text macro="place" suffix=", "/>
-            <text macro="edition" suffix=", "/>
-            <text macro="issued" suffix=". "/>
-            <text variable="section"/>
-            <group suffix=".">
-              <text macro="locators" prefix=", "/>
-              <text macro="access"/>
-            </group>
+        <else-if type="entry-dictionary entry-encyclopedia" match="any">
+          <text macro="author" suffix=". "/>
+          <text macro="title" suffix=". "/>
+          <text macro="container-contributors"/>
+          <text macro="secondary-contributors"/>
+          <text macro="container-title" suffix=". "/>
+          <text macro="edition" suffix=" "/>
+          <text variable="collection-title" prefix=", " suffix="."/>
+          <text macro="locators"/>
+          <group delimiter=". ">
+            <text macro="publisher"/>
           </group>
-        </else-if>
-        <else-if type="article article-magazine article-journal" match="any">
-          <group suffix=".">
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="container-title" suffix=", "/>
-            <text variable="collection-title" suffix=". "/>
-            <!-- On Zotero, use the field 'Extra' publication place -->
-            <text variable="note" suffix=", "/>
-            <text macro="edition" suffix=", "/>
-            <text macro="locators" suffix=", "/>
-            <text macro="issued" suffix=". "/>
-            <text variable="DOI" prefix="DOI " suffix=". "/>
+          <group delimiter=". " prefix=", " suffix=".">
+            <text macro="issued"/>
+            <text variable="volume" prefix="v. "/>
+            <text variable="page" prefix="p. "/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="thesis">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="issued-year" suffix=". "/>
-            <text variable="number-of-pages" suffix=" f. "/>
-            <text variable="genre" suffix=" &#8211; "/>
-            <text variable="publisher" suffix=", "/>
-            <text variable="publisher-place" suffix=", "/>
-            <text macro="issued-year" suffix=". "/>
-            <text variable="DOI" prefix="DOI " suffix=". "/>
-            <text macro="access" suffix=". "/>
-          </group>
-        </else-if>
         <else-if type="manuscript">
           <group>
             <text macro="author" suffix=". "/>
@@ -493,86 +494,74 @@
             <text macro="archive" suffix=". "/>
           </group>
         </else-if>
-        <else-if type="webpage">
-          <group>
+        <else-if type="paper-conference">
+          <group suffix=".">
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
-            <text macro="issued" suffix=". "/>
-            <text macro="container-title" suffix=". "/>
-            <text macro="genre" prefix=" [" suffix="]. "/>
-            <text variable="DOI" prefix="DOI " suffix=". "/>
-            <text macro="access" suffix="."/>
-            <!-- On Zotero, use the field 'Extra' for notes.-->
-            <text variable="note" prefix=" (" suffix=")."/>
-          </group>
-        </else-if>
-        <else-if type="paper-conference">
-          <text macro="author" suffix=". "/>
-          <text macro="title" suffix=". "/>
-          <text macro="event" suffix=", "/>
-          <text variable="volume" suffix="., "/>
-          <text macro="issued"/>
-          <!-- On Zotero, use the field 'Extra' for the event location.-->
-          <text variable="note" prefix=", "/>
-          <text macro="container-title" prefix=". "/>
-          <group delimiter=". " suffix=". ">
-            <group delimiter=", ">
-              <text macro="publisher"/>
-              <text macro="issued"/>
-            </group>
-            <text variable="page" prefix="p. "/>
-            <text variable="DOI" prefix="DOI "/>
+            <text macro="event" suffix=", "/>
+            <text variable="volume" suffix="., "/>
+            <text macro="issued" suffix="."/>
+            <!-- On Zotero, use the field 'Extra' for the event location.-->
+            <text variable="note" prefix=", "/>
+            <text macro="container-title" prefix=". "/>
+            <text macro="publisher" prefix=". "/>
+            <text macro="issued" prefix=", " suffix=". "/>
+            <text macro="locators" suffix=". "/>
             <text macro="access"/>
           </group>
         </else-if>
         <else-if type="report">
           <text macro="author" suffix=". "/>
-          <text macro="title" suffix=". "/>
+          <text macro="title"/>
           <text macro="container-contributors"/>
           <text macro="secondary-contributors"/>
-          <text macro="container-title"/>
-          <text variable="collection-title" prefix=", " suffix="."/>
-          <text variable="genre"/>
-          <text variable="number" prefix=", n. " suffix="."/>
-          <text macro="locators"/>
+          <text variable="genre" prefix=". "/>
+          <text macro="number"/>
+          <text macro="locators" prefix=", "/>
           <group delimiter=". " prefix=". ">
             <text macro="publisher"/>
           </group>
           <text macro="issued" prefix=", " suffix="."/>
           <text macro="access" prefix=" " suffix="."/>
         </else-if>
-        <else-if type="entry-dictionary entry-encyclopedia" match="any">
-          <text macro="author" suffix=". "/>
-          <text macro="title" suffix=". "/>
-          <text macro="container-contributors"/>
-          <text macro="secondary-contributors"/>
-          <text macro="container-title" suffix=". "/>
-          <text macro="edition" suffix=" "/>
-          <text variable="collection-title" prefix=", " suffix="."/>
-          <text macro="locators"/>
-          <group delimiter=". ">
-            <text macro="publisher"/>
+        <else-if type="webpage">
+          <group suffix=".">
+            <text macro="author" suffix=". "/>
+            <text macro="title" suffix=". "/>
+            <text macro="issued" suffix=". "/>
+            <text macro="container-title" suffix=". "/>
+            <text macro="genre" prefix=" [" suffix="]. "/>
+            <text macro="access"/>
+            <!-- On Zotero, use the field 'Extra' for notes.-->
+            <text variable="note" prefix=" (" suffix=")"/>
           </group>
-          <group delimiter=". " prefix=", " suffix=".">
-            <text macro="issued"/>
-            <text variable="volume" prefix="v. "/>
-            <text variable="page" prefix="p. "/>
+        </else-if>
+        <else-if type="thesis">
+          <group suffix=".">
+            <text macro="author" suffix=". "/>
+            <text macro="title" suffix=". "/>
+            <text macro="issued-year" suffix=". "/>
+            <text variable="number-of-pages" suffix=" f. "/>
+            <text variable="genre" suffix=" &#8211; "/>
+            <text variable="publisher" suffix=", "/>
+            <text variable="publisher-place" suffix=", "/>
+            <text macro="issued-year" suffix=". "/>
             <text macro="access"/>
           </group>
         </else-if>
         <else>
-          <text macro="author" suffix=". "/>
-          <text macro="title" suffix=". "/>
-          <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="publisher"/>
+          <group suffix=".">
+            <text macro="author" suffix=". "/>
+            <text macro="title" suffix=". "/>
+            <text macro="container-contributors" suffix=". "/>
+            <text macro="secondary-contributors" suffix=". "/>
+            <text macro="container-title" suffix=". "/>
+            <text variable="collection-title" suffix=". "/>
+            <text macro="locators" suffix=". "/>
+            <text macro="publisher" suffix=", "/>
+            <text macro="issued"/>
             <text macro="access"/>
           </group>
-          <text macro="issued" prefix=", "/>
         </else>
       </choose>
     </layout>