Skip to content

Update forks#1

Merged
braincident merged 155 commits into
braincident:masterfrom
JabRef:master
May 30, 2020
Merged

Update forks#1
braincident merged 155 commits into
braincident:masterfrom
JabRef:master

Conversation

@braincident

Copy link
Copy Markdown
Owner

update my local fork

Siedlerchr and others added 30 commits May 3, 2020 16:10
* Update EditAction.java

Fix the bug #6421

* Update CHANGELOG.md

* Update EditAction.java
270cd32 small fixes for revista-biblica.csl (#4770)
5dd7ede fix issue with DOI URL for unified-style-sheet-for-linguistics.csl (#4765)
9556b12 Create the-american-journal-of-bioethics.csl (#4766)
d50c761 fix initials of revista-biblica.csl (#4768)
acbb043 Create nwu-harvard-2020.csl (#4762)
cb19d25 Create revista-biblica.csl (#4763)
d40b5ff Small corrections in IFAO style (#4761)
ba4dd7c Add NZ Journal of History (#4760)
1e20dbd Harvard Stellenbosch: Further et al adjustment
a59a17e Update american-medical-association.csl to version 11 (#4727)
22849dd Create unified-style-sheet-for-linguistics-de-gruyter-literature.csl (#4627)
647fb56 Update karabuk-university-graduate-school-of-natural-and-applied-scie… (#4756)
a4317f2 Update quaternaire.csl (#4752)
36fe9c2 Update journal-of-management-studies.csl (#4740)
f0cb15d Bugfix (#4750)
ef19002 Revert 1 yrg23 patch 1 (#4754)
873fc9e Update the-geological-society-of-london.csl (#4738)
93ca354 Update The Geological Society dependents (#4751)
9d3f0f5 Update technische-universitat-dresden-linguistik.csl (#4737)
63d657c change et al. min (#4736)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 270cd32
…bb45961b8

cbb45961b8 Update locales-sl-SI.xml (#201)

git-subtree-dir: src/main/resources/csl-locales
git-subtree-split: cbb45961b815594f35c36da7e78154feb5647823
* fix #6127

add concise tips when SaveException happend

* Update SaveDatabaseAction.java

add space...
* Make wrap fields also visible in entry editor

Fixes #4373

* change comment

* add changelog
…ptyLib

* upstream/master: (23 commits)
  Make wrap fields also visible in entry editor (#6315)
  Add launcher to fix extension import in snap (#6439)
  add concise message when SaveException happen (#6444)
  Squashed 'src/main/resources/csl-locales/' changes from 79845b087b..cbb45961b8
  Squashed 'src/main/resources/csl-styles/' changes from 906cd6d..270cd32
  Addition to the early pull #6438 (#6441)
  Fix the bug #6421 (#6438)
  Cleanup dead code (#6436)
  Fixed entry duplication on file download (#6437)
  Add workaround for buildSrc issue (#6433)
  Remove dash from illegal characters. (#6300)
  Docs: For developers: New architectural decision added to list (#6397)
  Added a download checkbox to the import dialog (#6381)
  Bump jaxb-xjc from 2.3.2 to 2.3.3 (#6410)
  Bump flexmark-ext-gfm-strikethrough from 0.61.20 to 0.61.24 (#6413)
  Bump byte-buddy-parent from 1.10.9 to 1.10.10 (#6408)
  Bump flexmark-ext-gfm-tasklist from 0.61.20 to 0.61.24 (#6412)
  Bump org.beryx.jlink from 2.17.8 to 2.18.0 (#6411)
  Bump tika-core from 1.24 to 1.24.1 (#6409)
  Bump flexmark from 0.61.20 to 0.61.24 (#6416)
  ...
c35d219 Create journal-of-the-royal-society-of-western-australia.csl (#4772)
e772607 Update journal-of-the-royal-society-of-western-australia.csl
c4b5edc Update journal-of-the-royal-society-of-western-australia.csl
2245fb1 Update journal-of-the-royal-society-of-western-australia.csl
e8bcb31 Create journal-of-the-royal-society-of-western-australia.csl

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: c35d219
Co-authored-by: Mootez <mootez.saad@medtech.tn>
Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>
Fix action helper when no library is open
5dad23d Create monash-university-csiro.csl (#4773)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 5dad23d
Bumps [flexmark-ext-gfm-tasklist](https://github.com/vsch/flexmark-java) from 0.61.24 to 0.61.26.
- [Release notes](https://github.com/vsch/flexmark-java/releases)
- [Commits](vsch/flexmark-java@0.61.24...0.61.26)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps [flexmark](https://github.com/vsch/flexmark-java) from 0.61.24 to 0.61.26.
- [Release notes](https://github.com/vsch/flexmark-java/releases)
- [Commits](vsch/flexmark-java@0.61.24...0.61.26)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps org.beryx.jlink from 2.18.0 to 2.19.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
…k-2.19.0

Bump org.beryx.jlink from 2.18.0 to 2.19.0
…exmark-flexmark-0.61.26

Bump flexmark from 0.61.24 to 0.61.26
Siedlerchr and others added 29 commits May 27, 2020 18:08
Allow entrytype as sorting criterion
* Fix Pattern.compile for frequently used regexes

* Fix one additional Pattern.compile

* Fix style and unnecessary escape sequences

* Fix invalid index in call to substring

The original condition is evaluated to false.
The substring is shorter than "uni".

* Refactor name and javadoc of a regex

* Fix use of compiled regex for matching department

* Fix check for uppercase letter

Perhaps the assumption should be that the letters are ASCII.
If all letters are ASCII checking 'A' <= k.charAt(0) <= 'Z'
might make more sense.
I am not convinced about doing this with a regex.

* Fix usage of uncompiled regex

* Fix readability?

* Add test cases

Both test cases involves an author name containing department or school
 without university or institute of technology.

* Fix `null` appearing as part of author name

Corporate authors without university/institute of technology

* Refactor name of capital regex pattern

* Add debug output for reordering of names in fields

* Add helper methods

* Fix missing negation in "uni" matching

* Fix test cases for corporate authors

* Fix to keep all uppercase letters in abbreviation

* Fix commented out code

* Fix key for institution's name containing keyword

If the name of an institution can't be split, assume that
"School"/"Department" is part of the name.

* Fix test case for short institution name

* Refactor check for institution types

* Refactor comments and names improving readability?

* Refactor to improve readability and closure

* Fix JavaDoc

Minor typos and the "rest" part is now created differently.

* Fix JavaDoc typos

* Fix preliminary order for authors -> latexfree

* Drop logger

* Add convenience methods for cached latexfree names

* Add name format method for names containing latex

* Add call to formatNameLatexFree

* Fix unclear statement in JavaDoc

* Fix to only keep the first character of each word

There are some examples that will turn out wrong if only capital letters
 are kept, e.g., "iOS Developer University Program".
 The original problem with "The School of Life" becoming too short is
 avoided by only removing school/department for names containing two or
  more ',' separated strings. This will still produce an unexpected
   result if the address of the institution is part of the authors field

* Add latexfree Natbib test cases

* Fix typo in latex-free test cases

* Add Natbib test with escaped brackets

* Add Natbib institution test with escaped brackets

* Add test for latex-free comma separated lastnames

* Add test for latex-free comma separated first name

First name first and abbreviated first name first

* Add test for latex-free comma separated last name

Last name first and abbreviated first names

* Fix adherence to JavaDoc and readability(?)

* Fix readability(?)

* Fix CheckStyle issues

The deprecated static methods BibtexKeyGenerator.generateKey are moved
to the test file as a similar convenience method is required for
the test cases. Suppress warning has been added for some methods.

* Fix CHANGELOG.md

* Fix mistake in BibtexKeyGeneratorTest

generateKey was not copy-pasted properly.

* Add test for oxford comma

* Fix miss-capitalization of enum

* Fix fields not displayed latex-free

* Fix in-line methods in MainTableNameFormatter

* Fix in-line of generateKey() method

* Fix separating tests into parsing/representation

* Fix cache check and simplify expressions

* Drop inlined methods

* Fix most abbreviated abbreviations

* Drop old formatName method

* Refactor formatNameLatexFree

The author list parsing is moved outside of the if/else statements

* Refactor new parse tests

* Add more parse tests

* Drop all test cases containing escaped brackets

* Refactor parse with latex tests

Move them close to other parse tests

* Fix my own spelling mistakes

* Refactor abbreviation name
# Conflicts:
#	src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
#	src/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java
Removed BIB file directory from search when preferences has option unchecked
Bumps [flexmark](https://github.com/vsch/flexmark-java) from 0.61.32 to 0.62.0.
- [Release notes](https://github.com/vsch/flexmark-java/releases)
- [Commits](https://github.com/vsch/flexmark-java/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps [flexmark-ext-gfm-tasklist](https://github.com/vsch/flexmark-java) from 0.61.32 to 0.62.0.
- [Release notes](https://github.com/vsch/flexmark-java/releases)
- [Commits](https://github.com/vsch/flexmark-java/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps [bcprov-jdk15on](https://github.com/bcgit/bc-java) from 1.65 to 1.65.01.
- [Release notes](https://github.com/bcgit/bc-java/releases)
- [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
…le-bcprov-jdk15on-1.65.01

Bump bcprov-jdk15on from 1.65 to 1.65.01
…exmark-flexmark-0.62.0

Bump flexmark from 0.61.32 to 0.62.0
…exmark-flexmark-ext-gfm-tasklist-0.62.0

Bump flexmark-ext-gfm-tasklist from 0.61.32 to 0.62.0
Bumps [flexmark-ext-gfm-strikethrough](https://github.com/vsch/flexmark-java) from 0.61.32 to 0.62.0.
- [Release notes](https://github.com/vsch/flexmark-java/releases)
- [Commits](https://github.com/vsch/flexmark-java/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
FIx NPE in loading save order when starting jabref
@braincident braincident merged commit cf29f17 into braincident:master May 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.