Merge remote-tracking branch 'upstream/main' into fix-issue-JabRef#6448

* upstream/main: Fix spaces Add missing dots Squashed 'buildres/csl/csl-styles/' changes from 84dba23..43566f2 try to repack deb file (JabRef#9506) Fix date parser for year/month (JabRef#9507) # Conflicts: # CHANGELOG.md
Freeman6475 · Jan 1, 2023 · 1f57853 · 1f57853
2 parents bafbe29 + 6fd78ae
commit 1f57853
Show file tree

Hide file tree

Showing 33 changed files with 4,467 additions and 727 deletions.
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -142,6 +142,17 @@ jobs:
         run: |
           get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "${{ steps.gitversion.outputs.AssemblySemVer }}","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}"}
           get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "portable","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-portable"}
+      - name: Repack deb file for Debian (compression)
+        if: (matrix.os == 'ubuntu-latest')
+        shell: bash
+        run: |
+          cd build/distribution
+          ar x jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}_amd64.deb
+          zstd -d < control.tar.zst | xz > control.tar.xz
+          zstd -d < data.tar.zst | xz > data.tar.xz
+          ar -m -c -a sdsd jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}_amd64_repackaged.deb debian-binary control.tar.xz data.tar.xz
+          rm debian-binary control.tar.* data.tar.*
+          mv -f jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}_amd64_repackaged.deb  jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}_amd64.deb
       - name: Upload to GitHub workflow artifacts store
         if: (matrix.os != 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'YES')
         uses: actions/upload-artifact@v3

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,15 +11,18 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Added
 
+
 - We added a dropdown menu to let users change the library they want to import into during import.[#6177](https://github.com/JabRef/jabref/issues/6177)
 - We added the possibility to add/remove a preview style from the selected list using a double click [#9490](https://github.com/JabRef/jabref/issues/9490)
 - We added the option to define fields as "multine" directly in the custom entry types dialog [#6448](https://github.com/JabRef/jabref/issues/6448)
+- We added a dropdown menu to let users change the library they want to import into during import. [#6177](https://github.com/JabRef/jabref/issues/6177)
+- We added the possibility to add/remove a preview style from the selected list using a double click. [#9490](https://github.com/JabRef/jabref/issues/9490)
 
 
 
 ### Changed
 
-- We changed database structure: in MySQL/MariaDB we renamed tables by adding a `JABREF_` prefix, and in PGSQL we moved tables in `jabref` schema. We added `VersionDBStructure` variable in `METADATA` table to indicate current version of structure, this variable is needed for automatic migration [#9312](https://github.com/JabRef/jabref/issues/9312)
+- We changed database structure: in MySQL/MariaDB we renamed tables by adding a `JABREF_` prefix, and in PGSQL we moved tables in `jabref` schema. We added `VersionDBStructure` variable in `METADATA` table to indicate current version of structure, this variable is needed for automatic migration. [#9312](https://github.com/JabRef/jabref/issues/9312)
 - We moved some preferences options to a new tab in the preferences dialog. [#9442](https://github.com/JabRef/jabref/pull/9308)
 
 
@@ -29,8 +32,9 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 ### Fixed
 
 - The tab "deprecated fields" is shown in biblatex-mode only. [#7757](https://github.com/JabRef/jabref/issues/7757)
-- We fixed an issue where the last opened libraries were not remembered when a new unsaved libray was open as well [#9190](https://github.com/JabRef/jabref/issues/9190)
-- We fixed an issue where no context menu for the group "All entries" was present [forum#3682](https://discourse.jabref.org/t/how-sort-groups-a-z-not-subgroups/3682)
+- We fixed an issue where the last opened libraries were not remembered when a new unsaved libray was open as well. [#9190](https://github.com/JabRef/jabref/issues/9190)
+- We fixed an issue where no context menu for the group "All entries" was present. [forum#3682](https://discourse.jabref.org/t/how-sort-groups-a-z-not-subgroups/3682)
+- We fixed an issue where entering a date in the format "YYYY/MM" in the entry editor date field caused an exception. [#9492](https://github.com/JabRef/jabref/issues/9492)
 
 ### Removed
 

diff --git a/buildres/csl/csl-styles/american-journal-of-respiratory-and-critical-care-medicine.csl b/buildres/csl/csl-styles/american-journal-of-respiratory-and-critical-care-medicine.csl
@@ -2,6 +2,7 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
   <info>
     <title>American Journal of Respiratory and Critical Care Medicine</title>
+    <title-short>AJRCCM</title-short>
     <id>http://www.zotero.org/styles/american-journal-of-respiratory-and-critical-care-medicine</id>
     <link href="http://www.zotero.org/styles/american-journal-of-respiratory-and-critical-care-medicine" rel="self"/>
     <link href="http://www.zotero.org/styles/nature" rel="template"/>
@@ -14,11 +15,14 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1073-449X</issn>
     <eissn>1535-4970</eissn>
-    <updated>2014-06-03T22:14:43+00:00</updated>
+    <updated>2022-12-19T14:23:40+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="title">
@@ -119,7 +123,7 @@
       <text variable="citation-number"/>
     </layout>
   </citation>
-  <bibliography et-al-min="30" et-al-use-first="29" second-field-align="flush" entry-spacing="0" line-spacing="2">
+  <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush" entry-spacing="0" line-spacing="2">
     <layout>
       <text variable="citation-number" suffix="."/>
       <group delimiter=". " suffix=". ">

diff --git a/buildres/csl/csl-styles/australasian-journal-of-philosophy.csl b/buildres/csl/csl-styles/australasian-journal-of-philosophy.csl
@@ -41,6 +41,10 @@
         <single>eqn.</single>
         <multiple>eqns.</multiple>
       </term>
+      <term name="collection-number" form="short">
+        <single>no.</single>
+        <multiple>nos.</multiple>
+      </term>
     </terms>
   </locale>
   <macro name="author">
@@ -252,7 +256,7 @@
       </group>
     </layout>
   </citation>
-  <bibliography et-al-min="7" et-al-use-first="5" subsequent-author-substitute-rule="partial-each" hanging-indent="true">
+  <bibliography et-al-min="7" et-al-use-first="5" subsequent-author-substitute-rule="partial-each" hanging-indent="true" entry-spacing="1">
     <sort>
       <key macro="author"/>
       <key macro="year-date"/>
@@ -270,7 +274,8 @@
               <if is-numeric="volume">
                 <group delimiter=" " prefix=", ">
                   <text term="volume" form="short"/>
-                  <text variable="volume"/>
+                  <number variable="volume"/>
+                  <text variable="volume-title" text-case="title" prefix=": "/>
                 </group>
               </if>
             </choose>
@@ -282,6 +287,13 @@
                 </group>
               </if>
             </choose>
+            <group delimiter=", " prefix=", ">
+              <text variable="collection-title" text-case="title"/>
+              <group delimiter=" " prefix=", ">
+                <label variable="collection-number" form="short"/>
+                <number variable="collection-number"/>
+              </group>
+            </group>
           </if>
         </choose>
       </group>

diff --git a/buildres/csl/csl-styles/biochemical-society-transactions.csl b/buildres/csl/csl-styles/biochemical-society-transactions.csl
@@ -2,36 +2,39 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
   <info>
     <title>Biochemical Society Transactions</title>
-    <title-short>Biochem Soc Trans</title-short>
+    <title-short>BST</title-short>
     <id>http://www.zotero.org/styles/biochemical-society-transactions</id>
     <link href="http://www.zotero.org/styles/biochemical-society-transactions" rel="self"/>
     <link href="http://www.zotero.org/styles/vancouver" rel="template"/>
-    <link href="http://www.biochemsoctrans.org/" rel="documentation"/>
+    <link href="https://portlandpress.com/biochemsoctrans/pages/instructions_to_authors" rel="documentation"/>
     <author>
       <name>Mélanie Tremblay</name>
       <email>melanie.tremblay@hepato-neuro.ca</email>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>0300-5127</issn>
     <eissn>1470-8752</eissn>
     <summary>Biochem Soc Trans style.</summary>
-    <updated>2013-10-18T00:04:27+00:00</updated>
+    <updated>2022-12-19T12:40:30+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>
-  <!--  modified from vancouver  -->
   <macro name="author">
-    <names variable="author" suffix=". ">
-      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+    <names variable="author">
+      <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
       <label form="long" prefix=", "/>
       <substitute>
         <names variable="editor"/>
+        <text macro="title"/>
       </substitute>
     </names>
   </macro>
   <macro name="editor">
-    <names variable="editor" suffix=". ">
-      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+    <names variable="editor">
+      <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
       <label form="long" prefix=", "/>
     </names>
   </macro>
@@ -46,10 +49,14 @@
     </group>
   </macro>
   <macro name="access">
-    <group>
-      <text value="Available from: "/>
-      <text variable="URL"/>
-    </group>
+    <choose>
+      <if match="any" variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else>
+        <text variable="URL"/>
+      </else>
+    </choose>
   </macro>
   <macro name="accessed-date">
     <choose>
@@ -68,33 +75,15 @@
   <macro name="journal-title">
     <choose>
       <if type="article-journal article-magazine" match="any">
-        <group suffix=". ">
-          <text variable="container-title" form="short"/>
-          <choose>
-            <if variable="URL">
-              <text term="internet" prefix=" [" suffix="]" text-case="capitalize-first"/>
-            </if>
-          </choose>
-        </group>
+        <text variable="container-title" form="short" font-style="italic"/>
       </if>
       <else>
         <text variable="container-title" suffix=". " form="short"/>
       </else>
     </choose>
   </macro>
   <macro name="title">
-    <group delimiter=" ">
-      <text variable="title"/>
-      <choose>
-        <if type="article-journal article-magazine" match="none">
-          <choose>
-            <if variable="URL">
-              <text term="internet" prefix="[" suffix="]" text-case="capitalize-first"/>
-            </if>
-          </choose>
-        </if>
-      </choose>
-    </group>
+    <text variable="title"/>
   </macro>
   <macro name="edition">
     <choose>
@@ -113,43 +102,49 @@
     <sort>
       <key variable="citation-number"/>
     </sort>
-    <layout vertical-align="sup" prefix="[" suffix="]" delimiter=",">
+    <layout vertical-align="baseline" delimiter="," prefix="[" suffix="]">
       <text variable="citation-number"/>
     </layout>
   </citation>
   <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush">
     <layout>
-      <text variable="citation-number" prefix="[" suffix="]"/>
-      <text macro="author"/>
-      <date variable="issued">
-        <date-part name="year" prefix="(" suffix=") "/>
-      </date>
-      <text macro="title" suffix=". "/>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group prefix=" " delimiter=" ">
-            <text macro="edition"/>
-            <text macro="publisher"/>
-          </group>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
-          <group prefix=" " suffix=". ">
-            <text term="in" suffix=": " text-case="capitalize-first"/>
-            <text macro="editor"/>
-            <text variable="container-title"/>
-          </group>
-          <text macro="publisher" prefix=" "/>
-          <text variable="page" prefix=" p. " suffix="."/>
-        </else-if>
-        <else>
-          <text macro="journal-title"/>
-          <group suffix=". ">
-            <text variable="volume" font-weight="bold"/>
-            <text variable="page" prefix=", "/>
-          </group>
-        </else>
-      </choose>
-      <text macro="access"/>
+      <text variable="citation-number"/>
+      <group delimiter=". ">
+        <group delimiter=" ">
+          <text macro="author"/>
+          <date variable="issued">
+            <date-part name="year" prefix="(" suffix=")"/>
+          </date>
+          <text macro="title"/>
+        </group>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <group prefix=" " delimiter=" ">
+              <text macro="edition"/>
+              <text macro="publisher"/>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group prefix=" " suffix=". ">
+              <text term="in" suffix=": " text-case="capitalize-first"/>
+              <text macro="editor"/>
+              <text variable="container-title"/>
+            </group>
+            <text macro="publisher" prefix=" "/>
+            <text variable="page" prefix=" p. " suffix="."/>
+          </else-if>
+          <else>
+            <group delimiter=" ">
+              <text macro="journal-title"/>
+              <group delimiter=", ">
+                <text variable="volume" font-weight="bold"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text macro="access" prefix=" "/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/bluebook-law-review.csl b/buildres/csl/csl-styles/bluebook-law-review.csl
@@ -187,11 +187,16 @@
             <if type="article-newspaper thesis" match="any">
               <group suffix=", ">
                 <date variable="issued">
-                  <date-part name="month"/>
+                  <date-part name="month" form="short"/>
                   <date-part name="day" prefix=" "/>
                 </date>
               </group>
             </if>
+            <else-if type="article-magazine">
+              <date variable="issued">
+                <date-part name="month" suffix=" " form="short"/>
+              </date>
+            </else-if>
           </choose>
           <date variable="issued">
             <date-part name="year"/>

diff --git a/buildres/csl/csl-styles/boletin-de-pediatria.csl b/buildres/csl/csl-styles/boletin-de-pediatria.csl
@@ -14,7 +14,7 @@
     <category field="medicine"/>
     <issn>0214-2597</issn>
     <summary>Vancouver parentheses style strip periods for use in Boletín de Pediatría</summary>
-    <updated>2017-08-05T15:23:08+00:00</updated>
+    <updated>2022-11-20T15:23: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>
   <macro name="author">
@@ -257,7 +257,6 @@
     <choose>
       <if type="article-journal article-magazine review review-book" match="any">
         <text variable="volume"/>
-        <text variable="issue" prefix="(" suffix=")"/>
       </if>
     </choose>
   </macro>

diff --git a/buildres/csl/csl-styles/cambridge-university-press-author-date-cambridge-a.csl b/buildres/csl/csl-styles/cambridge-university-press-author-date-cambridge-a.csl
@@ -17,7 +17,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>CambridgeA style required by Journal of Tropical Ecology as of December 2022. Modified from 'cambridge-university-press-author-date' (which seems now to be CambridgeB) by Eric Marcon</summary>
-    <updated>2022-12-13T12:00:00+00:00</updated>
+    <updated>2022-12-21T12:00: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 xml:lang="en">
@@ -228,8 +228,7 @@
                 <text variable="publisher"/>
               </group>
               <group>
-                <label variable="page" form="short" prefix=" " suffix=" "/>
-                <text variable="page"/>
+                <text variable="page" prefix=", "/>
               </group>
             </if>
           </choose>

diff --git a/buildres/csl/csl-styles/cambridge-university-press-author-date.csl b/buildres/csl/csl-styles/cambridge-university-press-author-date.csl
@@ -220,7 +220,7 @@
                 <text variable="publisher"/>
               </group>
               <group>
-                <label variable="page" form="short" suffix=" "/>
+                <label variable="page" form="short" prefix=", " suffix=" "/>
                 <text variable="page"/>
               </group>
             </if>

diff --git a/buildres/csl/csl-styles/council-of-science-editors-author-date.csl b/buildres/csl/csl-styles/council-of-science-editors-author-date.csl
@@ -57,7 +57,7 @@
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
-        <text variable="title-short"/>
+        <text variable="title" form="short"/>
       </substitute>
     </names>
   </macro>