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

* upstream/main: Enable copy&paste for IntelliJ run configuration GitBook: [main] one page modified GitBook: [main] one page modified GitBook: [main] 19 pages and 6 assets modified Refine documentation Oobranch f : add frontend (#7791) Observable Preferences C (General) (#8047) Welcome btut 🎉 Observable preferences B (ProtectedTerms, EntryEditor and MrDlib) (#8046) Refine howto (#8049) Decision on handling of localized preferences. Added option to import CFF files (#7946) Observable preferences A (Appearance and Importer) (#8041) Squashed 'buildres/csl/csl-locales/' changes from ec6d62a9e7..7a507fc008 Squashed 'buildres/csl/csl-styles/' changes from ec4a4c0..2b37392
JabRef · Sep 2, 2021 · bdc5e95 · bdc5e95
2 parents 4a87e9c + 1a08b38
commit bdc5e95
Show file tree

Hide file tree

Showing 128 changed files with 5,154 additions and 1,774 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Added
 
+- We added import support for CFF files. [#7945](https://github.com/JabRef/jabref/issues/7945)
 - We added the option to copy the DOI of an entry directly from the context menu copy submenu. [#7826](https://github.com/JabRef/jabref/issues/7826)
 - We added a fulltext search feature. [#2838](https://github.com/JabRef/jabref/pull/2838)
 - We improved the deduction of bib-entries from imported fulltext pdfs. [#7947](https://github.com/JabRef/jabref/pull/7947)

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -7,3 +7,4 @@ Linus Dietz (since 2017)
 Carl Christian Snethlage (since 2020)
 Dominik Voigt (since 2020)
 Jonatan Askertop (since 2021)
+Benedikt Tutzer (since 2021)
diff --git a/buildres/csl/csl-styles/acta-anaesthesiologica-scandinavica.csl b/buildres/csl/csl-styles/acta-anaesthesiologica-scandinavica.csl
@@ -155,8 +155,6 @@
  </citation>
  <bibliography second-field-align="flush">
  <layout>
- <group delimiter=". " suffix=". ">
- <text variable="citation-number"/>
  <text variable="citation-number" suffix=". "/>
  <group delimiter=". " suffix=". ">
  <text macro="author"/>

diff --git a/buildres/csl/csl-styles/afte-journal.csl b/buildres/csl/csl-styles/afte-journal.csl
diff --git a/buildres/csl/csl-styles/american-journal-of-sociology.csl b/buildres/csl/csl-styles/american-journal-of-sociology.csl
@@ -14,7 +14,7 @@
  <category field="sociology"/>
  <issn>0002-9602</issn>
  <eissn>1537-5390</eissn>
- <updated>2021-08-10T10:27:52+00:00</updated>
+ <updated>2021-08-21T15:46:13+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">
@@ -56,10 +56,10 @@
  <macro name="title">
  <choose>
  <if type="book report" match="any">
- <text variable="title" font-style="italic"/>
+ <text variable="title" text-case="title" font-style="italic"/>
  </if>
  <else>
- <text variable="title" quotes="true"/>
+ <text variable="title" text-case="title" quotes="true"/>
  </else>
  </choose>
  </macro>
@@ -158,18 +158,18 @@
  </else-if>
  <else-if type="chapter paper-conference" match="any">
  <group delimiter=". " prefix=". ">
- <group delimiter=" ">
- <group delimiter=": ">
- <text term="in" text-case="capitalize-first" font-style="normal"/>
- <text variable="container-title" font-style="italic"/>
+ <group delimiter=", ">
+ <group delimiter=" ">
+ <group delimiter=" ">
+ <label text-case="capitalize-first" variable="page" form="short"/>
+ <text variable="page"/>
+ </group>
+ <text term="in" font-style="normal"/>
+ <text variable="container-title" text-case="title" font-style="italic"/>
  </group>
- <text macro="editors" prefix="(" suffix=")"/>
+ <text macro="editors"/>
  </group>
  <text macro="edition"/>
- <group delimiter=" ">
- <label text-case="capitalize-first" variable="page" form="short"/>
- <text variable="page"/>
- </group>
  </group>
  </else-if>
  <else-if type="webpage post post-weblog" match="any">
@@ -185,8 +185,8 @@
  </macro>
  <macro name="editors">
  <names variable="editor translator" delimiter=", ">
- <label form="short"/>
- <name prefix=" " and="text" name-as-sort-order="first"/>
+ <label form="verb"/>
+ <name prefix=" " and="text" initialize-with=". "/>
  </names>
  </macro>
  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
@@ -204,7 +204,7 @@
  </group>
  </layout>
  </citation>
- <bibliography et-al-min="4" et-al-use-first="1" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0" hanging-indent="true">
+ <bibliography et-al-subsequent-min="4" et-al-subsequent-use-first="1" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0" hanging-indent="true">
  <sort>
  <key macro="author"/>
  <key variable="issued"/>

diff --git a/buildres/csl/csl-styles/american-sociological-association.csl b/buildres/csl/csl-styles/american-sociological-association.csl
@@ -19,6 +19,11 @@
  <updated>2020-09-18T10:38:12+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="version">version</term>
+ </terms>
+ </locale>
  <macro name="editor">
  <names variable="editor">
  <label form="verb" suffix=" "/>
@@ -69,7 +74,7 @@
  <text prefix="(" suffix=")" variable="URL"/>
  </group>
  </if>
- <else-if type="article-journal" match="any">
+ <else-if type="article-journal report" match="any">
  <text variable="DOI" prefix="doi: "/>
  </else-if>
  </choose>
@@ -80,6 +85,11 @@
  <if type="thesis">
  <text variable="title" text-case="title"/>
  </if>
+ <!-- Software Hack -->
+ <else-if type="book" variable="version" match="all">
+ <!-- Allow lower-case initial letters, e.g., iPhone, ggplot2 -->
+ <text variable="title" font-style="italic"/>
+ </else-if>
  <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
  <text variable="title" font-style="italic" text-case="title"/>
  </else-if>
@@ -221,6 +231,20 @@
  <text macro="publisher"/>
  </group>
  </else-if>
+ <!--Software hack-->
+ <else-if type="book" variable="version" match="all">
+ <group prefix=" " delimiter=". ">
+ <group>
+ <!-- To Do: localize once we have a proper term -->
+ <text macro="title" suffix=" [computer program]" />
+ </group>
+ <group delimiter=" ">
+ <text term="version" text-case="capitalize-first"/>
+ <text variable="version"/>
+ </group>
+ <text variable="URL"/>
+ </group>
+ </else-if>
  <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
  <group delimiter=". ">
  <text macro="title" prefix=" "/>

diff --git a/buildres/csl/csl-styles/archeosciences.csl b/buildres/csl/csl-styles/archeosciences.csl
@@ -2,7 +2,7 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" delimiter-precedes-et-al="never" delimiter-precedes-last="never" page-range-format="expanded" demote-non-dropping-particle="never" default-locale="fr-FR">
  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
  <info>
- <title>ArchéoSciences (Français)</title>
+ <title>ArcheoSciences (Français)</title>
  <id>http://www.zotero.org/styles/archeosciences</id>
  <link href="http://www.zotero.org/styles/archeosciences" rel="self"/>
  <link href="http://www.zotero.org/styles/archeologie-medievale" rel="template"/>
@@ -16,7 +16,7 @@
  <category field="science"/>
  <issn>1960-1360</issn>
  <eissn>2104-3728</eissn>
- <summary>Style pour ArchéoSciences, revue d'Archéométrie.</summary>
+ <summary>Style pour ArcheoSciences, revue d'Archéométrie.</summary>
  <updated>2021-06-14T14:16:12+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>