diff --git a/.gitignore b/.gitignore
index f2a7cad5e5e..5b709f65ea7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@ src/main/gen/
src/main/generated/
src-gen/
+structure101-settings.java.hsw
+
# private data
/buildres/jabref-cert-2016.p12
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b8e2a93056..666e7a1f7a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We fixed an issue where it was no longer possible to connect to a shared mysql database due to an exception [#9761](https://github.com/JabRef/jabref/issues/9761)
- We fixed the citation key generation for (`[authors]`, `[authshort]`, `[authorsAlpha]`, `authIniN`, `authEtAl`, `auth.etal`)[https://docs.jabref.org/setup/citationkeypatterns#special-field-markers] to handle `and others` properly. [koppor#626](https://github.com/koppor/jabref/issues/626)
- We fixed the Save/save as file type shows BIBTEX_DB instead of "Bibtex library" [#9372](https://github.com/JabRef/jabref/issues/9372)
+- We fixed an issue regarding recording redundant prefixes in search history. [#9685](https://github.com/JabRef/jabref/issues/9685)
### Removed
diff --git a/build.gradle b/build.gradle
index 911769e6ec4..6593132b4e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -104,7 +104,7 @@ javafx {
}
jacoco {
- toolVersion = "0.8.8"
+ toolVersion = "0.8.10"
}
dependencies {
@@ -173,7 +173,7 @@ dependencies {
implementation 'com.jfoenix:jfoenix:9.0.10'
implementation 'org.controlsfx:controlsfx:11.1.2'
- implementation 'org.jsoup:jsoup:1.15.4'
+ implementation 'org.jsoup:jsoup:1.16.1'
implementation 'com.konghq:unirest-java:3.14.2'
implementation 'org.slf4j:slf4j-api:2.0.7'
@@ -196,13 +196,13 @@ dependencies {
exclude module: "log4j-core"
}
- implementation 'com.vladsch.flexmark:flexmark:0.64.0'
+ implementation 'com.vladsch.flexmark:flexmark:0.64.2'
implementation group: 'net.harawata', name: 'appdirs', version: '1.2.1'
testImplementation 'io.github.classgraph:classgraph:4.8.157'
- testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
- testImplementation 'org.junit.platform:junit-platform-launcher:1.9.2'
+ testImplementation 'org.junit.jupiter:junit-jupiter:5.9.3'
+ testImplementation 'org.junit.platform:junit-platform-launcher:1.9.3'
testImplementation 'org.mockito:mockito-core:5.3.1'
testImplementation 'org.xmlunit:xmlunit-core:2.9.1'
@@ -213,7 +213,7 @@ dependencies {
testImplementation "org.testfx:testfx-junit5:4.0.16-alpha"
testImplementation "org.hamcrest:hamcrest-library:2.2"
- checkstyle 'com.puppycrawl.tools:checkstyle:10.9.3'
+ checkstyle 'com.puppycrawl.tools:checkstyle:10.10.0'
// xjc needs the runtime as well for the ant task, otherwise it fails
xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '3.0.2'
xjc group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
@@ -498,6 +498,14 @@ checkstyle {
sourceSets = []
}
+modernizer {
+ failOnViolations = false
+ includeTestClasses = true
+ exclusions = [
+ 'java/util/Optional.get:()Ljava/lang/Object;'
+ ]
+}
+
// Release tasks
task deleteInstallerTemp(type: Delete) {
delete "$buildDir/installer"
diff --git a/buildres/csl/csl-styles/Gemfile.lock b/buildres/csl/csl-styles/Gemfile.lock
index 8414bfbd6a4..f48b77908e0 100644
--- a/buildres/csl/csl-styles/Gemfile.lock
+++ b/buildres/csl/csl-styles/Gemfile.lock
@@ -62,20 +62,20 @@ GEM
ruby-progressbar (~> 1.4)
git_diff (0.4.3)
hashdiff (0.3.7)
- mini_portile2 (2.8.0)
+ mini_portile2 (2.8.1)
multipart-post (2.1.1)
namae (1.1.1)
- nokogiri (1.13.10)
+ nokogiri (1.14.3)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
- nokogiri (1.13.10-x64-mingw32)
+ nokogiri (1.14.3-x64-mingw32)
racc (~> 1.4)
octokit (4.21.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
ostruct (0.5.2)
public_suffix (4.0.6)
- racc (1.6.1)
+ racc (1.6.2)
rake (13.0.6)
reverse_markdown (2.1.1)
nokogiri
diff --git a/buildres/csl/csl-styles/acta-palaeontologica-polonica.csl b/buildres/csl/csl-styles/acta-palaeontologica-polonica.csl
index 91a25d235ca..2c3605be38d 100644
--- a/buildres/csl/csl-styles/acta-palaeontologica-polonica.csl
+++ b/buildres/csl/csl-styles/acta-palaeontologica-polonica.csl
@@ -8,7 +8,8 @@
Martin R. Smith
- martins@gmail.com
+ martin.smith@durham.ac.uk
+ https://smithlabdurham.github.io/
Benjamin C. Moon
@@ -84,7 +85,8 @@
-
+
+
diff --git a/buildres/csl/csl-styles/cardiff-university-harvard.csl b/buildres/csl/csl-styles/cardiff-university-harvard.csl
index 401e2abd744..68703b4f79e 100644
--- a/buildres/csl/csl-styles/cardiff-university-harvard.csl
+++ b/buildres/csl/csl-styles/cardiff-university-harvard.csl
@@ -14,10 +14,13 @@
Lewys Peters
+
+ Patrick O'Brien
+
The Harvard author-date style - adapted for Cardiff University
- 2022-08-22T08:20:08+00:00
+ 2023-04-05T08:14:17+00:00
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License
@@ -85,7 +88,7 @@
-
+
@@ -101,20 +104,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -141,13 +140,12 @@
+
+
+
+
-
-
-
-
-
-
+
@@ -188,69 +186,82 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/buildres/csl/csl-styles/dependent/magnetic-resonance-in-medicine.csl b/buildres/csl/csl-styles/dependent/magnetic-resonance-in-medicine.csl
new file mode 100644
index 00000000000..5fdd285e808
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/magnetic-resonance-in-medicine.csl
@@ -0,0 +1,17 @@
+
+
diff --git a/buildres/csl/csl-styles/ecosistemas.csl b/buildres/csl/csl-styles/ecosistemas.csl
index 0c8fb185859..d7db55aa527 100644
--- a/buildres/csl/csl-styles/ecosistemas.csl
+++ b/buildres/csl/csl-styles/ecosistemas.csl
@@ -6,8 +6,8 @@
http://www.zotero.org/styles/ecosistemas
-
-
+
+
Francisco Rodriguez-Sanchez
f.rodriguez.sanc@gmail.com
@@ -113,7 +113,7 @@
-
+
diff --git a/buildres/csl/csl-styles/environmental-and-engineering-geoscience.csl b/buildres/csl/csl-styles/environmental-and-engineering-geoscience.csl
index fcf83490e56..e7235a005b8 100644
--- a/buildres/csl/csl-styles/environmental-and-engineering-geoscience.csl
+++ b/buildres/csl/csl-styles/environmental-and-engineering-geoscience.csl
@@ -2,9 +2,10 @@
diff --git a/buildres/csl/csl-styles/ieee.csl b/buildres/csl/csl-styles/ieee.csl
index 19081952c37..04c375f09b7 100644
--- a/buildres/csl/csl-styles/ieee.csl
+++ b/buildres/csl/csl-styles/ieee.csl
@@ -45,7 +45,7 @@
IEEE style as per the 2021 guidelines, V 01.29.2021.
- 2022-10-11T00:52:46+10:00
+ 2023-04-18T00:52:46+10:00
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License
@@ -174,25 +174,20 @@
+
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
diff --git a/buildres/csl/csl-styles/journal-of-dental-traumatology.csl b/buildres/csl/csl-styles/journal-of-dental-traumatology.csl
new file mode 100644
index 00000000000..784a3d393e5
--- /dev/null
+++ b/buildres/csl/csl-styles/journal-of-dental-traumatology.csl
@@ -0,0 +1,204 @@
+
+
diff --git a/buildres/csl/csl-styles/journal-of-paleontology.csl b/buildres/csl/csl-styles/journal-of-paleontology.csl
index 1f1fdcefdeb..6570974cc02 100644
--- a/buildres/csl/csl-styles/journal-of-paleontology.csl
+++ b/buildres/csl/csl-styles/journal-of-paleontology.csl
@@ -9,8 +9,8 @@
Martin R. Smith
- martins@gmail.com
- https://community.dur.ac.uk/martin.smith/
+ martin.smith@durham.ac.uk
+ https://smithlabdurham.github.io/
@@ -107,11 +107,19 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/buildres/csl/csl-styles/la-nouvelle-revue-du-travail.csl b/buildres/csl/csl-styles/la-nouvelle-revue-du-travail.csl
new file mode 100644
index 00000000000..e244ac652a0
--- /dev/null
+++ b/buildres/csl/csl-styles/la-nouvelle-revue-du-travail.csl
@@ -0,0 +1,207 @@
+
+
diff --git a/buildres/csl/csl-styles/lethaia.csl b/buildres/csl/csl-styles/lethaia.csl
index fe99d3419ed..8c9d777c38e 100644
--- a/buildres/csl/csl-styles/lethaia.csl
+++ b/buildres/csl/csl-styles/lethaia.csl
@@ -5,10 +5,11 @@
http://www.zotero.org/styles/lethaia
-
+
Martin R. Smith
- martins@gmail.com
+ martin.smith@durham.ac.uk
+ https://smithlabdurham.github.io/
@@ -19,14 +20,12 @@
-
-
+
-
-
+
@@ -79,11 +78,18 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/buildres/csl/csl-styles/magnetic-resonance-in-medicine.csl b/buildres/csl/csl-styles/magnetic-resonance-in-medicine.csl
deleted file mode 100644
index aef8b689b23..00000000000
--- a/buildres/csl/csl-styles/magnetic-resonance-in-medicine.csl
+++ /dev/null
@@ -1,172 +0,0 @@
-
-
diff --git a/buildres/csl/csl-styles/medizinische-universitat-innsbruck-vancouver.csl b/buildres/csl/csl-styles/medizinische-universitat-innsbruck-vancouver.csl
new file mode 100644
index 00000000000..b615bd3a045
--- /dev/null
+++ b/buildres/csl/csl-styles/medizinische-universitat-innsbruck-vancouver.csl
@@ -0,0 +1,328 @@
+
+
diff --git a/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl b/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
index 1a9517a9f90..540f5ea61fc 100644
--- a/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
+++ b/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
@@ -292,8 +292,8 @@
-
-
+
+
diff --git a/buildres/csl/csl-styles/north-pacific-anadromous-fish-commission-bulletin.csl b/buildres/csl/csl-styles/north-pacific-anadromous-fish-commission-bulletin.csl
new file mode 100644
index 00000000000..598de36b812
--- /dev/null
+++ b/buildres/csl/csl-styles/north-pacific-anadromous-fish-commission-bulletin.csl
@@ -0,0 +1,521 @@
+
+
diff --git a/buildres/csl/csl-styles/palaeontology.csl b/buildres/csl/csl-styles/palaeontology.csl
index f0e71ab0906..2b8452e9d98 100644
--- a/buildres/csl/csl-styles/palaeontology.csl
+++ b/buildres/csl/csl-styles/palaeontology.csl
@@ -12,8 +12,8 @@
Martin R. Smith
- martins@gmail.com
- https://community.dur.ac.uk/martin.smith/
+ martin.smith@durham.ac.uk
+ https://smithlabdurham.github.io/
@@ -80,11 +80,18 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/buildres/csl/csl-styles/paleobiology.csl b/buildres/csl/csl-styles/paleobiology.csl
index 0acc365760e..97887076167 100644
--- a/buildres/csl/csl-styles/paleobiology.csl
+++ b/buildres/csl/csl-styles/paleobiology.csl
@@ -8,8 +8,8 @@
Martin R. Smith
- martins@gmail.com
- https://plus.google.com/u/0/108450310917386384868
+ martin.smith@durham.ac.uk
+ https://smithlabdurham.github.io/
@@ -20,14 +20,12 @@
-
-
+
-
-
+
@@ -79,11 +77,18 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/buildres/csl/csl-styles/polish-archives-of-internal-medicine.csl b/buildres/csl/csl-styles/polish-archives-of-internal-medicine.csl
new file mode 100644
index 00000000000..0021f8b00da
--- /dev/null
+++ b/buildres/csl/csl-styles/polish-archives-of-internal-medicine.csl
@@ -0,0 +1,139 @@
+
+
diff --git a/buildres/csl/csl-styles/united-states-international-trade-commission.csl b/buildres/csl/csl-styles/united-states-international-trade-commission.csl
index a361dab0b1c..142bbf5aefa 100644
--- a/buildres/csl/csl-styles/united-states-international-trade-commission.csl
+++ b/buildres/csl/csl-styles/united-states-international-trade-commission.csl
@@ -24,10 +24,14 @@
Peg Hausman
Margaret.Hausman@usitc.gov
+
+ Brian Rose
+ brian.rose@usitc.gov
+
A bibliographical style file for the United States International Trade Commission
- 2022-08-17T18:21:43+00:00
+ 2023-04-04T12:17:26+00:00
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License
@@ -126,9 +130,12 @@
-
-
+
+
+
+
+
@@ -146,6 +153,10 @@
+
+
+
+
@@ -209,6 +220,12 @@
+
+
+
+
+
+
@@ -260,24 +277,10 @@
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
@@ -290,77 +293,44 @@
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
-
+
+
+
+
@@ -371,108 +341,100 @@
-
+
+
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -482,6 +444,9 @@
+
+
+
@@ -531,9 +496,10 @@
-
+
+
-
+
@@ -549,7 +515,7 @@
-
+
@@ -573,12 +539,17 @@
-
+
+
+
+
+
+
@@ -978,6 +949,7 @@
+
@@ -994,6 +966,7 @@
+
@@ -1180,9 +1153,6 @@
-
-
-
@@ -1196,7 +1166,7 @@
-
+
@@ -1348,7 +1318,7 @@
-
+
@@ -1357,6 +1327,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1380,7 +1364,7 @@
-
+
@@ -1393,8 +1377,24 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1414,12 +1414,24 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1455,7 +1467,7 @@
-
+
@@ -1502,6 +1514,8 @@
+
+
@@ -1513,6 +1527,11 @@
+
+
+
+
+
diff --git a/buildres/csl/csl-styles/universite-de-bordeaux-ecole-doctorale-de-droit.csl b/buildres/csl/csl-styles/universite-de-bordeaux-ecole-doctorale-de-droit.csl
index a17324264e4..d9f825d19d3 100644
--- a/buildres/csl/csl-styles/universite-de-bordeaux-ecole-doctorale-de-droit.csl
+++ b/buildres/csl/csl-styles/universite-de-bordeaux-ecole-doctorale-de-droit.csl
@@ -8,7 +8,7 @@
Pierre Gravier
- pierre.gravier@u-bordeaux.fr
+ pierre.gravier@free.fr
Frédérique Flamerie
@@ -16,7 +16,7 @@
- 2019-11-07T04:39:48+00:00
+ 2022-05-09T18:35:05+00:00
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License
@@ -25,7 +25,6 @@
e
re
er
- op. cit.
p.
en ligne
préf.
@@ -131,17 +130,29 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -678,7 +689,7 @@
-
+
diff --git a/buildres/csl/csl-styles/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl b/buildres/csl/csl-styles/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl
index a94d029dea5..e9c8d17f69d 100644
--- a/buildres/csl/csl-styles/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl
+++ b/buildres/csl/csl-styles/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl
@@ -1,13 +1,12 @@
-