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

) 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 Co-authored-by: github actions <jabrefmail+webfeedback@gmail.com>
JabRef · Aug 15, 2022 · e59398a · e59398a
1 parent 4e6e033
commit e59398a
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 14 deletions.
diff --git a/buildres/csl/csl-styles/apa-6th-edition-no-ampersand.csl b/buildres/csl/csl-styles/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/buildres/csl/csl-styles/apa-6th-edition.csl b/buildres/csl/csl-styles/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/buildres/csl/csl-styles/apa-annotated-bibliography.csl b/buildres/csl/csl-styles/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/buildres/csl/csl-styles/apa-cv.csl b/buildres/csl/csl-styles/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/buildres/csl/csl-styles/apa-no-ampersand.csl b/buildres/csl/csl-styles/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/buildres/csl/csl-styles/apa-no-doi-no-issue.csl b/buildres/csl/csl-styles/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/buildres/csl/csl-styles/apa-no-initials.csl b/buildres/csl/csl-styles/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/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl b/buildres/csl/csl-styles/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/buildres/csl/csl-styles/apa-numeric-superscript.csl b/buildres/csl/csl-styles/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/buildres/csl/csl-styles/apa-old-doi-prefix.csl b/buildres/csl/csl-styles/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/buildres/csl/csl-styles/apa-single-spaced.csl b/buildres/csl/csl-styles/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/buildres/csl/csl-styles/apa-with-abstract.csl b/buildres/csl/csl-styles/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/buildres/csl/csl-styles/apa.csl b/buildres/csl/csl-styles/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/buildres/csl/csl-styles/organization-studies.csl b/buildres/csl/csl-styles/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=" ">