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

* upstream/main: Observable Preferences J (Preview) and minor refactor (#8370) quickfix (#8383) Live reloading when switching themes (#7336) FIX NPE on Merge Dialog (#8380) Bump org.eclipse.jgit from 5.13.0.202109080827-r to 6.0.0.202111291000-r (#8378) Bump jackson-dataformat-yaml from 2.13.0 to 2.13.1 (#8379) Bump tika-core from 2.2.0 to 2.2.1 (#8377) Update turabian-fullnote-bibliography-no-ibid.csl Squashed 'buildres/csl/csl-locales/' changes from d5ee85de8e..c38205618f Squashed 'buildres/csl/csl-styles/' changes from 60bf7d5..f78c707
JabRef · Jan 4, 2022 · 2f7ffad · 2f7ffad
2 parents b2f6d8d + c94bb1b
commit 2f7ffad
Show file tree

Hide file tree

Showing 115 changed files with 9,227 additions and 1,412 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,9 +14,13 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 ### Changed
 
 - We integrated the external file types dialog directly inside the preferences. [#8341](https://github.com/JabRef/jabref/pull/8341)
+- We moved the search box in preview preferences closer to the available citation styles list. [#8370](https://github.com/JabRef/jabref/pull/8370)
+- Changing the preference to show the preview panel as a separate tab now has effect without restarting JabRef. [#8370](https://github.com/JabRef/jabref/pull/8370)
+- We enabled switching themes in JabRef without the need to restart JabRef. [#7335](https://github.com/JabRef/jabref/pull/7335)
 
 ### Fixed
 
+- We fixed an issue where clicking on "Accept changes" in the merge dialog would lead to an exception [forum#2418](https://discourse.jabref.org/t/the-library-has-been-modified-by-another-program/2418/8)
 - We fixed an issue where clicking on headings in the entry preview could lead to an exception. [#8292](https://github.com/JabRef/jabref/issues/8292)
 - We fixed an issue where IntegrityCheck used the system's character encoding instead of the one set by the library or in preferences [#8022](https://github.com/JabRef/jabref/issues/8022)
 - We fixed an issue about empty metadata in library properties when called from the right click menu. [#8358](https://github.com/JabRef/jabref/issues/8358)

diff --git a/build.gradle b/build.gradle
@@ -131,7 +131,7 @@ dependencies {
     implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.9.0'
     implementation 'com.h2database:h2-mvstore:2.0.204'
 
-    implementation group: 'org.apache.tika', name: 'tika-core', version: '2.2.0'
+    implementation group: 'org.apache.tika', name: 'tika-core', version: '2.2.1'
 
     // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
     implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
@@ -150,9 +150,9 @@ dependencies {
     antlr4 'org.antlr:antlr4:4.9.3'
     implementation 'org.antlr:antlr4-runtime:4.9.3'
 
-    implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5.13.0.202109080827-r'
+    implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.0.0.202111291000-r'
 
-    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.0'
+    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.1'
     implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.13.1'
 
     implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.4'

diff --git a/buildres/csl/csl-locales/.github/workflows/merge.yaml b/buildres/csl/csl-locales/.github/workflows/merge.yaml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+    tags-ignore:
+      - '**'
   workflow_dispatch:
     inputs:
       commit_message:

diff --git a/buildres/csl/csl-styles/.github/workflows/merge.yaml b/buildres/csl/csl-styles/.github/workflows/merge.yaml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+    tags-ignore:
+      - '**'
   workflow_dispatch:
     inputs:
       commit_message:

diff --git a/buildres/csl/csl-styles/afro-asia.csl b/buildres/csl/csl-styles/afro-asia.csl
@@ -147,7 +147,7 @@
   <macro name="producers">
     <names variable="author">
       <name form="long" sort-separator=", "/>
-      <et-al term="et-al" prefix=" " font-style="italic"/>
+      <et-al term="et-al" font-style="italic"/>
       <substitute>
         <text macro="container-producers"/>
       </substitute>
@@ -156,7 +156,7 @@
   <macro name="producers-short">
     <names variable="author">
       <name form="short"/>
-      <et-al term="et-al" prefix=" " suffix="." font-style="italic"/>
+      <et-al term="et-al" font-style="italic"/>
       <substitute>
         <text macro="container-producers-short"/>
       </substitute>
@@ -168,7 +168,7 @@
       <name form="long" name-as-sort-order="all" sort-separator=", ">
         <name-part name="family" text-case="uppercase"/>
       </name>
-      <et-al term="et-al" prefix=" " font-style="italic"/>
+      <et-al term="et-al" font-style="italic"/>
       <substitute>
         <text macro="container-producers-surname"/>
       </substitute>
@@ -178,7 +178,7 @@
   <macro name="container-producers">
     <names variable="editor">
       <name form="long" sort-separator=", "/>
-      <et-al term="et-al" prefix=" " font-style="italic"/>
+      <et-al term="et-al" font-style="italic"/>
       <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
       <substitute>
         <names variable="container-author"/>
@@ -188,7 +188,7 @@
   <macro name="container-producers-short">
     <names variable="editor">
       <name form="short"/>
-      <et-al term="et-al" prefix=" " font-style="italic"/>
+      <et-al term="et-al" font-style="italic"/>
       <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
       <substitute>
         <names variable="container-author"/>
@@ -201,7 +201,7 @@
       <name form="long" name-as-sort-order="all" sort-separator=", ">
         <name-part name="family" text-case="uppercase"/>
       </name>
-      <et-al term="et-al" prefix=" " font-style="italic"/>
+      <et-al term="et-al" font-style="italic"/>
       <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
       <substitute>
         <names variable="container-author"/>

diff --git a/buildres/csl/csl-styles/american-journal-of-archaeology.csl b/buildres/csl/csl-styles/american-journal-of-archaeology.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="minimal" default-locale="en-US">
   <info>
     <title>American Journal of Archaeology</title>
     <title-short>AJA</title-short>
@@ -15,7 +15,7 @@
     <issn>0002-9114</issn>
     <eissn>1939-828X</eissn>
     <summary>The American Journal of Archaeology style</summary>
-    <updated>2017-04-13T16:17:59+00:00</updated>
+    <updated>2021-11-12T14:22: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>
   <locale>
@@ -32,7 +32,7 @@
             <if variable="author">
               <names variable="editor">
                 <label form="verb-short" prefix=" " text-case="capitalize-first" suffix=" "/>
-                <name and="text" delimiter=", "/>
+                <name and="text" delimiter=", " suffix=". "/>
               </names>
             </if>
           </choose>
@@ -170,10 +170,10 @@
         </choose>
       </if>
       <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic" text-case="title"/>
       </else-if>
       <else>
-        <text variable="title" suffix=". " quotes="true"/>
+        <text variable="title" suffix=". " quotes="true" text-case="title"/>
       </else>
     </choose>
   </macro>
@@ -188,7 +188,7 @@
             </group>
           </if>
           <else>
-            <text variable="edition" suffix="."/>
+            <text variable="edition"/>
           </else>
         </choose>
       </if>
@@ -198,7 +198,7 @@
     <choose>
       <if type="article-journal">
         <text variable="volume" prefix=" "/>
-        <text variable="issue" prefix=" "/>
+        <text variable="issue" prefix=" (" suffix=")"/>
       </if>
       <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
         <group prefix=". " delimiter=". ">
@@ -239,7 +239,7 @@
         </group>
       </if>
       <else-if type="article-journal">
-        <text variable="page" prefix=": "/>
+        <text variable="page" prefix=":"/>
       </else-if>
     </choose>
   </macro>
@@ -265,9 +265,19 @@
     <text variable="container-title" font-style="italic"/>
   </macro>
   <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
+    <group>
+      <choose>
+        <if type="thesis" match="none">
+          <text value=". "/>
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+        </if>
+        <else>
+          <text variable="publisher"/>
+        </else>
+      </choose>
     </group>
   </macro>
   <macro name="date">
@@ -287,7 +297,14 @@
   </macro>
   <macro name="event">
     <group>
-      <text term="presented at" suffix=" "/>
+      <choose>
+        <if variable="genre" match="none">
+          <text term="presented at" suffix=" " text-case="capitalize-first"/>
+        </if>
+        <else>
+          <text term="presented at" suffix=" " text-case="lowercase"/>
+        </else>
+      </choose>
       <text variable="event"/>
     </group>
   </macro>
@@ -300,7 +317,7 @@
       <if variable="title" match="none"/>
       <else-if type="thesis"/>
       <else>
-        <text variable="genre" text-case="capitalize-first" prefix=". "/>
+        <text variable="genre" text-case="capitalize-first" prefix=" "/>
       </else>
     </choose>
   </macro>
@@ -320,14 +337,13 @@
         <text macro="day-month" prefix=", "/>
       </else-if>
       <else>
-        <group prefix=". " delimiter=", ">
+        <group prefix="" delimiter=", ">
           <choose>
             <if type="thesis">
               <text variable="genre" text-case="capitalize-first"/>
             </if>
           </choose>
           <text macro="publisher"/>
-          <text macro="day-month"/>
         </group>
       </else>
     </choose>
@@ -342,7 +358,6 @@
         <group delimiter=" ">
           <text macro="contributors-short"/>
           <text macro="date"/>
-          <text macro="day-month" prefix=" (" suffix="), "/>
         </group>
         <text macro="point-locators"/>
       </group>
@@ -356,14 +371,13 @@
     <layout suffix=".">
       <text macro="contributors" suffix=". "/>
       <text macro="date" suffix=". "/>
-      <text macro="day-month" text-case="capitalize-first" suffix=". "/>
       <text macro="title"/>
       <text macro="description"/>
-      <text macro="secondary-contributors" prefix=". "/>
+      <text macro="secondary-contributors" prefix=" "/>
       <text macro="container-title"/>
       <text macro="container-contributors" prefix=", "/>
       <text macro="locators-chapter"/>
-      <text macro="edition" prefix=". "/>
+      <text macro="edition" prefix=". " strip-periods="true"/>
       <text macro="locators"/>
       <text macro="collection-title" prefix=". "/>
       <text macro="issue"/>