Update APA and CPoS (#2716)

For APA: Switch the priority of URL and Archive name/number for theses and reports. URL is used much more commonly in practice and both are acceptable. URL is more user-friendly. For CPoS: Add support for dictionary and encyclopedia entries.
citation-style-language · Jun 4, 2017 · 33b05cdd91e0a20fe4035979900c4abc3d81a8f3 · 33b05cd
1 parent 914266b
commit 33b05cdd91e0a20fe4035979900c4abc3d81a8f3
Unified Split

Showing with 8 additions and 8 deletions.

+6 −6 apa.csl

+2 −2 comparative-population-studies.csl
diff --git a/apa.csl b/apa.csl
@@ -141,21 +141,21 @@
          <if variable="DOI" match="any">
            <text variable="DOI" prefix="https://doi.org/"/>
          </if>
-  
-          <else-if variable="archive" match="any">
+  
+          <else-if variable="URL" match="any">
            <group>
              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
              <text term="from" suffix=" "/>
-  
-              <text variable="archive" suffix="."/>
-  
-              <text variable="archive_location" prefix=" (" suffix=")"/>
+  
+              <text variable="URL"/>
            </group>
          </else-if>
-  
-          <else>
+  
+          <else-if variable="archive" match="any">
            <group>
              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
              <text term="from" suffix=" "/>
-  
-              <text variable="URL"/>
+  
+              <text variable="archive" suffix="."/>
+  
+              <text variable="archive_location" prefix=" (" suffix=")"/>
            </group>
-  
-          </else>
+  
+          </else-if>
        </choose>
      </if>
      <else>

diff --git a/comparative-population-studies.csl b/comparative-population-studies.csl
@@ -20,7 +20,7 @@
  </info>
  <macro name="container">
    <choose>
-  
-      <if type="chapter paper-conference" match="any">
+  
+      <if type="chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
        <text term="in" text-case="capitalize-first" suffix=": "/>
        <names variable="editor translator" delimiter="; " suffix=": ">
          <name delimiter-precedes-last="always" initialize-with="." name-as-sort-order="all" font-style="italic"/>
@@ -206,7 +206,7 @@
      <text variable="publisher-place"/>
      <text variable="publisher"/>
      <choose>
-  
-        <if type="chapter paper-conference" match="any">
+  
+        <if type="chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
          <text variable="page"/>
        </if>
      </choose>