diff --git a/CHANGELOG b/CHANGELOG index e59fb123398..1e96a68bd0b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/src/main/java/net/sf/jabref/BibtexFields.java b/src/main/java/net/sf/jabref/BibtexFields.java index b2ea00671c6..1309fc44609 100644 --- a/src/main/java/net/sf/jabref/BibtexFields.java +++ b/src/main/java/net/sf/jabref/BibtexFields.java @@ -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 @@ -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 ) ) ; diff --git a/src/main/java/net/sf/jabref/journals/AbbreviateAction.java b/src/main/java/net/sf/jabref/journals/AbbreviateAction.java index 782d7bcb3c4..2452be6b407 100644 --- a/src/main/java/net/sf/jabref/journals/AbbreviateAction.java +++ b/src/main/java/net/sf/jabref/journals/AbbreviateAction.java @@ -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 @@ -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(); diff --git a/src/main/java/net/sf/jabref/journals/UnabbreviateAction.java b/src/main/java/net/sf/jabref/journals/UnabbreviateAction.java index e5538139988..b0a3230e93a 100644 --- a/src/main/java/net/sf/jabref/journals/UnabbreviateAction.java +++ b/src/main/java/net/sf/jabref/journals/UnabbreviateAction.java @@ -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 @@ -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(); diff --git a/src/main/resources/help/About.html b/src/main/resources/help/About.html index ff62f206661..dc3f638e6c9 100644 --- a/src/main/resources/help/About.html +++ b/src/main/resources/help/About.html @@ -53,6 +53,7 @@