Update iforest.csl (#3872)

citation-style-language · Jan 11, 2019 · 7cc0ddf268ae502e9b8e8c3f64e226677427590c · 7cc0ddf
1 parent 3089bd8
commit 7cc0ddf268ae502e9b8e8c3f64e226677427590c
Unified Split

Showing with 17 additions and 34 deletions.

+17 −34 iforest.csl
diff --git a/iforest.csl b/iforest.csl
@@ -13,7 +13,7 @@
    <category citation-format="author-date"/>
    <category field="science"/>
    <issn>1971-7458</issn>
-  
-    <updated>2017-04-18T16:14:11+00:00</updated>
+  
+    <updated>2019-01-11T12:27:38+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">
@@ -107,7 +107,7 @@
            </choose>
          </else-if>
          <else>
-  
-            <text variable="title" form="short" quotes="true"/>
+  
+            <text variable="title" form="short" quotes="false"/>
          </else>
        </choose>
      </substitute>
@@ -170,14 +170,7 @@
  <macro name="title">
    <choose>
      <if type="book graphic manuscript motion_picture report song speech thesis" match="any">
-  
-        <choose>
-  
-          <if variable="version" type="book" match="all">
-  
-            <text variable="title"/>
-  
-          </if>
-  
-          <else>
-  
-            <text variable="title" font-style="normal"/>
-  
-          </else>
-  
-        </choose>
+  
+        <text variable="title"/>
      </if>
      <else-if variable="reviewed-author">
        <choose>
@@ -213,7 +206,7 @@
    <text macro="title"/>
    <choose>
      <if type="report thesis" match="any">
-  
-        <group prefix=" (" suffix=")" delimiter=", ">
+  
+        <group delimiter=", " prefix=" ">
          <group delimiter=" ">
            <choose>
              <if variable="genre" match="any">
@@ -257,9 +250,9 @@
  <macro name="publisher">
    <choose>
      <if type="report" match="any">
-  
-        <group delimiter=": ">
-  
-          <text variable="publisher-place"/>
+  
+        <group delimiter=", ">
          <text variable="publisher"/>
+  
+          <text variable="publisher-place"/>
        </group>
      </if>
      <else-if type="thesis" match="any">
@@ -277,7 +270,8 @@
          </choose>
          <choose>
            <if type="article-journal article-magazine" match="none">
-  
-              <group delimiter=": ">
+  
+              <group delimiter=", ">
+  
+                <text variable="publisher"/>
                <choose>
                  <if variable="publisher-place">
                    <text variable="publisher-place"/>
@@ -286,7 +280,6 @@
                    <text variable="event-place"/>
                  </else>
                </choose>
-  
-                <text variable="publisher"/>
              </group>
            </if>
          </choose>
@@ -457,20 +450,10 @@
              </group>
            </else>
          </choose>
-  
-          <choose>
-  
-            <if type="book thesis" match="any">
-  
-              <group delimiter=" ">
-  
-                <label plural="always" variable="page" form="short"/>
-  
-                <text variable="number-of-pages"/>
-  
-              </group>
-  
-            </if>
-  
-            <else>
-  
-              <group>
-  
-                <label variable="page" form="short" suffix=" "/>
-  
-                <text variable="page"/>
-  
-              </group>
-  
-            </else>
-  
-          </choose>
+  
+          <group delimiter=" ">
+  
+            <text term="page" plural="true" form="short"/>
+  
+            <text variable="number-of-pages"/>
+  
+          </group>
        </group>
      </else-if>
      <else-if type="legal_case">
@@ -517,8 +500,8 @@
          </choose>
          <group delimiter=" ">
            <text macro="secondary-contributors"/>
-  
-            <text macro="container-title" quotes="true"/>
-  
-            <text macro="container-contributors" quotes="false" prefix="(" suffix=")"/>
+  
+            <text macro="container-title" quotes="false"/>
+  
+            <text macro="container-contributors" prefix="(" suffix=")"/>
          </group>
        </group>
      </if>
@@ -530,7 +513,7 @@
        <text variable="container-title" text-case="title"/>
      </if>
      <else-if type="bill legal_case legislation" match="none">
-  
-        <text variable="container-title" font-style="italic"/>
+  
+        <text variable="container-title"/>
      </else-if>
    </choose>
  </macro>
@@ -592,12 +575,12 @@
      </if>
    </choose>
  </macro>
-  
-  <citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="primary-name" collapse="year">
+  
+  <citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="primary-name">
    <sort>
      <key macro="issued-sort"/>
      <key macro="author"/>
    </sort>
-  
-    <layout prefix="(" suffix=")" delimiter="; ">
+  
+    <layout delimiter=", " prefix="(" suffix=")">
      <group delimiter=" ">
        <text macro="author-short"/>
        <text macro="issued-year"/>