Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #5223 #5266

Merged
merged 6 commits into from
Sep 9, 2019
Merged

Issue #5223 #5266

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0410277
add Software entry type to Biblatex and Bibtex
mmihuu Sep 1, 2019
6e8ec1c
add DataSet entry type to Biblatex and Bibtex
mmihuu Sep 1, 2019
c6960b3
add eventitle, eventdate and venue to @unpublished entry type
mmihuu Sep 1, 2019
85b5492
remove @software and @dataset entry type from the bibtex and update c…
mmihuu Sep 2, 2019
1a70233
Fix spacing
tobiasdiez Sep 3, 2019
3052235
Fix empty line
tobiasdiez Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions src/main/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,8 @@ public class BiblatexEntryTypeDefinitions {
StandardField.PUBSTATE, StandardField.URL, StandardField.URLDATE)
.withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.DATE)
.withDetailFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE, StandardField.HOWPUBLISHED,
StandardField.NOTE, StandardField.LOCATION, StandardField.ADDENDUM, StandardField.PUBSTATE,
StandardField.URL, StandardField.URLDATE)
StandardField.NOTE, StandardField.LOCATION, StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.EVENTTITLE,
StandardField.EVENTDATE,StandardField.VENUE, StandardField.URL, StandardField.URLDATE)
.build();

private static final BibEntryType CONFERENCE = new BibEntryTypeBuilder()
Expand Down Expand Up @@ -414,8 +414,34 @@ public class BiblatexEntryTypeDefinitions {
.withRequiredFields(ONLINE.getRequiredFields())
.build();

private static final BibEntryType SOFTWARE = new BibEntryTypeBuilder()
.withType(StandardEntryType.Software)
.withImportantFields(
StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.HOWPUBLISHED, StandardField.LOCATION, StandardField.DOI,
StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
.withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.DATE)
.withDetailFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE, StandardField.HOWPUBLISHED,
StandardField.TYPE, StandardField.VERSION, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.LOCATION,
StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT,
StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
.build();

private static final BibEntryType DATASET = new BibEntryTypeBuilder()
.withType(StandardEntryType.DATESET)
.withImportantFields(
StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.HOWPUBLISHED, StandardField.LOCATION, StandardField.DOI,
StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
.withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.DATE)
.withDetailFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE, StandardField.HOWPUBLISHED,
StandardField.TYPE, StandardField.VERSION, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.LOCATION,
StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT,
StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
.build();



public static final List<BibEntryType> ALL = Arrays.asList(ARTICLE, BOOK, MVBOOK, INBOOK, BOOKINBOOK, SUPPBOOK,
BOOKLET, COLLECTION, MVCOLLECTION, INCOLLECTION, SUPPCOLLECTION, MANUAL, MISC, ONLINE, PATENT, PERIODICAL,
SUPPPERIODICAL, PROCEEDINGS, MVPROCEEDINGS, INPROCEEDINGS, REFERENCE, MVREFERENCE, INREFERENCE, REPORT, SET,
THESIS, UNPUBLISHED, CONFERENCE, ELECTRONIC, MASTERSTHESIS, PHDTHESIS, TECHREPORT, WWW);
THESIS, UNPUBLISHED, CONFERENCE, ELECTRONIC, MASTERSTHESIS, PHDTHESIS, TECHREPORT, WWW, SOFTWARE, DATASET);
}
16 changes: 15 additions & 1 deletion src/main/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,22 @@ public class BibtexEntryTypeDefinitions {
.withImportantFields(StandardField.MONTH, StandardField.YEAR)
.build();


private static final BibEntryType SOFTWARE = new BibEntryTypeBuilder()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think software and dataset are specific to biblatex and thus shouldn't be added here for the bibtex entry types.

.withType(StandardEntryType.Software)
.withImportantFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.HOWPUBLISHED, StandardField.MONTH, StandardField.YEAR, StandardField.NOTE)
.build();

private static final BibEntryType DATESET = new BibEntryTypeBuilder()
.withType(StandardEntryType.DATESET)
.withImportantFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.HOWPUBLISHED, StandardField.MONTH, StandardField.YEAR, StandardField.NOTE)
.build();




public static final List<BibEntryType> ALL = Arrays.asList(ARTICLE, INBOOK, BOOK, BOOKLET, INCOLLECTION, CONFERENCE,
INPROCEEDINGS, PROCEEDINGS, MANUAL, MASTERSTHESIS, PHDTHESIS, TECHREPORT, UNPUBLISHED, MISC);
INPROCEEDINGS, PROCEEDINGS, MANUAL, MASTERSTHESIS, PHDTHESIS, TECHREPORT, UNPUBLISHED, MISC, SOFTWARE, DATESET );

private BibtexEntryTypeDefinitions() {
}
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/org/jabref/model/entry/types/StandardEntryType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ public enum StandardEntryType implements EntryType {
SuppCollection("SuppCollection"),
SuppPeriodical("SuppPeriodical"),
Thesis("Thesis"),
WWW("WWW");
WWW("WWW"),
Software("Software"),
DATESET("DataSet");



private final String displayName;

Expand Down