Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into fix-for-issue-8189
Browse files Browse the repository at this point in the history 
* upstream/main:
  Update to jfx 19 (JabRef#9155)
  Squashed 'buildres/csl/csl-styles/' changes from 8d69f16..201e022
  Clarify the duplicates resolver dialog actions (JabRef#9140)
  • Loading branch information
@Siedlerchr
Siedlerchr committed Sep 17, 2022
2 parents 860b749 + 853338a commit 5436087
Show file tree
Hide file tree
Showing 39 changed files with 2,190 additions and 1,208 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- The fallback directory of the file folder now is the general file directory. In case there was a directory configured for a library and this directory was not found, JabRef placed the PDF next to the .bib file and not into the general file directory.
- The global default directory for storing PDFs is now the subdirectory "JabRef" in the user's home.
- We reworked the Define study parameters dialog. [#9123](https://github.com/JabRef/jabref/pull/9123)
- We simplified the actions to fast-resolve duplicates to 'Keep Left', 'Keep Right', 'Keep Both' and 'Keep Merged'. [#9056](https://github.com/JabRef/jabref/issues/9056)


### Fixed
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ dependencyLocking {
}

javafx {
version = "18.0.2"
version = "19"
modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ]
}

Expand Down Expand Up @@ -167,7 +167,7 @@ dependencies {
implementation 'org.kordamp.ikonli:ikonli-materialdesign2-pack:12.3.1'
implementation 'com.github.sialcasa.mvvmFX:mvvmfx-validation:f195849ca9' //jitpack
implementation 'de.saxsys:mvvmfx:1.8.0'
implementation 'com.tobiasdiez:easybind:2.2'
implementation 'com.tobiasdiez:easybind:2.2.1-SNAPSHOT'
implementation 'org.fxmisc.flowless:flowless:0.6.10'
implementation 'org.fxmisc.richtext:richtextfx:0.10.9'
implementation group: 'org.glassfish.hk2.external', name: 'jakarta.inject', version: '2.6.1'
Expand Down
276 changes: 276 additions & 0 deletions buildres/csl/csl-styles/american-medical-association-parentheses.csl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,276 @@
<?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" page-range-format="expanded" initialize-with-hyphen="false" default-locale="en-US">
<info>
<title>American Medical Association 11th edition (parentheses)</title>
<title-short>AMA (11th ed.)</title-short>
<id>http://www.zotero.org/styles/american-medical-association-parentheses</id>
<link href="http://www.zotero.org/styles/american-medical-association-parentheses" rel="self"/>
<link href="http://www.zotero.org/styles/american-medical-association-brackets" rel="template"/>
<link href="https://westlibrary.txwes.edu/sites/default/files/pdf/AMACitationStyle.pdf" rel="documentation"/>
<link href="https://www.amamanualofstyle.com/fileasset/AMAMOS/aaaAMWA%20presentation%20Nov%202019%20FULL.pdf" rel="documentation"/>
<author>
<name>Patrick O'Brien</name>
</author>
<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>2022-03-19T14:57:59+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="presented at">presented at</term>
</terms>
</locale>
<macro name="editor">
<names variable="editor">
<name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
<label form="short" prefix=", "/>
</names>
</macro>
<macro name="author">
<group suffix=".">
<names variable="author">
<name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
<label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
<text macro="title"/>
</substitute>
</names>
</group>
</macro>
<macro name="access">
<choose>
<if type="article-newspaper" match="none">
<choose>
<if variable="DOI">
<text value="doi:"/>
<text variable="DOI"/>
</if>
<else-if variable="URL">
<group delimiter=". ">
<choose>
<if type="webpage post post-weblog" match="any">
<date variable="issued" prefix="Published " form="text"/>
</if>
</choose>
<group>
<text term="accessed" text-case="capitalize-first" suffix=" "/>
<date variable="accessed">
<date-part name="month" suffix=" "/>
<date-part name="day" suffix=", "/>
<date-part name="year"/>
</date>
</group>
<text variable="URL"/>
</group>
</else-if>
</choose>
</if>
</choose>
</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" text-case="title"/>
</if>
<else>
<text variable="title"/>
</else>
</choose>
</macro>
<macro name="publisher">
<text variable="publisher"/>
</macro>
<macro name="edition">
<choose>
<if is-numeric="edition">
<group delimiter=" ">
<number variable="edition" form="ordinal"/>
<text term="edition" form="short"/>
</group>
</if>
<else>
<text variable="edition" suffix="."/>
</else>
</choose>
</macro>
<citation collapse="citation-number">
<sort>
<key variable="citation-number"/>
</sort>
<layout delimiter="," prefix="(" suffix=")">
<text variable="citation-number"/>
<group prefix=", ">
<label variable="locator" form="short" strip-periods="true"/>
<text variable="locator"/>
</group>
</layout>
</citation>
<bibliography hanging-indent="false" et-al-min="7" et-al-use-first="3" second-field-align="flush">
<layout>
<text variable="citation-number" suffix=". "/>
<text macro="author"/>
<text macro="title" prefix=" " suffix="."/>
<choose>
<if type="bill book graphic legislation motion_picture report song" match="any">
<group suffix="." prefix=" " delimiter=" ">
<group delimiter=" ">
<text term="volume" form="short" text-case="capitalize-first" strip-periods="true"/>
<text variable="volume" suffix="."/>
</group>
<text macro="edition"/>
<text macro="editor" prefix="(" suffix=")"/>
</group>
<text macro="publisher" prefix=" "/>
<group suffix="." prefix="; ">
<date variable="issued">
<date-part name="year"/>
</date>
<text variable="page" prefix=":"/>
</group>
</if>
<else-if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
<group prefix=" " delimiter=" ">
<text term="in" text-case="capitalize-first" suffix=":"/>
<text macro="editor"/>
<text variable="container-title" font-style="italic" suffix="." text-case="title"/>
<group delimiter=" ">
<text term="volume" form="short" text-case="capitalize-first" strip-periods="true"/>
<text variable="volume" suffix="."/>
</group>
<text macro="edition"/>
<text variable="collection-title" suffix="."/>
<group suffix=".">
<text macro="publisher"/>
<group suffix="." prefix="; ">
<date variable="issued">
<date-part name="year"/>
</date>
<text variable="page" prefix=":"/>
</group>
</group>
</group>
</else-if>
<else-if type="article-newspaper">
<text variable="container-title" font-style="italic" prefix=" " suffix=". "/>
<choose>
<if variable="URL">
<group delimiter=". " suffix=".">
<text variable="URL"/>
<group prefix="Published ">
<date variable="issued">
<date-part name="month" suffix=" "/>
<date-part name="day" suffix=", "/>
<date-part name="year"/>
</date>
</group>
<group>
<text term="accessed" text-case="capitalize-first" suffix=" "/>
<date variable="accessed">
<date-part name="month" suffix=" "/>
<date-part name="day" suffix=", "/>
<date-part name="year"/>
</date>
</group>
</group>
</if>
<else>
<group delimiter=":" suffix=".">
<group>
<date variable="issued">
<date-part name="month" suffix=" "/>
<date-part name="day" suffix=", "/>
<date-part name="year"/>
</date>
</group>
<text variable="page"/>
</group>
</else>
</choose>
</else-if>
<else-if type="legal_case">
<group suffix="," prefix=" " delimiter=" ">
<text macro="editor" prefix="(" suffix=")"/>
</group>
<group prefix=" " delimiter=" ">
<text variable="container-title"/>
<text variable="volume"/>
</group>
<text variable="page" prefix=", " suffix=" "/>
<group prefix="(" suffix=")." delimiter=" ">
<text variable="authority"/>
<date variable="issued">
<date-part name="year"/>
</date>
</group>
</else-if>
<else-if type="webpage post post-weblog" match="any">
<text variable="container-title" prefix=" " suffix="."/>
</else-if>
<else-if type="speech">
<group prefix=" " suffix=":">
<choose>
<if variable="genre">
<text variable="genre" suffix=" "/>
<text term="presented at"/>
</if>
<else>
<text term="presented at" text-case="capitalize-first"/>
</else>
</choose>
</group>
<group delimiter="; " prefix=" " suffix=".">
<text variable="event"/>
<group>
<date delimiter=" " variable="issued">
<date-part name="month"/>
<date-part name="day" suffix=","/>
<date-part name="year"/>
</date>
</group>
<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=".">
<text variable="container-title" font-style="italic" form="short" strip-periods="true" suffix="."/>
<group delimiter=";" prefix=" ">
<choose>
<if variable="issue volume" match="any">
<date variable="issued">
<date-part name="year"/>
</date>
</if>
<else>
<group delimiter=" ">
<text value="Published online"/>
<date form="text" date-parts="year-month-day" variable="issued"/>
</group>
</else>
</choose>
<group>
<text variable="volume"/>
<text variable="issue" prefix="(" suffix=")"/>
</group>
</group>
<text variable="page" prefix=":"/>
</group>
</else>
</choose>
<text prefix=" " macro="access"/>
</layout>
</bibliography>
</style>
15 changes: 15 additions & 0 deletions buildres/csl/csl-styles/dependent/acta-medica-philippina.csl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-GB">
<info>
<title>Acta Medica Philippina</title>
<id>http://www.zotero.org/styles/acta-medica-philippina</id>
<link href="http://www.zotero.org/styles/acta-medica-philippina" rel="self"/>
<link href="http://www.zotero.org/styles/vancouver-superscript" rel="independent-parent"/>
<link href="https://actamedicaphilippina.upm.edu.ph/index.php/acta/about/submissions" rel="documentation"/>
<category citation-format="numeric"/>
<category field="medicine"/>
<eissn>2094-9278</eissn>
<updated>2022-08-23T21: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>
4 changes: 2 additions & 2 deletions buildres/csl/csl-styles/dependent/journal-of-the-national-cancer-institute.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<title-short>JNCI</title-short>
<id>http://www.zotero.org/styles/journal-of-the-national-cancer-institute</id>
<link href="http://www.zotero.org/styles/journal-of-the-national-cancer-institute" rel="self"/>
<link href="http://www.zotero.org/styles/american-medical-association" rel="independent-parent"/>
<link href="http://www.zotero.org/styles/american-medical-association-parentheses" rel="independent-parent"/>
<link href="http://www.oxfordjournals.org/our_journals/jnci/for_authors/ms_prep.html#specificrequirements" rel="documentation"/>
<category citation-format="numeric"/>
<category field="medicine"/>
<issn>0027-8874</issn>
<eissn>1460-2105</eissn>
<updated>2012-09-09T21:58:08+00:00</updated>
<updated>2013-03-31T16:27: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>
</style>
20 changes: 20 additions & 0 deletions buildres/csl/csl-styles/dependent/laser-and-photonics-reviews.csl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
<info>
<title>Laser &amp; Photonics Reviews</title>
<id>http://www.zotero.org/styles/laser-and-photonics-reviews</id>
<link href="http://www.zotero.org/styles/laser-and-photonics-reviews" rel="self"/>
<link href="http://www.zotero.org/styles/advanced-materials" rel="independent-parent"/>
<link href="https://onlinelibrary.wiley.com/page/journal/18638899/homepage/author-guidelines" rel="documentation"/>
<author>
<name>Patrick O'Brien</name>
<email>[email protected]</email>
</author>
<category citation-format="numeric"/>
<category field="physics"/>
<issn>1863-8880</issn>
<eissn>1863-8899</eissn>
<updated>2022-08-02T12:29:00+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>
Loading

0 comments on commit 5436087

Please sign in to comment.