Squashed 'buildres/csl/csl-styles/' changes from c750b6e..b9302fd

b9302fd Update APA styles for "event" macro (#6174) d4daec6 remove DOI for printed articles organizational-studies.csl (#6176) acfc620 Create liver-transplantation.csl (#6167) 129a775 Change "event" to "event-title" (#6164) git-subtree-dir: buildres/csl/csl-styles git-subtree-split: b9302fd
JabRef · Aug 15, 2022 · ad89062 · ad89062
1 parent 871c8d7
commit ad89062
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 17 deletions.
diff --git a/apa-6th-edition-no-ampersand.csl b/apa-6th-edition-no-ampersand.csl
@@ -897,7 +897,7 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>

diff --git a/apa-6th-edition.csl b/apa-6th-edition.csl
@@ -896,7 +896,7 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>

diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
@@ -1552,7 +1552,7 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>

diff --git a/apa-cv.csl b/apa-cv.csl
@@ -1299,7 +1299,7 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>

diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
@@ -1552,7 +1552,7 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>

diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl
@@ -903,7 +903,7 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>

diff --git a/apa-no-initials.csl b/apa-no-initials.csl
@@ -1552,7 +1552,7 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>

diff --git a/apa-numeric-superscript-brackets.csl b/apa-numeric-superscript-brackets.csl
@@ -1355,7 +1355,7 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>

diff --git a/apa-numeric-superscript.csl b/apa-numeric-superscript.csl
@@ -1355,7 +1355,7 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>

diff --git a/apa-old-doi-prefix.csl b/apa-old-doi-prefix.csl
@@ -897,7 +897,7 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>

diff --git a/apa-single-spaced.csl b/apa-single-spaced.csl
@@ -1552,7 +1552,7 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>

diff --git a/apa-with-abstract.csl b/apa-with-abstract.csl
@@ -1552,7 +1552,7 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>

diff --git a/apa.csl b/apa.csl
@@ -1553,7 +1553,7 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>

diff --git a/dependent/liver-transplantation.csl b/dependent/liver-transplantation.csl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <info>
+    <title>Liver Transplantation</title>
+    <id>http://www.zotero.org/styles/liver-transplantation</id>
+    <link href="http://www.zotero.org/styles/liver-transplantation" rel="self"/>
+    <link href="http://www.zotero.org/styles/vancouver" rel="independent-parent"/>
+    <link href="https://aasldpubs.onlinelibrary.wiley.com/hub/journal/15276473/about/author-guidelines" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1527-6473</issn>
+    <issn>1527-6465</issn>
+    <updated>2022-08-03T21:58:08+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>
+</style>
diff --git a/food-and-agriculture-organization-of-the-united-nations.csl b/food-and-agriculture-organization-of-the-united-nations.csl
@@ -31,7 +31,7 @@
     <category field="science"/>
     <category field="social_science"/>
     <summary>This style is created to meet the citation and bibliographical requirements of FAOSTYLE, and has been tested with Zotero and Mendeley. Last update: February 2022.</summary>
-    <updated>2022-02-02T16:03:38+00:00</updated>
+    <updated>2022-08-02T08:28:31+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 settings for English. Settings for other languages could be added later to this section. -->
@@ -180,6 +180,20 @@
       </else>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <!-- in-line citation: (author, date) -->
   <citation disambiguate-add-year-suffix="true" collapse="year" et-al-min="4" et-al-use-first="1">
     <sort>
@@ -298,7 +312,7 @@
                 <text variable="title"/>
                 <group delimiter=" ">
                   <text term="presented at"/>
-                  <text variable="event" suffix=","/>
+                  <text macro="event-title" suffix=","/>
                   <date form="text" variable="issued" suffix=","/>
                   <text macro="publisher-and-place"/>
                 </group>
@@ -310,7 +324,7 @@
                 <text macro="in-and-container"/>
                 <text variable="collection-title"/>
                 <group delimiter=", " suffix=".">
-                  <text variable="event"/>
+                  <text macro="event-title"/>
                   <text variable="publisher-place"/>
                   <text variable="publisher"/>
                   <!-- Not using macro "publisher-and-place" here because event date needs to be appended and the suffix "." of the macro would appear. -->

diff --git a/organization-studies.csl b/organization-studies.csl
@@ -1173,7 +1173,11 @@
   <macro name="access">
     <choose>
       <if variable="DOI" match="any">
-        <text variable="DOI" prefix="https://doi.org/"/>
+        <choose>
+          <if match="none" variable="volume page">
+            <text variable="DOI" prefix="https://doi.org/"/>
+          </if>
+        </choose>
       </if>
       <else-if variable="URL">
         <group delimiter=" ">