Merge remote-tracking branch 'upstream/main' into a4-ds-t2

syncing local fork

i

CHANGELOG.md

@@ -35,9 +35,13 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We improved the linking of the `python3` interpreter via the shebang to dynamically use the systems default Python. Related to [JabRef-Browser-Extension #177](https://github.com/JabRef/JabRef-Browser-Extension/issues/177)
 - Automatically found pdf files now have the linking button to the far left and uses a link icon with a plus instead of a briefcase. The file name also has lowered opacity(70%) until added. [#3607](https://github.com/JabRef/jabref/issues/3607)
 - We simplified the select entry type form by splitting it into two parts ("Recommended" and "Others") based on internal usage data. [#6730](https://github.com/JabRef/jabref/issues/6730)
+- The export to MS Office XML now uses the month name for the field `Month` instead of the two digit number [forum#2685](https://discourse.jabref.org/t/export-month-as-text-not-number/2685)
 
 ### Fixed
 
+- We fixed an issue where getting bibliograhpic data from DOI or another identifer did not respect the library mode (BibTeX/biblatex)[#1018](https://github.com/JabRef/jabref/issues/6267)
+- We fixed an issue where importing entries would not respect the library mode (BibTeX/biblatex)[#1018](https://github.com/JabRef/jabref/issues/1018)
+- We fixed an issue where an exception occured when importing entries from a web search [#7606](https://github.com/JabRef/jabref/issues/7606)
 - We fixed an issue where the table column sort order was not properly stored and resulted in unsorted eports [#7524](https://github.com/JabRef/jabref/issues/7524)
 - We fixed an issue where the value of the field `school` or `institution` would be printed twice in the HTML Export [forum#2634](https://discourse.jabref.org/t/problem-with-exporting-techreport-phdthesis-mastersthesis-to-html/2634)
 - We fixed an issue preventing to connect to a shared database. [#7570](https://github.com/JabRef/jabref/pull/7570)

README.md

@@ -46,7 +46,7 @@ It supports you in every step of your research work.
 
 ## Installation
 
-Fresh development builds are available at [builds.jabref.org](https://builds.jabref.org/master/).
+Fresh development builds are available at [builds.jabref.org](https://builds.jabref.org/main/).
 The [latest stable release is available at FossHub](https://downloads.jabref.org/).
 
 Please see our [Installation Guide](https://docs.jabref.org/installation).

build.gradle

@@ -118,7 +118,7 @@ dependencies {
     implementation 'org.libreoffice:libreoffice:7.1.2'
     implementation 'org.libreoffice:unoloader:7.1.2'
 
-    implementation 'io.github.java-diff-utils:java-diff-utils:4.9'
+    implementation 'io.github.java-diff-utils:java-diff-utils:4.10'
     implementation 'info.debatty:java-string-similarity:2.0.0'
 
     antlr3 'org.antlr:antlr:3.5.2'
@@ -196,7 +196,7 @@ dependencies {
     implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.62.2'
     implementation 'com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.62.2'
 
-    testImplementation 'io.github.classgraph:classgraph:4.8.104'
+    testImplementation 'io.github.classgraph:classgraph:4.8.105'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.7.1'
     testImplementation 'org.junit.platform:junit-platform-launcher:1.7.1'
@@ -278,7 +278,8 @@ processResources {
                 "azureInstrumentationKey": System.getenv('AzureInstrumentationKey') ? System.getenv('AzureInstrumentationKey') : '',
                 "springerNatureAPIKey": System.getenv('SpringerNatureAPIKey') ? System.getenv('SpringerNatureAPIKey') : '',
                 "astrophysicsDataSystemAPIKey": System.getenv('AstrophysicsDataSystemAPIKey') ? System.getenv('AstrophysicsDataSystemAPIKey') : '',
-                "ieeeAPIKey": System.getenv('IEEEAPIKey') ? System.getenv('IEEEAPIKey') : ''
+                "ieeeAPIKey": System.getenv('IEEEAPIKey') ? System.getenv('IEEEAPIKey') : '',
+                "scienceDirectApiKey": System.getenv('SCIENCEDIRECTAPIKEY') ? System.getenv('SCIENCEDIRECTAPIKEY') : ''
         )
         filteringCharset = 'UTF-8'
     }

buildres/csl/csl-locales/Gemfile

@@ -1,4 +1,4 @@
-ruby '2.7.1'
+ruby '3.0.0'
 source 'https://rubygems.org'
 
 gem 'rake'

buildres/csl/csl-locales/Gemfile.lock

@@ -1,56 +1,85 @@
 GIT
   remote: https://github.com/citation-style-language/Sheldon.git
-  revision: 1962fad73610a3e0b1610e0c24c16669d584196b
+  revision: 38b6de75ac4dd86d6b3b47c172431e6e44f53ca0
   specs:
-    sheldon (1.0.2)
+    sheldon (1.0.30)
       citeproc-ruby
       csl-styles
       diffy
       dotenv
+      erubis (~> 2.7)
+      faraday
+      faraday_middleware
+      git_diff
+      hashdiff (= 0.3.7)
       nokogiri
+      octokit (~> 4.0)
       ostruct
       reverse_markdown
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     citeproc (1.0.10)
       namae (~> 1.0)
-    citeproc-ruby (1.1.12)
+    citeproc-ruby (1.1.13)
       citeproc (~> 1.0, >= 1.0.9)
       csl (~> 1.5)
-    csl (1.5.1)
+    csl (1.5.2)
       namae (~> 1.0)
     csl-styles (1.0.1.10)
       csl (~> 1.0)
     diff-lcs (1.4.4)
     diffy (3.4.0)
     dotenv (2.7.6)
-    fuubar (2.5.0)
+    erubis (2.7.0)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    faraday-net_http (1.0.1)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    mini_portile2 (2.4.0)
-    namae (1.0.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    ostruct (0.2.0)
-    rake (13.0.1)
+    git_diff (0.4.3)
+    hashdiff (0.3.7)
+    mini_portile2 (2.5.0)
+    multipart-post (2.1.1)
+    namae (1.0.2)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    octokit (4.20.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    ostruct (0.3.3)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rake (13.0.3)
     reverse_markdown (2.0.0)
       nokogiri
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    ruby-progressbar (1.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
 
 PLATFORMS
   ruby
@@ -64,7 +93,7 @@ DEPENDENCIES
   sheldon!
 
 RUBY VERSION
-   ruby 2.7.1
+   ruby 3.0.0p0
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

buildres/csl/csl-locales/spec/spec_helper.rb

@@ -2,6 +2,8 @@
 require 'json'
 
 LOCALE_ROOT = File.expand_path('../..', __FILE__)
+PULL_REQUEST = File.join(LOCALE_ROOT, 'pull-request')
+LOCALE_ROOT = PULL_REQUEST if File.directory?(PULL_REQUEST)
 
 NO_REGIONS = %w{
   eu ar la

buildres/csl/csl-styles/acta-anaesthesiologica-scandinavica.csl

@@ -155,9 +155,11 @@
   </citation>
   <bibliography second-field-align="flush">
     <layout>
-      <text variable="citation-number" suffix=". "/>
-      <text macro="author" suffix="."/>
-      <text macro="title" suffix="." prefix=" "/>
+      <group delimiter=". " suffix=". ">
+        <text variable="citation-number"/>
+        <text macro="author"/>
+        <text macro="title"/>
+      </group>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group prefix=" " delimiter=" ">