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.

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

Make (un)abbreviating journal titles also work on the journaltitle field #15

Merged
merged 1 commit into from
Aug 20, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[master]
- Make (un)abbreviating journal titles also work on the journaltitle field
- Change default behaviour to be more non-invasive: timestamps and owners are NOT set by default per entry.
- "Open Folder" works again
- newline separator can now be configured globally
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/net/sf/jabref/BibtexFields.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2003-2011 Raik Nagel and JabRef contributors
/* Copyright (C) 2003-2014 Raik Nagel and JabRef contributors
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
Expand Down Expand Up @@ -96,6 +96,10 @@ private BibtexFields()
dummy = new BibtexSingleField( "journal", true, GUIGlobals.SMALL_W ) ;
dummy.setExtras("journalNames");
add(dummy) ;
dummy = new BibtexSingleField( "journaltitle", true, GUIGlobals.SMALL_W ) ;
dummy.setExtras("journalNames");
add(dummy) ;

add( new BibtexSingleField( "key", true ) ) ;
add( new BibtexSingleField( "month", true, GUIGlobals.SMALL_W ) ) ;
add( new BibtexSingleField( "note", true, GUIGlobals.MEDIUM_W ) ) ;
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/net/sf/jabref/journals/AbbreviateAction.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2003-2011 JabRef contributors.
/* Copyright (C) 2003-2014 JabRef contributors.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
Expand Down Expand Up @@ -56,6 +56,8 @@ public void run() {
for (BibtexEntry entry : entries) {
if (Globals.journalAbbrev.abbreviate(panel.database(), entry, "journal", ce, iso))
count++;
if (Globals.journalAbbrev.abbreviate(panel.database(), entry, "journaltitle", ce, iso))
count++;
}
if (count > 0) {
ce.end();
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/net/sf/jabref/journals/UnabbreviateAction.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2003-2011 JabRef contributors.
/* Copyright (C) 2003-2014 JabRef contributors.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
Expand Down Expand Up @@ -54,6 +54,8 @@ public void run() {
for (BibtexEntry entry : entries) {
if (Globals.journalAbbrev.unabbreviate(panel.database(), entry, "journal", ce))
count++;
if (Globals.journalAbbrev.unabbreviate(panel.database(), entry, "journaltitle", ce))
count++;
}
if (count > 0) {
ce.end();
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/help/About.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ <h2>Contributions from:</h2>
Fedor Bezrukov,
Fabian Bieker,
Aaron Chen,
Thorsten Dahlheimer,
Fabrice Dessaint,
Nathan Dunn,
E. Hakan Duran,
Expand Down