Squashed 'buildres/csl/csl-styles/' changes from 7bde3e4..4eee79a

4eee79a Fix director not showing in MHRAs (#6271) 20c4b5e Update the-journal-of-pain.csl (#6202) 6ba269f Added missing book volume in short-title-note (#6262) 1a11c0f Update harvard-stellenbosch-university.csl (#6256) 6b598e7 Update karstenia.csl (#6242) 38bc5fe APA: Swap priority for periodical page and number (#6255) git-subtree-dir: buildres/csl/csl-styles git-subtree-split: 4eee79a
JabRef · Oct 15, 2022 · 7c9262b · 7c9262b
1 parent 7486037
commit 7c9262b
Show file tree

Hide file tree

Showing 15 changed files with 93 additions and 54 deletions.
diff --git a/amsterdam-university-press-academic.csl b/amsterdam-university-press-academic.csl
@@ -15,7 +15,7 @@
     <category citation-format="note"/>
     <category field="generic-base"/>
     <summary>AUP format with full notes and bibliography</summary>
-    <updated>2020-04-12T17:07:57+00:00</updated>
+    <updated>2022-10-07T12:18:32+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">
@@ -95,6 +95,9 @@
           <text term="version" form="short"/>
           <text variable="version" form="short"/>
         </group>
+        <group prefix=", ">
+          <text variable="volume" form="short"/>
+        </group>
       </else-if>
       <else-if type="legal_case interview" match="any">
         <text variable="title" form="short"/>

diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
@@ -1425,13 +1425,16 @@
           </else>
         </choose>
         <choose>
-          <if variable="page">
-            <text variable="page"/>
-          </if>
-          <else>
+          <if variable="number">
             <!-- Ex. 6: Journal article with article number or eLocator -->
             <!-- This should be localized -->
-            <text variable="number" prefix="Article "/>
+            <group delimiter=" ">
+              <text term="article-locator" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </if>
+          <else>
+            <text variable="page"/>
           </else>
         </choose>
       </group>

diff --git a/apa-cv.csl b/apa-cv.csl
@@ -1172,13 +1172,16 @@
           </else>
         </choose>
         <choose>
-          <if variable="page">
-            <text variable="page"/>
-          </if>
-          <else>
+          <if variable="number">
             <!-- Ex. 6: Journal article with article number or eLocator -->
             <!-- This should be localized -->
-            <text variable="number" prefix="Article "/>
+            <group delimiter=" ">
+              <text term="article-locator" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </if>
+          <else>
+            <text variable="page"/>
           </else>
         </choose>
       </group>

diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
@@ -1425,13 +1425,16 @@
           </else>
         </choose>
         <choose>
-          <if variable="page">
-            <text variable="page"/>
-          </if>
-          <else>
+          <if variable="number">
             <!-- Ex. 6: Journal article with article number or eLocator -->
             <!-- This should be localized -->
-            <text variable="number" prefix="Article "/>
+            <group delimiter=" ">
+              <text term="article-locator" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </if>
+          <else>
+            <text variable="page"/>
           </else>
         </choose>
       </group>

diff --git a/apa-no-initials.csl b/apa-no-initials.csl
@@ -1425,13 +1425,16 @@
           </else>
         </choose>
         <choose>
-          <if variable="page">
-            <text variable="page"/>
-          </if>
-          <else>
+          <if variable="number">
             <!-- Ex. 6: Journal article with article number or eLocator -->
             <!-- This should be localized -->
-            <text variable="number" prefix="Article "/>
+            <group delimiter=" ">
+              <text term="article-locator" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </if>
+          <else>
+            <text variable="page"/>
           </else>
         </choose>
       </group>

diff --git a/apa-numeric-superscript-brackets.csl b/apa-numeric-superscript-brackets.csl
@@ -1228,13 +1228,16 @@
           </else>
         </choose>
         <choose>
-          <if variable="page">
-            <text variable="page"/>
-          </if>
-          <else>
+          <if variable="number">
             <!-- Ex. 6: Journal article with article number or eLocator -->
             <!-- This should be localized -->
-            <text variable="number" prefix="Article "/>
+            <group delimiter=" ">
+              <text term="article-locator" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </if>
+          <else>
+            <text variable="page"/>
           </else>
         </choose>
       </group>

diff --git a/apa-numeric-superscript.csl b/apa-numeric-superscript.csl
@@ -1228,13 +1228,16 @@
           </else>
         </choose>
         <choose>
-          <if variable="page">
-            <text variable="page"/>
-          </if>
-          <else>
+          <if variable="number">
             <!-- Ex. 6: Journal article with article number or eLocator -->
             <!-- This should be localized -->
-            <text variable="number" prefix="Article "/>
+            <group delimiter=" ">
+              <text term="article-locator" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </if>
+          <else>
+            <text variable="page"/>
           </else>
         </choose>
       </group>

diff --git a/apa-single-spaced.csl b/apa-single-spaced.csl
@@ -1425,13 +1425,16 @@
           </else>
         </choose>
         <choose>
-          <if variable="page">
-            <text variable="page"/>
-          </if>
-          <else>
+          <if variable="number">
             <!-- Ex. 6: Journal article with article number or eLocator -->
             <!-- This should be localized -->
-            <text variable="number" prefix="Article "/>
+            <group delimiter=" ">
+              <text term="article-locator" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </if>
+          <else>
+            <text variable="page"/>
           </else>
         </choose>
       </group>

diff --git a/apa-with-abstract.csl b/apa-with-abstract.csl
@@ -1425,13 +1425,16 @@
           </else>
         </choose>
         <choose>
-          <if variable="page">
-            <text variable="page"/>
-          </if>
-          <else>
+          <if variable="number">
             <!-- Ex. 6: Journal article with article number or eLocator -->
             <!-- This should be localized -->
-            <text variable="number" prefix="Article "/>
+            <group delimiter=" ">
+              <text term="article-locator" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </if>
+          <else>
+            <text variable="page"/>
           </else>
         </choose>
       </group>

diff --git a/apa.csl b/apa.csl
@@ -1426,13 +1426,16 @@
           </else>
         </choose>
         <choose>
-          <if variable="page">
-            <text variable="page"/>
-          </if>
-          <else>
+          <if variable="number">
             <!-- Ex. 6: Journal article with article number or eLocator -->
             <!-- This should be localized -->
-            <text variable="number" prefix="Article "/>
+            <group delimiter=" ">
+              <text term="article-locator" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </if>
+          <else>
+            <text variable="page"/>
           </else>
         </choose>
       </group>

diff --git a/harvard-stellenbosch-university.csl b/harvard-stellenbosch-university.csl
@@ -307,6 +307,16 @@
             </group>
             <text macro="publisher"/>
           </else-if>
+          <else-if type="article" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=" ">
+                <text variable="genre"/>
+                <text variable="number"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
         </choose>
         <text macro="access"/>
       </group>

diff --git a/karstenia.csl b/karstenia.csl
@@ -120,7 +120,7 @@
           </date>
         </group>
         <choose>
-          <if type="book thesis">
+          <if type="book thesis" match="any">
             <group delimiter=". ">
               <text macro="title"/>
               <text macro="edition"/>

diff --git a/modern-humanities-research-association-author-date.csl b/modern-humanities-research-association-author-date.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB" page-range-format="chicago">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="chicago" default-locale="en-GB">
   <info>
     <title>Modern Humanities Research Association 3rd edition (author-date)</title>
     <title-short>MHRA</title-short>
@@ -67,7 +67,7 @@
     </choose>
   </macro>
   <macro name="editor-translator">
-    <names variable="editor translator" delimiter=", ">
+    <names variable="editor translator director" delimiter=", ">
       <label form="verb-short" suffix=" "/>
       <name and="text" delimiter=", "/>
     </names>

diff --git a/modern-humanities-research-association.csl b/modern-humanities-research-association.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB" page-range-format="chicago">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="chicago" default-locale="en-GB">
   <info>
     <title>Modern Humanities Research Association 3rd edition (note with bibliography)</title>
     <title-short>MHRA</title-short>
@@ -140,7 +140,7 @@
           </if>
         </choose>
       </group>
-      <names variable="editor translator" delimiter=", ">
+      <names variable="editor translator director" delimiter=", ">
         <label form="verb-short" text-case="lowercase" suffix=" "/>
         <name and="text" delimiter=", "/>
       </names>

diff --git a/the-journal-of-pain.csl b/the-journal-of-pain.csl
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="minimal" default-locale="en-US">
-  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="minimal" default-locale="en-US">
   <info>
     <title>The Journal of Pain</title>
     <title-short>J Pain</title-short>
@@ -17,7 +16,7 @@
     <category field="medicine"/>
     <issn>1526-5900</issn>
     <eissn>1528-8447</eissn>
-    <updated>2013-02-15T11:55:10+00:00</updated>
+    <updated>2022-08-31T11:55:10+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">