[jabref] 04/08: refresh 001_koppor_debian_3.8.patch
Tony Mancill
tmancill at moszumanska.debian.org
Sat Dec 17 02:24:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch dev
in repository jabref.
commit bdf58211c2d9e4100ecfe1b727e41462e7d83549
Author: tony mancill <tmancill at debian.org>
Date: Fri Dec 16 18:06:22 2016 -0800
refresh 001_koppor_debian_3.8.patch
---
debian/patches/001_koppor_debian_3.8.patch | 1487 ++++++++++++++++++++++++++--
1 file changed, 1425 insertions(+), 62 deletions(-)
diff --git a/debian/patches/001_koppor_debian_3.8.patch b/debian/patches/001_koppor_debian_3.8.patch
index e7440ab..2418f29 100644
--- a/debian/patches/001_koppor_debian_3.8.patch
+++ b/debian/patches/001_koppor_debian_3.8.patch
@@ -1,10 +1,10 @@
-Description: patches from koppor/debian_3.8
+Description: Debian-specific patches from koppor/debian_3.8
Author: Oliver Kopp <kopp.dev at gmail.com>
Source: https://github.com/koppor/jabref/commits/debian_3.8
Forwarded: not-needed
diff --git a/build.gradle b/build.gradle
-index c31aab6d2..343d21c63 100644
+index ae18040b0..dc794baf5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -91,8 +91,6 @@ dependencies {
@@ -40,10 +40,22 @@ index c31aab6d2..343d21c63 100644
testCompile 'org.mockito:mockito-core:2.3.0'
testCompile 'com.github.tomakehurst:wiremock:2.4.1'
diff --git a/external-libraries.txt b/external-libraries.txt
-index 4d969fa02..52518a719 100644
+index 9d4ee4843..d50c2ca60 100644
--- a/external-libraries.txt
+++ b/external-libraries.txt
-@@ -45,16 +45,6 @@ Project: Apache Commons Logging
+@@ -22,11 +22,6 @@ Note: It is important to include v1.5.54 or later as v1.5.54 is the first ver
+
+
+ # Libraries
+-Id: com.apple:AppleJavaExtensions
+-Project: AppleJavaExtensions
+-URL: https://developer.apple.com/legacy/library/samplecode/AppleJavaExtensions/Introduction/Intro.html
+-License: Apple License
+-
+ Id: org.antlr:antlr
+ Project: ANTLR 3
+ URL: http://www.antlr.org/
+@@ -47,16 +42,6 @@ Project: Apache Commons Logging
URL: http://commons.apache.org/logging/
License: Apache-2.0
@@ -60,7 +72,7 @@ index 4d969fa02..52518a719 100644
Id: com.jgoodies:jgoodies-common
Project: JGoodies Common
URL: http://www.jgoodies.com/downloads/libraries/
-@@ -145,10 +135,11 @@ Project: SwingX
+@@ -147,10 +132,11 @@ Project: SwingX
URL: https://swingx.java.net/
License: LGPL-3.0
@@ -76,7 +88,7 @@ index 4d969fa02..52518a719 100644
Id: spin
Path: lib/spin.jar
-@@ -156,19 +147,4 @@ Project: Spin
+@@ -158,19 +144,4 @@ Project: Spin
URL: http://spin.sourceforge.net/
License: LGPL-2.1+
@@ -96,19 +108,93 @@ index 4d969fa02..52518a719 100644
-Licence: Apache-2.0
-
The last entry has to end with an empty line. Otherwise the entry is not present in About.html.
+diff --git a/lib/AppleJavaExtensions.jar b/lib/AppleJavaExtensions.jar
+deleted file mode 100644
+index 6659a81c6..000000000
+Binary files a/lib/AppleJavaExtensions.jar and /dev/null differ
+diff --git a/lib/microba.jar b/lib/microba.jar
+new file mode 100644
+index 000000000..8367e7621
+Binary files /dev/null and b/lib/microba.jar differ
+diff --git a/licenses/com.apple_AppleJavaExtensions.txt b/licenses/com.apple_AppleJavaExtensions.txt
+deleted file mode 100644
+index 08fb3d1cf..000000000
+--- a/licenses/com.apple_AppleJavaExtensions.txt
++++ /dev/null
+@@ -1,51 +0,0 @@
+-AppleJavaExtensions
+-
+-This is a pluggable jar of stub classes representing the new Apple eAWT and
+-eIO APIs for Java on Mac OS X. The purpose of these stubs is to allow for
+-compilation of eAWT- or eIO-referencing code on platforms other than Mac OS X.
+-The jar file is enclosed in a zip archive for easy expansion on other
+-platforms.
+-
+-These stubs are not intended for the runtime classpath on non-Mac platforms.
+-Please see the OSXAdapter sample for how to write cross-platform code that uses
+- eAWT.
+-
+-Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple
+-Computer, Inc. ("Apple") in consideration of your agreement to the
+-following terms, and your use, installation, modification or
+-redistribution of this Apple software constitutes acceptance of these
+-terms. If you do not agree with these terms, please do not use,
+-install, modify or redistribute this Apple software.
+-
+-In consideration of your agreement to abide by the following terms, and
+-subject to these terms, Apple grants you a personal, non-exclusive
+-license, under Apple's copyrights in this original Apple software (the
+-"Apple Software"), to use, reproduce, modify and redistribute the Apple
+-Software, with or without modifications, in source and/or binary forms;
+-provided that if you redistribute the Apple Software in its entirety and
+-without modifications, you must retain this notice and the following
+-text and disclaimers in all such redistributions of the Apple Software.
+-Neither the name, trademarks, service marks or logos of Apple Computer,
+-Inc. may be used to endorse or promote products derived from the Apple
+-Software without specific prior written permission from Apple. Except
+-as expressly stated in this notice, no other rights or licenses, express
+-or implied, are granted by Apple herein, including but not limited to
+-any patent rights that may be infringed by your derivative works or by
+-other works in which the Apple Software may be incorporated.
+-
+-The Apple Software is provided by Apple on an "AS IS" basis. APPLE
+-MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
+-THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
+-FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
+-OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
+-
+-IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
+-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+-INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION,
+-MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED
+-AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
+-STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
+-POSSIBILITY OF SUCH DAMAGE.
+-
+-Copyright © 2003-2010 Apple Inc., All Rights Reserved
diff --git a/src/main/java/net/sf/jabref/gui/BasePanel.java b/src/main/java/net/sf/jabref/gui/BasePanel.java
-index f89a0a9bc..25a6d1437 100644
+index c25b88161..910ace0d9 100644
--- a/src/main/java/net/sf/jabref/gui/BasePanel.java
+++ b/src/main/java/net/sf/jabref/gui/BasePanel.java
-@@ -98,7 +98,6 @@ import net.sf.jabref.logic.autocompleter.AutoCompleter;
+@@ -91,7 +91,6 @@ import net.sf.jabref.gui.undo.UndoableRemoveEntry;
+ import net.sf.jabref.gui.util.component.CheckBoxMessage;
+ import net.sf.jabref.gui.worker.AbstractWorker;
+ import net.sf.jabref.gui.worker.CallBack;
+-import net.sf.jabref.gui.worker.CitationStyleToClipboardWorker;
+ import net.sf.jabref.gui.worker.MarkEntriesAction;
+ import net.sf.jabref.gui.worker.SendAsEMailAction;
+ import net.sf.jabref.gui.worker.Worker;
+@@ -100,8 +99,6 @@ import net.sf.jabref.logic.autocompleter.AutoCompleter;
import net.sf.jabref.logic.autocompleter.AutoCompleterFactory;
import net.sf.jabref.logic.autocompleter.ContentAutoCompleters;
import net.sf.jabref.logic.bibtexkeypattern.BibtexKeyPatternUtil;
-import net.sf.jabref.logic.citationstyle.CitationStyleCache;
+-import net.sf.jabref.logic.citationstyle.CitationStyleOutputFormat;
import net.sf.jabref.logic.exporter.BibtexDatabaseWriter;
import net.sf.jabref.logic.exporter.FileSaveSession;
import net.sf.jabref.logic.exporter.SaveException;
-@@ -151,8 +150,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
+@@ -154,8 +151,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
private final BibDatabaseContext bibDatabaseContext;
private final MainTableDataModel tableModel;
@@ -117,7 +203,7 @@ index f89a0a9bc..25a6d1437 100644
// To contain instantiated entry editors. This is to save time
// As most enums, this must not be null
private BasePanelMode mode = BasePanelMode.SHOWING_NOTHING;
-@@ -219,8 +216,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
+@@ -222,8 +217,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
this.frame = frame;
this.tableModel = new MainTableDataModel(getBibDatabaseContext());
@@ -126,7 +212,35 @@ index f89a0a9bc..25a6d1437 100644
setupMainPanel();
setupActions();
-@@ -2382,10 +2377,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
+@@ -495,12 +488,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
+ // The action for copying the BibTeX key and the title for the first selected entry
+ actions.put(Actions.COPY_KEY_AND_TITLE, (BaseAction) () -> copyKeyAndTitle());
+
+- actions.put(Actions.COPY_CITATION_ASCII_DOC, (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.ASCII_DOC));
+- actions.put(Actions.COPY_CITATION_XSLFO, (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.XSL_FO));
+- actions.put(Actions.COPY_CITATION_HTML, (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.HTML));
+- actions.put(Actions.COPY_CITATION_RTF, (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.RTF));
+- actions.put(Actions.COPY_CITATION_TEXT, (BaseAction) () -> copyCitationToClipboard(CitationStyleOutputFormat.TEXT));
+-
+ // The action for copying the BibTeX keys as hyperlinks to the urls of the selected entries
+ actions.put(Actions.COPY_KEY_AND_LINK, new CopyBibTeXKeyAndLinkAction(mainTable));
+
+@@ -708,14 +695,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
+ actions.put(Actions.DOWNLOAD_FULL_TEXT, new FindFullTextAction(this));
+ }
+
+- /**
+- * Generates and copies citations based on the selected entries to the clipboard
+- * @param outputFormat the desired {@link CitationStyleOutputFormat}
+- */
+- private void copyCitationToClipboard(CitationStyleOutputFormat outputFormat) {
+- new CitationStyleToClipboardWorker(this, outputFormat).execute();
+- }
+-
+ private void copy() {
+ List<BibEntry> bes = mainTable.getSelectedEntries();
+
+@@ -2418,10 +2397,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
this.currentSearchQuery = currentSearchQuery;
}
@@ -149,8 +263,36 @@ index f43f8f9bd..2177138bc 100644
// STILL MISSING:
GROUP_REGULAR("\uF4E6", Color.RED);
+diff --git a/src/main/java/net/sf/jabref/gui/JabRefFrame.java b/src/main/java/net/sf/jabref/gui/JabRefFrame.java
+index 31c543522..648dcb0d2 100644
+--- a/src/main/java/net/sf/jabref/gui/JabRefFrame.java
++++ b/src/main/java/net/sf/jabref/gui/JabRefFrame.java
+@@ -139,9 +139,9 @@ import net.sf.jabref.preferences.SearchPreferences;
+ import com.google.common.eventbus.Subscribe;
+ import com.jgoodies.looks.HeaderStyle;
+ import com.jgoodies.looks.Options;
++
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+-import osx.macadapter.MacAdapter;
+
+ /**
+ * The main window of the application.
+@@ -668,11 +668,7 @@ public class JabRefFrame extends JFrame implements OutputPrinter {
+ //if the events happen too early (ie when the window is not initialized yet), the
+ //opened (double-clicked) documents are not displayed.
+ if (OS.OS_X) {
+- try {
+- new MacAdapter().registerMacEvents(this);
+- } catch (Exception e) {
+- LOGGER.fatal("Could not interface with Mac OS X methods.", e);
+- }
++ LOGGER.fatal("This program is not designed to run at Mac OS X");
+ }
+
+ }
diff --git a/src/main/java/net/sf/jabref/gui/PreviewPanel.java b/src/main/java/net/sf/jabref/gui/PreviewPanel.java
-index 0238f1861..97501e09b 100644
+index 4d7d10be5..014519479 100644
--- a/src/main/java/net/sf/jabref/gui/PreviewPanel.java
+++ b/src/main/java/net/sf/jabref/gui/PreviewPanel.java
@@ -31,8 +31,6 @@ import net.sf.jabref.JabRefExecutorService;
@@ -315,6 +457,36 @@ index 6b4a3b997..a11d7710d 100644
}
} else {
// in this case the user selected "none" in the date picker, so we just clear the field
+diff --git a/src/main/java/net/sf/jabref/gui/menus/RightClickMenu.java b/src/main/java/net/sf/jabref/gui/menus/RightClickMenu.java
+index f5ce7dd3f..ca816a900 100644
+--- a/src/main/java/net/sf/jabref/gui/menus/RightClickMenu.java
++++ b/src/main/java/net/sf/jabref/gui/menus/RightClickMenu.java
+@@ -29,7 +29,6 @@ import net.sf.jabref.gui.specialfields.SpecialFieldMenuAction;
+ import net.sf.jabref.gui.specialfields.SpecialFieldValueViewModel;
+ import net.sf.jabref.gui.specialfields.SpecialFieldViewModel;
+ import net.sf.jabref.gui.worker.MarkEntriesAction;
+-import net.sf.jabref.logic.citationstyle.CitationStyle;
+ import net.sf.jabref.logic.l10n.Localization;
+ import net.sf.jabref.model.entry.BibEntry;
+ import net.sf.jabref.model.entry.FieldName;
+@@ -73,17 +72,7 @@ public class RightClickMenu extends JPopupMenu implements PopupMenuListener {
+ // the submenu will behave dependent on what style is currently selected (citation/preview)
+ PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences();
+ String style = previewPreferences.getPreviewCycle().get(previewPreferences.getPreviewCyclePosition());
+- if (CitationStyle.isCitationStyleFile(style)) {
+- copySpecialMenu.add(new GeneralAction(Actions.COPY_CITATION_HTML, Localization.menuTitle("Copy citation") + " (HTML)", KeyBinding.COPY_PREVIEW));
+- JMenu copyCitationMenu = new JMenu(Localization.menuTitle("Copy citation") + "...");
+- copyCitationMenu.add(new GeneralAction(Actions.COPY_CITATION_TEXT, "Text"));
+- copyCitationMenu.add(new GeneralAction(Actions.COPY_CITATION_RTF, "RTF"));
+- copyCitationMenu.add(new GeneralAction(Actions.COPY_CITATION_ASCII_DOC, "AsciiDoc"));
+- copyCitationMenu.add(new GeneralAction(Actions.COPY_CITATION_XSLFO, "XSL-FO"));
+- copySpecialMenu.add(copyCitationMenu);
+- } else {
+ copySpecialMenu.add(new GeneralAction(Actions.COPY_CITATION_HTML, Localization.lang("Copy preview"), KeyBinding.COPY_PREVIEW));
+- }
+
+ copySpecialMenu.add(new GeneralAction(Actions.EXPORT_TO_CLIPBOARD, Localization.lang("Export to clipboard"),
+ IconTheme.JabRefIcon.EXPORT_TO_CLIPBOARD.getSmallIcon()));
diff --git a/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntries.java b/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntries.java
index e5b65c483..1b19f585e 100644
--- a/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntries.java
@@ -389,10 +561,24 @@ index e5b65c483..1b19f585e 100644
}
SwingUtilities.invokeLater(() -> scrollPane.getVerticalScrollBar()
diff --git a/src/main/java/net/sf/jabref/gui/preftabs/PreviewPrefsTab.java b/src/main/java/net/sf/jabref/gui/preftabs/PreviewPrefsTab.java
-index 38bdaf180..3cbfc9978 100644
+index 38bdaf180..205384ebc 100644
--- a/src/main/java/net/sf/jabref/gui/preftabs/PreviewPrefsTab.java
+++ b/src/main/java/net/sf/jabref/gui/preftabs/PreviewPrefsTab.java
-@@ -22,7 +22,6 @@ import net.sf.jabref.Globals;
+@@ -5,7 +5,6 @@ import java.awt.Dimension;
+ import java.util.ArrayList;
+ import java.util.Enumeration;
+ import java.util.List;
+-import java.util.concurrent.ExecutionException;
+
+ import javax.swing.BoxLayout;
+ import javax.swing.DefaultListModel;
+@@ -16,13 +15,11 @@ import javax.swing.JPanel;
+ import javax.swing.JScrollPane;
+ import javax.swing.JTextArea;
+ import javax.swing.ListSelectionModel;
+-import javax.swing.SwingWorker;
+
+ import net.sf.jabref.Globals;
import net.sf.jabref.JabRefGUI;
import net.sf.jabref.gui.BasePanel;
import net.sf.jabref.gui.PreviewPanel;
@@ -400,7 +586,7 @@ index 38bdaf180..3cbfc9978 100644
import net.sf.jabref.logic.l10n.Localization;
import net.sf.jabref.logic.util.TestEntry;
import net.sf.jabref.preferences.PreviewPreferences;
-@@ -38,8 +37,6 @@ public class PreviewPrefsTab extends JPanel implements PrefsTab {
+@@ -38,8 +35,6 @@ public class PreviewPrefsTab extends JPanel implements PrefsTab {
private static final Log LOGGER = LogFactory.getLog(PreviewPrefsTab.class);
@@ -409,7 +595,7 @@ index 38bdaf180..3cbfc9978 100644
private final DefaultListModel<Object> availableModel = new DefaultListModel<>();
private final DefaultListModel<Object> chosenModel = new DefaultListModel<>();
-@@ -171,16 +168,12 @@ public class PreviewPrefsTab extends JPanel implements PrefsTab {
+@@ -171,16 +166,12 @@ public class PreviewPrefsTab extends JPanel implements PrefsTab {
chosenModel.clear();
boolean isPreviewChosen = false;
for (String style : previewPreferences.getPreviewCycle()) {
@@ -426,7 +612,7 @@ index 38bdaf180..3cbfc9978 100644
}
availableModel.clear();
-@@ -193,35 +186,6 @@ public class PreviewPrefsTab extends JPanel implements PrefsTab {
+@@ -193,35 +184,6 @@ public class PreviewPrefsTab extends JPanel implements PrefsTab {
btnUp.setEnabled(!chosen.isSelectionEmpty());
btnDown.setEnabled(!chosen.isSelectionEmpty());
@@ -462,7 +648,7 @@ index 38bdaf180..3cbfc9978 100644
layout.setText(Globals.prefs.getPreviewPreferences().getPreviewStyle().replace("__NEWLINE__", "\n"));
}
-@@ -231,11 +195,7 @@ public class PreviewPrefsTab extends JPanel implements PrefsTab {
+@@ -231,11 +193,7 @@ public class PreviewPrefsTab extends JPanel implements PrefsTab {
Enumeration<Object> elements = chosenModel.elements();
while (elements.hasMoreElements()) {
Object obj = elements.nextElement();
@@ -475,6 +661,207 @@ index 38bdaf180..3cbfc9978 100644
}
PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences()
.getBuilder()
+diff --git a/src/main/java/net/sf/jabref/gui/worker/CitationStyleToClipboardWorker.java b/src/main/java/net/sf/jabref/gui/worker/CitationStyleToClipboardWorker.java
+deleted file mode 100644
+index c3daa9472..000000000
+--- a/src/main/java/net/sf/jabref/gui/worker/CitationStyleToClipboardWorker.java
++++ /dev/null
+@@ -1,195 +0,0 @@
+-package net.sf.jabref.gui.worker;
+-
+-import java.awt.datatransfer.StringSelection;
+-import java.awt.datatransfer.Transferable;
+-import java.io.StringReader;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.concurrent.ExecutionException;
+-import java.util.regex.Pattern;
+-import java.util.stream.Collectors;
+-
+-import javax.swing.SwingWorker;
+-
+-import net.sf.jabref.Globals;
+-import net.sf.jabref.gui.BasePanel;
+-import net.sf.jabref.gui.ClipBoardManager;
+-import net.sf.jabref.gui.exporter.RtfTransferable;
+-import net.sf.jabref.gui.fieldeditors.HtmlTransferable;
+-import net.sf.jabref.gui.fieldeditors.XmlTransferable;
+-import net.sf.jabref.logic.citationstyle.CitationStyle;
+-import net.sf.jabref.logic.citationstyle.CitationStyleGenerator;
+-import net.sf.jabref.logic.citationstyle.CitationStyleOutputFormat;
+-import net.sf.jabref.logic.l10n.Localization;
+-import net.sf.jabref.logic.layout.Layout;
+-import net.sf.jabref.logic.layout.LayoutFormatterPreferences;
+-import net.sf.jabref.logic.layout.LayoutHelper;
+-import net.sf.jabref.logic.util.OS;
+-import net.sf.jabref.model.entry.BibEntry;
+-import net.sf.jabref.preferences.PreviewPreferences;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * Copies the selected entries and formats them with the selected citation style (or preview), then it is copied to the clipboard.
+- * This worker cannot be reused.
+- */
+-public class CitationStyleToClipboardWorker extends SwingWorker<List<String>, Void> {
+-
+- private static final Log LOGGER = LogFactory.getLog(CitationStyleToClipboardWorker.class);
+- private static final Pattern REMOVE_HTML = Pattern.compile("<(?!br)(?!BR).*?>");
+- private static final Pattern WHITESPACE = Pattern.compile("(?m)^\\s|\\v+");
+- private static final Pattern HTML_NEWLINE = Pattern.compile("<br>|<BR>");
+-
+- private final BasePanel basePanel;
+- private final List<BibEntry> selectedEntries;
+- private final String style;
+- private final String previewStyle;
+- private final CitationStyleOutputFormat outputFormat;
+-
+-
+- public CitationStyleToClipboardWorker(BasePanel basePanel, CitationStyleOutputFormat outputFormat) {
+- this.basePanel = basePanel;
+- this.selectedEntries = basePanel.getSelectedEntries();
+- PreviewPreferences previewPreferences = Globals.prefs.getPreviewPreferences();
+- this.style = previewPreferences.getPreviewCycle().get(previewPreferences.getPreviewCyclePosition());
+- this.previewStyle = Globals.prefs.getPreviewPreferences().getPreviewStyle();
+- this.outputFormat = outputFormat;
+-
+- basePanel.frame().setStatus(Localization.lang("Copying..."));
+- }
+-
+- @Override
+- protected List<String> doInBackground() throws Exception {
+- if (CitationStyle.isCitationStyleFile(style)) {
+- return CitationStyleGenerator.generateCitations(selectedEntries, style, outputFormat);
+- } else {
+- StringReader sr = new StringReader(previewStyle.replace("__NEWLINE__", "\n"));
+- LayoutFormatterPreferences layoutFormatterPreferences = Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
+- Layout layout = new LayoutHelper(sr, layoutFormatterPreferences).getLayoutFromText();
+-
+- List<String> citations = new ArrayList<>(selectedEntries.size());
+- for (BibEntry entry : selectedEntries) {
+- citations.add(layout.doLayout(entry, basePanel.getDatabase()));
+- }
+- return citations;
+- }
+- }
+-
+- @Override
+- public void done() {
+- try {
+- List<String> citations = get();
+-
+- // if it's not a citation style take care of the preview
+- if (!CitationStyle.isCitationStyleFile(style)) {
+- new ClipBoardManager().setTransferableClipboardContents(processPreview(citations));
+-
+- } else {
+- // if it's generated by a citation style take care of each output format
+- Transferable transferable;
+- switch (outputFormat) {
+- case HTML:
+- transferable = processHtml(citations);
+- break;
+- case RTF:
+- transferable = processRtf(citations);
+- break;
+- case XSL_FO:
+- transferable = processXslFo(citations);
+- break;
+- case ASCII_DOC:
+- case TEXT:
+- transferable = processText(citations);
+- break;
+- default:
+- LOGGER.warn("unknown output format: '" + outputFormat + "', processing it via the default.");
+- transferable = processText(citations);
+- break;
+- }
+- new ClipBoardManager().setTransferableClipboardContents(transferable);
+- }
+-
+- basePanel.frame().setStatus(Localization.lang("Copied %0 citations.", String.valueOf(selectedEntries.size())));
+- } catch (InterruptedException | ExecutionException e) {
+- LOGGER.error("Error while copying citations to the clipboard", e);
+- }
+- }
+-
+- /**
+- * Generates a plain text string out of the preview and copies it additionally to the html to the clipboard
+- * (WYSIWYG Editors use the HTML, plain text editors the text)
+- */
+- protected static HtmlTransferable processPreview(List<String> citations) {
+- String html = String.join(CitationStyleOutputFormat.HTML.getLineSeparator(), citations);
+- String plain = citations.stream().map(c -> {
+- String tmp = WHITESPACE.matcher(c).replaceAll("");
+- tmp = REMOVE_HTML.matcher(tmp).replaceAll("");
+- return HTML_NEWLINE.matcher(tmp).replaceAll(OS.NEWLINE) + OS.NEWLINE;
+- }).collect(Collectors.joining(""));
+- return new HtmlTransferable(html, plain);
+- }
+-
+- /**
+- * Joins every citation with a newline and returns it.
+- */
+- protected static StringSelection processText(List<String> citations) {
+- return new StringSelection(String.join(CitationStyleOutputFormat.TEXT.getLineSeparator(), citations));
+- }
+-
+- /**
+- * Converts the citations into the RTF format.
+- */
+- protected static RtfTransferable processRtf(List<String> citations) {
+- String result = "{\\rtf" + OS.NEWLINE +
+- String.join(CitationStyleOutputFormat.RTF.getLineSeparator(), citations) +
+- "}";
+- return new RtfTransferable(result);
+- }
+-
+- /**
+- * Inserts each citation into a XLSFO body and copies it to the clipboard
+- */
+- protected static XmlTransferable processXslFo(List<String> citations) {
+- String result = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + OS.NEWLINE +
+- "<fo:root xmlns:fo=\"http://www.w3.org/1999/XSL/Format\">" + OS.NEWLINE +
+- " <fo:layout-master-set>" + OS.NEWLINE +
+- " <fo:simple-page-master master-name=\"citations\">" + OS.NEWLINE +
+- " <fo:region-body/>" + OS.NEWLINE +
+- " </fo:simple-page-master>" + OS.NEWLINE +
+- " </fo:layout-master-set>" + OS.NEWLINE +
+- " <fo:page-sequence master-reference=\"citations\">" + OS.NEWLINE +
+- " <fo:flow flow-name=\"xsl-region-body\">" + OS.NEWLINE + OS.NEWLINE;
+-
+- result += String.join(CitationStyleOutputFormat.XSL_FO.getLineSeparator(), citations);
+-
+- result += OS.NEWLINE +
+- " </fo:flow>" + OS.NEWLINE +
+- " </fo:page-sequence>" + OS.NEWLINE +
+- "</fo:root>" + OS.NEWLINE;
+-
+- return new XmlTransferable(result);
+- }
+-
+- /**
+- * Inserts each citation into a HTML body and copies it to the clipboard
+- */
+- protected static HtmlTransferable processHtml(List<String> citations) {
+- String result = "<!DOCTYPE html>" + OS.NEWLINE +
+- "<html>" + OS.NEWLINE +
+- " <head>" + OS.NEWLINE +
+- " <meta charset=\"utf-8\">" + OS.NEWLINE +
+- " </head>" + OS.NEWLINE +
+- " <body>" + OS.NEWLINE + OS.NEWLINE;
+-
+- result += String.join(CitationStyleOutputFormat.HTML.getLineSeparator(), citations);
+-
+- result += OS.NEWLINE +
+- " </body>" + OS.NEWLINE +
+- "</html>" + OS.NEWLINE;
+-
+- return new HtmlTransferable(result);
+- }
+-
+-}
diff --git a/src/main/java/net/sf/jabref/gui/worker/CitationStyleWorker.java b/src/main/java/net/sf/jabref/gui/worker/CitationStyleWorker.java
deleted file mode 100644
index 1cd1489d7..000000000
@@ -744,7 +1131,7 @@ index f4988b46d..000000000
-}
diff --git a/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleCache.java b/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleCache.java
deleted file mode 100644
-index aef0b05e9..000000000
+index 95d977129..000000000
--- a/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleCache.java
+++ /dev/null
@@ -1,77 +0,0 @@
@@ -787,7 +1174,7 @@ index aef0b05e9..000000000
- public String getCitationFor(BibEntry entry) {
- String citation = citationStylesCache.get(entry);
- if (citation == null) {
-- citation = CitationStyleGenerator.generateCitation(entry, this.citationStyle);
+- citation = CitationStyleGenerator.generateCitation(entry, this.citationStyle.getSource(), CitationStyleOutputFormat.HTML);
- citationStylesCache.put(entry, citation);
- }
- return citation;
@@ -827,16 +1214,18 @@ index aef0b05e9..000000000
-}
diff --git a/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleGenerator.java b/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleGenerator.java
deleted file mode 100644
-index fed37f29c..000000000
+index cfa75548b..000000000
--- a/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleGenerator.java
+++ /dev/null
-@@ -1,80 +0,0 @@
+@@ -1,100 +0,0 @@
-package net.sf.jabref.logic.citationstyle;
-
-import java.io.IOException;
--import java.util.Map;
+-import java.util.Arrays;
+-import java.util.Collections;
+-import java.util.List;
+-import java.util.Optional;
-
--import net.sf.jabref.logic.formatter.bibtexfields.UnicodeToLatexFormatter;
-import net.sf.jabref.logic.l10n.Localization;
-import net.sf.jabref.model.entry.BibEntry;
-
@@ -853,91 +1242,117 @@ index fed37f29c..000000000
-
-
-/**
-- * WARNING: the citation is generated with JavaScript which may take some time, better call it in outside the main Thread
+- * WARNING: the citation is generated using JavaScript which may take some time, better call it from outside the main Thread
- */
-public class CitationStyleGenerator {
-
- private static final Log LOGGER = LogFactory.getLog(CitationStyleGenerator.class);
-- private static final UnicodeToLatexFormatter UNICODE_TO_LATEX_FORMATTER = new UnicodeToLatexFormatter();
- private static final BibTeXConverter BIBTEX_CONVERTER = new BibTeXConverter();
-
- /**
+- * WARNING: the citation is generated using JavaScript which may take some time, better call it from outside the main Thread
- * Generates a Citation based on the given entry and style
-- * WARNING: the citation is generated with JavaScript which may take some time, better call it in outside the main Thread
- */
- protected static String generateCitation(BibEntry entry, CitationStyle style) {
- return generateCitation(entry, style.getSource(), CitationStyleOutputFormat.HTML);
- }
-
- /**
+- * WARNING: the citation is generated using JavaScript which may take some time, better call it from outside the main Thread
- * Generates a Citation based on the given entry and style
-- * WARNING: the citation is generated with JavaScript which may take some time, better call it in outside the main Thread
- */
- protected static String generateCitation(BibEntry entry, String style) {
- return generateCitation(entry, style, CitationStyleOutputFormat.HTML);
- }
-
- /**
+- * WARNING: the citation is generated using JavaScript which may take some time, better call it from outside the main Thread
- * Generates a Citation based on the given entry, style, and output format
-- * WARNING: the citation is generated with JavaScript which may take some time, better call it in outside the main Thread
- */
- protected static String generateCitation(BibEntry entry, String style, CitationStyleOutputFormat outputFormat) {
+- return generateCitations(Collections.singletonList(entry), style, outputFormat).get(0);
+- }
+-
+- /**
+- * WARNING: the citation is generated using JavaScript which may take some time, better call it from outside the main Thread
+- * Generates the citation for multiple entries at once. This is useful when the Citation Style has an increasing number
+- */
+- public static List<String> generateCitations(List<BibEntry> bibEntries, String style, CitationStyleOutputFormat outputFormat) {
- try {
-- String citeKey = entry.getCiteKeyOptional().orElse("");
-- BibTeXEntry bibTeXEntry = new BibTeXEntry(new Key(entry.getType()), new Key(citeKey));
-- for (Map.Entry<String, String> field : entry.getFieldMap().entrySet()) {
-- String value = UNICODE_TO_LATEX_FORMATTER.format(field.getValue());
-- bibTeXEntry.addField(new Key(field.getKey()), new DigitStringValue(value));
+- CSLItemData[] cslItemData = new CSLItemData[bibEntries.size()];
+- for (int i = 0; i < bibEntries.size(); i++) {
+- cslItemData[i] = bibEntryToCSLItemData(bibEntries.get(i));
- }
--
-- CSLItemData cslItemData = BIBTEX_CONVERTER.toItemData(bibTeXEntry);
- Bibliography bibliography = CSL.makeAdhocBibliography(style, outputFormat.getFormat(), cslItemData);
-- return bibliography.getEntries()[0];
+- return Arrays.asList(bibliography.getEntries());
-
- } catch (IOException | ArrayIndexOutOfBoundsException e) {
- LOGGER.error("Could not generate BibEntry citation", e);
-- return Localization.lang("Cannot generate preview based on selected citation style.");
+- return Collections.singletonList(Localization.lang("Cannot generate preview based on selected citation style."));
- } catch (TokenMgrException e) {
- LOGGER.error("Bad character inside BibEntry", e);
- // sadly one cannot easily retrieve the bad char from the TokenMgrError
-- return new StringBuilder()
+- return Collections.singletonList(new StringBuilder()
- .append(Localization.lang("Cannot generate preview based on selected citation style."))
-- .append(outputFormat == CitationStyleOutputFormat.HTML ? "<br>" : "\n")
+- .append(outputFormat.getLineSeparator())
- .append(Localization.lang("Bad character inside entry"))
-- .append(outputFormat == CitationStyleOutputFormat.HTML ? "<br>" : "\n")
+- .append(outputFormat.getLineSeparator())
- .append(e.getLocalizedMessage())
-- .toString();
+- .toString());
- }
- }
-
+- /**
+- * Converts the {@link BibEntry} into {@link CSLItemData}.
+- */
+- private static CSLItemData bibEntryToCSLItemData(BibEntry bibEntry) {
+- String citeKey = bibEntry.getCiteKeyOptional().orElse("");
+- BibTeXEntry bibTeXEntry = new BibTeXEntry(new Key(bibEntry.getType()), new Key(citeKey));
+-
+- // Not every field is already generated into latex free fields
+- for (String key : bibEntry.getFieldMap().keySet()) {
+- Optional<String> latexFreeField = bibEntry.getLatexFreeField(key);
+- latexFreeField.ifPresent(value -> bibTeXEntry.addField(new Key(key), new DigitStringValue(value)));
+- }
+- return BIBTEX_CONVERTER.toItemData(bibTeXEntry);
+- }
+-
-}
diff --git a/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleOutputFormat.java b/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleOutputFormat.java
deleted file mode 100644
-index dc6bf3119..000000000
+index 6306dc0ff..000000000
--- a/src/main/java/net/sf/jabref/logic/citationstyle/CitationStyleOutputFormat.java
+++ /dev/null
-@@ -1,27 +0,0 @@
+@@ -1,35 +0,0 @@
-package net.sf.jabref.logic.citationstyle;
-
-
+-import net.sf.jabref.logic.util.OS;
+-
-public enum CitationStyleOutputFormat {
-
-- HTML("html"),
-- TEXT("text"),
-- ASCII_DOC("asciidoc"),
-- FO("fo"),
-- RTF("rtf");
+- ASCII_DOC("asciidoc", ""),
+- HTML("html", OS.NEWLINE + "<br>" + OS.NEWLINE),
+- RTF("rtf", "\\line" + OS.NEWLINE),
+- TEXT("text", ""),
+- XSL_FO("fo", OS.NEWLINE);
-
- private final String format;
+- private final String lineSeparator;
-
-- CitationStyleOutputFormat(String format) {
+- CitationStyleOutputFormat(String format, String lineSeparator) {
- this.format = format;
+- this.lineSeparator = lineSeparator;
- }
-
- public String getFormat() {
- return format;
- }
-
+- public String getLineSeparator() {
+- return lineSeparator;
+- }
+-
- @Override
- public String toString() {
- return format;
@@ -1083,7 +1498,7 @@ index ba6463b1f..000000000
-
-}
diff --git a/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java b/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java
-index d98895592..c85dc1da5 100644
+index 4c91d2a70..0cb30420b 100644
--- a/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java
@@ -42,7 +42,6 @@ import net.sf.jabref.logic.autocompleter.AutoCompletePreferences;
@@ -1119,18 +1534,15 @@ index d27b0af63..e96f567e5 100644
private final String type;
private final String driverPath;
diff --git a/src/main/java/net/sf/jabref/shared/PostgreSQLProcessor.java b/src/main/java/net/sf/jabref/shared/PostgreSQLProcessor.java
-index 6a302d1a0..1191eb26c 100644
+index 6a302d1a0..61818b325 100644
--- a/src/main/java/net/sf/jabref/shared/PostgreSQLProcessor.java
+++ b/src/main/java/net/sf/jabref/shared/PostgreSQLProcessor.java
-@@ -1,5 +1,6 @@
- package net.sf.jabref.shared;
-
-+import java.sql.Connection;
- import java.sql.PreparedStatement;
+@@ -4,26 +4,14 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-@@ -8,22 +9,12 @@ import java.util.logging.Level;
- import java.util.logging.Logger;
+ import java.sql.Statement;
+-import java.util.logging.Level;
+-import java.util.logging.Logger;
import net.sf.jabref.model.entry.BibEntry;
-import net.sf.jabref.shared.listener.PostgresSQLNotificationListener;
@@ -1152,7 +1564,7 @@ index 6a302d1a0..1191eb26c 100644
public PostgreSQLProcessor(DBMSConnection connection) {
super(connection);
}
-@@ -85,47 +76,4 @@ public class PostgreSQLProcessor extends DBMSProcessor {
+@@ -85,47 +73,4 @@ public class PostgreSQLProcessor extends DBMSProcessor {
return "\"" + expression + "\"";
}
@@ -1233,15 +1645,894 @@ index 2cae95385..000000000
- }
-
-}
+diff --git a/src/main/java/osx/macadapter/MacAdapter.java b/src/main/java/osx/macadapter/MacAdapter.java
+deleted file mode 100644
+index 419eba846..000000000
+--- a/src/main/java/osx/macadapter/MacAdapter.java
++++ /dev/null
+@@ -1,85 +0,0 @@
+-package osx.macadapter;
+-
+-import java.io.File;
+-import java.util.List;
+-
+-import net.sf.jabref.gui.JabRefFrame;
+-
+-import com.apple.eawt.AboutHandler;
+-import com.apple.eawt.AppEvent;
+-import com.apple.eawt.AppEvent.AboutEvent;
+-import com.apple.eawt.AppEvent.OpenFilesEvent;
+-import com.apple.eawt.AppEvent.PreferencesEvent;
+-import com.apple.eawt.AppEvent.QuitEvent;
+-import com.apple.eawt.AppReOpenedListener;
+-import com.apple.eawt.Application;
+-import com.apple.eawt.FullScreenUtilities;
+-import com.apple.eawt.OpenFilesHandler;
+-import com.apple.eawt.PreferencesHandler;
+-import com.apple.eawt.QuitHandler;
+-import com.apple.eawt.QuitResponse;
+-
+-public class MacAdapter implements PreferencesHandler, AboutHandler, QuitHandler, OpenFilesHandler, AppReOpenedListener {
+-
+- private JabRefFrame parentFrame;
+-
+- public void registerMacEvents(JabRefFrame inputFrame) {
+- parentFrame = inputFrame;
+- Application.getApplication().setOpenFileHandler(this);
+- Application.getApplication().setAboutHandler(this);
+- Application.getApplication().setPreferencesHandler(this);
+- Application.getApplication().setQuitHandler(this);
+- Application.getApplication().addAppEventListener(this);
+- FullScreenUtilities.setWindowCanFullScreen(parentFrame, true);
+- }
+-
+- @Override
+- // The OSXAdapter calls this method when a ".bib" file has been double-clicked from the Finder.
+- public void openFiles(OpenFilesEvent event) {
+- if (parentFrame == null) {
+- return;
+- }
+-
+- List<File> files = event.getFiles();
+-
+- for (File file : files) {
+- parentFrame.openAction(file.getAbsolutePath());
+- }
+- }
+-
+- @Override
+- public void handleQuitRequestWith(QuitEvent evt, QuitResponse resp) {
+- if (parentFrame == null) {
+- return;
+- }
+-
+- if (parentFrame.quit()) {
+- resp.performQuit();
+- } else {
+- resp.cancelQuit();
+- }
+- }
+-
+- @Override
+- public void handleAbout(AboutEvent arg0) {
+- if (parentFrame == null) {
+- return;
+- }
+-
+- parentFrame.about();
+- }
+-
+- @Override
+- public void handlePreferences(PreferencesEvent arg0) {
+- if (parentFrame == null) {
+- return;
+- }
+-
+- parentFrame.showPreferencesDialog();
+- }
+-
+- @Override
+- public void appReOpened(AppEvent.AppReOpenedEvent appReOpenedEvent) {
+- parentFrame.setVisible(true);
+- }
+-}
+diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
+index 1798e9656..8642ca84d 100644
+--- a/src/main/resources/l10n/JabRef_da.properties
++++ b/src/main/resources/l10n/JabRef_da.properties
+@@ -975,11 +975,7 @@ Preferences=Indstillinger
+ Preferences_recorded.=Indstillinger_gemt.
+
+ Preview=Forhåndsvisning
+-Citation_Style=
+ Current_Preview=
+-Cannot_generate_preview_based_on_selected_citation_style.=
+-Bad_character_inside_entry=
+-Error_while_generating_citation_style=
+ Preview_style_changed_to\:_%0=
+ Next_preview_layout=
+ Previous_preview_layout=
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=
+ Jump_to_entry=
+-
+-Copied_%0_citations.=
+-Copying...=
+diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
+index 05bf7882c..d7efde6c2 100644
+--- a/src/main/resources/l10n/JabRef_de.properties
++++ b/src/main/resources/l10n/JabRef_de.properties
+@@ -975,11 +975,7 @@ Preferences=Einstellungen
+ Preferences_recorded.=Einstellungen_gespeichert.
+
+ Preview=Vorschau
+-Citation_Style=Zitierstil
+ Current_Preview=Aktuelle_Vorschau
+-Cannot_generate_preview_based_on_selected_citation_style.=Vorschau_für_gewählten_Zitierstil_kann_nicht_generiert_werden.
+-Bad_character_inside_entry=Eintrag_enthält_fehlerhaftes_Zeichen
+-Error_while_generating_citation_style=Fehler_beim_Generieren_des_Zitierstils
+ Preview_style_changed_to\:_%0=Vorschaustil_geändert_zu:_%0
+ Next_preview_layout=Nächster_Vorschaustil
+ Previous_preview_layout=Voriger_Vorschaustil
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=Abweichende_Anpass
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=Eintragstyp_%0_ist_nur_für_Biblatex,_nicht_aber_für_BibTeX_definiert
+ Jump_to_entry=Springe_zu_Eintrag
+-
+-Copied_%0_citations.=Es_wurden_%0_Zitierungen_kopiert.
+-Copying...=Kopiere...
+diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
+index 77d73ccf0..8db3c5d74 100644
+--- a/src/main/resources/l10n/JabRef_en.properties
++++ b/src/main/resources/l10n/JabRef_en.properties
+@@ -975,11 +975,7 @@ Preferences=Preferences
+ Preferences_recorded.=Preferences_recorded.
+
+ Preview=Preview
+-Citation_Style=Citation_Style
+ Current_Preview=Current_Preview
+-Cannot_generate_preview_based_on_selected_citation_style.=Cannot_generate_preview_based_on_selected_citation_style.
+-Bad_character_inside_entry=Bad_character_inside_entry
+-Error_while_generating_citation_style=Error_while_generating_citation_style
+ Preview_style_changed_to\:_%0=Preview_style_changed_to\:_%0
+ Next_preview_layout=Next_preview_layout
+ Previous_preview_layout=Previous_preview_layout
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=Different_customiz
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX
+ Jump_to_entry=Jump_to_entry
+-
+-Copied_%0_citations.=Copied_%0_citations.
+-Copying...=Copying...
+diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
+index 60d05f66b..f1c98da92 100644
+--- a/src/main/resources/l10n/JabRef_es.properties
++++ b/src/main/resources/l10n/JabRef_es.properties
+@@ -975,11 +975,7 @@ Preferences=Preferencias
+ Preferences_recorded.=Preferencias_guardadas.
+
+ Preview=Vista_previa
+-Citation_Style=
+ Current_Preview=
+-Cannot_generate_preview_based_on_selected_citation_style.=
+-Bad_character_inside_entry=
+-Error_while_generating_citation_style=
+ Preview_style_changed_to\:_%0=
+ Next_preview_layout=
+ Previous_preview_layout=
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=
+ Jump_to_entry=
+-
+-Copied_%0_citations.=
+-Copying...=
+diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
+index 95a914796..9a0d5b13c 100644
+--- a/src/main/resources/l10n/JabRef_fa.properties
++++ b/src/main/resources/l10n/JabRef_fa.properties
+@@ -975,11 +975,7 @@ Preferences=
+ Preferences_recorded.=
+
+ Preview=
+-Citation_Style=
+ Current_Preview=
+-Cannot_generate_preview_based_on_selected_citation_style.=
+-Bad_character_inside_entry=
+-Error_while_generating_citation_style=
+ Preview_style_changed_to\:_%0=
+ Next_preview_layout=
+ Previous_preview_layout=
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=
+ Jump_to_entry=
+-
+-Copied_%0_citations.=
+-Copying...=
+diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
+index be874a0af..bb2a42655 100644
+--- a/src/main/resources/l10n/JabRef_fr.properties
++++ b/src/main/resources/l10n/JabRef_fr.properties
+@@ -975,11 +975,7 @@ Preferences=Préférences
+ Preferences_recorded.=Préférences_enregistrées.
+
+ Preview=Aperçu
+-Citation_Style=Style_de_citation
+ Current_Preview=Aperçu_actuel
+-Cannot_generate_preview_based_on_selected_citation_style.=La_prévisualisation_ne_peut_pas_être_générée_à_partir_du_style_de_citation_sélectionné.
+-Bad_character_inside_entry=Caractère_érroné_dans_l'entrée
+-Error_while_generating_citation_style=Erreur_lors_de_la_génération_du_style_de_citation
+ Preview_style_changed_to\:_%0=Style_d'aperçu_modifié_en_:_%0
+ Next_preview_layout=Mode_d'aperçu_suivant
+ Previous_preview_layout=Mode_d'aperçu_précédent
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=Le_type_d'entrée_%0_est_uniquement_défini_pour_BibLaTeX_et_pas_pour_BibTeX
+ Jump_to_entry=Aller_à_cette_entrée
+-
+-Copied_%0_citations.=
+-Copying...=
+diff --git a/src/main/resources/l10n/JabRef_in.properties b/src/main/resources/l10n/JabRef_in.properties
+index b3cc8c430..28829bb3e 100644
+--- a/src/main/resources/l10n/JabRef_in.properties
++++ b/src/main/resources/l10n/JabRef_in.properties
+@@ -975,11 +975,7 @@ Preferences=Preferensi
+ Preferences_recorded.=Preferensi_disimpan.
+
+ Preview=Pratampilan
+-Citation_Style=
+ Current_Preview=
+-Cannot_generate_preview_based_on_selected_citation_style.=
+-Bad_character_inside_entry=
+-Error_while_generating_citation_style=
+ Preview_style_changed_to\:_%0=
+ Next_preview_layout=
+ Previous_preview_layout=
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=
+ Jump_to_entry=
+-
+-Copied_%0_citations.=
+-Copying...=
+diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
+index 35d14ed46..74815df44 100644
+--- a/src/main/resources/l10n/JabRef_it.properties
++++ b/src/main/resources/l10n/JabRef_it.properties
+@@ -975,11 +975,7 @@ Preferences=Preferenze
+ Preferences_recorded.=Preferenze_registrate.
+
+ Preview=Anteprima
+-Citation_Style=Stile_delle_citazioni
+ Current_Preview=Anteprima_di_stampa_corrente
+-Cannot_generate_preview_based_on_selected_citation_style.=Non_posso_generare_un'anteprima_usando_lo_stile_delle_citazioni_scelto.
+-Bad_character_inside_entry=Carattere_errato_nella_voce
+-Error_while_generating_citation_style=Errore_durante_la_generazione_dello_stile_di_citazione
+ Preview_style_changed_to\:_%0=Stile_di_anteprima_modificato_in\:_%0
+ Next_preview_layout=Prossimo_layout_di_anteprima
+ Previous_preview_layout=Successivo_layout_di_anteprima
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=Personalizzazione_
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=Il_tipo_di_voce_%0_è_definita_per_Biblatex_ma_non_per_BibTeX
+ Jump_to_entry=Salta_alla_voce
+-
+-Copied_%0_citations.=
+-Copying...=
+diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
+index 2d5571b09..1c3f2887c 100644
+--- a/src/main/resources/l10n/JabRef_ja.properties
++++ b/src/main/resources/l10n/JabRef_ja.properties
+@@ -975,11 +975,7 @@ Preferences=設定
+ Preferences_recorded.=設定が記録されました。
+
+ Preview=プレビュー
+-Citation_Style=引用様式
+ Current_Preview=現在のプレビュー
+-Cannot_generate_preview_based_on_selected_citation_style.=選択された引用様式に沿ってプレビューを生成することができませんでした。
+-Bad_character_inside_entry=項目中に不適切な文字
+-Error_while_generating_citation_style=引用様式を生成中にエラー発生
+ Preview_style_changed_to\:_%0=プレビュー様式が_%0_に変更されました
+ Next_preview_layout=次のプレビュー様式
+ Previous_preview_layout=前のプレビュー様式
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=
+ Jump_to_entry=項目へジャンプ
+-
+-Copied_%0_citations.=
+-Copying...=
+diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
+index 23328275c..af900a3cd 100644
+--- a/src/main/resources/l10n/JabRef_nl.properties
++++ b/src/main/resources/l10n/JabRef_nl.properties
+@@ -975,11 +975,7 @@ Preferences=Instellingen
+ Preferences_recorded.=Instellingen_opgeslagen.
+
+ Preview=Voorbeeld
+-Citation_Style=
+ Current_Preview=
+-Cannot_generate_preview_based_on_selected_citation_style.=
+-Bad_character_inside_entry=
+-Error_while_generating_citation_style=
+ Preview_style_changed_to\:_%0=
+ Next_preview_layout=
+ Previous_preview_layout=
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=
+ Jump_to_entry=
+-
+-Copied_%0_citations.=
+-Copying...=
+diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
+index 5409f8d2b..6e7245413 100644
+--- a/src/main/resources/l10n/JabRef_no.properties
++++ b/src/main/resources/l10n/JabRef_no.properties
+@@ -975,11 +975,7 @@ Preferences=Oppsett
+ Preferences_recorded.=Lagret_oppsett.
+
+ Preview=Forh\u00e5ndsvisning
+-Citation_Style=
+ Current_Preview=
+-Cannot_generate_preview_based_on_selected_citation_style.=
+-Bad_character_inside_entry=
+-Error_while_generating_citation_style=
+ Preview_style_changed_to\:_%0=
+ Next_preview_layout=
+ Previous_preview_layout=
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=
+ Jump_to_entry=
+-
+-Copied_%0_citations.=
+-Copying...=
+diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
+index 92155f07d..1eb8e192f 100644
+--- a/src/main/resources/l10n/JabRef_pt_BR.properties
++++ b/src/main/resources/l10n/JabRef_pt_BR.properties
+@@ -975,11 +975,7 @@ Preferences=Preferências
+ Preferences_recorded.=Preferências_salvas.
+
+ Preview=Previsualização
+-Citation_Style=
+ Current_Preview=
+-Cannot_generate_preview_based_on_selected_citation_style.=
+-Bad_character_inside_entry=
+-Error_while_generating_citation_style=
+ Preview_style_changed_to\:_%0=
+ Next_preview_layout=
+ Previous_preview_layout=
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=
+ Jump_to_entry=
+-
+-Copied_%0_citations.=
+-Copying...=
+diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
+index 3e1661f59..d8b4ddb2a 100644
+--- a/src/main/resources/l10n/JabRef_ru.properties
++++ b/src/main/resources/l10n/JabRef_ru.properties
+@@ -975,11 +975,7 @@ Preferences=Пользовательские_настройки
+ Preferences_recorded.=Пользовательские_настройки_записаны.
+
+ Preview=Предварительный_просмотр
+-Citation_Style=
+ Current_Preview=
+-Cannot_generate_preview_based_on_selected_citation_style.=
+-Bad_character_inside_entry=
+-Error_while_generating_citation_style=
+ Preview_style_changed_to\:_%0=
+ Next_preview_layout=
+ Previous_preview_layout=
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=
+ Jump_to_entry=
+-
+-Copied_%0_citations.=
+-Copying...=
+diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
+index 7a0fff6bc..1770ccd1b 100644
+--- a/src/main/resources/l10n/JabRef_sv.properties
++++ b/src/main/resources/l10n/JabRef_sv.properties
+@@ -975,11 +975,7 @@ Preferences=Inställningar
+ Preferences_recorded.=Inställningar_sparade.
+
+ Preview=Postvisning
+-Citation_Style=
+ Current_Preview=
+-Cannot_generate_preview_based_on_selected_citation_style.=
+-Bad_character_inside_entry=
+-Error_while_generating_citation_style=
+ Preview_style_changed_to\:_%0=
+ Next_preview_layout=
+ Previous_preview_layout=
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=
+ Jump_to_entry=
+-
+-Copied_%0_citations.=
+-Copying...=
+diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
+index e2f618abf..c16c9f694 100644
+--- a/src/main/resources/l10n/JabRef_tr.properties
++++ b/src/main/resources/l10n/JabRef_tr.properties
+@@ -975,11 +975,7 @@ Preferences=Tercihler
+ Preferences_recorded.=Tercihler_kaydedildi.
+
+ Preview=Önizleme
+-Citation_Style=
+ Current_Preview=
+-Cannot_generate_preview_based_on_selected_citation_style.=
+-Bad_character_inside_entry=
+-Error_while_generating_citation_style=
+ Preview_style_changed_to\:_%0=
+ Next_preview_layout=
+ Previous_preview_layout=
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=
+ Jump_to_entry=
+-
+-Copied_%0_citations.=
+-Copying...=
+diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
+index 17b32c167..f0e7def0e 100644
+--- a/src/main/resources/l10n/JabRef_vi.properties
++++ b/src/main/resources/l10n/JabRef_vi.properties
+@@ -975,11 +975,7 @@ Preferences=Các_tùy_thích
+ Preferences_recorded.=Các_tùy_thích_được_ghi_lại.
+
+ Preview=Xem_trước
+-Citation_Style=Kiểu_trích_dẫn
+ Current_Preview=Xem_trước_hiện_tại
+-Cannot_generate_preview_based_on_selected_citation_style.=Không_thể_tạo_ra_xem_trước_dựa_trên_kiểu_trích_dẫn_đã_chọn.
+-Bad_character_inside_entry=Kí_tự_xấu_trong_mục
+-Error_while_generating_citation_style=Lỗi_trong_khi_tạo_ra_kiểu_trích_dẫn
+ Preview_style_changed_to\:_%0=Thay_đổi_kiểu_xem_trước_theo\:_%0
+ Next_preview_layout=Xem_trước_bố_trí_tiếp_theo
+ Previous_preview_layout=Xem_trước_bố_trí_trước_đó
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=
+ Jump_to_entry=
+-
+-Copied_%0_citations.=
+-Copying...=
+diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties
+index acca530dd..4af9d5edd 100644
+--- a/src/main/resources/l10n/JabRef_zh.properties
++++ b/src/main/resources/l10n/JabRef_zh.properties
+@@ -975,11 +975,7 @@ Preferences=首选项
+ Preferences_recorded.=首选项被记录。
+
+ Preview=预览
+-Citation_Style=引用样式
+ Current_Preview=当前预览
+-Cannot_generate_preview_based_on_selected_citation_style.=无法为选中的引用样式生成预览.
+-Bad_character_inside_entry=记录是包含非法字符
+-Error_while_generating_citation_style=生成引用样式时出错
+ Preview_style_changed_to\:_%0=预览样式更改为\:_%0
+ Next_preview_layout=下一条预览布局
+ Previous_preview_layout=上一条预览布局
+@@ -2323,6 +2319,3 @@ Different_customization,_current_settings_will_be_overwritten=
+
+ Entry_type_%0_is_only_defined_for_Biblatex_but_not_for_BibTeX=
+ Jump_to_entry=
+-
+-Copied_%0_citations.=
+-Copying...=
+diff --git a/src/main/resources/l10n/Menu_da.properties b/src/main/resources/l10n/Menu_da.properties
+index 3454ce9de..3c7faed39 100644
+--- a/src/main/resources/l10n/Menu_da.properties
++++ b/src/main/resources/l10n/Menu_da.properties
+@@ -135,5 +135,3 @@ Development_version=
+ View_change_log=
+ Copy_BibTeX_key_and_link=
+ Copy_DOI_url=
+-
+-Copy_citation=
+diff --git a/src/main/resources/l10n/Menu_de.properties b/src/main/resources/l10n/Menu_de.properties
+index 52d3c7483..f8e4e2536 100644
+--- a/src/main/resources/l10n/Menu_de.properties
++++ b/src/main/resources/l10n/Menu_de.properties
+@@ -135,5 +135,3 @@ Development_version=Entwicklungsversion
+ View_change_log=Changelog_öffnen
+ Copy_BibTeX_key_and_link=BibTeX-Key_und_Link_kopieren
+ Copy_DOI_url=DOI-URL_kopieren
+-
+-Copy_citation=Kopiere_Zitation
+diff --git a/src/main/resources/l10n/Menu_en.properties b/src/main/resources/l10n/Menu_en.properties
+index 4d20f9a75..6a30064bd 100644
+--- a/src/main/resources/l10n/Menu_en.properties
++++ b/src/main/resources/l10n/Menu_en.properties
+@@ -135,5 +135,3 @@ Development_version=Development_version
+ View_change_log=View_change_log
+ Copy_BibTeX_key_and_link=Copy_BibTeX_key_and_link
+ Copy_DOI_url=Copy_DOI_url
+-
+-Copy_citation=Copy_citation
+diff --git a/src/main/resources/l10n/Menu_es.properties b/src/main/resources/l10n/Menu_es.properties
+index c6a373605..12598350d 100644
+--- a/src/main/resources/l10n/Menu_es.properties
++++ b/src/main/resources/l10n/Menu_es.properties
+@@ -135,5 +135,3 @@ Development_version=Versión_de_desarrollo
+ View_change_log=Ver_registro_de_cambios
+ Copy_BibTeX_key_and_link=Copiar_clave_BibTeX_y_enlace
+ Copy_DOI_url=Copiar_la_url_del_DOI
+-
+-Copy_citation=
+diff --git a/src/main/resources/l10n/Menu_fa.properties b/src/main/resources/l10n/Menu_fa.properties
+index bf9e2f1f5..3cef28936 100644
+--- a/src/main/resources/l10n/Menu_fa.properties
++++ b/src/main/resources/l10n/Menu_fa.properties
+@@ -135,5 +135,3 @@ Development_version=
+ View_change_log=
+ Copy_BibTeX_key_and_link=
+ Copy_DOI_url=
+-
+-Copy_citation=
+diff --git a/src/main/resources/l10n/Menu_fr.properties b/src/main/resources/l10n/Menu_fr.properties
+index e6852d4bf..22e5451f7 100644
+--- a/src/main/resources/l10n/Menu_fr.properties
++++ b/src/main/resources/l10n/Menu_fr.properties
+@@ -135,5 +135,3 @@ Development_version=Version_en_développement
+ View_change_log=Afficher_le_fichier_des_changements
+ Copy_BibTeX_key_and_link=Copier_la_clef_BibTeX_et_le_lien
+ Copy_DOI_url=Copier_l'URL_du_DOI
+-
+-Copy_citation=
+diff --git a/src/main/resources/l10n/Menu_in.properties b/src/main/resources/l10n/Menu_in.properties
+index c87591cbc..accd0c7a9 100644
+--- a/src/main/resources/l10n/Menu_in.properties
++++ b/src/main/resources/l10n/Menu_in.properties
+@@ -135,5 +135,3 @@ Development_version=
+ View_change_log=
+ Copy_BibTeX_key_and_link=
+ Copy_DOI_url=
+-
+-Copy_citation=
+diff --git a/src/main/resources/l10n/Menu_it.properties b/src/main/resources/l10n/Menu_it.properties
+index c994dc88d..5392d98d4 100644
+--- a/src/main/resources/l10n/Menu_it.properties
++++ b/src/main/resources/l10n/Menu_it.properties
+@@ -135,5 +135,3 @@ Development_version=Versione_di_sviluppo
+ View_change_log=Visualizza_la_lista_delle_modifiche
+ Copy_BibTeX_key_and_link=Copia_la_chiave_e_il_link_BibTeX
+ Copy_DOI_url=Copia_l'url_del_DOI
+-
+-Copy_citation=
+diff --git a/src/main/resources/l10n/Menu_ja.properties b/src/main/resources/l10n/Menu_ja.properties
+index c2f476e26..bdcc22c47 100644
+--- a/src/main/resources/l10n/Menu_ja.properties
++++ b/src/main/resources/l10n/Menu_ja.properties
+@@ -135,5 +135,3 @@ Development_version=開発版
+ View_change_log=変更履歴を閲覧
+ Copy_BibTeX_key_and_link=BibTeX鍵とリンクをコピー
+ Copy_DOI_url=DOIのURLをコピー
+-
+-Copy_citation=
+diff --git a/src/main/resources/l10n/Menu_nl.properties b/src/main/resources/l10n/Menu_nl.properties
+index 326bcde8a..ca51ddcd5 100644
+--- a/src/main/resources/l10n/Menu_nl.properties
++++ b/src/main/resources/l10n/Menu_nl.properties
+@@ -135,5 +135,3 @@ Development_version=
+ View_change_log=
+ Copy_BibTeX_key_and_link=
+ Copy_DOI_url=
+-
+-Copy_citation=
+diff --git a/src/main/resources/l10n/Menu_no.properties b/src/main/resources/l10n/Menu_no.properties
+index 06758073d..31d61399d 100644
+--- a/src/main/resources/l10n/Menu_no.properties
++++ b/src/main/resources/l10n/Menu_no.properties
+@@ -135,5 +135,3 @@ Development_version=Utviklingsversjon
+ View_change_log=Vis_endringslogg
+ Copy_BibTeX_key_and_link=
+ Copy_DOI_url=
+-
+-Copy_citation=
+diff --git a/src/main/resources/l10n/Menu_pt_BR.properties b/src/main/resources/l10n/Menu_pt_BR.properties
+index 2eba8924d..080a103c9 100644
+--- a/src/main/resources/l10n/Menu_pt_BR.properties
++++ b/src/main/resources/l10n/Menu_pt_BR.properties
+@@ -135,5 +135,3 @@ Development_version=
+ View_change_log=
+ Copy_BibTeX_key_and_link=
+ Copy_DOI_url=
+-
+-Copy_citation=
+diff --git a/src/main/resources/l10n/Menu_ru.properties b/src/main/resources/l10n/Menu_ru.properties
+index ea0d8b275..48dfbbdc9 100644
+--- a/src/main/resources/l10n/Menu_ru.properties
++++ b/src/main/resources/l10n/Menu_ru.properties
+@@ -135,5 +135,3 @@ Development_version=Версия_для_разработчиков
+ View_change_log=Просмотр_журнала_изменений
+ Copy_BibTeX_key_and_link=
+ Copy_DOI_url=
+-
+-Copy_citation=
+diff --git a/src/main/resources/l10n/Menu_sv.properties b/src/main/resources/l10n/Menu_sv.properties
+index 570840df4..d798f6782 100644
+--- a/src/main/resources/l10n/Menu_sv.properties
++++ b/src/main/resources/l10n/Menu_sv.properties
+@@ -135,5 +135,3 @@ Development_version=Utvecklingsversion
+ View_change_log=Visa_ändringar
+ Copy_BibTeX_key_and_link=
+ Copy_DOI_url=
+-
+-Copy_citation=
+diff --git a/src/main/resources/l10n/Menu_tr.properties b/src/main/resources/l10n/Menu_tr.properties
+index 3de436b65..00b2029e4 100644
+--- a/src/main/resources/l10n/Menu_tr.properties
++++ b/src/main/resources/l10n/Menu_tr.properties
+@@ -135,5 +135,3 @@ Development_version=Geliştirme_sürümü
+ View_change_log=Değişiklik_kütüğünü_göster
+ Copy_BibTeX_key_and_link=BibTeX_anahtarı_ve_bağlantısını_kopyala
+ Copy_DOI_url=DOI_url'sini_kopyala
+-
+-Copy_citation=
+diff --git a/src/main/resources/l10n/Menu_vi.properties b/src/main/resources/l10n/Menu_vi.properties
+index d268ae3a9..55fd8accd 100644
+--- a/src/main/resources/l10n/Menu_vi.properties
++++ b/src/main/resources/l10n/Menu_vi.properties
+@@ -135,5 +135,3 @@ Development_version=Phiên_bản_phát_triển
+ View_change_log=Xem_nhật_kí_thay_đổi
+ Copy_BibTeX_key_and_link=Sao_chép_khóa_BibTex_và_đường_liên_kết
+ Copy_DOI_url=Sao_chép_DOI_url
+-
+-Copy_citation=
+diff --git a/src/main/resources/l10n/Menu_zh.properties b/src/main/resources/l10n/Menu_zh.properties
+index ef82349fc..c34246e67 100644
+--- a/src/main/resources/l10n/Menu_zh.properties
++++ b/src/main/resources/l10n/Menu_zh.properties
+@@ -135,5 +135,3 @@ Development_version=开发中版本
+ View_change_log=查看变更记录
+ Copy_BibTeX_key_and_link=拷贝_BibTeX_key_和链接
+ Copy_DOI_url=拷贝_DOI_URL
+-
+-Copy_citation=
+diff --git a/src/test/java/net/sf/jabref/gui/worker/CitationStyleToClipboardWorkerTest.java b/src/test/java/net/sf/jabref/gui/worker/CitationStyleToClipboardWorkerTest.java
+deleted file mode 100644
+index 2b9456369..000000000
+--- a/src/test/java/net/sf/jabref/gui/worker/CitationStyleToClipboardWorkerTest.java
++++ /dev/null
+@@ -1,220 +0,0 @@
+-package net.sf.jabref.gui.worker;
+-
+-import java.awt.datatransfer.DataFlavor;
+-import java.awt.datatransfer.StringSelection;
+-import java.util.Arrays;
+-
+-import net.sf.jabref.gui.exporter.RtfTransferable;
+-import net.sf.jabref.gui.fieldeditors.HtmlTransferable;
+-import net.sf.jabref.gui.fieldeditors.XmlTransferable;
+-import net.sf.jabref.logic.util.OS;
+-
+-import org.junit.Assert;
+-import org.junit.Test;
+-
+-
+-public class CitationStyleToClipboardWorkerTest {
+-
+- @Test
+- public void processPreviewText() throws Exception {
+- String expected = "Article (Smith2016)Smith, B.; Jones, B. & Williams, J.Taylor, P. (Ed.)Title of the test entry BibTeX Journal, JabRef Publishing, 2016, 34, 45-67 Abstract: This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. " + OS.NEWLINE +
+- "Article (Smith2016)Smith, B.; Jones, B. & Williams, J.Taylor, P. (Ed.)Title of the test entry BibTeX Journal, JabRef Publishing, 2016, 34, 45-67 Abstract: This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. " + OS.NEWLINE;
+-
+- String citation = "Article (Smith2016)" + OS.NEWLINE +
+- "Smith, B.; Jones, B. & Williams, J." + OS.NEWLINE +
+- "Taylor, P. (Ed.)" + OS.NEWLINE +
+- "Title of the test entry " + OS.NEWLINE +
+- "BibTeX Journal, JabRef Publishing, 2016, 34, 45-67 " + OS.NEWLINE +
+- OS.NEWLINE +
+- "Abstract: This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. ";
+-
+- HtmlTransferable HtmlTransferable = CitationStyleToClipboardWorker.processPreview(Arrays.asList(citation, citation));
+-
+- Object actual = HtmlTransferable.getTransferData(DataFlavor.stringFlavor);
+- Assert.assertEquals(expected, actual);
+- }
+-
+- @Test
+- public void processPreviewHtml() throws Exception {
+- String expected = "<font face=\"sans-serif\"><b><i>Article</i><a name=\"Smith2016\"> (Smith2016)</a></b><br>" + OS.NEWLINE +
+- " Smith, B.; Jones, B. & Williams, J.<BR>" + OS.NEWLINE +
+- " Taylor, P. <i>(Ed.)</i><BR>" + OS.NEWLINE +
+- " Title of the test entry <BR>" + OS.NEWLINE +
+- OS.NEWLINE +
+- " <em>BibTeX Journal, </em>" + OS.NEWLINE +
+- OS.NEWLINE +
+- OS.NEWLINE +
+- OS.NEWLINE +
+- " <em>JabRef Publishing, </em>" + OS.NEWLINE +
+- "<b>2016</b><i>, 34</i>, 45-67 " + OS.NEWLINE +
+- "<BR><BR><b>Abstract: </b> This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. " + OS.NEWLINE +
+- "</dd>" + OS.NEWLINE +
+- "<p></p></font>" + OS.NEWLINE +
+- "<br>" + OS.NEWLINE +
+- "<font face=\"sans-serif\"><b><i>Article</i><a name=\"Smith2016\"> (Smith2016)</a></b><br>" + OS.NEWLINE +
+- " Smith, B.; Jones, B. & Williams, J.<BR>" + OS.NEWLINE +
+- " Taylor, P. <i>(Ed.)</i><BR>" + OS.NEWLINE +
+- " Title of the test entry <BR>" + OS.NEWLINE +
+- OS.NEWLINE +
+- " <em>BibTeX Journal, </em>" + OS.NEWLINE +
+- OS.NEWLINE +
+- OS.NEWLINE +
+- OS.NEWLINE +
+- " <em>JabRef Publishing, </em>" + OS.NEWLINE +
+- "<b>2016</b><i>, 34</i>, 45-67 " + OS.NEWLINE +
+- "<BR><BR><b>Abstract: </b> This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. " + OS.NEWLINE +
+- "</dd>" + OS.NEWLINE +
+- "<p></p></font>";
+-
+- String citation = "<font face=\"sans-serif\"><b><i>Article</i><a name=\"Smith2016\"> (Smith2016)</a></b><br>" + OS.NEWLINE +
+- " Smith, B.; Jones, B. & Williams, J.<BR>" + OS.NEWLINE +
+- " Taylor, P. <i>(Ed.)</i><BR>" + OS.NEWLINE +
+- " Title of the test entry <BR>" + OS.NEWLINE +
+- OS.NEWLINE +
+- " <em>BibTeX Journal, </em>" + OS.NEWLINE +
+- OS.NEWLINE +
+- OS.NEWLINE +
+- OS.NEWLINE +
+- " <em>JabRef Publishing, </em>" + OS.NEWLINE +
+- "<b>2016</b><i>, 34</i>, 45-67 " + OS.NEWLINE +
+- "<BR><BR><b>Abstract: </b> This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. " + OS.NEWLINE +
+- "</dd>" + OS.NEWLINE +
+- "<p></p></font>";
+-
+- HtmlTransferable transferable = CitationStyleToClipboardWorker.processPreview(Arrays.asList(citation, citation));
+-
+- Object actual = transferable.getTransferData(HtmlTransferable.HTML_FLAVOR);
+- Assert.assertEquals(expected, actual);
+- }
+-
+- @Test
+- public void processText() throws Exception {
+- String expected = "[1]B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, Jul. 2016." + OS.NEWLINE +
+- "[1]B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, Jul. 2016." + OS.NEWLINE;
+-
+- String citation = "[1]B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, Jul. 2016." + OS.NEWLINE;
+- StringSelection textTransferable = CitationStyleToClipboardWorker.processText(Arrays.asList(citation, citation));
+-
+- Object actual = textTransferable.getTransferData(DataFlavor.stringFlavor);
+- Assert.assertEquals(expected, actual);
+- }
+-
+- @Test
+- public void processRtf() throws Exception {
+- String expected = "{\\rtf" + OS.NEWLINE +
+- "[1]\\tab B. Smith, B. Jones, and J. Williams, \\uc0\\u8220{}Title of the test entry,\\uc0\\u8221{} {\\i{}BibTeX Journal}, vol. 34, no. 3, pp. 45\\uc0\\u8211{}67, Jul. 2016." + OS.NEWLINE +
+- "\\line" + OS.NEWLINE +
+- "[1]\\tab B. Smith, B. Jones, and J. Williams, \\uc0\\u8220{}Title of the test entry,\\uc0\\u8221{} {\\i{}BibTeX Journal}, vol. 34, no. 3, pp. 45\\uc0\\u8211{}67, Jul. 2016." + OS.NEWLINE +
+- "}";
+-
+- String citation = "[1]\\tab B. Smith, B. Jones, and J. Williams, \\uc0\\u8220{}Title of the test entry,\\uc0\\u8221{} {\\i{}BibTeX Journal}, vol. 34, no. 3, pp. 45\\uc0\\u8211{}67, Jul. 2016." + OS.NEWLINE;
+- RtfTransferable rtfTransferable = CitationStyleToClipboardWorker.processRtf(Arrays.asList(citation, citation));
+-
+- Object actual = rtfTransferable.getTransferData(DataFlavor.stringFlavor);
+- Assert.assertEquals(expected, actual);
+- }
+-
+- @Test
+- public void processXslFo() throws Exception {
+- String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + OS.NEWLINE +
+- "<fo:root xmlns:fo=\"http://www.w3.org/1999/XSL/Format\">" + OS.NEWLINE +
+- " <fo:layout-master-set>" + OS.NEWLINE +
+- " <fo:simple-page-master master-name=\"citations\">" + OS.NEWLINE +
+- " <fo:region-body/>" + OS.NEWLINE +
+- " </fo:simple-page-master>" + OS.NEWLINE +
+- " </fo:layout-master-set>" + OS.NEWLINE +
+- " <fo:page-sequence master-reference=\"citations\">" + OS.NEWLINE +
+- " <fo:flow flow-name=\"xsl-region-body\">" + OS.NEWLINE +
+- OS.NEWLINE +
+- "<fo:block id=\"Smith2016\">" + OS.NEWLINE +
+- " <fo:table table-layout=\"fixed\" width=\"100%\">" + OS.NEWLINE +
+- " <fo:table-column column-number=\"1\" column-width=\"2.5em\"/>" + OS.NEWLINE +
+- " <fo:table-column column-number=\"2\" column-width=\"proportional-column-width(1)\"/>" + OS.NEWLINE +
+- " <fo:table-body>" + OS.NEWLINE +
+- " <fo:table-row>" + OS.NEWLINE +
+- " <fo:table-cell>" + OS.NEWLINE +
+- " <fo:block>[1]</fo:block>" + OS.NEWLINE +
+- " </fo:table-cell>" + OS.NEWLINE +
+- " <fo:table-cell>" + OS.NEWLINE +
+- " <fo:block>B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <fo:inline font-style=\"italic\">BibTeX Journal</fo:inline>, vol. 34, no. 3, pp. 45–67, Jul. 2016.</fo:block>" + OS.NEWLINE +
+- " </fo:table-cell>" + OS.NEWLINE +
+- " </fo:table-row>" + OS.NEWLINE +
+- " </fo:table-body>" + OS.NEWLINE +
+- " </fo:table>" + OS.NEWLINE +
+- "</fo:block>" + OS.NEWLINE +
+- OS.NEWLINE +
+- "<fo:block id=\"Smith2016\">" + OS.NEWLINE +
+- " <fo:table table-layout=\"fixed\" width=\"100%\">" + OS.NEWLINE +
+- " <fo:table-column column-number=\"1\" column-width=\"2.5em\"/>" + OS.NEWLINE +
+- " <fo:table-column column-number=\"2\" column-width=\"proportional-column-width(1)\"/>" + OS.NEWLINE +
+- " <fo:table-body>" + OS.NEWLINE +
+- " <fo:table-row>" + OS.NEWLINE +
+- " <fo:table-cell>" + OS.NEWLINE +
+- " <fo:block>[1]</fo:block>" + OS.NEWLINE +
+- " </fo:table-cell>" + OS.NEWLINE +
+- " <fo:table-cell>" + OS.NEWLINE +
+- " <fo:block>B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <fo:inline font-style=\"italic\">BibTeX Journal</fo:inline>, vol. 34, no. 3, pp. 45–67, Jul. 2016.</fo:block>" + OS.NEWLINE +
+- " </fo:table-cell>" + OS.NEWLINE +
+- " </fo:table-row>" + OS.NEWLINE +
+- " </fo:table-body>" + OS.NEWLINE +
+- " </fo:table>" + OS.NEWLINE +
+- "</fo:block>" + OS.NEWLINE +
+- OS.NEWLINE +
+- " </fo:flow>" + OS.NEWLINE +
+- " </fo:page-sequence>" + OS.NEWLINE +
+- "</fo:root>" + OS.NEWLINE;
+-
+- String citation = "<fo:block id=\"Smith2016\">" + OS.NEWLINE +
+- " <fo:table table-layout=\"fixed\" width=\"100%\">" + OS.NEWLINE +
+- " <fo:table-column column-number=\"1\" column-width=\"2.5em\"/>" + OS.NEWLINE +
+- " <fo:table-column column-number=\"2\" column-width=\"proportional-column-width(1)\"/>" + OS.NEWLINE +
+- " <fo:table-body>" + OS.NEWLINE +
+- " <fo:table-row>" + OS.NEWLINE +
+- " <fo:table-cell>" + OS.NEWLINE +
+- " <fo:block>[1]</fo:block>" + OS.NEWLINE +
+- " </fo:table-cell>" + OS.NEWLINE +
+- " <fo:table-cell>" + OS.NEWLINE +
+- " <fo:block>B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <fo:inline font-style=\"italic\">BibTeX Journal</fo:inline>, vol. 34, no. 3, pp. 45–67, Jul. 2016.</fo:block>" + OS.NEWLINE +
+- " </fo:table-cell>" + OS.NEWLINE +
+- " </fo:table-row>" + OS.NEWLINE +
+- " </fo:table-body>" + OS.NEWLINE +
+- " </fo:table>" + OS.NEWLINE +
+- "</fo:block>" + OS.NEWLINE;
+-
+- XmlTransferable xmlTransferable = CitationStyleToClipboardWorker.processXslFo(Arrays.asList(citation, citation));
+-
+- Object actual = xmlTransferable.getTransferData(DataFlavor.stringFlavor);
+- Assert.assertEquals(expected, actual);
+- }
+-
+- @Test
+- public void processHtml() throws Exception {
+- String expected = "<!DOCTYPE html>" + OS.NEWLINE +
+- "<html>" + OS.NEWLINE +
+- " <head>" + OS.NEWLINE +
+- " <meta charset=\"utf-8\">" + OS.NEWLINE +
+- " </head>" + OS.NEWLINE +
+- " <body>" + OS.NEWLINE +
+- OS.NEWLINE +
+- " <div class=\"csl-entry\">" + OS.NEWLINE +
+- " <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <i>BibTeX Journal</i>, vol. 34, no. 3, pp. 45–67, Jul. 2016.</div>" + OS.NEWLINE +
+- " </div>" + OS.NEWLINE +
+- OS.NEWLINE +
+- "<br>" + OS.NEWLINE +
+- " <div class=\"csl-entry\">" + OS.NEWLINE +
+- " <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <i>BibTeX Journal</i>, vol. 34, no. 3, pp. 45–67, Jul. 2016.</div>" + OS.NEWLINE +
+- " </div>" + OS.NEWLINE +
+- OS.NEWLINE +
+- " </body>" + OS.NEWLINE +
+- "</html>" + OS.NEWLINE;
+-
+- String citation = " <div class=\"csl-entry\">" + OS.NEWLINE +
+- " <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <i>BibTeX Journal</i>, vol. 34, no. 3, pp. 45–67, Jul. 2016.</div>" + OS.NEWLINE +
+- " </div>" + OS.NEWLINE;
+- HtmlTransferable htmlTransferable = CitationStyleToClipboardWorker.processHtml(Arrays.asList(citation, citation));
+-
+- Object actual = htmlTransferable.getTransferData(DataFlavor.stringFlavor);
+- Assert.assertEquals(expected, actual);
+- }
+-
+-}
diff --git a/src/test/java/net/sf/jabref/logic/citationstyle/CitationStyleGeneratorTest.java b/src/test/java/net/sf/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
deleted file mode 100644
-index 03f580009..000000000
+index ed7aec24b..000000000
--- a/src/test/java/net/sf/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
+++ /dev/null
-@@ -1,46 +0,0 @@
+@@ -1,119 +0,0 @@
-package net.sf.jabref.logic.citationstyle;
-
-import net.sf.jabref.logic.l10n.Localization;
+-import net.sf.jabref.logic.util.TestEntry;
-import net.sf.jabref.model.entry.BibEntry;
-import net.sf.jabref.model.entry.FieldName;
-
@@ -1284,6 +2575,78 @@ index 03f580009..000000000
- assertEquals(expected, citation);
- }
-
+- @Test
+- public void testAsciiDocFormat() {
+- String expectedCitation = "[1] B. Smith, B. Jones, and J. Williams, ``Title of the test entry,'' __BibTeX Journal__, vol. 34, no. 3, pp. 45–67, Jul. 2016.\n";
+- BibEntry entry = TestEntry.getTestEntry();
+- String style = CitationStyle.getDefault().getSource();
+- CitationStyleOutputFormat format = CitationStyleOutputFormat.ASCII_DOC;
+-
+- String actualCitation = CitationStyleGenerator.generateCitation(entry, style, format);
+- assertEquals(expectedCitation, actualCitation);
+- }
+-
+- @Test
+- public void testHtmlFormat() {
+- String expectedCitation = " <div class=\"csl-entry\">\n" +
+- " <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <i>BibTeX Journal</i>, vol. 34, no. 3, pp. 45–67, Jul. 2016.</div>\n" +
+- " </div>\n";
+- BibEntry entry = TestEntry.getTestEntry();
+- String style = CitationStyle.getDefault().getSource();
+- CitationStyleOutputFormat format = CitationStyleOutputFormat.HTML;
+-
+- String actualCitation = CitationStyleGenerator.generateCitation(entry, style, format);
+- assertEquals(expectedCitation, actualCitation);
+- }
+-
+- @Test
+- public void testRtfFormat() {
+- String expectedCitation = "[1]\\tab B. Smith, B. Jones, and J. Williams, \\uc0\\u8220{}Title of the test entry,\\uc0\\u8221{} {\\i{}BibTeX Journal}, vol. 34, no. 3, pp. 45\\uc0\\u8211{}67, Jul. 2016.\r\n";
+- BibEntry entry = TestEntry.getTestEntry();
+- String style = CitationStyle.getDefault().getSource();
+- CitationStyleOutputFormat format = CitationStyleOutputFormat.RTF;
+-
+- String actualCitation = CitationStyleGenerator.generateCitation(entry, style, format);
+- assertEquals(expectedCitation, actualCitation);
+- }
+-
+- @Test
+- public void testTextFormat() {
+- String expectedCitation = "[1]B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, Jul. 2016.\n";
+- BibEntry entry = TestEntry.getTestEntry();
+- String style = CitationStyle.getDefault().getSource();
+- CitationStyleOutputFormat format = CitationStyleOutputFormat.TEXT;
+-
+- String actualCitation = CitationStyleGenerator.generateCitation(entry, style, format);
+- assertEquals(expectedCitation, actualCitation);
+- }
+-
+- @Test
+- public void testXslFoFormat() {
+- String expectedCitation = "<fo:block id=\"Smith2016\">\n" +
+- " <fo:table table-layout=\"fixed\" width=\"100%\">\n" +
+- " <fo:table-column column-number=\"1\" column-width=\"2.5em\"/>\n" +
+- " <fo:table-column column-number=\"2\" column-width=\"proportional-column-width(1)\"/>\n" +
+- " <fo:table-body>\n" +
+- " <fo:table-row>\n" +
+- " <fo:table-cell>\n" +
+- " <fo:block>[1]</fo:block>\n" +
+- " </fo:table-cell>\n" +
+- " <fo:table-cell>\n" +
+- " <fo:block>B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <fo:inline font-style=\"italic\">BibTeX Journal</fo:inline>, vol. 34, no. 3, pp. 45–67, Jul. 2016.</fo:block>\n" +
+- " </fo:table-cell>\n" +
+- " </fo:table-row>\n" +
+- " </fo:table-body>\n" +
+- " </fo:table>\n" +
+- "</fo:block>\n";
+- BibEntry entry = TestEntry.getTestEntry();
+- String style = CitationStyle.getDefault().getSource();
+- CitationStyleOutputFormat format = CitationStyleOutputFormat.XSL_FO;
+-
+- String actualCitation = CitationStyleGenerator.generateCitation(entry, style, format);
+- assertEquals(expectedCitation, actualCitation);
+- }
+-
-}
diff --git a/src/test/java/net/sf/jabref/logic/citationstyle/CitationStyleTest.java b/src/test/java/net/sf/jabref/logic/citationstyle/CitationStyleTest.java
deleted file mode 100644
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git
More information about the pkg-java-commits
mailing list