Merge remote-tracking branch 'upstream/main' into lucenceUpgrade

* upstream/main: Remove obsolete comments Improve key generation (#8641) Refine search code (#8636) Fix import entry by id does not generate citation key (#8361) Update Gradle Wrapper from 7.4.1 to 7.4.2. (#8637) Bump hmarr/auto-approve-action from 2.1.0 to 2.2.0 (#8638) GitBook: [#57] test Citation keygen: Return vonPart if lastName is empty (#8634) Ensure SSL truststore is present at startup (#8631) Squashed 'buildres/csl/csl-styles/' changes from 6a7b708..21e2177 (#8632) Add more tests for FieldChange Class (#8614)
JabRef · Apr 5, 2022 · 4dcb7f8 · 4dcb7f8
2 parents 8dd352f + dbf921e
commit 4dcb7f8
Show file tree

Hide file tree

Showing 85 changed files with 1,450 additions and 547 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -16,7 +16,7 @@ jobs:
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
       - name: Auto approve
-        uses: hmarr/auto-approve-action@v2.1.0
+        uses: hmarr/auto-approve-action@v2.2.0
         if: steps.waitforstatuschecks.outputs.status == 'success'
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Fixed
 
+- We fixed an issue where the author's lastname was not used for the citation key generation if it started with a lowercase letter [#8601](https://github.com/JabRef/jabref/issues/8601)
 - We fixed an issue where custom "Protected terms" files were missing after a restart of JabRef [#8608](https://github.com/JabRef/jabref/issues/8608)
 - We fixed an issue where JabRef could not start due to a missing directory for the fulltex index [#8579](https://github.com/JabRef/jabref/issues/8579)
 - We fixed an issue where long article numbers in the `pages` field would cause an exception and preventing the citation style to display [#8381](https://github.com/JabRef/jabref/issues/8381), [citeproc-java](https://github.com/michel-kraemer/citeproc-java/issues/114)
@@ -41,6 +42,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where opening the changelog from withing JabRef led to a 404 error [#8563](https://github.com/JabRef/jabref/issues/8563)
 - We fixed an issue where not all found unlinked local files were imported correctly due to some race condition. [#8444](https://github.com/JabRef/jabref/issues/8444)
 - We fixed an issue where Merge entries dialog exceeds screen boundaries.
+- We fixed an issue where no citationkey was generated on import, pasting a doi or an entry on the main table [8406](https://github.com/JabRef/jabref/issues/8406), [koppor#553](https://github.com/koppor/jabref/issues/553)
 
 ### Removed
 

diff --git a/buildres/csl/csl-styles/.github/workflows/label-gun.yml b/buildres/csl/csl-styles/.github/workflows/label-gun.yml
@@ -0,0 +1,16 @@
+name: 'Automated tagging for PRs and issues'
+
+on:
+  issues:
+    types: [opened, edited, closed]
+  issue_comment:
+    types: [created, edited, closed]
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: retorquere/label-gun@main
+        with:
+          token: ${{ github.token }}
+          label.awaiting: "waiting-for-response-from-contributor"
diff --git a/buildres/csl/csl-styles/american-journal-of-archaeology.csl b/buildres/csl/csl-styles/american-journal-of-archaeology.csl
@@ -353,7 +353,7 @@
       <key variable="issued"/>
       <key macro="contributors-short"/>
     </sort>
-    <layout delimiter="; ">
+    <layout delimiter="; " suffix=".">
       <group delimiter=", ">
         <group delimiter=" ">
           <text macro="contributors-short"/>

diff --git a/buildres/csl/csl-styles/american-medical-association-alphabetical.csl b/buildres/csl/csl-styles/american-medical-association-alphabetical.csl
@@ -27,12 +27,12 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <summary>The American Medical Association style as used in JAMA, with alphabetically sorted bibliography. Version 11 as per November-2019.</summary>
-    <updated>2021-10-28T13:38:04+00:00</updated>
+    <updated>2022-03-17T13:38:04+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">
     <terms>
-      <term name="page-range-delimiter">-</term>      
+      <term name="page-range-delimiter">-</term>
       <term name="presented at">presented at</term>
     </terms>
   </locale>
@@ -86,7 +86,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
         <text variable="title" font-style="italic" text-case="title"/>
       </if>
       <else>
@@ -252,6 +252,15 @@
             <text variable="event-place"/>
           </group>
         </else-if>
+        <else-if type="thesis" match="any">
+          <group delimiter=". " prefix=" " suffix=".">
+            <text variable="genre"/>
+            <group delimiter="; ">
+              <text variable="publisher"/>
+              <date date-parts="year" form="text" variable="issued"/>
+            </group>
+          </group>
+        </else-if>
         <else>
           <text macro="editor" prefix=" " suffix="."/>
           <group prefix=" " suffix=".">

diff --git a/buildres/csl/csl-styles/american-medical-association-brackets.csl b/buildres/csl/csl-styles/american-medical-association-brackets.csl
@@ -27,7 +27,7 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <summary>The American Medical Association style as used in JAMA. Version 11 as per November-2019.</summary>
-    <updated>2021-10-28T13:38:04+00:00</updated>
+    <updated>2022-03-17T13:38:04+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">
@@ -86,7 +86,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
         <text variable="title" font-style="italic" text-case="title"/>
       </if>
       <else>
@@ -247,6 +247,15 @@
             <text variable="event-place"/>
           </group>
         </else-if>
+        <else-if type="thesis" match="any">
+          <group delimiter=". " prefix=" " suffix=".">
+            <text variable="genre"/>
+            <group delimiter="; ">
+              <text variable="publisher"/>
+              <date date-parts="year" form="text" variable="issued"/>
+            </group>
+          </group>
+        </else-if>
         <else>
           <text macro="editor" prefix=" " suffix="."/>
           <group prefix=" " suffix=".">

diff --git a/buildres/csl/csl-styles/american-medical-association-no-et-al.csl b/buildres/csl/csl-styles/american-medical-association-no-et-al.csl
@@ -27,12 +27,12 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <summary>The American Medical Association style as used in JAMA, without et al. Version 11 as per November-2019.</summary>
-    <updated>2021-10-28T13:38:04+00:00</updated>
+    <updated>2022-03-17T13:38:04+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">
     <terms>
-      <term name="page-range-delimiter">-</term>      
+      <term name="page-range-delimiter">-</term>
       <term name="presented at">presented at</term>
     </terms>
   </locale>
@@ -86,7 +86,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
         <text variable="title" font-style="italic" text-case="title"/>
       </if>
       <else>
@@ -247,6 +247,15 @@
             <text variable="event-place"/>
           </group>
         </else-if>
+        <else-if type="thesis" match="any">
+          <group delimiter=". " prefix=" " suffix=".">
+            <text variable="genre"/>
+            <group delimiter="; ">
+              <text variable="publisher"/>
+              <date date-parts="year" form="text" variable="issued"/>
+            </group>
+          </group>
+        </else-if>
         <else>
           <text macro="editor" prefix=" " suffix="."/>
           <group prefix=" " suffix=".">

diff --git a/buildres/csl/csl-styles/american-medical-association-no-url.csl b/buildres/csl/csl-styles/american-medical-association-no-url.csl
@@ -27,12 +27,12 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <summary>The American Medical Association style as used in JAMA, without the URL. Version 11 as per November-2019.</summary>
-    <updated>2021-10-28T13:38:04+00:00</updated>
+    <updated>2022-03-17T13:38:04+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">
     <terms>
-      <term name="page-range-delimiter">-</term>      
+      <term name="page-range-delimiter">-</term>
       <term name="presented at">presented at</term>
     </terms>
   </locale>
@@ -56,7 +56,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
         <text variable="title" font-style="italic" text-case="title"/>
       </if>
       <else>
@@ -217,6 +217,15 @@
             <text variable="event-place"/>
           </group>
         </else-if>
+        <else-if type="thesis" match="any">
+          <group delimiter=". " prefix=" " suffix=".">
+            <text variable="genre"/>
+            <group delimiter="; ">
+              <text variable="publisher"/>
+              <date date-parts="year" form="text" variable="issued"/>
+            </group>
+          </group>
+        </else-if>
         <else>
           <text macro="editor" prefix=" " suffix="."/>
           <group prefix=" " suffix=".">

diff --git a/buildres/csl/csl-styles/american-medical-association.csl b/buildres/csl/csl-styles/american-medical-association.csl
@@ -27,7 +27,7 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <summary>The American Medical Association style as used in JAMA. Version 11 as per November-2019.</summary>
-    <updated>2021-10-28T13:38:04+00:00</updated>
+    <updated>2022-03-17T08:48:24+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">
@@ -86,7 +86,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
         <text variable="title" font-style="italic" text-case="title"/>
       </if>
       <else>
@@ -247,6 +247,15 @@
             <text variable="event-place"/>
           </group>
         </else-if>
+        <else-if type="thesis" match="any">
+          <group delimiter=". " prefix=" " suffix=".">
+            <text variable="genre"/>
+            <group delimiter="; ">
+              <text variable="publisher"/>
+              <date date-parts="year" form="text" variable="issued"/>
+            </group>
+          </group>
+        </else-if>
         <else>
           <text macro="editor" prefix=" " suffix="."/>
           <group prefix=" " suffix=".">

diff --git a/buildres/csl/csl-styles/archaeonautica.csl b/buildres/csl/csl-styles/archaeonautica.csl
@@ -9,7 +9,7 @@
     <link href="https://journals.openedition.org/archaeonautica/279" rel="documentation"/>
     <author>
       <name>Antonio Mendes da Silva</name>
-      <email>mendes@mmsh.univ-aix.fr</email>
+      <email>antonio.mendes@cnrs.fr</email>
     </author>
     <category citation-format="author-date"/>
     <category field="humanities"/>
@@ -18,7 +18,7 @@
     <eissn>2117-6973</eissn>
     <summary>Style conçu pour la revue Archaeonautica. L’archéologie maritime et navale de la
             préhistoire à l’époque contemporaine. Centre Camille Jullian, CNRS</summary>
-    <updated>2020-05-04T12:23:43+00:00</updated>
+    <updated>2020-05-10T04:06:42+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="fr">
@@ -346,8 +346,9 @@
     </choose>
   </macro>
   <macro name="year-date">
+    <!-- Une tabulation après la date -->
     <group suffix="&#9;">
-      <!-- Une tabulation après la date -->
+      <!-- Fin de la tabulation -->
       <choose>
         <if variable="issued">
           <date variable="issued">
@@ -462,19 +463,28 @@
       </date>
     </group>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="&amp;#160;; " name-delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" ">
+  <macro name="archive">
+    <group suffix="." prefix=". ">
+      <group delimiter=", ">
+        <text variable="archive"/>
+        <text variable="archive_location"/>
+        <text variable="call-number"/>
+      </group>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="&#160;; " name-delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" ">
     <sort>
       <key variable="issued" sort="descending"/>
       <key macro="author-citation"/>
       <key macro="title"/>
     </sort>
-    <layout delimiter="&amp;#160;; ">
-      <group delimiter=",&amp;#160;">
+    <layout delimiter="&#160;; " prefix="(" suffix=")">
+      <group delimiter=",&#160;">
         <group delimiter=" ">
           <text macro="author-citation"/>
           <text macro="year-date-short"/>
         </group>
-        <group delimiter="&amp;#160;">
+        <group delimiter="&#160;">
           <label variable="locator" form="short"/>
           <text variable="locator"/>
         </group>
@@ -500,6 +510,7 @@
         <text macro="publisher"/>
         <text macro="collection"/>
         <text macro="page-bib"/>
+        <text macro="archive"/>
       </group>
       <text macro="accessed"/>
     </layout>

diff --git a/buildres/csl/csl-styles/cardiff-university-harvard.csl b/buildres/csl/csl-styles/cardiff-university-harvard.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">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Cardiff University - Harvard</title>
@@ -86,7 +86,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song thesis patent" match="any">
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis patent webpage" match="any">
         <text variable="title" font-style="italic"/>
       </if>
       <else>