Delete adjacent space in remaining cases - Part 2

( Reference to 1301 )
citation-style-language · Jan 22, 2015 · 3bc225cdfcc59fa346c2ace33682bb01b9c79028 · 3bc225c
1 parent 123bc5d
commit 3bc225cdfcc59fa346c2ace33682bb01b9c79028
diff --git a/american-sociological-association.csl b/american-sociological-association.csl
@@ -60,10 +60,10 @@
    <group>
      <choose>
        <if variable="URL">
-  
-          <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-  
-          <date variable="accessed" form="text" suffix=" "/>
-  
-          <group prefix=" (" suffix=")">
-  
-            <text variable="URL"/>
+  
+          <group delimiter=" ">
+  
+            <text term="retrieved" text-case="capitalize-first"/>
+  
+            <date variable="accessed" form="text"/>
+  
+            <text prefix="(" suffix=")" variable="URL"/>
          </group>
        </if>
      </choose>

diff --git a/associacao-brasileira-de-normas-tecnicas-ufjf.csl b/associacao-brasileira-de-normas-tecnicas-ufjf.csl
@@ -499,7 +499,7 @@
          </group>
        </else-if>
        <else-if type="book">
-  
-          <group>
+  
+          <group suffix=".">
            <text macro="author" suffix=". "/>
            <text macro="title" suffix=". "/>
            <text macro="translator" suffix=". "/>
@@ -509,11 +509,11 @@
            <text variable="number-of-pages" suffix=" p. "/>
            <text macro="locators"/>
            <text macro="access" suffix=". "/>
-  
-            <group prefix=" (" suffix=").">
+  
+            <group prefix="(" suffix="). " delimiter=", ">
              <text variable="collection-title"/>
-  
-              <text variable="collection-number" prefix=", "/>
+  
+              <text variable="collection-number"/>
            </group>
-  
-            <text macro="abstract" prefix=" " suffix="."/>
+  
+            <text macro="abstract"/>
          </group>
          <text variable="ISBN" suffix=". "/>
        </else-if>

diff --git a/association-for-computational-linguistics.csl b/association-for-computational-linguistics.csl
@@ -249,9 +249,9 @@
        </else-if>
        <!-- corresponds to "inproceedings" and "conference" in bibtex -->
        <else-if type="paper-conference">
-  
-          <text variable="title" prefix=" " suffix="."/>
-  
-          <text term="in" text-case="capitalize-first" prefix=" " suffix=" "/>
-  
-          <group prefix=" " suffix="." delimiter=", ">
+  
+          <text variable="title" prefix=" " suffix=". "/>
+  
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+  
+          <group suffix="." delimiter=", ">
            <text macro="editor"/>
            <text variable="container-title" font-style="italic"/>
            <text macro="volume-or-number"/>

diff --git a/british-journal-of-political-science.csl b/british-journal-of-political-science.csl
@@ -61,17 +61,15 @@
    <group>
      <choose>
        <if variable="URL">
-  
-          <text term="available at" text-case="capitalize-first" suffix=" "/>
-  
-          <group prefix=" ">
-  
-            <text variable="URL"/>
-  
-            <group delimiter=" " prefix=", ">
-  
-              <text term="accessed"/>
-  
-              <date variable="accessed" delimiter=" ">
-  
-                <date-part name="day"/>
-  
-                <date-part name="month"/>
-  
-                <date-part name="year"/>
-  
-              </date>
-  
-            </group>
+  
+          <group prefix=" " delimiter=" ">
+  
+            <text term="available at" text-case="capitalize-first"/>
+  
+            <text variable="URL"/ suffix=",">
+  
+            <text term="accessed"/>
+  
+            <date variable="accessed" delimiter=" ">
+  
+              <date-part name="day"/>
+  
+              <date-part name="month"/>
+  
+              <date-part name="year"/>
+  
+            </date>
          </group>
        </if>
      </choose>

diff --git a/environmental-chemistry.csl b/environmental-chemistry.csl
@@ -36,12 +36,12 @@
    </group>
  </macro>
  <macro name="publisher">
-  
-    <group suffix=", ">
-  
-      <text macro="accessed-date" prefix=" "/>
-  
-    </group>
-  
-    <group prefix="(" suffix=")">
-  
-      <text variable="publisher" suffix=": "/>
-  
-      <text variable="publisher-place"/>
+  
+    <group prefix=" " delimiter=", ">
+  
+      <text macro="accessed-date"/>
+  
+      <group prefix="(" suffix=")" delimiter=": ">
+  
+        <text variable="publisher"/>
+  
+        <text variable="publisher-place"/>
+  
+      </group>
    </group>
  </macro>
  <macro name="access">

diff --git a/geistes-und-kulturwissenschaften-heilmann.csl b/geistes-und-kulturwissenschaften-heilmann.csl
@@ -213,8 +213,10 @@
              <text prefix="&#160;" variable="collection-number"/>
              <choose>
                <if variable="collection-editor">
-  
-                  <text prefix=", " term="editor" form="verb-short" text-case="lowercase" suffix=" "/>
-  
-                  <text prefix=" " macro="secondary-collection-contributors"/>
+  
+                  <group prefix=", " delimiter=" ">
+  
+                    <text term="editor" form="verb-short" text-case="lowercase"/>
+  
+                    <text macro="secondary-collection-contributors"/>
+  
+                  </group>
                </if>
              </choose>
            </group>
@@ -272,7 +274,7 @@
              <text prefix="&#160;" variable="collection-number"/>
              <choose>
                <if variable="collection-editor">
-  
-                  <text prefix=", " term="editor" form="verb-short" text-case="lowercase" suffix=" "/>
+  
+                  <text prefix=", " term="editor" form="verb-short" text-case="lowercase"/>
                  <text prefix=" " macro="secondary-collection-contributors"/>
                </if>
              </choose>

diff --git a/harvard-durham-university-business-school.csl b/harvard-durham-university-business-school.csl
@@ -223,7 +223,7 @@
        </else-if>
        <else-if type="chapter paper-conference" match="any">
          <text macro="title" prefix=" " suffix=". "/>
-  
-          <group prefix=" " delimiter=" ">
+  
+          <group delimiter=" ">
            <text term="in" text-case="capitalize-first" suffix=":"/>
            <text macro="editor" suffix=". "/>
            <text variable="container-title" font-style="italic" suffix="."/>
@@ -237,21 +237,21 @@
          </group>
        </else-if>
        <else>
-  
-          <group suffix=".">
-  
-            <text macro="title" prefix=" "/>
-  
-            <text macro="editor" prefix=" "/>
-  
-          </group>
-  
-          <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-  
-          <text macro="online" prefix=" " suffix=". "/>
-  
-          <group prefix=" " suffix=".">
-  
-            <group prefix=" ">
-  
-              <text variable="volume"/>
-  
-              <text variable="issue" prefix=" (" suffix=")"/>
-  
-              <text macro="issued"/>
-  
-            </group>
-  
-            <group prefix=" ">
-  
-              <label variable="page" form="short"/>
-  
-              <text macro="pages"/>
+  
+          <group prefix=" " delimiter=" ">
+  
+            <text macro="title"/>
+  
+            <text macro="editor" suffix="."/>
+  
+            <text variable="container-title" font-style="italic" suffix="."/>
+  
+            <text macro="online" suffix="."/>
+  
+            <group suffix=".">
+  
+              <group>
+  
+                <text variable="volume"/>
+  
+                <text variable="issue" prefix=" (" suffix=")"/>
+  
+                <text macro="issued"/>
+  
+              </group>
+  
+              <group prefix=" ">
+  
+                <label variable="page" form="short"/>
+  
+                <text macro="pages"/>
+  
+              </group>
            </group>
          </group>
        </else>

diff --git a/harvard-imperial-college-london.csl b/harvard-imperial-college-london.csl
@@ -222,7 +222,7 @@
        </else-if>
        <else-if type="chapter paper-conference" match="any">
          <text macro="title" prefix=" " suffix=". "/>
-  
-          <group prefix=" " delimiter=" ">
+  
+          <group delimiter=" ">
            <text term="in" text-case="capitalize-first" suffix=":"/>
            <text macro="editor" suffix=". "/>
            <text variable="container-title" font-style="italic" suffix="."/>
@@ -236,19 +236,19 @@
          </group>
        </else-if>
        <else>
-  
-          <group suffix=".">
-  
-            <text macro="title" prefix=" "/>
-  
-            <text macro="editor" prefix=" "/>
+  
+          <group prefix=" " suffix="." delimiter=" ">
+  
+            <text macro="title"/>
+  
+            <text macro="editor"/>
          </group>
          <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
          <text macro="online" prefix=" " suffix=". "/>
-  
-          <group prefix=" " suffix=".">
-  
-            <group prefix=" ">
+  
+          <group suffix="." delimiter=" ">
+  
+            <group>
              <text variable="volume"/>
              <text variable="issue" prefix=" (" suffix=")"/>
              <text macro="issued"/>
            </group>
-  
-            <group prefix=" ">
+  
+            <group>
              <label variable="page" form="short"/>
              <text macro="pages"/>
            </group>

diff --git a/international-journal-of-wildland-fire.csl b/international-journal-of-wildland-fire.csl
@@ -218,12 +218,10 @@
            <text variable="title" prefix=" "/>
            <text macro="editor-translator" prefix=" "/>
          </group>
-  
-          <group prefix=" " suffix=".">
+  
+          <group prefix=" " suffix="." delimiter=" ">
            <text macro="container-title" font-style="italic"/>
-  
-            <group suffix=", ">
-  
-              <text variable="volume" prefix=" " font-weight="bold"/>
-  
-            </group>
-  
-            <text variable="page" prefix=" "/>
+  
+            <text variable="volume" suffix="," font-weight="bold"/>
+  
+            <text variable="page"/>
          </group>
        </else>
      </choose>

diff --git a/iso690-full-note-sk.csl b/iso690-full-note-sk.csl
@@ -335,7 +335,7 @@
              <text macro="contributors-long" suffix=". "/>
              <text macro="title-long" font-style="italic"/>
              <text prefix=" " macro="medium" suffix="."/>
-  
-              <text prefix=". " macro="issued" suffix=", "/>
+  
+              <text prefix=". " macro="issued" suffix=","/>
              <text prefix=" " macro="citation-locator"/>
              <text prefix=". " macro="quoted" suffix="."/>
              <text variable="URL" prefix=". Dostupné na internete: "/>

diff --git a/journal-of-analytical-toxicology.csl b/journal-of-analytical-toxicology.csl
@@ -97,7 +97,7 @@
        </if>
        <else-if type="chapter paper-conference" match="any">
          <text macro="title" prefix=" " suffix=". "/>
-  
-          <group prefix=" " delimiter=" " suffix=".">
+  
+          <group delimiter=" " suffix=". ">
            <text term="in" text-case="capitalize-first"/>
            <group delimiter=", ">
              <text macro="editor"/>
@@ -110,7 +110,7 @@
            </group>
          </group>
          <group delimiter=", ">
-  
-            <text macro="publisher" prefix=" "/>
+  
+            <text macro="publisher"/>
            <group>
              <label variable="page" suffix=" " form="short"/>
              <text variable="page"/>

diff --git a/journal-of-social-archaeology.csl b/journal-of-social-archaeology.csl
@@ -194,9 +194,7 @@
        </else-if>
        <else-if type="webpage"/>
        <else>
-  
-          <group suffix=", ">
-  
-            <text macro="editor" prefix=" "/>
-  
-          </group>
+  
+          <text macro="editor" prefix=" " suffix=","/>
          <group prefix=" " suffix=".">
            <text variable="container-title" form="short" font-style="italic"/>
            <group prefix=" ">

diff --git a/journal-of-vegetation-science.csl b/journal-of-vegetation-science.csl
@@ -128,9 +128,9 @@
          </group>
        </else-if>
        <else-if type="article-journal">
-  
-          <group suffix=". ">
-  
-            <text macro="title" prefix=" "/>
-  
-            <text macro="editor-translator" prefix=" "/>
+  
+          <group prefix=" " suffix=". " delimiter=" ">
+  
+            <text macro="title"/>
+  
+            <text macro="editor-translator"/>
          </group>
          <choose>
            <if variable="issue volume" match="any">
@@ -148,9 +148,9 @@
          </choose>
        </else-if>
        <else>
-  
-          <group suffix=". ">
-  
-            <text macro="title" prefix=" "/>
-  
-            <text macro="editor-translator" prefix=" "/>
+  
+          <group suffix=". " prefix=" " delimiter=" ">
+  
+            <text macro="title"/>
+  
+            <text macro="editor-translator"/>
          </group>
          <group delimiter=" " suffix=".">
            <text variable="container-title" font-style="italic"/>

diff --git a/journalistica.csl b/journalistica.csl
@@ -252,10 +252,10 @@
          </group>
        </else-if>
        <else>
-  
-          <group suffix=" ">
-  
-            <text macro="year-date" prefix=" (" suffix=")."/>
-  
-            <text macro="title" prefix=" '" suffix="',"/>
-  
-            <text macro="editor" prefix=" "/>
+  
+          <group suffix=" " prefix=" " delimiter=" ">
+  
+            <text macro="year-date" prefix="(" suffix=")."/>
+  
+            <text macro="title" prefix="'" suffix="',"/>
+  
+            <text macro="editor"/>
          </group>
          <group prefix=" " delimiter=" ">
            <text variable="container-title" suffix="," font-style="italic"/>

diff --git a/media-culture-and-society.csl b/media-culture-and-society.csl
@@ -196,10 +196,10 @@
          </group>
        </else-if>
        <else>
-  
-          <group suffix=" ">
-  
-            <text macro="year-date" prefix=" (" suffix=")"/>
-  
-            <text macro="title" prefix=" " suffix=","/>
-  
-            <text macro="editor" prefix=" "/>
+  
+          <group suffix=" " prefix=" " delimiter=" ">
+  
+            <text macro="year-date" prefix="(" suffix=")"/>
+  
+            <text macro="title" suffix=","/>
+  
+            <text macro="editor"/>
          </group>
          <group prefix=" " delimiter=" ">
            <text variable="container-title" suffix="," font-style="italic"/>

diff --git a/medicine-and-science-in-sports-and-exercise.csl b/medicine-and-science-in-sports-and-exercise.csl
@@ -131,7 +131,7 @@
        </if>
        <else-if type="chapter paper-conference" match="any">
          <text macro="title" suffix=". "/>
-  
-          <group prefix=" " suffix=". ">
+  
+          <group suffix=".">
            <text term="in" suffix=": " text-case="capitalize-first"/>
            <text macro="editor"/>
            <text variable="container-title" font-style="italic"/>

diff --git a/methods-in-ecology-and-evolution.csl b/methods-in-ecology-and-evolution.csl
@@ -164,9 +164,9 @@
          </group>
        </else-if>
        <else>
-  
-          <group suffix=". ">
-  
-            <text macro="title" prefix=" "/>
-  
-            <text macro="editor-translator" prefix=" "/>
+  
+          <group suffix=". " prefix=" " delimiter=" ">
+  
+            <text macro="title"/>
+  
+            <text macro="editor-translator"/>
          </group>
          <group delimiter=", " suffix=".">
            <text variable="container-title" font-style="italic"/>

diff --git a/molecular-ecology.csl b/molecular-ecology.csl
@@ -124,7 +124,7 @@
          <text macro="title" prefix=" "/>
          <group prefix=".">
            <group prefix=" In:">
-  
-              <text variable="container-title" font-style="italic" prefix=" " suffix=" "/>
+  
+              <text variable="container-title" font-style="italic" prefix=" "/>
              <text variable="collection-title" prefix=" " suffix="."/>
              <names variable="editor translator" prefix=" (" delimiter=", " suffix=")">
                <label form="short" suffix=" " strip-periods="true"/>

diff --git a/myrmecological-news.csl b/myrmecological-news.csl
@@ -150,7 +150,7 @@
        </if>
        <else-if type="chapter">
          <text macro="title" prefix=" " suffix=". "/>
-  
-          <group prefix=" " delimiter=" ">
+  
+          <group delimiter=" ">
            <text term="in" text-case="capitalize-first" suffix=": "/>
            <text macro="editor" suffix=" (Eds.): " text-case="capitalize-all"/>
            <text variable="container-title" suffix=". &#8211;"/>

diff --git a/nccr-mediality.csl b/nccr-mediality.csl
@@ -213,8 +213,10 @@
    </choose>
    <choose>
      <if variable="collection-editor">
-  
-        <text prefix=", " term="editor" form="verb-short" text-case="lowercase" suffix=". "/>
-  
-        <text prefix=" " macro="secondary-collection-contributors"/>
+  
+        <group prefix=", " delimiter=". ">
+  
+          <text term="editor" form="verb-short" text-case="lowercase"/>
+  
+          <text macro="secondary-collection-contributors"/>
+  
+        </group>
      </if>
    </choose>
  </macro>

diff --git a/nephrology-dialysis-transplantation.csl b/nephrology-dialysis-transplantation.csl
@@ -136,8 +136,10 @@
      <text macro="title" suffix=". "/>
      <choose>
        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-  
-          <text macro="edition" prefix=" " suffix=" "/>
-  
-          <text macro="publisher2" prefix=" "/>
+  
+          <group delimiter=" "  prefix=" ">
+  
+            <text macro="edition"/>
+  
+            <text macro="publisher2"/>
+  
+          </group>
        </if>
        <else-if type="chapter paper-conference" match="any">
          <group prefix=" " suffix=". ">