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

* upstream/main: Don't throw exception when validating invalid paths (#8112) Bump jackson-dataformat-yaml from 2.12.5 to 2.13.0 Bump jackson-datatype-jsr310 from 2.12.5 to 2.13.0 Bump byte-buddy-parent from 1.11.15 to 1.11.18 Bump classgraph from 4.8.116 to 4.8.121 Bump checkstyle from 9.0 to 9.0.1 remove iso charset, website returns utf8 for icar comp sci only returns one result fix springer fetcher Fix computer science fetcher Squashed 'buildres/csl/csl-locales/' changes from 7a507fc008..495f888637 Squashed 'buildres/csl/csl-styles/' changes from 5facb37..3b00357 Update CHANGELOG.md snap: Use lzo compression & switch to core20 base
JabRef · Oct 4, 2021 · 7bf5838 · 7bf5838
2 parents 0a07917 + bac8304
commit 7bf5838
Show file tree

Hide file tree

Showing 30 changed files with 913 additions and 173 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We moved the export order in the preferences from `File` to `Import and Export`. [#7935](https://github.com/JabRef/jabref/pull/7935)
 - We reworked the export order in the preferences and the save order in the library preferences. You can now set more than three sort criteria in your library preferences. [#7935](https://github.com/JabRef/jabref/pull/7935)
 - The metadata-to-pdf actions now also embeds the bibfile to the PDF. [#8037](https://github.com/JabRef/jabref/pull/8037)
+- The snap was updated to use the core20 base and to use lzo compression for better startup performance [#8109](https://github.com/JabRef/jabref/pull/8109)
 
 ### Fixed
 
@@ -43,6 +44,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where it was impossible to add or modify groups. [#7912](https://github.com/JabRef/jabref/pull/793://github.com/JabRef/jabref/pull/7921)
 - We fixed an issue where exported entries from a Citavi bib containing URLs could not be imported [#7892](https://github.com/JabRef/jabref/issues/7882)
 - We fixed an issue where the icons in the search bar had the same color, toggled as well as untoggled. [#8014](https://github.com/JabRef/jabref/pull/8014)
+- We fixed an issue where typing an invalid UNC path into the "Main file directory" text field caused an error. [#8107](https://github.com/JabRef/jabref/issues/8107)
 
 ### Removed
 

diff --git a/build.gradle b/build.gradle
@@ -144,8 +144,8 @@ dependencies {
 
     implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5.13.0.202109080827-r'
 
-    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.12.5'
-    implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.12.5'
+    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.0'
+    implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.13.0'
 
     implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.4'
 
@@ -207,11 +207,11 @@ dependencies {
 
     implementation group: 'net.harawata', name: 'appdirs', version: '1.2.1'
 
-    testImplementation 'io.github.classgraph:classgraph:4.8.116'
+    testImplementation 'io.github.classgraph:classgraph:4.8.121'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
     testImplementation 'org.junit.platform:junit-platform-launcher:1.8.1'
 
-    testImplementation 'net.bytebuddy:byte-buddy-parent:1.11.15'
+    testImplementation 'net.bytebuddy:byte-buddy-parent:1.11.18'
     testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
     testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '3.0.0-SNAPSHOT'
     testImplementation 'org.mockito:mockito-core:3.12.4'
@@ -223,7 +223,7 @@ dependencies {
     testImplementation "org.testfx:testfx-junit5:4.0.17-alpha-SNAPSHOT"
     testImplementation "org.hamcrest:hamcrest-library:2.2"
 
-    checkstyle 'com.puppycrawl.tools:checkstyle:9.0'
+    checkstyle 'com.puppycrawl.tools:checkstyle:9.0.1'
     xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '2.3.3'
 }
 

diff --git a/buildres/csl/csl-locales/Gemfile.lock b/buildres/csl/csl-locales/Gemfile.lock
@@ -20,7 +20,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     citeproc (1.0.10)
       namae (~> 1.0)
@@ -47,11 +47,11 @@ GEM
       ruby-progressbar (~> 1.4)
     git_diff (0.4.3)
     hashdiff (0.3.7)
-    mini_portile2 (2.5.0)
+    mini_portile2 (2.6.1)
     multipart-post (2.1.1)
     namae (1.0.2)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     octokit (4.20.0)
       faraday (>= 0.9)

diff --git a/...ff-university-biosi-and-carbs-harvard.csl → ...csl-styles/cardiff-university-harvard.csl b/...ff-university-biosi-and-carbs-harvard.csl → ...csl-styles/cardiff-university-harvard.csl
@@ -2,11 +2,11 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
-    <title>Cardiff University BIOSI and CARBS - Harvard</title>
-    <id>http://www.zotero.org/styles/cardiff-university-biosi-and-carbs-harvard</id>
-    <link href="http://www.zotero.org/styles/cardiff-university-biosi-and-carbs-harvard" rel="self"/>
-    <link href="https://xerte.cardiff.ac.uk/play_12072" rel="documentation"/>
-    <link href="https://xerte.cardiff.ac.uk/play_10324" rel="documentation"/>
+    <title>Cardiff University - Harvard</title>
+    <id>http://www.zotero.org/styles/cardiff-university-harvard</id>
+    <link href="http://www.zotero.org/styles/cardiff-university-harvard" rel="self"/>
+    <link href="https://xerte.cardiff.ac.uk/play_4191" rel="documentation"/>
+    <link href="https://xerte.cardiff.ac.uk/play_4069" rel="documentation"/>
     <link href="https://github.com/citation-style-language/styles/pull/3676#issuecomment-420542651" rel="documentation"/>
     <author>
       <name>Zoe Young</name>

diff --git a/buildres/csl/csl-styles/chicago-author-date.csl b/buildres/csl/csl-styles/chicago-author-date.csl
@@ -526,7 +526,7 @@
   </macro>
   <macro name="description">
     <choose>
-      <if type="interview">
+      <if variable="interviewer" type="interview" match="any">
         <group delimiter=". ">
           <text macro="interviewer"/>
           <text variable="medium" text-case="capitalize-first"/>

diff --git a/buildres/csl/csl-styles/database.csl b/buildres/csl/csl-styles/database.csl
@@ -25,8 +25,12 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name and="text" delimiter-precedes-last="never" et-al-min="4" et-al-use-first="3" initialize-with=". " name-as-sort-order="all"/>
+      <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
       <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title"/>
+      </substitute>
     </names>
   </macro>
   <macro name="publisher">

diff --git a/buildres/csl/csl-styles/demographic-research.csl b/buildres/csl/csl-styles/demographic-research.csl
@@ -4,7 +4,7 @@
     <title>Demographic Research</title>
     <id>http://www.zotero.org/styles/demographic-research</id>
     <link href="http://www.zotero.org/styles/demographic-research" rel="self"/>
-    <link href="http://www.zotero.org/styles/cardiff-university-biosi-and-carbs-harvard" rel="template"/>
+    <link href="http://www.zotero.org/styles/cardiff-university-harvard" rel="template"/>
     <link href="http://www.demographic-research.org/files/demographic_research_reference_guidelines.pdf" rel="documentation"/>
     <author>
       <name>Ilya Kashnitsky</name>

diff --git a/buildres/csl/csl-styles/dependent/human-molecular-genetics.csl b/buildres/csl/csl-styles/dependent/human-molecular-genetics.csl
diff --git a/buildres/csl/csl-styles/dependent/international-studies-quarterly.csl b/buildres/csl/csl-styles/dependent/international-studies-quarterly.csl
@@ -4,8 +4,8 @@
     <title>International Studies Quarterly</title>
     <id>http://www.zotero.org/styles/international-studies-quarterly</id>
     <link href="http://www.zotero.org/styles/international-studies-quarterly" rel="self"/>
-    <link href="http://www.zotero.org/styles/international-studies-association" rel="independent-parent"/>
-    <link href="http://onlinelibrary.wiley.com/journal/10.1111/%28ISSN%291468-2478/homepage/ForAuthors.html" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/chicago-author-date" rel="independent-parent"/>
+    <link href="https://academic.oup.com/isq/pages/general_instructions" rel="documentation"/>
     <category citation-format="author-date"/>
     <category field="political_science"/>
     <issn>1468-2478</issn>

diff --git a/buildres/csl/csl-styles/dependent/prifysgol-caerdydd-harvard.csl b/buildres/csl/csl-styles/dependent/prifysgol-caerdydd-harvard.csl
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="cy-GB">
   <info>
-    <title>Prifysgol Caerdydd - Harvard (Cymraeg)</title>
+    <title>Prifysgol Caerdydd - hen Harvard (Cymraeg)</title>
     <id>http://www.zotero.org/styles/prifysgol-caerdydd-harvard</id>
     <link href="http://www.zotero.org/styles/prifysgol-caerdydd-harvard" rel="self"/>
-    <link href="http://www.zotero.org/styles/harvard-cardiff-university" rel="independent-parent"/>
-    <link href="https://xerte.cardiff.ac.uk/play_4069" rel="documentation"/>
-    <link href="https://xerte.cardiff.ac.uk/play_5253" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/harvard-cardiff-university-old" rel="independent-parent"/>
     <link href="https://github.com/citation-style-language/styles/pull/3676#issuecomment-420542651" rel="documentation"/>
     <author>
       <name>Zoe Young</name>

diff --git a/...csl-styles/harvard-cardiff-university.csl → ...styles/harvard-cardiff-university-old.csl b/...csl-styles/harvard-cardiff-university.csl → ...styles/harvard-cardiff-university-old.csl
@@ -1,13 +1,11 @@
 <?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">
   <info>
-    <title>Cardiff University - Harvard</title>
-    <id>http://www.zotero.org/styles/harvard-cardiff-university</id>
-    <link href="http://www.zotero.org/styles/harvard-cardiff-university" rel="self"/>
-    <link href="https://xerte.cardiff.ac.uk/play_4069" rel="documentation"/>
-    <link href="https://xerte.cardiff.ac.uk/play_4191" rel="documentation"/>
+    <title>Cardiff University - (old) Harvard</title>
+    <id>http://www.zotero.org/styles/harvard-cardiff-university-old</id>
+    <link href="http://www.zotero.org/styles/harvard-cardiff-university-old" rel="self"/>
     <link href="https://github.com/citation-style-language/styles/pull/3676#issuecomment-420542651" rel="documentation"/>
-    <author>
+      <author>
       <name>Zoe Young</name>
       <email>youngz@cardiff.ac.uk</email>
     </author>

diff --git a/buildres/csl/csl-styles/harvard-swinburne-university-of-technology.csl b/buildres/csl/csl-styles/harvard-swinburne-university-of-technology.csl
@@ -1,31 +1,49 @@
 <?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">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="symbol" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <info>
     <title>Swinburne University of Technology - Harvard</title>
+    <title-short>Swinburne Harvard</title-short>
     <id>http://www.zotero.org/styles/harvard-swinburne-university-of-technology</id>
     <link href="http://www.zotero.org/styles/harvard-swinburne-university-of-technology" rel="self"/>
-    <!--<link href="http://www.lib.monash.edu.au/tutorials/citing/harvard.html" rel="documentation"/>
-    If the same style is used by Monash University, it should get a dependent style pointing to this one -->
-    <link href="http://www.swinburne.edu.au/lib/researchhelp/harvard_system.htm" rel="documentation"/>
+    <link href="https://www.swinburne.edu.au/library/search/referencing-guides/harvard-style-guide/" rel="documentation"/>
     <author>
       <name>Julian Onions</name>
       <email>julian.onions@gmail.com</email>
     </author>
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
+    <contributor>
+      <name>Kiran Castellino</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <summary>The Australian version of the Harvard author-date style</summary>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <summary>The version of the Harvard author-date style used by Swinburne University of Technology, Australia</summary>
+    <updated>2021-08-28T11:17:24+10: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-GB">
     <terms>
+      <term name="accessed">viewed</term>
+      <term name="anonymous" form="short">Anon</term>
+      <term name="edition" form="short">edn</term>
       <term name="editor" form="short">
         <single>ed.</single>
         <multiple>eds</multiple>
       </term>
+      <term name="chapter" form="short">
+        <single>ch.</single>
+        <multiple>chs</multiple>
+      </term>
+      <term name="issue" form="short">
+        <single>no.</single>
+        <multiple>nos</multiple>
+      </term>
+      <term name="section" form="short">
+        <single>s.</single>
+        <multiple>ss.</multiple>
+      </term>
+      <term name="translator" form="verb-short">trans.</term>
     </terms>
   </locale>
   <macro name="editor">
@@ -41,36 +59,40 @@
       </names>
     </group>
   </macro>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
+  <macro name="translator">
+    <group delimiter=" ">
+      <text term="translator" form="verb-short"/>
+      <names variable="translator" delimiter=", " suffix=",">
+        <name and="symbol" initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
+      </names>
+    </group>
   </macro>
   <macro name="author">
     <names variable="author">
       <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
       <label form="short" prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor"/>
-        <text macro="anon"/>
+        <text macro="title"/>
       </substitute>
     </names>
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="symbol" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
+      <name form="short" and="symbol" delimiter=", " delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all"/>
       <substitute>
         <names variable="editor"/>
-        <names variable="translator"/>
-        <text macro="anon"/>
+        <text variable="title" font-style="italic"/>
       </substitute>
     </names>
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
-        <text variable="title" font-style="italic"/>
+      <if variable="container-title">
+        <text variable="title" quotes="true"/>
       </if>
       <else>
-        <text variable="title" quotes="true"/>
+        <text variable="title" font-style="italic"/>
       </else>
     </choose>
   </macro>
@@ -83,9 +105,12 @@
   <macro name="year-date">
     <choose>
       <if variable="issued">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
+        <choose>
+          <if is-uncertain-date="issued">
+            <text term="circa" form="short" suffix=" "/>
+          </if>
+        </choose>
+        <date variable="issued" form="text" date-parts="year"/>
       </if>
       <else>
         <text term="no date" form="short"/>
@@ -130,33 +155,33 @@
   <macro name="access">
     <choose>
       <if variable="URL">
-        <text value="viewed"/>
+        <text term="accessed"/>
         <group prefix=" " delimiter=", ">
-          <date variable="accessed" delimiter=" ">
-            <date-part name="day"/>
-            <date-part name="month" suffix=","/>
-            <date-part name="year"/>
-          </date>
+          <date variable="accessed" form="text"/>
           <text variable="URL" prefix="&lt;" suffix="&gt;"/>
         </group>
       </if>
     </choose>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="by-cite">
+    <sort>
+      <key macro="author-short"/>
+      <key macro="year-date"/>
+    </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <group delimiter=" ">
           <text macro="author-short"/>
           <text macro="year-date"/>
         </group>
         <group delimiter=" ">
-          <label variable="locator" plural="never" form="short"/>
+          <label variable="locator" form="short"/>
           <text variable="locator"/>
         </group>
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true">
+  <bibliography hanging-indent="false">
     <sort>
       <key macro="author"/>
       <key variable="title"/>
@@ -168,10 +193,9 @@
           <text macro="year-date"/>
         </group>
         <text macro="title"/>
-        <group delimiter=" ">
-          <text macro="editor"/>
-          <text variable="container-title" font-style="italic"/>
-        </group>
+        <text macro="translator"/>
+        <text macro="editor"/>
+        <text variable="container-title" font-style="italic"/>
         <text macro="locators-journal"/>
         <text macro="edition"/>
         <text variable="genre"/>

diff --git a/buildres/csl/csl-styles/harvard-university-of-kent.csl b/buildres/csl/csl-styles/harvard-university-of-kent.csl
@@ -4,7 +4,7 @@
     <title>University of Kent - Harvard</title>
     <id>http://www.zotero.org/styles/harvard-university-of-kent</id>
     <link href="http://www.zotero.org/styles/harvard-university-of-kent" rel="self"/>
-    <link href="http://www.zotero.org/styles/cardiff-university-biosi-and-carbs-harvard" rel="template"/>
+    <link href="http://www.zotero.org/styles/cardiff-university-harvard" rel="template"/>
     <link href="http://www.kent.ac.uk/ai/Harvard-Style-Guide-July-2014.pdf" rel="documentation"/>
     <author>
       <name>Sebastian Karcher</name>