Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into fix-for-9685
Browse files Browse the repository at this point in the history 
* upstream/main: (72 commits)
  Fix split multiline localization (#9814)
  New Crowdin updates (#9834)
  change versin to 0.8.10
  remove  jacoco version config
  Bump org.junit.platform:junit-platform-launcher from 1.9.2 to 1.9.3
  Bump org.jsoup:jsoup from 1.15.4 to 1.16.1
  Bump org.junit.jupiter:junit-jupiter from 5.9.2 to 5.9.3
  Bump com.puppycrawl.tools:checkstyle from 10.9.3 to 10.10.0
  Bump com.vladsch.flexmark:flexmark from 0.64.0 to 0.64.2
  Refresh example styles
  Squashed 'buildres/csl/csl-styles/' changes from 4728902faa..a985762505
  New translations JabRef_en.properties (Tagalog)
  New translations JabRef_en.properties (Persian)
  New translations JabRef_en.properties (Indonesian)
  New translations JabRef_en.properties (Portuguese, Brazilian)
  New translations JabRef_en.properties (Vietnamese)
  New translations JabRef_en.properties (Chinese Traditional)
  New translations JabRef_en.properties (Chinese Simplified)
  New translations JabRef_en.properties (Ukrainian)
  New translations JabRef_en.properties (Turkish)
  ...
  • Loading branch information
@Siedlerchr
Siedlerchr committed May 3, 2023
2 parents 2cd605b + 5bc359f commit e22fdce
Show file tree
Hide file tree
Showing 137 changed files with 3,453 additions and 1,693 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ src/main/gen/
src/main/generated/
src-gen/

structure101-settings.java.hsw

# private data
/buildres/jabref-cert-2016.p12

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We moved the manage content selectors dialog to the library properties. [#9768](https://github.com/JabRef/jabref/pull/9768)
- We moved the preferences menu command from the options menu to the file menu. [#9768](https://github.com/JabRef/jabref/pull/9768)
- We changed the handling of an "overflow" of authors at `[authIniN]`: JabRef uses `+` to indicate an overflow. Example: `[authIni2]` produces `A+` (instead of `AB`) for `Aachen and Berlin and Chemnitz`. [#9703](https://github.com/JabRef/jabref/pull/9703)
- We moved the preferences option to open the last edited files on startup to the 'General' tab. [#9808](https://github.com/JabRef/jabref/pull/9808)


### Fixed
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ javafx {
}

jacoco {
toolVersion = "0.8.8"
toolVersion = "0.8.10"
}

dependencies {
Expand Down Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions buildres/csl/csl-styles/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions buildres/csl/csl-styles/acta-palaeontologica-polonica.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<link href="http://www.app.pan.pl/instruction.html" rel="documentation"/>
<author>
<name>Martin R. Smith</name>
<email>martins@gmail.com</email>
<email>martin.smith@durham.ac.uk</email>
<uri>https://smithlabdurham.github.io/</uri>
</author>
<contributor>
<name>Benjamin C. Moon</name>
Expand Down Expand Up @@ -84,7 +85,8 @@
<text macro="year-date"/>
</group>
<text variable="year-suffix" font-style="italic"/>
<group prefix=": ">
<group prefix=": " delimiter=" ">
<label variable="locator" form="short"/>
<text variable="locator"/>
</group>
</layout>
Expand Down
173 changes: 92 additions & 81 deletions buildres/csl/csl-styles/cardiff-university-harvard.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@
<author>
<name>Lewys Peters</name>
</author>
<contributor>
<name>Patrick O'Brien</name>
</contributor>
<category citation-format="author-date"/>
<category field="generic-base"/>
<summary>The Harvard author-date style - adapted for Cardiff University</summary>
<updated>2022-08-22T08:20:08+00:00</updated>
<updated>2023-04-05T08:14:17+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>
<macro name="editor">
Expand Down Expand Up @@ -85,7 +88,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 post post-weblog webpage" match="any">
<text variable="title" font-style="italic"/>
</if>
<else>
Expand All @@ -101,20 +104,16 @@
</macro>
<macro name="year-date">
<choose>
<if type="bill legislation" match="none">
<choose>
<if variable="issued">
<date variable="issued">
<date-part name="year"/>
</date>
<text variable="year-suffix"/>
</if>
<else>
<text term="no date" prefix="[" suffix="]"/>
<text variable="year-suffix" prefix="[" suffix="]"/>
</else>
</choose>
<if variable="issued">
<date variable="issued">
<date-part name="year"/>
</date>
<text variable="year-suffix"/>
</if>
<else>
<text term="no date" prefix="[" suffix="]"/>
<text variable="year-suffix" prefix="[" suffix="]"/>
</else>
</choose>
</macro>
<macro name="published-date">
Expand All @@ -141,13 +140,12 @@
</choose>
</macro>
<macro name="pages">
<group>
<label variable="page" form="short" suffix=" "/>
<text variable="page"/>
</group>
<choose>
<if type="chapter paper-conference article article-journal article-magazine article-newspaper book review review-book report" match="any">
<group>
<label variable="page" form="short" suffix=" "/>
<text variable="page" suffix="."/>
</group>
</if>
<if type="article article-journal article-magazine article-newspaper book review review-book report" match="any"/>
</choose>
</macro>
<macro name="bill-detail">
Expand Down Expand Up @@ -188,69 +186,82 @@
<key variable="title"/>
</sort>
<layout>
<text macro="author"/>
<text macro="year-date" prefix=" " suffix="."/>
<choose>
<if type="bill book graphic legal_case legislation motion_picture report song" match="any">
<group delimiter=". " prefix=" " suffix=".">
<text macro="title"/>
<text macro="edition"/>
<text macro="editor"/>
<text macro="publisher"/>
<text macro="bill-detail"/>
</group>
</if>
<else-if type="chapter paper-conference" match="any">
<text macro="title" prefix=" " suffix="."/>
<group prefix=" " delimiter=" ">
<text term="in" text-case="capitalize-first" suffix=":"/>
<text macro="editor"/>
<text variable="container-title" font-style="italic" suffix="."/>
<text variable="collection-title" suffix="."/>
</group>
<group prefix=" " delimiter=" ">
<text macro="edition"/>
<group suffix="" delimiter=", ">
<group delimiter=". ">
<text macro="author"/>
<text macro="year-date"/>
<choose>
<if type="bill book graphic legal_case legislation motion_picture report song entry-encyclopedia entry-dictionary" match="any">
<group delimiter=". " suffix=".">
<text macro="title"/>
<text macro="edition"/>
<text macro="editor"/>
<text macro="publisher"/>
<text macro="bill-detail"/>
<text macro="pages"/>
</group>
</group>
</else-if>
<else-if type="thesis">
<group prefix=" " delimiter=". " suffix=".">
<text macro="title"/>
<text macro="edition"/>
</group>
<group prefix=" " delimiter=", " suffix=".">
<text variable="genre"/>
<text macro="publisher"/>
</group>
</else-if>
<else-if type="webpage post post-weblog" match="any">
<group delimiter=". " prefix=" " suffix=".">
<text macro="title"/>
</group>
</else-if>
<else-if type="patent" match="any">
<group delimiter=" " prefix=" " suffix=".">
<text macro="title"/>
<text macro="patent"/>
</group>
</else-if>
<else>
<group suffix=".">
<text macro="title" prefix=" "/>
<text macro="editor" prefix=" "/>
</group>
<group prefix=" ">
<text variable="container-title" font-style="italic" suffix=" "/>
<text variable="volume"/>
<text variable="issue" prefix="(" suffix=")"/>
</group>
</else>
</choose>
<group>
</if>
<else-if type="chapter paper-conference" match="any">
<group delimiter=". " suffix=".">
<text macro="title"/>
<group prefix=" " delimiter=" ">
<text term="in" text-case="capitalize-first" suffix=":"/>
<text macro="editor"/>
<text variable="container-title" font-style="italic" suffix="."/>
<text variable="collection-title" suffix="."/>
</group>
<group prefix=" " delimiter=" ">
<text macro="edition"/>
<group suffix="" delimiter=", ">
<date form="text" variable="event-date"/>
<text macro="publisher"/>
<text macro="pages"/>
</group>
</group>
</group>
</else-if>
<else-if type="thesis">
<group delimiter=". " suffix=".">
<text macro="title"/>
<text macro="edition"/>
<group prefix=" " delimiter=", ">
<text variable="genre"/>
<text macro="publisher"/>
</group>
</group>
</else-if>
<else-if type="webpage post post-weblog" match="any">
<group delimiter=". " suffix=".">
<text macro="title"/>
</group>
</else-if>
<else-if type="patent" match="any">
<group delimiter=" " suffix=".">
<text macro="title"/>
<text macro="patent"/>
</group>
</else-if>
<else>
<group delimiter=". " suffix=".">
<group>
<text macro="title"/>
<text macro="editor" prefix=" "/>
</group>
<group delimiter=", ">
<group delimiter=" ">
<text variable="container-title" font-style="italic"/>
<group>
<text variable="volume"/>
<text variable="issue" prefix="(" suffix=")"/>
</group>
</group>
<text macro="pages"/>
</group>
</group>
</else>
</choose>
</group>
<group suffix=".">
<text macro="published-date"/>
<text macro="pages" prefix=", "/>
<text prefix=". " macro="access" suffix="."/>
</group>
</layout>
Expand Down
17 changes: 17 additions & 0 deletions buildres/csl/csl-styles/dependent/magnetic-resonance-in-medicine.csl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
<info>
<title>Magnetic Resonance in Medicine</title>
<id>http://www.zotero.org/styles/magnetic-resonance-in-medicine</id>
<link href="http://www.zotero.org/styles/magnetic-resonance-in-medicine" rel="self"/>
<link href="http://www.zotero.org/styles/american-medical-association-10th-edition" rel="independent-parent"/>
<link href="https://onlinelibrary.wiley.com/journal/15222594" rel="documentation"/>
<link href="https://onlinelibrary.wiley.com/pb-assets/assets/15222594/authorguidelinesdec22-1671206311.pdf" rel="documentation"/>
<category citation-format="numeric"/>
<category field="medicine"/>
<issn>0740-3194</issn>
<eissn>1522-2594</eissn>
<updated>2023-02-27T21:58:08+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>
</style>
6 changes: 3 additions & 3 deletions buildres/csl/csl-styles/ecosistemas.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<id>http://www.zotero.org/styles/ecosistemas</id>
<link href="http://www.zotero.org/styles/ecosistemas" rel="self"/>
<link href="http://www.zotero.org/styles/american-journal-of-botany" rel="template"/>
<link href="http://www.revistaecosistemas.net/public/journals/1/docs/Normasparaautores_RevistaEcosistemas.pdf" rel="documentation"/>
<link href="http://www.revistaecosistemas.net/index.php/ecosistemas/about/submissions#authorGuidelines" rel="documentation"/>
<link href="https://www.revistaecosistemas.net/public/journals/1/docs/Normasparaautores_RevistaEcosistemas.pdf" rel="documentation"/>
<link href="https://www.revistaecosistemas.net/index.php/ecosistemas/about/submissions" rel="documentation"/>
<author>
<name>Francisco Rodriguez-Sanchez</name>
<email>f.rodriguez.sanc@gmail.com</email>
Expand Down Expand Up @@ -113,7 +113,7 @@
</sort>
<layout prefix="(" suffix=")" delimiter="; ">
<group delimiter=" ">
<group delimiter=", ">
<group delimiter=" ">
<text macro="author-short"/>
<text macro="year-date"/>
</group>
Expand Down
Loading

0 comments on commit e22fdce

Please sign in to comment.