From 1d68c6e161b27c982ebcc2e4a346eb8b383ac071 Mon Sep 17 00:00:00 2001
From: David Stevens <dstevens@kth.se>
Date: Thu, 27 Feb 2020 18:25:52 +0100
Subject: [PATCH 01/16] [feat] Implement Emacs key bindings

Emacs style key bindings are re-added to JabRef through the preferences
menu. The supported key bindings have feature parity with the previous
implementation in JabRef v<4, and additionally support any class that
extends TextInputControl. In practice, this means that the new
implementation supports both TextFields and TextAreas by default. Some
functionality may still be missing

Co-authored-by: Felix Luthman <34520175+felixlut@users.noreply.github.com>
Co-authored-by: Tommy Samuelsson <Zodbigt@users.noreply.github.com>
Co-authored-by: muachilin <32566798+muachilin@users.noreply.github.com>
Co-authored-by: Kristoffer Gunnarsson <kristoffergunnarsson47@gmail.com>
---
 src/main/java/org/jabref/JabRefGUI.java       |   8 +
 .../jabref/gui/keyboard/EmacsKeyBindings.java | 103 ++++++++++
 .../org/jabref/gui/keyboard/KeyBinding.java   |  15 ++
 .../gui/preferences/EntryEditorTab.fxml       |  22 ++-
 .../gui/preferences/EntryEditorTabView.java   |  10 +
 .../preferences/EntryEditorTabViewModel.java  |  26 +++
 .../util/strings/EmacsStringManipulator.java  | 178 ++++++++++++++++++
 .../model/util/ResultingEmacsState.java       |  12 ++
 .../jabref/preferences/JabRefPreferences.java |   4 +
 src/main/resources/l10n/JabRef_en.properties  |  26 +++
 .../strings/EmacsStringManipulatorTest.java   | 125 ++++++++++++
 11 files changed, 528 insertions(+), 1 deletion(-)
 create mode 100755 src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java
 create mode 100644 src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java
 create mode 100644 src/main/java/org/jabref/model/util/ResultingEmacsState.java
 create mode 100644 src/test/java/org/jabref/logic/util/strings/EmacsStringManipulatorTest.java

diff --git a/src/main/java/org/jabref/JabRefGUI.java b/src/main/java/org/jabref/JabRefGUI.java
index 3d9b20c3ba3..ef193ead33e 100644
--- a/src/main/java/org/jabref/JabRefGUI.java
+++ b/src/main/java/org/jabref/JabRefGUI.java
@@ -8,6 +8,7 @@
 
 import javafx.application.Platform;
 import javafx.scene.Scene;
+import javafx.scene.input.KeyEvent;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 
@@ -19,6 +20,7 @@
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.importer.ParserResultWarningDialog;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
+import org.jabref.gui.keyboard.EmacsKeyBindings;
 import org.jabref.gui.shared.SharedDatabaseUIManager;
 import org.jabref.logic.autosaveandbackup.BackupManager;
 import org.jabref.logic.importer.OpenDatabase;
@@ -87,6 +89,12 @@ private void openWindow(Stage mainStage) {
         root.getChildren().add(JabRefGUI.mainFrame);
 
         Scene scene = new Scene(root, 800, 800);
+
+        //Handle Emacs key bindings
+        scene.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
+            EmacsKeyBindings.executeEmacs(scene, event);
+        });
+
         Globals.getThemeLoader().installCss(scene, Globals.prefs);
         mainStage.setTitle(JabRefFrame.FRAME_TITLE);
         mainStage.getIcons().addAll(IconTheme.getLogoSetFX());
diff --git a/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java
new file mode 100755
index 00000000000..26f569cb7c9
--- /dev/null
+++ b/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java
@@ -0,0 +1,103 @@
+package org.jabref.gui.keyboard;
+
+import java.util.Optional;
+
+import javafx.scene.Scene;
+import javafx.scene.control.TextInputControl;
+import javafx.scene.input.KeyEvent;
+
+import org.jabref.Globals;
+import org.jabref.logic.util.strings.EmacsStringManipulator;
+import org.jabref.model.util.ResultingEmacsState;
+import org.jabref.preferences.JabRefPreferences;
+
+public class EmacsKeyBindings {
+
+    public static void executeEmacs(Scene scene, KeyEvent event) {
+        boolean EmacsFlag = Globals.prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS);
+        if (EmacsFlag && scene.focusOwnerProperty().get() instanceof TextInputControl) {
+            boolean CAFlag = Globals.prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CA);
+            boolean CFFlag = Globals.prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CF);
+            boolean CNFlag = Globals.prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CN);
+            boolean AUFlag = Globals.prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_AU);
+
+            KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
+            TextInputControl focusedTextField = (TextInputControl) scene.focusOwnerProperty().get();
+            Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
+            if (keyBinding.isPresent()) {
+                if (keyBinding.get().equals(KeyBinding.EMACS_DELETE)) {
+                    focusedTextField.deletePreviousChar();
+                    event.consume();
+                } else if (keyBinding.get().equals(KeyBinding.EMACS_BACKWARD)) {
+                    focusedTextField.backward();
+                    event.consume();
+                } else if (CFFlag && keyBinding.get().equals(KeyBinding.EMACS_FORWARD)) {
+                    focusedTextField.forward();
+                    event.consume();
+                } else if (CAFlag && keyBinding.get().equals(KeyBinding.EMACS_BEGINNING)) {
+                    focusedTextField.home();
+                    event.consume();
+                } else if (keyBinding.get().equals(KeyBinding.EMACS_END)) {
+                    focusedTextField.end();
+                    event.consume();
+                } else if (keyBinding.get().equals(KeyBinding.EMACS_BEGINNING_DOC)) {
+                    focusedTextField.home();
+                    event.consume();
+                } else if (keyBinding.get().equals(KeyBinding.EMACS_END_DOC)) {
+                    focusedTextField.end();
+                    event.consume();
+                } else if (keyBinding.get().equals(KeyBinding.EMACS_UP)) {
+                    focusedTextField.home();
+                    event.consume();
+                } else if (CNFlag && keyBinding.get().equals(KeyBinding.EMACS_DOWN)) {
+                    focusedTextField.end();
+                    event.consume();
+                } else if (keyBinding.get().equals(KeyBinding.EMACS_CAPITALIZE)) {
+                    int pos = focusedTextField.getCaretPosition();
+                    String text = focusedTextField.getText(0, focusedTextField.getText().length());
+                    ResultingEmacsState res = EmacsStringManipulator.capitalize(pos, text);
+                    focusedTextField.setText(res.text);
+                    focusedTextField.positionCaret(res.caretPos);
+                    event.consume();
+                }
+                else if (keyBinding.get().equals(KeyBinding.EMACS_LOWERCASE)) {
+                    int pos = focusedTextField.getCaretPosition();
+                    String text = focusedTextField.getText(0, focusedTextField.getText().length());
+                    ResultingEmacsState res = EmacsStringManipulator.lowercase(pos, text);
+                    focusedTextField.setText(res.text);
+                    focusedTextField.positionCaret(res.caretPos);
+                    event.consume();
+                }
+                else if (AUFlag && keyBinding.get().equals(KeyBinding.EMACS_UPPERCASE)) {
+                    int pos = focusedTextField.getCaretPosition();
+                    String text = focusedTextField.getText(0, focusedTextField.getText().length());
+                    ResultingEmacsState res = EmacsStringManipulator.uppercase(pos, text);
+                    focusedTextField.setText(res.text);
+                    focusedTextField.positionCaret(res.caretPos);
+                    event.consume();
+                }
+                else if (keyBinding.get().equals(KeyBinding.EMACS_KILLLINE)) {
+                    int pos = focusedTextField.getCaretPosition();
+                    focusedTextField.setText(focusedTextField.getText(0, pos));
+                    focusedTextField.positionCaret(pos);
+                    event.consume();
+                } else if (keyBinding.get().equals(KeyBinding.EMACS_KILLWORD)) {
+                    int pos = focusedTextField.getCaretPosition();
+                    String text = focusedTextField.getText(0, focusedTextField.getText().length());
+                    ResultingEmacsState res = EmacsStringManipulator.killWord(pos, text);
+                    focusedTextField.setText(res.text);
+                    focusedTextField.positionCaret(res.caretPos);
+                    event.consume();
+                }
+                else if (keyBinding.get().equals(KeyBinding.EMACS_BACKWARDKILLWORD)) {
+                    int pos = focusedTextField.getCaretPosition();
+                    String text = focusedTextField.getText(0, focusedTextField.getText().length());
+                    ResultingEmacsState res = EmacsStringManipulator.backwardKillWord(pos, text);
+                    focusedTextField.setText(res.text);
+                    focusedTextField.positionCaret(res.caretPos);
+                    event.consume();
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
index 7c4f66a193d..7985d2296e5 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -3,6 +3,21 @@
 import org.jabref.logic.l10n.Localization;
 
 public enum KeyBinding {
+    EMACS_DELETE("Emacs delete", Localization.lang("Delete text"), "ctrl+D", KeyBindingCategory.EDIT),
+    EMACS_BACKWARD("Emacs move caret left", Localization.lang("Move caret left"), "ctrl+B", KeyBindingCategory.EDIT),
+    EMACS_FORWARD("Emacs move caret right", Localization.lang("Move caret right"), "ctrl+F", KeyBindingCategory.EDIT),
+    EMACS_BEGINNING("Emacs move caret to beginning", Localization.lang("Move caret to beginning"), "ctrl+A", KeyBindingCategory.EDIT),
+    EMACS_END("Emacs move caret to end", Localization.lang("Move caret to end"), "ctrl+E", KeyBindingCategory.EDIT),
+    EMACS_BEGINNING_DOC("Emacs move caret to beginning of the document", Localization.lang("Move the caret to the beginning of the document"), "alt+LESS", KeyBindingCategory.EDIT),
+    EMACS_END_DOC("Emacs move caret to end of the document", Localization.lang("Move the caret to the end of the document"), "alt+shift+LESS", KeyBindingCategory.EDIT),
+    EMACS_UP("Emacs move caret up", Localization.lang("Move the caret up"), "ctrl+P", KeyBindingCategory.EDIT),
+    EMACS_DOWN("Emacs move caret down", Localization.lang("Move the caret down"), "ctrl+N", KeyBindingCategory.EDIT),
+    EMACS_CAPITALIZE("Emacs capitalize next word", Localization.lang("Capitalize the next word"), "alt+C", KeyBindingCategory.EDIT),
+    EMACS_LOWERCASE("Emacs lowercase next word", Localization.lang("Make all characters in the next word lowercase"), "alt+L", KeyBindingCategory.EDIT),
+    EMACS_UPPERCASE("Emacs uppercase next word", Localization.lang("Make all characters in the next word uppercase"), "alt+U", KeyBindingCategory.EDIT),
+    EMACS_KILLLINE("Emacs remove line", Localization.lang("Remove words after the cursor"), "ctrl+K", KeyBindingCategory.EDIT),
+    EMACS_KILLWORD("Emacs remove the next word", Localization.lang("Remove the next word in the line"), "alt+D", KeyBindingCategory.EDIT),
+    EMACS_BACKWARDKILLWORD("Emacs remove the previous word", Localization.lang("Remove the previous word in the line"), "alt+DELETE", KeyBindingCategory.EDIT),
 
     ABBREVIATE("Abbreviate", Localization.lang("Abbreviate journal names"), "ctrl+alt+A", KeyBindingCategory.TOOLS),
     AUTOGENERATE_BIBTEX_KEYS("Autogenerate BibTeX keys", Localization.lang("Autogenerate BibTeX keys"), "ctrl+G", KeyBindingCategory.QUALITY),
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml b/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
index 4458fb6ee94..8741483ea08 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
@@ -27,7 +27,27 @@
     </CheckBox>
     <CheckBox fx:id="enableLatexCitationsTab" text="%Show 'LaTeX Citations' tab"/>
     <CheckBox fx:id="enableValidation" text="%Show validation messages"/>
-
+    <CheckBox fx:id="enableEmacsKeyBindings" text="%Use Emacs key bindings"/>
+    <CheckBox fx:id="enableEmacsRebindCA" text="%Rebind C-a, too" disable="${!enableEmacsKeyBindings.selected}">
+        <padding>
+            <Insets left="20.0"/>
+        </padding>
+    </CheckBox>
+    <CheckBox fx:id="enableEmacsRebindCF" text="%Rebind C-f, too" disable="${!enableEmacsKeyBindings.selected}">
+        <padding>
+            <Insets left="20.0"/>
+        </padding>
+    </CheckBox>
+    <CheckBox fx:id="enableEmacsRebindCN" text="%Rebind C-n, too" disable="${!enableEmacsKeyBindings.selected}">
+        <padding>
+            <Insets left="20.0"/>
+        </padding>
+    </CheckBox>
+    <CheckBox fx:id="enableEmacsRebindAU" text="%Rebind A-u, too" disable="${!enableEmacsKeyBindings.selected}">
+        <padding>
+            <Insets left="20.0"/>
+        </padding>
+    </CheckBox>
     <Label styleClass="sectionHeader" text="%Autocompletion"/>
     <CheckBox fx:id="enableAutoComplete" text="%Use autocompletion"/>
     <VBox spacing="10.0">
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTabView.java b/src/main/java/org/jabref/gui/preferences/EntryEditorTabView.java
index 78b30681fcc..cf210d8cfa5 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorTabView.java
@@ -19,6 +19,11 @@ public class EntryEditorTabView extends AbstractPreferenceTabView<EntryEditorTab
     @FXML private CheckBox enableLatexCitationsTab;
     @FXML private CheckBox enableValidation;
     @FXML private CheckBox enableAutoComplete;
+    @FXML private CheckBox enableEmacsKeyBindings;
+    @FXML private CheckBox enableEmacsRebindCA;
+    @FXML private CheckBox enableEmacsRebindCF;
+    @FXML private CheckBox enableEmacsRebindCN;
+    @FXML private CheckBox enableEmacsRebindAU;
     @FXML private TextField autoCompleteFields;
     @FXML private RadioButton autoCompleteFirstLast;
     @FXML private RadioButton autoCompleteLastFirst;
@@ -48,6 +53,11 @@ public void initialize () {
         enableLatexCitationsTab.selectedProperty().bindBidirectional(viewModel.enableLatexCitationsTabProperty());
         enableValidation.selectedProperty().bindBidirectional(viewModel.enableValidationProperty());
         enableAutoComplete.selectedProperty().bindBidirectional(viewModel.enableAutoCompleteProperty());
+        enableEmacsKeyBindings.selectedProperty().bindBidirectional(viewModel.enableEmacsKeyBindingsProperty());
+        enableEmacsRebindCA.selectedProperty().bindBidirectional(viewModel.enableEmacsRebindCAProperty());
+        enableEmacsRebindCF.selectedProperty().bindBidirectional(viewModel.enableEmacsRebindCFProperty());
+        enableEmacsRebindCN.selectedProperty().bindBidirectional(viewModel.enableEmacsRebindCNProperty());
+        enableEmacsRebindAU.selectedProperty().bindBidirectional(viewModel.enableEmacsRebindAUProperty());
         autoCompleteFields.textProperty().bindBidirectional(viewModel.autoCompleteFieldsProperty());
         autoCompleteFirstLast.selectedProperty().bindBidirectional(viewModel.autoCompleteFirstLastProperty());
         autoCompleteLastFirst.selectedProperty().bindBidirectional(viewModel.autoCompleteLastFirstProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java b/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
index 6eaa08a10b2..948de1cbba4 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
@@ -32,6 +32,11 @@ public class EntryEditorTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty firstNameModeAbbreviatedProperty = new SimpleBooleanProperty();
     private final BooleanProperty firstNameModeFullProperty = new SimpleBooleanProperty();
     private final BooleanProperty firstNameModeBothProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enableEmacsKeyBindingsProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enableEmacsRebindCAProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enableEmacsRebindCFProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enableEmacsRebindCNProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enableEmacsRebindAUProperty = new SimpleBooleanProperty();
 
     private AutoCompletePreferences autoCompletePreferences;
 
@@ -52,6 +57,11 @@ public void setValues() {
         acceptRecommendationsProperty.setValue(preferences.getBoolean(JabRefPreferences.ACCEPT_RECOMMENDATIONS));
         enableLatexCitationsTabProperty.setValue(preferences.getBoolean(JabRefPreferences.SHOW_LATEX_CITATIONS));
         enableValidationProperty.setValue(preferences.getBoolean(JabRefPreferences.VALIDATE_IN_ENTRY_EDITOR));
+        enableEmacsKeyBindingsProperty.setValue(preferences.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS));
+        enableEmacsRebindCAProperty.setValue(preferences.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CA));
+        enableEmacsRebindCFProperty.setValue(preferences.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CF));
+        enableEmacsRebindCNProperty.setValue(preferences.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CN));
+        enableEmacsRebindAUProperty.setValue(preferences.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_AU));
         enableAutoCompleteProperty.setValue(autoCompletePreferences.shouldAutoComplete());
         autoCompleteFieldsProperty.setValue(autoCompletePreferences.getCompleteNamesAsString());
 
@@ -84,6 +94,11 @@ public void storeSettings() {
         preferences.putBoolean(JabRefPreferences.ACCEPT_RECOMMENDATIONS, acceptRecommendationsProperty.getValue());
         preferences.putBoolean(JabRefPreferences.SHOW_LATEX_CITATIONS, enableLatexCitationsTabProperty.getValue());
         preferences.putBoolean(JabRefPreferences.VALIDATE_IN_ENTRY_EDITOR, enableValidationProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS, enableEmacsKeyBindingsProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CA, enableEmacsRebindCAProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CF, enableEmacsRebindCFProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CN, enableEmacsRebindCNProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_AU, enableEmacsRebindAUProperty.getValue());
 
         autoCompletePreferences.setShouldAutoComplete(enableAutoCompleteProperty.getValue());
         autoCompletePreferences.setCompleteNames(autoCompleteFieldsProperty.getValue());
@@ -148,4 +163,15 @@ public List<String> getRestartWarnings() {
     public BooleanProperty firstNameModeFullProperty() { return firstNameModeFullProperty; }
 
     public BooleanProperty firstNameModeBothProperty() { return firstNameModeBothProperty; }
+
+    public BooleanProperty enableEmacsKeyBindingsProperty() { return enableEmacsKeyBindingsProperty; }
+
+    public BooleanProperty enableEmacsRebindCAProperty() { return enableEmacsRebindCAProperty; }
+
+    public BooleanProperty enableEmacsRebindCFProperty() { return enableEmacsRebindCFProperty; }
+
+    public BooleanProperty enableEmacsRebindCNProperty() { return enableEmacsRebindCNProperty; }
+
+    public BooleanProperty enableEmacsRebindAUProperty() { return enableEmacsRebindAUProperty; }
 }
+
diff --git a/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java b/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java
new file mode 100644
index 00000000000..4f2c72a9737
--- /dev/null
+++ b/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java
@@ -0,0 +1,178 @@
+package org.jabref.logic.util.strings;
+import org.jabref.model.util.ResultingEmacsState;
+
+public class EmacsStringManipulator {
+    private enum LetterCase {
+        UPPER,
+        LOWER,
+        CAPITALIZED
+    }
+
+    private enum Direction {
+        NEXT, PREVIOUS
+    }
+
+    private static ResultingEmacsState setNextWordsCase(String text, int pos, LetterCase targetCase) {
+        StringBuilder res = new StringBuilder();
+
+        boolean firstLetter = true;
+        int i = pos;
+        boolean firstLoop = true;
+        StringBuilder newWordBuilder = new StringBuilder();
+        for (; i < text.length(); i++) {
+            // Swallow whitespace
+            while (firstLoop && i < text.length() && !String.valueOf(text.charAt(i)).matches("\\w")) {
+                newWordBuilder.append(text.charAt(i));
+                i++;
+            }
+            if (i >= text.length()) {
+                break;
+            }
+            if (firstLoop) {
+                firstLoop = false;
+            }
+            char currentChar = text.charAt(i);
+            if (String.valueOf(currentChar).matches("\\w")) {
+                switch (targetCase) {
+                    case UPPER:
+                        newWordBuilder.append(Character.toUpperCase(currentChar));
+                        break;
+                    case LOWER:
+                        newWordBuilder.append(Character.toLowerCase(currentChar));
+                        break;
+                    case CAPITALIZED:
+                        if (firstLetter) {
+                            newWordBuilder.append(Character.toUpperCase(currentChar));
+                            firstLetter = false;
+                        } else {
+                            newWordBuilder.append(Character.toLowerCase(currentChar));
+                        }
+                        break;
+                }
+            } else {
+                // We have reached the word boundary.
+                break;
+            }
+        }
+        res.append(text, 0, pos);
+        res.append(newWordBuilder);
+        res.append(text, i, text.length());
+
+        return new ResultingEmacsState(i, res.toString());
+    }
+
+    /**
+     * Delete all characters in a string from the given position to the next word boundary.
+     *
+     * @param pos The index to start from.
+     * @param text The text to manipulate.
+     * @param dir The direction to search.
+     * @return The resulting text.
+     */
+    public static ResultingEmacsState deleteUntilWordBoundary(int pos, String text, Direction dir) {
+        StringBuilder res = new StringBuilder();
+        int offset;
+        int wordBreak;
+        switch (dir) {
+            case NEXT:
+                res.append(text, 0, pos);
+                offset = 1;
+                wordBreak = text.length();
+                break;
+            case PREVIOUS:
+                res.append(text, pos, text.length());
+                offset = -1;
+                wordBreak = 0;
+                break;
+            default:
+                throw new AssertionError("Missing case in switch deleteUntilWordBoundary");
+        }
+
+        for (int i = pos; i < text.length() && i >= 0; i += offset) {
+            if (i == pos) {
+                // Swallow whitespace until we hit a word character or newline.
+                while (i < text.length()
+                        && i >= 0
+                        && !String.valueOf(text.charAt(i)).matches("\\w|[\\r\\n]")) {
+                    i += offset;
+                }
+            }
+            if (!(i < text.length() && i >= 0) || !String.valueOf(text.charAt(i)).matches("\\w")) {
+                wordBreak = i;
+                break;
+            }
+        }
+        int caretPosition;
+        if (dir == Direction.NEXT) {
+            res.append(text, wordBreak, text.length());
+            // Since we deleted forward, we're in the right place already.
+            caretPosition = pos;
+
+        } else {
+            // Since we deleted backwards, we need to move the caret appropriately.
+            // We need to protect against having stepped beyond the string during the while-loop.
+            if (wordBreak != -1) {
+                res.append(text, 0, wordBreak);
+                caretPosition = wordBreak;
+            } else {
+                caretPosition = 0;
+            }
+        }
+        return new ResultingEmacsState(caretPosition, res.toString());
+    }
+
+    /**
+     * Capitalize the next word on the right side of the cursor.
+     *
+     * @param pos the position of the cursor
+     * @param text String to analyze
+     * @return String the result text
+     */
+    public static ResultingEmacsState capitalize(int pos, String text) {
+        return setNextWordsCase(text, pos, LetterCase.CAPITALIZED);
+    }
+
+    /**
+     * Make all characters in the next word uppercase.
+     *
+     * @param pos the position of the cursor
+     * @param text String to analyze
+     * @return String the result text
+     */
+    public static ResultingEmacsState uppercase(int pos, String text) {
+        return setNextWordsCase(text, pos, LetterCase.UPPER);
+    }
+
+    /**
+     * Make all characters in the next word lowercase.
+     *
+     * @param pos the position of the cursor
+     * @param text String to analyze
+     * @return String the result text
+     */
+    public static ResultingEmacsState lowercase(int pos, String text) {
+        return setNextWordsCase(text, pos, LetterCase.LOWER);
+    }
+
+    /**
+     * Remove the next word on the right side of the cursor.
+     *
+     * @param pos the position of the cursor
+     * @param text String to analyze
+     * @return String the result text
+     */
+    public static ResultingEmacsState killWord(int pos, String text) {
+        return deleteUntilWordBoundary(pos, text, Direction.NEXT);
+    }
+
+    /**
+     * Remove the previous word on the left side of the cursor.
+     *
+     * @param pos the position of the cursor
+     * @param text String to analyze
+     * @return String the result text
+     */
+    public static ResultingEmacsState backwardKillWord(int pos, String text) {
+        return deleteUntilWordBoundary(pos, text, Direction.PREVIOUS);
+    }
+}
diff --git a/src/main/java/org/jabref/model/util/ResultingEmacsState.java b/src/main/java/org/jabref/model/util/ResultingEmacsState.java
new file mode 100644
index 00000000000..b65acf6d227
--- /dev/null
+++ b/src/main/java/org/jabref/model/util/ResultingEmacsState.java
@@ -0,0 +1,12 @@
+package org.jabref.model.util;
+
+public class ResultingEmacsState {
+    public final int caretPos;
+    public final String text;
+
+
+    public ResultingEmacsState(int pos, String text) {
+        this.caretPos = pos;
+        this.text = text;
+    }
+}
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 08037697918..a0e413a9b98 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -200,6 +200,8 @@ public class JabRefPreferences implements PreferencesService {
     public static final String EDITOR_EMACS_KEYBINDINGS = "editorEMACSkeyBindings";
     public static final String EDITOR_EMACS_KEYBINDINGS_REBIND_CA = "editorEMACSkeyBindingsRebindCA";
     public static final String EDITOR_EMACS_KEYBINDINGS_REBIND_CF = "editorEMACSkeyBindingsRebindCF";
+    public static final String EDITOR_EMACS_KEYBINDINGS_REBIND_CN = "editorEMACSkeyBindingsRebindCN";
+    public static final String EDITOR_EMACS_KEYBINDINGS_REBIND_AU = "editorEMACSkeyBindingsRebindAU";
     public static final String GROUPS_DEFAULT_FIELD = "groupsDefaultField";
 
     public static final String KEYWORD_SEPARATOR = "groupKeywordSeparator";
@@ -567,6 +569,8 @@ private JabRefPreferences() {
         defaults.put(EDITOR_EMACS_KEYBINDINGS, Boolean.FALSE);
         defaults.put(EDITOR_EMACS_KEYBINDINGS_REBIND_CA, Boolean.TRUE);
         defaults.put(EDITOR_EMACS_KEYBINDINGS_REBIND_CF, Boolean.TRUE);
+        defaults.put(EDITOR_EMACS_KEYBINDINGS_REBIND_CN, Boolean.TRUE);
+        defaults.put(EDITOR_EMACS_KEYBINDINGS_REBIND_AU, Boolean.TRUE);
         defaults.put(AUTO_COMPLETE, Boolean.FALSE);
         defaults.put(AUTOCOMPLETER_FIRSTNAME_MODE, AutoCompleteFirstNameMode.BOTH.name());
         defaults.put(AUTOCOMPLETER_FIRST_LAST, Boolean.FALSE); // "Autocomplete names in 'Firstname Lastname' format only"
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 5e1bd848dbd..70253228ab6 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -673,6 +673,14 @@ Quit\ JabRef=Quit JabRef
 
 Read\ only=Read only
 
+Rebind\ C-a,\ too=Rebind C-a, too
+
+Rebind\ C-f,\ too=Rebind C-f, too
+
+Rebind\ C-n,\ too=Rebind C-n, too
+
+Rebind\ A-u,\ too=Rebind A-u, too
+
 Redo=Redo
 
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Refine supergroup: When selected, view entries contained in both this group and its supergroup
@@ -903,6 +911,8 @@ Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Upgrade external PD
 usage=usage
 Use\ autocompletion=Use autocompletion
 
+Use\ Emacs\ key\ bindings= Use Emacs key bindings
+
 Use\ regular\ expression\ search=Use regular expression search
 
 Username=Username
@@ -2115,3 +2125,19 @@ Optional=Optional
 Required=Required
 Entry\ type\ cannot\ be\ empty.\ Please\ enter\ a\ name.=Entry type cannot be empty. Please enter a name.
 Field\ cannot\ be\ empty.\ Please\ enter\ a\ name.=Field cannot be empty. Please enter a name.
+
+Delete\ text=Delete text
+Move\ caret\ left=Move caret left
+Move\ caret\ right=Move caret right
+Move\ caret\ to\ beginning=Move caret to beginning
+Move\ caret\ to\ end=Move caret to end
+Move\ the\ caret\ down=Move the caret down
+Move\ the\ caret\ to\ the\ beginning\ of\ the\ document=Move the caret to the beginning of the document
+Move\ the\ caret\ to\ the\ end\ of\ the\ document=Move the caret to the end of the document
+Move\ the\ caret\ up=Move the caret up
+Capitalize\ the\ next\ word=Capitalize the next word
+Make\ all\ characters\ in\ the\ next\ word\ lowercase=Make all characters in the next word lowercase
+Make\ all\ characters\ in\ the\ next\ word\ uppercase=Make all characters in the next word uppercase
+Remove\ all\ the\ words\ in\ the\ line=Remove all the words in the line
+Remove\ the\ next\ word\ in\ the\ line=Remove the next word in the line
+Remove\ the\ previous\ word\ in\ the\ line=Remove the previous word in the line
diff --git a/src/test/java/org/jabref/logic/util/strings/EmacsStringManipulatorTest.java b/src/test/java/org/jabref/logic/util/strings/EmacsStringManipulatorTest.java
new file mode 100644
index 00000000000..b668e76742f
--- /dev/null
+++ b/src/test/java/org/jabref/logic/util/strings/EmacsStringManipulatorTest.java
@@ -0,0 +1,125 @@
+package org.jabref.logic.util.strings;
+
+import org.jabref.model.util.ResultingEmacsState;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class EmacsStringManipulatorTest {
+
+    @Test
+    public void capitalizePreservesNewlines() {
+        int pos = 5; // Position of the caret, between the two ll in the first hellO"
+        String textInput = "hello\n\nhELLO";
+        String whatTextShouldBe = "hello\n\nHello";
+        ResultingEmacsState textOutput = EmacsStringManipulator.capitalize(pos, textInput);
+        assertEquals(whatTextShouldBe, textOutput.text);
+    }
+
+    @Test
+    public void uppercasePreservesSpace() {
+        int pos = 3; // Position of the caret, between the two ll in the first hello
+        String textInput = "hello hello";
+        String whatTextShouldBe = "helLO hello";
+        ResultingEmacsState textOutput = EmacsStringManipulator.uppercase(pos, textInput);
+        assertEquals(whatTextShouldBe, textOutput.text);
+    }
+
+    @Test
+    public void uppercasePreservesNewlines() {
+        int pos = 3; // Position of the caret, between the two ll in the first hello
+        String textInput = "hello\nhello";
+        String whatTextShouldBe = "helLO\nhello";
+        ResultingEmacsState textOutput = EmacsStringManipulator.uppercase(pos, textInput);
+        assertEquals(whatTextShouldBe, textOutput.text);
+    }
+
+    @Test
+    public void uppercasePreservesTab() {
+        int pos = 3; // Position of the caret, between the two ll in the first hello
+        String textInput = "hello\thello";
+        String whatTextShouldBe = "helLO\thello";
+        ResultingEmacsState textOutput = EmacsStringManipulator.uppercase(pos, textInput);
+        assertEquals(whatTextShouldBe, textOutput.text);
+    }
+
+    @Test
+    public void uppercasePreservesDoubleSpace() {
+        int pos = 5; // Position of the caret, at the first space
+        String textInput = "hello  hello";
+        String whatTextShouldBe = "hello  HELLO";
+        ResultingEmacsState textOutput = EmacsStringManipulator.uppercase(pos, textInput);
+        assertEquals(whatTextShouldBe, textOutput.text);
+    }
+
+    @Test
+    public void uppercaseIgnoresTrailingWhitespace() {
+        int pos = 5; // First space
+        String textInput = "hello  ";
+        String whatTextShouldBe = "hello  ";
+        ResultingEmacsState textOutput = EmacsStringManipulator.uppercase(pos, textInput);
+        assertEquals(whatTextShouldBe, textOutput.text);
+        // Expected caret position is right after the last space, which is index 7
+        assertEquals(7, textOutput.caretPos);
+    }
+
+    @Test
+    public void killWordTrimsTrailingWhitespace() {
+        int pos = 5; // First space
+        String textInput = "hello  ";
+        String whatTextShouldBe = "hello";
+        ResultingEmacsState textOutput = EmacsStringManipulator.killWord(pos, textInput);
+        assertEquals(whatTextShouldBe, textOutput.text);
+        assertEquals(pos, textOutput.caretPos);
+    }
+
+    @Test
+    public void backwardsKillWordTrimsPreceedingWhitespace() {
+        int pos = 1; // Second space
+        String textInput = "  hello";
+        // One space should be preserved since we are deleting everything preceding the second space.
+        String whatTextShouldBe = " hello";
+        ResultingEmacsState textOutput = EmacsStringManipulator.backwardKillWord(pos, textInput);
+        assertEquals(whatTextShouldBe, textOutput.text);
+        // The caret should have been moved to the start.
+        assertEquals(0, textOutput.caretPos);
+    }
+
+    @Test
+    public void uppercasePreservesMixedSpaceNewLineTab() {
+        int pos = 5; // Position of the caret, after first hello
+        String textInput = "hello \n\thello";
+        String whatTextShouldBe = "hello \n\tHELLO";
+        ResultingEmacsState textOutput = EmacsStringManipulator.uppercase(pos, textInput);
+        assertEquals(whatTextShouldBe, textOutput.text);
+    }
+
+    @Test
+    public void lowercaseEditsTheNextWord() {
+        int pos = 5; // Position of the caret, right at the space
+        String textInput = "hello HELLO";
+        String whatTextShouldBe = "hello hello";
+        ResultingEmacsState textOutput = EmacsStringManipulator.lowercase(pos, textInput);
+        assertEquals(whatTextShouldBe, textOutput.text);
+    }
+
+    @Test
+    public void killWordRemovesFromPositionUpToNextWord() {
+        int pos = 3; // Position of the caret, between the two "ll in the first hello"
+        String textInput = "hello hello";
+        String whatTextShouldBe = "hel hello";
+        ResultingEmacsState textOutput = EmacsStringManipulator.killWord(pos, textInput);
+        assertEquals(whatTextShouldBe, textOutput.text);
+    }
+
+    @Test
+    public void killWordRemovesNextWordIfPositionIsInSpace() {
+        int pos = 5; // Position of the caret, atfer the first hello"
+        String textInput = "hello person";
+        String whatTextShouldBe = "hello";
+        ResultingEmacsState textOutput = EmacsStringManipulator.killWord(pos, textInput);
+        assertEquals(whatTextShouldBe, textOutput.text);
+    }
+
+}

From 88c16b61e7baf5d40ea9163eec6677c02b71f6cc Mon Sep 17 00:00:00 2001
From: David Stevens <dstevens@kth.se>
Date: Thu, 27 Feb 2020 21:01:25 +0100
Subject: [PATCH 02/16] Rename localized strings and fix checkstyle error

---
 .../org/jabref/gui/keyboard/KeyBinding.java   | 20 ++++++-------
 .../gui/preferences/EntryEditorTab.fxml       |  8 +++---
 .../util/strings/EmacsStringManipulator.java  | 18 ++++++------
 .../model/util/ResultingEmacsState.java       |  1 -
 src/main/resources/l10n/JabRef_en.properties  | 28 +++++++++----------
 5 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
index 7985d2296e5..2b815a26246 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -6,18 +6,18 @@ public enum KeyBinding {
     EMACS_DELETE("Emacs delete", Localization.lang("Delete text"), "ctrl+D", KeyBindingCategory.EDIT),
     EMACS_BACKWARD("Emacs move caret left", Localization.lang("Move caret left"), "ctrl+B", KeyBindingCategory.EDIT),
     EMACS_FORWARD("Emacs move caret right", Localization.lang("Move caret right"), "ctrl+F", KeyBindingCategory.EDIT),
-    EMACS_BEGINNING("Emacs move caret to beginning", Localization.lang("Move caret to beginning"), "ctrl+A", KeyBindingCategory.EDIT),
-    EMACS_END("Emacs move caret to end", Localization.lang("Move caret to end"), "ctrl+E", KeyBindingCategory.EDIT),
-    EMACS_BEGINNING_DOC("Emacs move caret to beginning of the document", Localization.lang("Move the caret to the beginning of the document"), "alt+LESS", KeyBindingCategory.EDIT),
-    EMACS_END_DOC("Emacs move caret to end of the document", Localization.lang("Move the caret to the end of the document"), "alt+shift+LESS", KeyBindingCategory.EDIT),
+    EMACS_BEGINNING("Emacs move caret to beginning of line", Localization.lang("Move caret to beginning of line"), "ctrl+A", KeyBindingCategory.EDIT),
+    EMACS_END("Emacs move caret to  of line", Localization.lang("Move caret to end of line"), "ctrl+E", KeyBindingCategory.EDIT),
+    EMACS_BEGINNING_DOC("Emacs move caret to beginning of text", Localization.lang("Move the caret to the beginning of text"), "alt+LESS", KeyBindingCategory.EDIT),
+    EMACS_END_DOC("Emacs move caret to end of text", Localization.lang("Move the caret to the end of text"), "alt+shift+LESS", KeyBindingCategory.EDIT),
     EMACS_UP("Emacs move caret up", Localization.lang("Move the caret up"), "ctrl+P", KeyBindingCategory.EDIT),
     EMACS_DOWN("Emacs move caret down", Localization.lang("Move the caret down"), "ctrl+N", KeyBindingCategory.EDIT),
-    EMACS_CAPITALIZE("Emacs capitalize next word", Localization.lang("Capitalize the next word"), "alt+C", KeyBindingCategory.EDIT),
-    EMACS_LOWERCASE("Emacs lowercase next word", Localization.lang("Make all characters in the next word lowercase"), "alt+L", KeyBindingCategory.EDIT),
-    EMACS_UPPERCASE("Emacs uppercase next word", Localization.lang("Make all characters in the next word uppercase"), "alt+U", KeyBindingCategory.EDIT),
-    EMACS_KILLLINE("Emacs remove line", Localization.lang("Remove words after the cursor"), "ctrl+K", KeyBindingCategory.EDIT),
-    EMACS_KILLWORD("Emacs remove the next word", Localization.lang("Remove the next word in the line"), "alt+D", KeyBindingCategory.EDIT),
-    EMACS_BACKWARDKILLWORD("Emacs remove the previous word", Localization.lang("Remove the previous word in the line"), "alt+DELETE", KeyBindingCategory.EDIT),
+    EMACS_CAPITALIZE("Emacs capitalize word", Localization.lang("Capitalize current word"), "alt+C", KeyBindingCategory.EDIT),
+    EMACS_LOWERCASE("Emacs lowercase word", Localization.lang("Make current word lowercase"), "alt+L", KeyBindingCategory.EDIT),
+    EMACS_UPPERCASE("Emacs uppercase word", Localization.lang("Make current word uppercase"), "alt+U", KeyBindingCategory.EDIT),
+    EMACS_KILLLINE("Emacs remove line", Localization.lang("Remove line after caret"), "ctrl+K", KeyBindingCategory.EDIT),
+    EMACS_KILLWORD("Emacs remove word forwards", Localization.lang("Remove current word forwards"), "alt+D", KeyBindingCategory.EDIT),
+    EMACS_BACKWARDKILLWORD("Emacs remove word backwards", Localization.lang("Remove the current word backwards"), "alt+DELETE", KeyBindingCategory.EDIT),
 
     ABBREVIATE("Abbreviate", Localization.lang("Abbreviate journal names"), "ctrl+alt+A", KeyBindingCategory.TOOLS),
     AUTOGENERATE_BIBTEX_KEYS("Autogenerate BibTeX keys", Localization.lang("Autogenerate BibTeX keys"), "ctrl+G", KeyBindingCategory.QUALITY),
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml b/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
index 8741483ea08..31c5db9dc0a 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
@@ -28,22 +28,22 @@
     <CheckBox fx:id="enableLatexCitationsTab" text="%Show 'LaTeX Citations' tab"/>
     <CheckBox fx:id="enableValidation" text="%Show validation messages"/>
     <CheckBox fx:id="enableEmacsKeyBindings" text="%Use Emacs key bindings"/>
-    <CheckBox fx:id="enableEmacsRebindCA" text="%Rebind C-a, too" disable="${!enableEmacsKeyBindings.selected}">
+    <CheckBox fx:id="enableEmacsRebindCA" text="%Rebind C-a" disable="${!enableEmacsKeyBindings.selected}">
         <padding>
             <Insets left="20.0"/>
         </padding>
     </CheckBox>
-    <CheckBox fx:id="enableEmacsRebindCF" text="%Rebind C-f, too" disable="${!enableEmacsKeyBindings.selected}">
+    <CheckBox fx:id="enableEmacsRebindCF" text="%Rebind C-f" disable="${!enableEmacsKeyBindings.selected}">
         <padding>
             <Insets left="20.0"/>
         </padding>
     </CheckBox>
-    <CheckBox fx:id="enableEmacsRebindCN" text="%Rebind C-n, too" disable="${!enableEmacsKeyBindings.selected}">
+    <CheckBox fx:id="enableEmacsRebindCN" text="%Rebind C-n" disable="${!enableEmacsKeyBindings.selected}">
         <padding>
             <Insets left="20.0"/>
         </padding>
     </CheckBox>
-    <CheckBox fx:id="enableEmacsRebindAU" text="%Rebind A-u, too" disable="${!enableEmacsKeyBindings.selected}">
+    <CheckBox fx:id="enableEmacsRebindAU" text="%Rebind A-u" disable="${!enableEmacsKeyBindings.selected}">
         <padding>
             <Insets left="20.0"/>
         </padding>
diff --git a/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java b/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java
index 4f2c72a9737..2dec6823b20 100644
--- a/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java
+++ b/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java
@@ -67,7 +67,7 @@ private static ResultingEmacsState setNextWordsCase(String text, int pos, Letter
      * @param pos The index to start from.
      * @param text The text to manipulate.
      * @param dir The direction to search.
-     * @return The resulting text.
+     * @return The resulting text and caret position.
      */
     public static ResultingEmacsState deleteUntilWordBoundary(int pos, String text, Direction dir) {
         StringBuilder res = new StringBuilder();
@@ -122,33 +122,33 @@ public static ResultingEmacsState deleteUntilWordBoundary(int pos, String text,
     }
 
     /**
-     * Capitalize the next word on the right side of the cursor.
+     * Capitalize the word on the right side of the cursor.
      *
      * @param pos the position of the cursor
      * @param text String to analyze
-     * @return String the result text
+     * @return String The resulting text and caret position.
      */
     public static ResultingEmacsState capitalize(int pos, String text) {
         return setNextWordsCase(text, pos, LetterCase.CAPITALIZED);
     }
 
     /**
-     * Make all characters in the next word uppercase.
+     * Make all characters in the word uppercase.
      *
      * @param pos the position of the cursor
      * @param text String to analyze
-     * @return String the result text
+     * @return String The resulting text and caret position.
      */
     public static ResultingEmacsState uppercase(int pos, String text) {
         return setNextWordsCase(text, pos, LetterCase.UPPER);
     }
 
     /**
-     * Make all characters in the next word lowercase.
+     * Make all characters in the word lowercase.
      *
      * @param pos the position of the cursor
      * @param text String to analyze
-     * @return String the result text
+     * @return String The resulting text and caret position.
      */
     public static ResultingEmacsState lowercase(int pos, String text) {
         return setNextWordsCase(text, pos, LetterCase.LOWER);
@@ -159,7 +159,7 @@ public static ResultingEmacsState lowercase(int pos, String text) {
      *
      * @param pos the position of the cursor
      * @param text String to analyze
-     * @return String the result text
+     * @return String The resulting text and caret position.
      */
     public static ResultingEmacsState killWord(int pos, String text) {
         return deleteUntilWordBoundary(pos, text, Direction.NEXT);
@@ -170,7 +170,7 @@ public static ResultingEmacsState killWord(int pos, String text) {
      *
      * @param pos the position of the cursor
      * @param text String to analyze
-     * @return String the result text
+     * @return String The resulting text and caret position.
      */
     public static ResultingEmacsState backwardKillWord(int pos, String text) {
         return deleteUntilWordBoundary(pos, text, Direction.PREVIOUS);
diff --git a/src/main/java/org/jabref/model/util/ResultingEmacsState.java b/src/main/java/org/jabref/model/util/ResultingEmacsState.java
index b65acf6d227..842a9b21855 100644
--- a/src/main/java/org/jabref/model/util/ResultingEmacsState.java
+++ b/src/main/java/org/jabref/model/util/ResultingEmacsState.java
@@ -4,7 +4,6 @@ public class ResultingEmacsState {
     public final int caretPos;
     public final String text;
 
-
     public ResultingEmacsState(int pos, String text) {
         this.caretPos = pos;
         this.text = text;
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 70253228ab6..85c87ce90fb 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -673,13 +673,13 @@ Quit\ JabRef=Quit JabRef
 
 Read\ only=Read only
 
-Rebind\ C-a,\ too=Rebind C-a, too
+Rebind\ C-a=Rebind C-a
 
-Rebind\ C-f,\ too=Rebind C-f, too
+Rebind\ C-f=Rebind C-f
 
-Rebind\ C-n,\ too=Rebind C-n, too
+Rebind\ C-n=Rebind C-n
 
-Rebind\ A-u,\ too=Rebind A-u, too
+Rebind\ A-u=Rebind A-u
 
 Redo=Redo
 
@@ -2126,18 +2126,18 @@ Required=Required
 Entry\ type\ cannot\ be\ empty.\ Please\ enter\ a\ name.=Entry type cannot be empty. Please enter a name.
 Field\ cannot\ be\ empty.\ Please\ enter\ a\ name.=Field cannot be empty. Please enter a name.
 
+Capitalize\ current\ word=Capitalize current word
 Delete\ text=Delete text
+Make\ current\ word\ lowercase=Make current word lowercase
+Make\ current\ word\ uppercase=Make current word uppercase
 Move\ caret\ left=Move caret left
 Move\ caret\ right=Move caret right
-Move\ caret\ to\ beginning=Move caret to beginning
-Move\ caret\ to\ end=Move caret to end
+Move\ caret\ to\ beginning\ of\ line=Move caret to beginning of line
+Move\ caret\ to\ end\ of\ line=Move caret to end of line
 Move\ the\ caret\ down=Move the caret down
-Move\ the\ caret\ to\ the\ beginning\ of\ the\ document=Move the caret to the beginning of the document
-Move\ the\ caret\ to\ the\ end\ of\ the\ document=Move the caret to the end of the document
+Move\ the\ caret\ to\ the\ beginning\ of\ text=Move the caret to the beginning of text
+Move\ the\ caret\ to\ the\ end\ of\ text=Move the caret to the end of text
 Move\ the\ caret\ up=Move the caret up
-Capitalize\ the\ next\ word=Capitalize the next word
-Make\ all\ characters\ in\ the\ next\ word\ lowercase=Make all characters in the next word lowercase
-Make\ all\ characters\ in\ the\ next\ word\ uppercase=Make all characters in the next word uppercase
-Remove\ all\ the\ words\ in\ the\ line=Remove all the words in the line
-Remove\ the\ next\ word\ in\ the\ line=Remove the next word in the line
-Remove\ the\ previous\ word\ in\ the\ line=Remove the previous word in the line
+Remove\ current\ word\ forwards=Remove current word forwards
+Remove\ line\ after\ caret=Remove line after caret
+Remove\ the\ current\ word\ backwards=Remove the current word backwards

From aad47bf1429b2ca274504bd79c3fe1c227b78dce Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Wed, 21 Oct 2020 01:13:23 +0200
Subject: [PATCH 03/16] Integrated some suggestions

---
 .../jabref/gui/keyboard/EmacsKeyBindings.java | 46 +++++++++----------
 .../org/jabref/gui/keyboard/KeyBinding.java   |  6 +--
 .../util/strings/EmacsStringManipulator.java  |  1 +
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java
index 3569f8488e7..7bdec94be44 100755
--- a/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java
+++ b/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java
@@ -14,78 +14,78 @@
 public class EmacsKeyBindings {
 
     public static void executeEmacs(Scene scene, KeyEvent event, PreferencesService preferencesService) {
-        boolean EmacsFlag = preferencesService.getEmacsKeyPreferences().useEmacsKeyBindings();
-        if (EmacsFlag && scene.focusOwnerProperty().get() instanceof TextInputControl) {
-            boolean CAFlag = preferencesService.getEmacsKeyPreferences().shouldRebindCA();
-            boolean CFFlag = preferencesService.getEmacsKeyPreferences().shouldRebindCF();
-            boolean CNFlag = preferencesService.getEmacsKeyPreferences().shouldRebindCN();
-            boolean AUFlag = preferencesService.getEmacsKeyPreferences().shouldRebindAU();
+        if (preferencesService.getEmacsKeyPreferences().useEmacsKeyBindings()
+                && scene.focusOwnerProperty().get() instanceof TextInputControl) {
 
             KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
             TextInputControl focusedTextField = (TextInputControl) scene.focusOwnerProperty().get();
             Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
-            if (keyBinding.isPresent()) {
-                if (keyBinding.get().equals(KeyBinding.EMACS_DELETE)) {
+            keyBinding.ifPresent(binding -> {
+                if (binding.equals(KeyBinding.EMACS_DELETE)) {
                     focusedTextField.deletePreviousChar();
                     event.consume();
-                } else if (keyBinding.get().equals(KeyBinding.EMACS_BACKWARD)) {
+                } else if (binding == KeyBinding.EMACS_BACKWARD) {
                     focusedTextField.backward();
                     event.consume();
-                } else if (CFFlag && keyBinding.get().equals(KeyBinding.EMACS_FORWARD)) {
+                } else if (preferencesService.getEmacsKeyPreferences().shouldRebindCF()
+                        && binding == KeyBinding.EMACS_FORWARD) {
                     focusedTextField.forward();
                     event.consume();
-                } else if (CAFlag && keyBinding.get().equals(KeyBinding.EMACS_BEGINNING)) {
+                } else if (preferencesService.getEmacsKeyPreferences().shouldRebindCA()
+                        && binding == KeyBinding.EMACS_BEGINNING) {
                     focusedTextField.home();
                     event.consume();
-                } else if (keyBinding.get().equals(KeyBinding.EMACS_END)) {
+                } else if (binding == KeyBinding.EMACS_END) {
                     focusedTextField.end();
                     event.consume();
-                } else if (keyBinding.get().equals(KeyBinding.EMACS_BEGINNING_DOC)) {
+                } else if (binding == KeyBinding.EMACS_BEGINNING_DOC) {
                     focusedTextField.home();
                     event.consume();
-                } else if (keyBinding.get().equals(KeyBinding.EMACS_END_DOC)) {
+                } else if (binding == KeyBinding.EMACS_END_DOC) {
                     focusedTextField.end();
                     event.consume();
-                } else if (keyBinding.get().equals(KeyBinding.EMACS_UP)) {
+                } else if (binding == KeyBinding.EMACS_UP) {
                     focusedTextField.home();
                     event.consume();
-                } else if (CNFlag && keyBinding.get().equals(KeyBinding.EMACS_DOWN)) {
+                } else if (preferencesService.getEmacsKeyPreferences().shouldRebindCN()
+                        && binding == KeyBinding.EMACS_DOWN) {
                     focusedTextField.end();
                     event.consume();
-                } else if (keyBinding.get().equals(KeyBinding.EMACS_CAPITALIZE)) {
+                } else if (binding == KeyBinding.EMACS_CAPITALIZE) {
                     int pos = focusedTextField.getCaretPosition();
                     String text = focusedTextField.getText(0, focusedTextField.getText().length());
                     ResultingEmacsState res = EmacsStringManipulator.capitalize(pos, text);
                     focusedTextField.setText(res.text);
                     focusedTextField.positionCaret(res.caretPos);
                     event.consume();
-                } else if (keyBinding.get().equals(KeyBinding.EMACS_LOWERCASE)) {
+                } else if (binding == KeyBinding.EMACS_LOWERCASE) {
                     int pos = focusedTextField.getCaretPosition();
                     String text = focusedTextField.getText(0, focusedTextField.getText().length());
                     ResultingEmacsState res = EmacsStringManipulator.lowercase(pos, text);
                     focusedTextField.setText(res.text);
                     focusedTextField.positionCaret(res.caretPos);
                     event.consume();
-                } else if (AUFlag && keyBinding.get().equals(KeyBinding.EMACS_UPPERCASE)) {
+                } else if (preferencesService.getEmacsKeyPreferences().shouldRebindAU()
+                        && binding == KeyBinding.EMACS_UPPERCASE) {
                     int pos = focusedTextField.getCaretPosition();
                     String text = focusedTextField.getText(0, focusedTextField.getText().length());
                     ResultingEmacsState res = EmacsStringManipulator.uppercase(pos, text);
                     focusedTextField.setText(res.text);
                     focusedTextField.positionCaret(res.caretPos);
                     event.consume();
-                } else if (keyBinding.get().equals(KeyBinding.EMACS_KILLLINE)) {
+                } else if (binding == KeyBinding.EMACS_KILL_LINE) {
                     int pos = focusedTextField.getCaretPosition();
                     focusedTextField.setText(focusedTextField.getText(0, pos));
                     focusedTextField.positionCaret(pos);
                     event.consume();
-                } else if (keyBinding.get().equals(KeyBinding.EMACS_KILLWORD)) {
+                } else if (binding == KeyBinding.EMACS_KILL_WORD) {
                     int pos = focusedTextField.getCaretPosition();
                     String text = focusedTextField.getText(0, focusedTextField.getText().length());
                     ResultingEmacsState res = EmacsStringManipulator.killWord(pos, text);
                     focusedTextField.setText(res.text);
                     focusedTextField.positionCaret(res.caretPos);
                     event.consume();
-                } else if (keyBinding.get().equals(KeyBinding.EMACS_BACKWARDKILLWORD)) {
+                } else if (binding == KeyBinding.EMACS_KILL_WORD_BACKWARD) {
                     int pos = focusedTextField.getCaretPosition();
                     String text = focusedTextField.getText(0, focusedTextField.getText().length());
                     ResultingEmacsState res = EmacsStringManipulator.backwardKillWord(pos, text);
@@ -93,7 +93,7 @@ public static void executeEmacs(Scene scene, KeyEvent event, PreferencesService
                     focusedTextField.positionCaret(res.caretPos);
                     event.consume();
                 }
-            }
+            });
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
index 1c64f4f68bb..f156352bcf8 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -15,9 +15,9 @@ public enum KeyBinding {
     EMACS_CAPITALIZE("Emacs capitalize word", Localization.lang("Capitalize current word"), "alt+C", KeyBindingCategory.EDIT),
     EMACS_LOWERCASE("Emacs lowercase word", Localization.lang("Make current word lowercase"), "alt+L", KeyBindingCategory.EDIT),
     EMACS_UPPERCASE("Emacs uppercase word", Localization.lang("Make current word uppercase"), "alt+U", KeyBindingCategory.EDIT),
-    EMACS_KILLLINE("Emacs remove line", Localization.lang("Remove line after caret"), "ctrl+K", KeyBindingCategory.EDIT),
-    EMACS_KILLWORD("Emacs remove word forwards", Localization.lang("Remove current word forwards"), "alt+D", KeyBindingCategory.EDIT),
-    EMACS_BACKWARDKILLWORD("Emacs remove word backwards", Localization.lang("Remove the current word backwards"), "alt+DELETE", KeyBindingCategory.EDIT),
+    EMACS_KILL_LINE("Emacs remove all characters caret to end of line", Localization.lang("Remove line after caret"), "ctrl+K", KeyBindingCategory.EDIT),
+    EMACS_KILL_WORD("Emacs remove characters until next word", Localization.lang("Remove characters until next word"), "alt+D", KeyBindingCategory.EDIT),
+    EMACS_KILL_WORD_BACKWARD("Emacs characters until previous word", Localization.lang("Remove the current word backwards"), "alt+DELETE", KeyBindingCategory.EDIT),
 
     ABBREVIATE("Abbreviate", Localization.lang("Abbreviate journal names"), "ctrl+alt+A", KeyBindingCategory.TOOLS),
     AUTOGENERATE_CITATION_KEYS("Autogenerate citation keys", Localization.lang("Autogenerate citation keys"), "ctrl+G", KeyBindingCategory.QUALITY),
diff --git a/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java b/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java
index 45a97e82a57..fe2f567061b 100644
--- a/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java
+++ b/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java
@@ -1,4 +1,5 @@
 package org.jabref.logic.util.strings;
+
 import org.jabref.model.util.ResultingEmacsState;
 
 public class EmacsStringManipulator {

From 5b9498c1ad8349d34f804cb23be652fcb0749502 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Wed, 21 Oct 2020 20:59:29 +0200
Subject: [PATCH 04/16] Introduced KeyBindingCategory Emacs

---
 .../org/jabref/gui/keyboard/KeyBinding.java   | 32 ++++++++++---------
 .../gui/keyboard/KeyBindingCategory.java      |  5 +--
 src/main/resources/l10n/JabRef_en.properties  |  2 ++
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
index f156352bcf8..5973b4df414 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -3,21 +3,23 @@
 import org.jabref.logic.l10n.Localization;
 
 public enum KeyBinding {
-    EMACS_DELETE("Emacs delete", Localization.lang("Delete text"), "ctrl+D", KeyBindingCategory.EDIT),
-    EMACS_BACKWARD("Emacs move caret left", Localization.lang("Move caret left"), "ctrl+B", KeyBindingCategory.EDIT),
-    EMACS_FORWARD("Emacs move caret right", Localization.lang("Move caret right"), "ctrl+F", KeyBindingCategory.EDIT),
-    EMACS_BEGINNING("Emacs move caret to beginning of line", Localization.lang("Move caret to beginning of line"), "ctrl+A", KeyBindingCategory.EDIT),
-    EMACS_END("Emacs move caret to  of line", Localization.lang("Move caret to end of line"), "ctrl+E", KeyBindingCategory.EDIT),
-    EMACS_BEGINNING_DOC("Emacs move caret to beginning of text", Localization.lang("Move the caret to the beginning of text"), "alt+LESS", KeyBindingCategory.EDIT),
-    EMACS_END_DOC("Emacs move caret to end of text", Localization.lang("Move the caret to the end of text"), "alt+shift+LESS", KeyBindingCategory.EDIT),
-    EMACS_UP("Emacs move caret up", Localization.lang("Move the caret up"), "ctrl+P", KeyBindingCategory.EDIT),
-    EMACS_DOWN("Emacs move caret down", Localization.lang("Move the caret down"), "ctrl+N", KeyBindingCategory.EDIT),
-    EMACS_CAPITALIZE("Emacs capitalize word", Localization.lang("Capitalize current word"), "alt+C", KeyBindingCategory.EDIT),
-    EMACS_LOWERCASE("Emacs lowercase word", Localization.lang("Make current word lowercase"), "alt+L", KeyBindingCategory.EDIT),
-    EMACS_UPPERCASE("Emacs uppercase word", Localization.lang("Make current word uppercase"), "alt+U", KeyBindingCategory.EDIT),
-    EMACS_KILL_LINE("Emacs remove all characters caret to end of line", Localization.lang("Remove line after caret"), "ctrl+K", KeyBindingCategory.EDIT),
-    EMACS_KILL_WORD("Emacs remove characters until next word", Localization.lang("Remove characters until next word"), "alt+D", KeyBindingCategory.EDIT),
-    EMACS_KILL_WORD_BACKWARD("Emacs characters until previous word", Localization.lang("Remove the current word backwards"), "alt+DELETE", KeyBindingCategory.EDIT),
+    EMACS_DELETE("Emacs delete", Localization.lang("Delete text"), "ctrl+D", KeyBindingCategory.EMACS),
+    EMACS_BACKWARD("Emacs move caret left", Localization.lang("Move caret left"), "ctrl+B", KeyBindingCategory.EMACS),
+    EMACS_FORWARD("Emacs move caret right", Localization.lang("Move caret right"), "ctrl+F", KeyBindingCategory.EMACS),
+    EMACS_WORD_BACKWARD("Emacs move caret to previous word", Localization.lang("Move caret to previous word"), "alt+B", KeyBindingCategory.EMACS),
+    EMACS_WORD_FORWARD("Emacs move caret to next word", Localization.lang("Move caret to next word"), "alt+B", KeyBindingCategory.EMACS),
+    EMACS_BEGINNING("Emacs move caret to beginning of line", Localization.lang("Move caret to beginning of line"), "ctrl+A", KeyBindingCategory.EMACS),
+    EMACS_END("Emacs move caret to  of line", Localization.lang("Move caret to end of line"), "ctrl+E", KeyBindingCategory.EMACS),
+    EMACS_BEGINNING_DOC("Emacs move caret to beginning of text", Localization.lang("Move the caret to the beginning of text"), "alt+LESS", KeyBindingCategory.EMACS),
+    EMACS_END_DOC("Emacs move caret to end of text", Localization.lang("Move the caret to the end of text"), "alt+shift+LESS", KeyBindingCategory.EMACS),
+    EMACS_UP("Emacs move caret up", Localization.lang("Move the caret up"), "ctrl+P", KeyBindingCategory.EMACS),
+    EMACS_DOWN("Emacs move caret down", Localization.lang("Move the caret down"), "ctrl+N", KeyBindingCategory.EMACS),
+    EMACS_CAPITALIZE("Emacs capitalize word", Localization.lang("Capitalize current word"), "alt+C", KeyBindingCategory.EMACS),
+    EMACS_LOWERCASE("Emacs lowercase word", Localization.lang("Make current word lowercase"), "alt+L", KeyBindingCategory.EMACS),
+    EMACS_UPPERCASE("Emacs uppercase word", Localization.lang("Make current word uppercase"), "alt+U", KeyBindingCategory.EMACS),
+    EMACS_KILL_LINE("Emacs remove all characters caret to end of line", Localization.lang("Remove line after caret"), "ctrl+K", KeyBindingCategory.EMACS),
+    EMACS_KILL_WORD("Emacs remove characters until next word", Localization.lang("Remove characters until next word"), "alt+D", KeyBindingCategory.EMACS),
+    EMACS_KILL_WORD_BACKWARD("Emacs characters until previous word", Localization.lang("Remove the current word backwards"), "alt+DELETE", KeyBindingCategory.EMACS),
 
     ABBREVIATE("Abbreviate", Localization.lang("Abbreviate journal names"), "ctrl+alt+A", KeyBindingCategory.TOOLS),
     AUTOGENERATE_CITATION_KEYS("Autogenerate citation keys", Localization.lang("Autogenerate citation keys"), "ctrl+G", KeyBindingCategory.QUALITY),
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java
index 4f8e080b617..27ef76973ce 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java
@@ -11,11 +11,12 @@ public enum KeyBindingCategory {
     VIEW(Localization.lang("View")),
     BIBTEX(BibDatabaseMode.BIBTEX.getFormattedName()),
     QUALITY(Localization.lang("Quality")),
-    TOOLS(Localization.lang("Tools"));
+    TOOLS(Localization.lang("Tools")),
+    EMACS(Localization.lang("Emacs"));
 
     private final String name;
 
-    private KeyBindingCategory(String name) {
+    KeyBindingCategory(String name) {
         this.name = name;
     }
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index a0192f073b3..c9b0b8603bb 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2109,6 +2109,8 @@ Make\ current\ word\ lowercase=Make current word lowercase
 Make\ current\ word\ uppercase=Make current word uppercase
 Move\ caret\ left=Move caret left
 Move\ caret\ right=Move caret right
+Move\ caret\ to\ previous\ word=Move caret to previous word
+Move\ caret\ to\ next\ word=Move caret to next word
 Move\ caret\ to\ beginning\ of\ line=Move caret to beginning of line
 Move\ caret\ to\ end\ of\ line=Move caret to end of line
 Move\ the\ caret\ down=Move the caret down

From b3fbfe951da8fe1d6c791c68d8622712a2e14c7f Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Thu, 22 Oct 2020 18:55:40 +0200
Subject: [PATCH 05/16] Integrated some more remarks

---
 .../util/strings/EmacsStringManipulator.java  | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java b/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java
index fe2f567061b..b1e5fd894f0 100644
--- a/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java
+++ b/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.util.strings;
 
+import java.util.regex.Pattern;
+
 import org.jabref.model.util.ResultingEmacsState;
 
 public class EmacsStringManipulator {
@@ -13,7 +15,9 @@ private enum Direction {
         NEXT, PREVIOUS
     }
 
-    private static ResultingEmacsState setNextWordsCase(String text, int pos, LetterCase targetCase) {
+    Pattern WORDCHAR = Pattern.compile("\\w");
+
+    private ResultingEmacsState setNextWordsCase(String text, int pos, LetterCase targetCase) {
         StringBuilder res = new StringBuilder();
 
         boolean firstLetter = true;
@@ -22,18 +26,18 @@ private static ResultingEmacsState setNextWordsCase(String text, int pos, Letter
         StringBuilder newWordBuilder = new StringBuilder();
         for (; i < text.length(); i++) {
             // Swallow whitespace
-            while (firstLoop && i < text.length() && !String.valueOf(text.charAt(i)).matches("\\w")) {
+            while (firstLoop && i < text.length() && !WORDCHAR.matcher(String.valueOf(text.charAt(i))).matches()) {
                 newWordBuilder.append(text.charAt(i));
                 i++;
             }
             if (i >= text.length()) {
                 break;
             }
-            if (firstLoop) {
-                firstLoop = false;
-            }
+
+            firstLoop = false;
+
             char currentChar = text.charAt(i);
-            if (String.valueOf(currentChar).matches("\\w")) {
+            if (WORDCHAR.matcher(String.valueOf(currentChar)).matches()) {
                 switch (targetCase) {
                     case UPPER:
                         newWordBuilder.append(Character.toUpperCase(currentChar));
@@ -70,7 +74,7 @@ private static ResultingEmacsState setNextWordsCase(String text, int pos, Letter
      * @param dir The direction to search.
      * @return The resulting text and caret position.
      */
-    public static ResultingEmacsState deleteUntilWordBoundary(int pos, String text, Direction dir) {
+    public ResultingEmacsState deleteUntilWordBoundary(int pos, String text, Direction dir) {
         StringBuilder res = new StringBuilder();
         int offset;
         int wordBreak;
@@ -97,7 +101,7 @@ public static ResultingEmacsState deleteUntilWordBoundary(int pos, String text,
                     i += offset;
                 }
             }
-            if (!(i < text.length() && i >= 0) || !String.valueOf(text.charAt(i)).matches("\\w")) {
+            if (!(i < text.length() && i >= 0) || !WORDCHAR.matcher(String.valueOf(text.charAt(i))).matches()) {
                 wordBreak = i;
                 break;
             }
@@ -128,7 +132,7 @@ public static ResultingEmacsState deleteUntilWordBoundary(int pos, String text,
      * @param text String to analyze
      * @return String The resulting text and caret position.
      */
-    public static ResultingEmacsState capitalize(int pos, String text) {
+    public ResultingEmacsState capitalize(int pos, String text) {
         return setNextWordsCase(text, pos, LetterCase.CAPITALIZED);
     }
 
@@ -139,7 +143,7 @@ public static ResultingEmacsState capitalize(int pos, String text) {
      * @param text String to analyze
      * @return String The resulting text and caret position.
      */
-    public static ResultingEmacsState uppercase(int pos, String text) {
+    public ResultingEmacsState uppercase(int pos, String text) {
         return setNextWordsCase(text, pos, LetterCase.UPPER);
     }
 
@@ -150,7 +154,7 @@ public static ResultingEmacsState uppercase(int pos, String text) {
      * @param text String to analyze
      * @return String The resulting text and caret position.
      */
-    public static ResultingEmacsState lowercase(int pos, String text) {
+    public ResultingEmacsState lowercase(int pos, String text) {
         return setNextWordsCase(text, pos, LetterCase.LOWER);
     }
 
@@ -161,7 +165,7 @@ public static ResultingEmacsState lowercase(int pos, String text) {
      * @param text String to analyze
      * @return String The resulting text and caret position.
      */
-    public static ResultingEmacsState killWord(int pos, String text) {
+    public ResultingEmacsState killWord(int pos, String text) {
         return deleteUntilWordBoundary(pos, text, Direction.NEXT);
     }
 
@@ -172,7 +176,7 @@ public static ResultingEmacsState killWord(int pos, String text) {
      * @param text String to analyze
      * @return String The resulting text and caret position.
      */
-    public static ResultingEmacsState backwardKillWord(int pos, String text) {
+    public ResultingEmacsState backwardKillWord(int pos, String text) {
         return deleteUntilWordBoundary(pos, text, Direction.PREVIOUS);
     }
 }

From f0468b23986044525251938be58ce63e557fc60b Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Fri, 23 Oct 2020 00:51:03 +0200
Subject: [PATCH 06/16] Integrated again some more remarks

---
 src/main/java/org/jabref/gui/JabRefGUI.java   |   6 +-
 ...eyBindings.java => EditorKeyBindings.java} |  63 +++++------
 .../gui/keyboard/EmacsKeyPreferences.java     |  41 -------
 .../org/jabref/gui/keyboard/KeyBinding.java   |  35 +++---
 .../gui/keyboard/KeyBindingCategory.java      |   2 +-
 .../gui/preferences/EntryEditorTab.fxml       |  21 ----
 .../gui/preferences/EntryEditorTabView.java   |  10 --
 .../preferences/EntryEditorTabViewModel.java  |  31 ------
 .../jabref/logic/bst/BibtexCaseChanger.java   |  51 ++++-----
 .../jabref/logic/bst/ChangeCaseFunction.java  |   4 +-
 ...anipulator.java => StringManipulator.java} | 100 ++++++++----------
 ...csState.java => ResultingStringState.java} |   4 +-
 .../jabref/preferences/JabRefPreferences.java |  20 ----
 .../preferences/PreferencesService.java       |   5 -
 src/main/resources/l10n/JabRef_en.properties  |  13 +--
 .../logic/bst/BibtexCaseChangersTest.java     |   8 +-
 ...orTest.java => StringManipulatorTest.java} |  28 ++---
 17 files changed, 141 insertions(+), 301 deletions(-)
 rename src/main/java/org/jabref/gui/keyboard/{EmacsKeyBindings.java => EditorKeyBindings.java} (59%)
 mode change 100755 => 100644
 delete mode 100644 src/main/java/org/jabref/gui/keyboard/EmacsKeyPreferences.java
 rename src/main/java/org/jabref/logic/util/strings/{EmacsStringManipulator.java => StringManipulator.java} (56%)
 rename src/main/java/org/jabref/model/util/{ResultingEmacsState.java => ResultingStringState.java} (63%)
 rename src/test/java/org/jabref/logic/util/strings/{EmacsStringManipulatorTest.java => StringManipulatorTest.java} (76%)

diff --git a/src/main/java/org/jabref/gui/JabRefGUI.java b/src/main/java/org/jabref/gui/JabRefGUI.java
index 35c2f315e7b..ed4f9c7dd30 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -17,7 +17,7 @@
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.importer.ParserResultWarningDialog;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
-import org.jabref.gui.keyboard.EmacsKeyBindings;
+import org.jabref.gui.keyboard.EditorKeyBindings;
 import org.jabref.gui.shared.SharedDatabaseUIManager;
 import org.jabref.logic.autosaveandbackup.BackupManager;
 import org.jabref.logic.importer.OpenDatabase;
@@ -90,9 +90,7 @@ private void openWindow(Stage mainStage) {
         Globals.prefs.getTheme().installCss(scene);
 
         // Handle Emacs key bindings
-        scene.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            EmacsKeyBindings.executeEmacs(scene, event, Globals.prefs);
-        });
+        scene.addEventFilter(KeyEvent.KEY_PRESSED, event -> EditorKeyBindings.call(scene, event, Globals.prefs));
 
         mainStage.setTitle(JabRefFrame.FRAME_TITLE);
         mainStage.getIcons().addAll(IconTheme.getLogoSetFX());
diff --git a/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/EditorKeyBindings.java
old mode 100755
new mode 100644
similarity index 59%
rename from src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java
rename to src/main/java/org/jabref/gui/keyboard/EditorKeyBindings.java
index 7bdec94be44..327a2dc244d
--- a/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java
+++ b/src/main/java/org/jabref/gui/keyboard/EditorKeyBindings.java
@@ -7,88 +7,89 @@
 import javafx.scene.input.KeyEvent;
 
 import org.jabref.gui.Globals;
-import org.jabref.logic.util.strings.EmacsStringManipulator;
-import org.jabref.model.util.ResultingEmacsState;
+import org.jabref.logic.util.strings.StringManipulator;
+import org.jabref.model.util.ResultingStringState;
 import org.jabref.preferences.PreferencesService;
 
-public class EmacsKeyBindings {
+public class EditorKeyBindings {
 
-    public static void executeEmacs(Scene scene, KeyEvent event, PreferencesService preferencesService) {
-        if (preferencesService.getEmacsKeyPreferences().useEmacsKeyBindings()
-                && scene.focusOwnerProperty().get() instanceof TextInputControl) {
+    public static void call(Scene scene, KeyEvent event, PreferencesService preferencesService) {
+        if (scene.focusOwnerProperty().get() instanceof TextInputControl) {
 
             KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
             TextInputControl focusedTextField = (TextInputControl) scene.focusOwnerProperty().get();
             Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
             keyBinding.ifPresent(binding -> {
-                if (binding.equals(KeyBinding.EMACS_DELETE)) {
-                    focusedTextField.deletePreviousChar();
+                if (binding.equals(KeyBinding.EDITOR_DELETE)) {
+                    focusedTextField.deleteNextChar();
                     event.consume();
-                } else if (binding == KeyBinding.EMACS_BACKWARD) {
+                } else if (binding == KeyBinding.EDITOR_BACKWARD) {
                     focusedTextField.backward();
                     event.consume();
-                } else if (preferencesService.getEmacsKeyPreferences().shouldRebindCF()
-                        && binding == KeyBinding.EMACS_FORWARD) {
+                } else if (binding == KeyBinding.EDITOR_FORWARD) {
                     focusedTextField.forward();
                     event.consume();
-                } else if (preferencesService.getEmacsKeyPreferences().shouldRebindCA()
-                        && binding == KeyBinding.EMACS_BEGINNING) {
+                } else if (binding == KeyBinding.EDITOR_WORD_BACKWARD) {
+                    focusedTextField.previousWord();
+                    event.consume();
+                } else if (binding == KeyBinding.EDITOR_WORD_FORWARD) {
+                    focusedTextField.nextWord();
+                    event.consume();
+                } else if (binding == KeyBinding.EDITOR_BEGINNING) {
                     focusedTextField.home();
                     event.consume();
-                } else if (binding == KeyBinding.EMACS_END) {
+                } else if (binding == KeyBinding.EDITOR_END) {
                     focusedTextField.end();
                     event.consume();
-                } else if (binding == KeyBinding.EMACS_BEGINNING_DOC) {
+                } else if (binding == KeyBinding.EDITOR_BEGINNING_DOC) {
                     focusedTextField.home();
                     event.consume();
-                } else if (binding == KeyBinding.EMACS_END_DOC) {
+                } else if (binding == KeyBinding.EDITOR_END_DOC) {
                     focusedTextField.end();
                     event.consume();
-                } else if (binding == KeyBinding.EMACS_UP) {
+                } else if (binding == KeyBinding.EDITOR_UP) {
                     focusedTextField.home();
                     event.consume();
-                } else if (preferencesService.getEmacsKeyPreferences().shouldRebindCN()
-                        && binding == KeyBinding.EMACS_DOWN) {
+                } else if (binding == KeyBinding.EDITOR_DOWN) {
                     focusedTextField.end();
                     event.consume();
-                } else if (binding == KeyBinding.EMACS_CAPITALIZE) {
+                } else if (binding == KeyBinding.EDITOR_CAPITALIZE) {
                     int pos = focusedTextField.getCaretPosition();
                     String text = focusedTextField.getText(0, focusedTextField.getText().length());
-                    ResultingEmacsState res = EmacsStringManipulator.capitalize(pos, text);
+                    ResultingStringState res = StringManipulator.capitalize(pos, text);
                     focusedTextField.setText(res.text);
                     focusedTextField.positionCaret(res.caretPos);
                     event.consume();
-                } else if (binding == KeyBinding.EMACS_LOWERCASE) {
+                } else if (binding == KeyBinding.EDITOR_LOWERCASE) {
                     int pos = focusedTextField.getCaretPosition();
                     String text = focusedTextField.getText(0, focusedTextField.getText().length());
-                    ResultingEmacsState res = EmacsStringManipulator.lowercase(pos, text);
+                    ResultingStringState res = StringManipulator.lowercase(pos, text);
                     focusedTextField.setText(res.text);
                     focusedTextField.positionCaret(res.caretPos);
                     event.consume();
-                } else if (preferencesService.getEmacsKeyPreferences().shouldRebindAU()
-                        && binding == KeyBinding.EMACS_UPPERCASE) {
+                } else if (binding == KeyBinding.EDITOR_UPPERCASE) {
                     int pos = focusedTextField.getCaretPosition();
                     String text = focusedTextField.getText(0, focusedTextField.getText().length());
-                    ResultingEmacsState res = EmacsStringManipulator.uppercase(pos, text);
+                    ResultingStringState res = StringManipulator.uppercase(pos, text);
                     focusedTextField.setText(res.text);
                     focusedTextField.positionCaret(res.caretPos);
                     event.consume();
-                } else if (binding == KeyBinding.EMACS_KILL_LINE) {
+                } else if (binding == KeyBinding.EDITOR_KILL_LINE) {
                     int pos = focusedTextField.getCaretPosition();
                     focusedTextField.setText(focusedTextField.getText(0, pos));
                     focusedTextField.positionCaret(pos);
                     event.consume();
-                } else if (binding == KeyBinding.EMACS_KILL_WORD) {
+                } else if (binding == KeyBinding.EDITOR_KILL_WORD) {
                     int pos = focusedTextField.getCaretPosition();
                     String text = focusedTextField.getText(0, focusedTextField.getText().length());
-                    ResultingEmacsState res = EmacsStringManipulator.killWord(pos, text);
+                    ResultingStringState res = StringManipulator.killWord(pos, text);
                     focusedTextField.setText(res.text);
                     focusedTextField.positionCaret(res.caretPos);
                     event.consume();
-                } else if (binding == KeyBinding.EMACS_KILL_WORD_BACKWARD) {
+                } else if (binding == KeyBinding.EDITOR_KILL_WORD_BACKWARD) {
                     int pos = focusedTextField.getCaretPosition();
                     String text = focusedTextField.getText(0, focusedTextField.getText().length());
-                    ResultingEmacsState res = EmacsStringManipulator.backwardKillWord(pos, text);
+                    ResultingStringState res = StringManipulator.backwardKillWord(pos, text);
                     focusedTextField.setText(res.text);
                     focusedTextField.positionCaret(res.caretPos);
                     event.consume();
diff --git a/src/main/java/org/jabref/gui/keyboard/EmacsKeyPreferences.java b/src/main/java/org/jabref/gui/keyboard/EmacsKeyPreferences.java
deleted file mode 100644
index 9f20da72f22..00000000000
--- a/src/main/java/org/jabref/gui/keyboard/EmacsKeyPreferences.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.jabref.gui.keyboard;
-
-public class EmacsKeyPreferences {
-    private final boolean useEmacsKeyBindings;
-    private final boolean rebindCA;
-    private final boolean rebindCF;
-    private final boolean rebindCN;
-    private final boolean rebindAU;
-
-    public EmacsKeyPreferences(boolean useEmacsKeyBindings,
-                               boolean rebindCA,
-                               boolean rebindCF,
-                               boolean rebindCN,
-                               boolean rebindAU) {
-        this.useEmacsKeyBindings = useEmacsKeyBindings;
-        this.rebindCA = rebindCA;
-        this.rebindCF = rebindCF;
-        this.rebindCN = rebindCN;
-        this.rebindAU = rebindAU;
-    }
-
-    public boolean useEmacsKeyBindings() {
-        return useEmacsKeyBindings;
-    }
-
-    public boolean shouldRebindCA() {
-        return rebindCA;
-    }
-
-    public boolean shouldRebindCF() {
-        return rebindCF;
-    }
-
-    public boolean shouldRebindCN() {
-        return rebindCN;
-    }
-
-    public boolean shouldRebindAU() {
-        return rebindAU;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
index 5973b4df414..b17f0bc4027 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -3,23 +3,24 @@
 import org.jabref.logic.l10n.Localization;
 
 public enum KeyBinding {
-    EMACS_DELETE("Emacs delete", Localization.lang("Delete text"), "ctrl+D", KeyBindingCategory.EMACS),
-    EMACS_BACKWARD("Emacs move caret left", Localization.lang("Move caret left"), "ctrl+B", KeyBindingCategory.EMACS),
-    EMACS_FORWARD("Emacs move caret right", Localization.lang("Move caret right"), "ctrl+F", KeyBindingCategory.EMACS),
-    EMACS_WORD_BACKWARD("Emacs move caret to previous word", Localization.lang("Move caret to previous word"), "alt+B", KeyBindingCategory.EMACS),
-    EMACS_WORD_FORWARD("Emacs move caret to next word", Localization.lang("Move caret to next word"), "alt+B", KeyBindingCategory.EMACS),
-    EMACS_BEGINNING("Emacs move caret to beginning of line", Localization.lang("Move caret to beginning of line"), "ctrl+A", KeyBindingCategory.EMACS),
-    EMACS_END("Emacs move caret to  of line", Localization.lang("Move caret to end of line"), "ctrl+E", KeyBindingCategory.EMACS),
-    EMACS_BEGINNING_DOC("Emacs move caret to beginning of text", Localization.lang("Move the caret to the beginning of text"), "alt+LESS", KeyBindingCategory.EMACS),
-    EMACS_END_DOC("Emacs move caret to end of text", Localization.lang("Move the caret to the end of text"), "alt+shift+LESS", KeyBindingCategory.EMACS),
-    EMACS_UP("Emacs move caret up", Localization.lang("Move the caret up"), "ctrl+P", KeyBindingCategory.EMACS),
-    EMACS_DOWN("Emacs move caret down", Localization.lang("Move the caret down"), "ctrl+N", KeyBindingCategory.EMACS),
-    EMACS_CAPITALIZE("Emacs capitalize word", Localization.lang("Capitalize current word"), "alt+C", KeyBindingCategory.EMACS),
-    EMACS_LOWERCASE("Emacs lowercase word", Localization.lang("Make current word lowercase"), "alt+L", KeyBindingCategory.EMACS),
-    EMACS_UPPERCASE("Emacs uppercase word", Localization.lang("Make current word uppercase"), "alt+U", KeyBindingCategory.EMACS),
-    EMACS_KILL_LINE("Emacs remove all characters caret to end of line", Localization.lang("Remove line after caret"), "ctrl+K", KeyBindingCategory.EMACS),
-    EMACS_KILL_WORD("Emacs remove characters until next word", Localization.lang("Remove characters until next word"), "alt+D", KeyBindingCategory.EMACS),
-    EMACS_KILL_WORD_BACKWARD("Emacs characters until previous word", Localization.lang("Remove the current word backwards"), "alt+DELETE", KeyBindingCategory.EMACS),
+    EDITOR_DELETE("Delete", Localization.lang("Delete text"), "ctrl+D", KeyBindingCategory.EDITOR),
+    // DELETE BACKWARDS = Rubout
+    EDITOR_BACKWARD("Move caret left", Localization.lang("Move caret left"), "ctrl+B", KeyBindingCategory.EDITOR),
+    EDITOR_FORWARD("Move caret right", Localization.lang("Move caret right"), "ctrl+F", KeyBindingCategory.EDITOR),
+    EDITOR_WORD_BACKWARD("Move caret to previous word", Localization.lang("Move caret to previous word"), "alt+B", KeyBindingCategory.EDITOR),
+    EDITOR_WORD_FORWARD("Move caret to next word", Localization.lang("Move caret to next word"), "alt+F", KeyBindingCategory.EDITOR),
+    EDITOR_BEGINNING("Move caret to beginning of line", Localization.lang("Move caret to beginning of line"), "ctrl+A", KeyBindingCategory.EDITOR),
+    EDITOR_END("Move caret to  of line", Localization.lang("Move caret to end of line"), "ctrl+E", KeyBindingCategory.EDITOR),
+    EDITOR_BEGINNING_DOC("Move caret to beginning of text", Localization.lang("Move the caret to the beginning of text"), "alt+LESS", KeyBindingCategory.EDITOR),
+    EDITOR_END_DOC("Move caret to end of text", Localization.lang("Move the caret to the end of text"), "alt+shift+LESS", KeyBindingCategory.EDITOR),
+    EDITOR_UP("Move caret up", Localization.lang("Move the caret up"), "ctrl+P", KeyBindingCategory.EDITOR),
+    EDITOR_DOWN("Move caret down", Localization.lang("Move the caret down"), "ctrl+N", KeyBindingCategory.EDITOR),
+    EDITOR_CAPITALIZE("Capitalize word", Localization.lang("Capitalize current word"), "alt+C", KeyBindingCategory.EDITOR),
+    EDITOR_LOWERCASE("Lowercase word", Localization.lang("Make current word lowercase"), "alt+L", KeyBindingCategory.EDITOR),
+    EDITOR_UPPERCASE("Uppercase word", Localization.lang("Make current word uppercase"), "alt+U", KeyBindingCategory.EDITOR),
+    EDITOR_KILL_LINE("Remove all characters caret to end of line", Localization.lang("Remove line after caret"), "ctrl+K", KeyBindingCategory.EDITOR),
+    EDITOR_KILL_WORD("Remove characters until next word", Localization.lang("Remove characters until next word"), "alt+D", KeyBindingCategory.EDITOR),
+    EDITOR_KILL_WORD_BACKWARD("Characters until previous word", Localization.lang("Remove the current word backwards"), "alt+DELETE", KeyBindingCategory.EDITOR),
 
     ABBREVIATE("Abbreviate", Localization.lang("Abbreviate journal names"), "ctrl+alt+A", KeyBindingCategory.TOOLS),
     AUTOGENERATE_CITATION_KEYS("Autogenerate citation keys", Localization.lang("Autogenerate citation keys"), "ctrl+G", KeyBindingCategory.QUALITY),
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java
index 27ef76973ce..ae8cb0b673f 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java
@@ -12,7 +12,7 @@ public enum KeyBindingCategory {
     BIBTEX(BibDatabaseMode.BIBTEX.getFormattedName()),
     QUALITY(Localization.lang("Quality")),
     TOOLS(Localization.lang("Tools")),
-    EMACS(Localization.lang("Emacs"));
+    EDITOR(Localization.lang("Text editor"));
 
     private final String name;
 
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml b/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
index 31c5db9dc0a..0fda219a207 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
@@ -27,27 +27,6 @@
     </CheckBox>
     <CheckBox fx:id="enableLatexCitationsTab" text="%Show 'LaTeX Citations' tab"/>
     <CheckBox fx:id="enableValidation" text="%Show validation messages"/>
-    <CheckBox fx:id="enableEmacsKeyBindings" text="%Use Emacs key bindings"/>
-    <CheckBox fx:id="enableEmacsRebindCA" text="%Rebind C-a" disable="${!enableEmacsKeyBindings.selected}">
-        <padding>
-            <Insets left="20.0"/>
-        </padding>
-    </CheckBox>
-    <CheckBox fx:id="enableEmacsRebindCF" text="%Rebind C-f" disable="${!enableEmacsKeyBindings.selected}">
-        <padding>
-            <Insets left="20.0"/>
-        </padding>
-    </CheckBox>
-    <CheckBox fx:id="enableEmacsRebindCN" text="%Rebind C-n" disable="${!enableEmacsKeyBindings.selected}">
-        <padding>
-            <Insets left="20.0"/>
-        </padding>
-    </CheckBox>
-    <CheckBox fx:id="enableEmacsRebindAU" text="%Rebind A-u" disable="${!enableEmacsKeyBindings.selected}">
-        <padding>
-            <Insets left="20.0"/>
-        </padding>
-    </CheckBox>
     <Label styleClass="sectionHeader" text="%Autocompletion"/>
     <CheckBox fx:id="enableAutoComplete" text="%Use autocompletion"/>
     <VBox spacing="10.0">
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTabView.java b/src/main/java/org/jabref/gui/preferences/EntryEditorTabView.java
index 9def7b2de04..9d6afafe3dd 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorTabView.java
@@ -19,11 +19,6 @@ public class EntryEditorTabView extends AbstractPreferenceTabView<EntryEditorTab
     @FXML private CheckBox enableLatexCitationsTab;
     @FXML private CheckBox enableValidation;
     @FXML private CheckBox enableAutoComplete;
-    @FXML private CheckBox enableEmacsKeyBindings;
-    @FXML private CheckBox enableEmacsRebindCA;
-    @FXML private CheckBox enableEmacsRebindCF;
-    @FXML private CheckBox enableEmacsRebindCN;
-    @FXML private CheckBox enableEmacsRebindAU;
     @FXML private TextField autoCompleteFields;
     @FXML private RadioButton autoCompleteFirstLast;
     @FXML private RadioButton autoCompleteLastFirst;
@@ -54,11 +49,6 @@ public void initialize() {
         enableLatexCitationsTab.selectedProperty().bindBidirectional(viewModel.enableLatexCitationsTabProperty());
         enableValidation.selectedProperty().bindBidirectional(viewModel.enableValidationProperty());
         enableAutoComplete.selectedProperty().bindBidirectional(viewModel.enableAutoCompleteProperty());
-        enableEmacsKeyBindings.selectedProperty().bindBidirectional(viewModel.enableEmacsKeyBindingsProperty());
-        enableEmacsRebindCA.selectedProperty().bindBidirectional(viewModel.enableEmacsRebindCAProperty());
-        enableEmacsRebindCF.selectedProperty().bindBidirectional(viewModel.enableEmacsRebindCFProperty());
-        enableEmacsRebindCN.selectedProperty().bindBidirectional(viewModel.enableEmacsRebindCNProperty());
-        enableEmacsRebindAU.selectedProperty().bindBidirectional(viewModel.enableEmacsRebindAUProperty());
         autoCompleteFields.textProperty().bindBidirectional(viewModel.autoCompleteFieldsProperty());
         autoCompleteFirstLast.selectedProperty().bindBidirectional(viewModel.autoCompleteFirstLastProperty());
         autoCompleteLastFirst.selectedProperty().bindBidirectional(viewModel.autoCompleteLastFirstProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java b/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
index c6b096472b4..3c673441008 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
@@ -12,7 +12,6 @@
 import org.jabref.gui.autocompleter.AutoCompleteFirstNameMode;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
-import org.jabref.gui.keyboard.EmacsKeyPreferences;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.preferences.PreferencesService;
@@ -42,7 +41,6 @@ public class EntryEditorTabViewModel implements PreferenceTabViewModel {
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
     private final EntryEditorPreferences initialEntryEditorPreferences;
-    private final EmacsKeyPreferences initialEmacsKeyPreferences;
     private final AutoCompletePreferences initialAutoCompletePreferences;
 
     private final List<String> restartWarnings = new ArrayList<>();
@@ -51,7 +49,6 @@ public EntryEditorTabViewModel(DialogService dialogService, PreferencesService p
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.initialEntryEditorPreferences = preferencesService.getEntryEditorPreferences();
-        this.initialEmacsKeyPreferences = preferencesService.getEmacsKeyPreferences();
         this.initialAutoCompletePreferences = preferencesService.getAutoCompletePreferences();
     }
 
@@ -67,12 +64,6 @@ public void setValues() {
         enableLatexCitationsTabProperty.setValue(initialEntryEditorPreferences.shouldShowLatexCitationsTab());
         enableValidationProperty.setValue(initialEntryEditorPreferences.isEnableValidation());
 
-        enableEmacsKeyBindingsProperty.setValue(initialEmacsKeyPreferences.useEmacsKeyBindings());
-        enableEmacsRebindCAProperty.setValue(initialEmacsKeyPreferences.shouldRebindCA());
-        enableEmacsRebindCFProperty.setValue(initialEmacsKeyPreferences.shouldRebindCF());
-        enableEmacsRebindCNProperty.setValue(initialEmacsKeyPreferences.shouldRebindCN());
-        enableEmacsRebindAUProperty.setValue(initialEmacsKeyPreferences.shouldRebindAU());
-
         enableAutoCompleteProperty.setValue(initialAutoCompletePreferences.shouldAutoComplete());
         autoCompleteFieldsProperty.setValue(initialAutoCompletePreferences.getCompleteNamesAsString());
 
@@ -103,13 +94,6 @@ public void storeSettings() {
                 enableValidationProperty.getValue(),
                 initialEntryEditorPreferences.getDividerPosition()));
 
-        preferencesService.storeEmacsKeyPreferences(new EmacsKeyPreferences(
-                enableEmacsKeyBindingsProperty.getValue(),
-                enableEmacsRebindCAProperty.getValue(),
-                enableEmacsRebindCFProperty.getValue(),
-                enableEmacsRebindCNProperty.getValue(),
-                enableEmacsRebindAUProperty.getValue()));
-
         // default
         AutoCompletePreferences.NameFormat nameFormat = AutoCompletePreferences.NameFormat.BOTH;
         if (autoCompleteFirstLastProperty.getValue()) {
@@ -207,19 +191,4 @@ public BooleanProperty firstNameModeFullProperty() {
     public BooleanProperty firstNameModeBothProperty() {
         return firstNameModeBothProperty;
     }
-
-    public BooleanProperty enableEmacsKeyBindingsProperty() {
-        return enableEmacsKeyBindingsProperty; }
-
-    public BooleanProperty enableEmacsRebindCAProperty() {
-        return enableEmacsRebindCAProperty; }
-
-    public BooleanProperty enableEmacsRebindCFProperty() {
-        return enableEmacsRebindCFProperty; }
-
-    public BooleanProperty enableEmacsRebindCNProperty() {
-        return enableEmacsRebindCNProperty; }
-
-    public BooleanProperty enableEmacsRebindAUProperty() {
-        return enableEmacsRebindAUProperty; }
 }
diff --git a/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java b/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java
index e05ce998e80..acc6787f939 100644
--- a/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java
+++ b/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java
@@ -16,7 +16,7 @@ public final class BibtexCaseChanger {
     // global variable to store the current brace level
     private int braceLevel;
 
-    public enum FORMAT_MODE {
+    public enum FormatMode {
         // First character and character after a ":" as upper case - everything else in lower case. Obey {}.
         TITLE_LOWERS('t'),
 
@@ -40,7 +40,7 @@ public enum FORMAT_MODE {
 
         private final char asChar;
 
-        FORMAT_MODE(char asChar) {
+        FormatMode(char asChar) {
             this.asChar = asChar;
         }
 
@@ -53,8 +53,8 @@ public char asChar() {
          *
          * @throws IllegalArgumentException if char is not 't', 'l', 'u'
          */
-        public static FORMAT_MODE getFormatModeForBSTFormat(final char bstFormat) {
-            for (FORMAT_MODE mode : FORMAT_MODE.values()) {
+        public static FormatMode getFormatModeForBSTFormat(final char bstFormat) {
+            for (FormatMode mode : FormatMode.values()) {
                 if (mode.asChar == bstFormat) {
                     return mode;
                 }
@@ -72,11 +72,11 @@ private BibtexCaseChanger() {
      * @param s      the string to handle
      * @param format the format
      */
-    public static String changeCase(String s, FORMAT_MODE format) {
+    public static String changeCase(String s, FormatMode format) {
         return (new BibtexCaseChanger()).doChangeCase(s, format);
     }
 
-    private String doChangeCase(String s, FORMAT_MODE format) {
+    private String doChangeCase(String s, FormatMode format) {
         char[] c = s.toCharArray();
 
         StringBuilder sb = new StringBuilder();
@@ -93,7 +93,7 @@ private String doChangeCase(String s, FORMAT_MODE format) {
                     i++;
                     continue;
                 }
-                if ((format == FORMAT_MODE.TITLE_LOWERS) && ((i == 0) || (prevColon && Character.isWhitespace(c[i - 1])))) {
+                if ((format == FormatMode.TITLE_LOWERS) && ((i == 0) || (prevColon && Character.isWhitespace(c[i - 1])))) {
                     sb.append('{');
                     i++;
                     prevColon = false;
@@ -141,7 +141,7 @@ private String doChangeCase(String s, FORMAT_MODE format) {
      * @param format
      * @return
      */
-    private int convertSpecialChar(StringBuilder sb, char[] c, int start, FORMAT_MODE format) {
+    private int convertSpecialChar(StringBuilder sb, char[] c, int start, FormatMode format) {
         int i = start;
 
         sb.append(c[i]);
@@ -181,7 +181,7 @@ private int convertSpecialChar(StringBuilder sb, char[] c, int start, FORMAT_MOD
      * @param format
      * @return the new position
      */
-    private int convertAccented(char[] c, int start, String s, StringBuilder sb, FORMAT_MODE format) {
+    private int convertAccented(char[] c, int start, String s, StringBuilder sb, FormatMode format) {
         int pos = start;
         pos += s.length();
 
@@ -214,29 +214,26 @@ private int convertAccented(char[] c, int start, String s, StringBuilder sb, FOR
         return pos;
     }
 
-    private int convertNonControl(char[] c, int start, StringBuilder sb, FORMAT_MODE format) {
+    private int convertNonControl(char[] c, int start, StringBuilder sb, FormatMode format) {
         int pos = start;
         switch (format) {
-            case TITLE_LOWERS:
-            case ALL_LOWERS:
+            case TITLE_LOWERS, ALL_LOWERS -> {
                 sb.append(Character.toLowerCase(c[pos]));
                 pos++;
-                break;
-            case ALL_UPPERS:
+            }
+            case ALL_UPPERS -> {
                 sb.append(Character.toUpperCase(c[pos]));
                 pos++;
-                break;
-            default:
-                LOGGER.info("convertNonControl - Unknown format: " + format);
-                break;
+            }
+            default -> LOGGER.info("convertNonControl - Unknown format: " + format);
         }
         return pos;
     }
 
-    private int convertCharIfBraceLevelIsZero(char[] c, int start, StringBuilder sb, FORMAT_MODE format) {
+    private int convertCharIfBraceLevelIsZero(char[] c, int start, StringBuilder sb, FormatMode format) {
         int i = start;
         switch (format) {
-            case TITLE_LOWERS:
+            case TITLE_LOWERS -> {
                 if ((i == 0) || (prevColon && Character.isWhitespace(c[i - 1]))) {
                     sb.append(c[i]);
                 } else {
@@ -247,16 +244,10 @@ private int convertCharIfBraceLevelIsZero(char[] c, int start, StringBuilder sb,
                 } else if (!Character.isWhitespace(c[i])) {
                     prevColon = false;
                 }
-                break;
-            case ALL_LOWERS:
-                sb.append(Character.toLowerCase(c[i]));
-                break;
-            case ALL_UPPERS:
-                sb.append(Character.toUpperCase(c[i]));
-                break;
-            default:
-                LOGGER.info("convertCharIfBraceLevelIsZero - Unknown format: " + format);
-                break;
+            }
+            case ALL_LOWERS -> sb.append(Character.toLowerCase(c[i]));
+            case ALL_UPPERS -> sb.append(Character.toUpperCase(c[i]));
+            default -> LOGGER.info("convertCharIfBraceLevelIsZero - Unknown format: " + format);
         }
         i++;
         return i;
diff --git a/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java b/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java
index 65f4f64c619..1e1c923a6cc 100644
--- a/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java
+++ b/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java
@@ -3,7 +3,7 @@
 import java.util.Locale;
 import java.util.Stack;
 
-import org.jabref.logic.bst.BibtexCaseChanger.FORMAT_MODE;
+import org.jabref.logic.bst.BibtexCaseChanger.FormatMode;
 import org.jabref.logic.bst.VM.BstEntry;
 import org.jabref.logic.bst.VM.BstFunction;
 
@@ -60,6 +60,6 @@ public void execute(BstEntry context) {
         char format = ((String) o1).toLowerCase(Locale.ROOT).charAt(0);
         String s = (String) o2;
 
-        stack.push(BibtexCaseChanger.changeCase(s, FORMAT_MODE.getFormatModeForBSTFormat(format)));
+        stack.push(BibtexCaseChanger.changeCase(s, FormatMode.getFormatModeForBSTFormat(format)));
     }
 }
diff --git a/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
similarity index 56%
rename from src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java
rename to src/main/java/org/jabref/logic/util/strings/StringManipulator.java
index b1e5fd894f0..e8adaab22a0 100644
--- a/src/main/java/org/jabref/logic/util/strings/EmacsStringManipulator.java
+++ b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
@@ -1,10 +1,11 @@
 package org.jabref.logic.util.strings;
 
-import java.util.regex.Pattern;
+import org.jabref.logic.formatter.casechanger.CapitalizeFormatter;
+import org.jabref.logic.formatter.casechanger.LowerCaseFormatter;
+import org.jabref.logic.formatter.casechanger.UpperCaseFormatter;
+import org.jabref.model.util.ResultingStringState;
 
-import org.jabref.model.util.ResultingEmacsState;
-
-public class EmacsStringManipulator {
+public class StringManipulator {
     private enum LetterCase {
         UPPER,
         LOWER,
@@ -15,55 +16,40 @@ private enum Direction {
         NEXT, PREVIOUS
     }
 
-    Pattern WORDCHAR = Pattern.compile("\\w");
+    private static ResultingStringState setWordCase(String text, int pos, LetterCase targetCase) {
+        StringBuilder result = new StringBuilder();
+        int i = pos;
 
-    private ResultingEmacsState setNextWordsCase(String text, int pos, LetterCase targetCase) {
-        StringBuilder res = new StringBuilder();
+        // swallow whitespaces
+        while (i < text.length() && Character.isWhitespace(text.charAt(i))) {
+            result.append(text.charAt(i));
+            i++;
+        }
+        if (i >= text.length()) {
+            return new ResultingStringState(i, text);
+        }
 
-        boolean firstLetter = true;
-        int i = pos;
-        boolean firstLoop = true;
-        StringBuilder newWordBuilder = new StringBuilder();
-        for (; i < text.length(); i++) {
-            // Swallow whitespace
-            while (firstLoop && i < text.length() && !WORDCHAR.matcher(String.valueOf(text.charAt(i))).matches()) {
-                newWordBuilder.append(text.charAt(i));
-                i++;
-            }
-            if (i >= text.length()) {
-                break;
-            }
+        StringBuilder nextWord = new StringBuilder();
+        // read next word
+        char currentChar = text.charAt(i);
+        while ((Character.isLetterOrDigit(currentChar) || Character.toString(currentChar).equals("_"))) {
+            nextWord.append(currentChar);
+            i++;
 
-            firstLoop = false;
-
-            char currentChar = text.charAt(i);
-            if (WORDCHAR.matcher(String.valueOf(currentChar)).matches()) {
-                switch (targetCase) {
-                    case UPPER:
-                        newWordBuilder.append(Character.toUpperCase(currentChar));
-                        break;
-                    case LOWER:
-                        newWordBuilder.append(Character.toLowerCase(currentChar));
-                        break;
-                    case CAPITALIZED:
-                        if (firstLetter) {
-                            newWordBuilder.append(Character.toUpperCase(currentChar));
-                            firstLetter = false;
-                        } else {
-                            newWordBuilder.append(Character.toLowerCase(currentChar));
-                        }
-                        break;
-                }
-            } else {
-                // We have reached the word boundary.
+            if (i >= text.length()) {
                 break;
             }
+            currentChar = text.charAt(i);
         }
-        res.append(text, 0, pos);
-        res.append(newWordBuilder);
-        res.append(text, i, text.length());
 
-        return new ResultingEmacsState(i, res.toString());
+        String changedString = switch (targetCase) {
+            case UPPER -> (new UpperCaseFormatter()).format(nextWord.toString());
+            case LOWER -> (new LowerCaseFormatter()).format(nextWord.toString());
+            case CAPITALIZED -> (new CapitalizeFormatter()).format(nextWord.toString());
+        };
+
+        String res = text.substring(0, pos) + result.toString() + changedString + text.substring(i);
+        return new ResultingStringState(i, res);
     }
 
     /**
@@ -74,7 +60,7 @@ private ResultingEmacsState setNextWordsCase(String text, int pos, LetterCase ta
      * @param dir The direction to search.
      * @return The resulting text and caret position.
      */
-    public ResultingEmacsState deleteUntilWordBoundary(int pos, String text, Direction dir) {
+    public static ResultingStringState deleteUntilWordBoundary(int pos, String text, Direction dir) {
         StringBuilder res = new StringBuilder();
         int offset;
         int wordBreak;
@@ -101,7 +87,7 @@ public ResultingEmacsState deleteUntilWordBoundary(int pos, String text, Directi
                     i += offset;
                 }
             }
-            if (!(i < text.length() && i >= 0) || !WORDCHAR.matcher(String.valueOf(text.charAt(i))).matches()) {
+            if (!(i < text.length() && i >= 0) || Character.isWhitespace(text.charAt(i))) {
                 wordBreak = i;
                 break;
             }
@@ -122,7 +108,7 @@ public ResultingEmacsState deleteUntilWordBoundary(int pos, String text, Directi
                 caretPosition = 0;
             }
         }
-        return new ResultingEmacsState(caretPosition, res.toString());
+        return new ResultingStringState(caretPosition, res.toString());
     }
 
     /**
@@ -132,8 +118,8 @@ public ResultingEmacsState deleteUntilWordBoundary(int pos, String text, Directi
      * @param text String to analyze
      * @return String The resulting text and caret position.
      */
-    public ResultingEmacsState capitalize(int pos, String text) {
-        return setNextWordsCase(text, pos, LetterCase.CAPITALIZED);
+    public static ResultingStringState capitalize(int pos, String text) {
+        return setWordCase(text, pos, LetterCase.CAPITALIZED);
     }
 
     /**
@@ -143,8 +129,8 @@ public ResultingEmacsState capitalize(int pos, String text) {
      * @param text String to analyze
      * @return String The resulting text and caret position.
      */
-    public ResultingEmacsState uppercase(int pos, String text) {
-        return setNextWordsCase(text, pos, LetterCase.UPPER);
+    public static ResultingStringState uppercase(int pos, String text) {
+        return setWordCase(text, pos, LetterCase.UPPER);
     }
 
     /**
@@ -154,8 +140,8 @@ public ResultingEmacsState uppercase(int pos, String text) {
      * @param text String to analyze
      * @return String The resulting text and caret position.
      */
-    public ResultingEmacsState lowercase(int pos, String text) {
-        return setNextWordsCase(text, pos, LetterCase.LOWER);
+    public static ResultingStringState lowercase(int pos, String text) {
+        return setWordCase(text, pos, LetterCase.LOWER);
     }
 
     /**
@@ -165,7 +151,7 @@ public ResultingEmacsState lowercase(int pos, String text) {
      * @param text String to analyze
      * @return String The resulting text and caret position.
      */
-    public ResultingEmacsState killWord(int pos, String text) {
+    public static ResultingStringState killWord(int pos, String text) {
         return deleteUntilWordBoundary(pos, text, Direction.NEXT);
     }
 
@@ -176,7 +162,7 @@ public ResultingEmacsState killWord(int pos, String text) {
      * @param text String to analyze
      * @return String The resulting text and caret position.
      */
-    public ResultingEmacsState backwardKillWord(int pos, String text) {
+    public static ResultingStringState backwardKillWord(int pos, String text) {
         return deleteUntilWordBoundary(pos, text, Direction.PREVIOUS);
     }
 }
diff --git a/src/main/java/org/jabref/model/util/ResultingEmacsState.java b/src/main/java/org/jabref/model/util/ResultingStringState.java
similarity index 63%
rename from src/main/java/org/jabref/model/util/ResultingEmacsState.java
rename to src/main/java/org/jabref/model/util/ResultingStringState.java
index 842a9b21855..78ddcdc3431 100644
--- a/src/main/java/org/jabref/model/util/ResultingEmacsState.java
+++ b/src/main/java/org/jabref/model/util/ResultingStringState.java
@@ -1,10 +1,10 @@
 package org.jabref.model.util;
 
-public class ResultingEmacsState {
+public class ResultingStringState {
     public final int caretPos;
     public final String text;
 
-    public ResultingEmacsState(int pos, String text) {
+    public ResultingStringState(int pos, String text) {
         this.caretPos = pos;
         this.text = text;
     }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 5e729ef95f2..3c59f48aa5b 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -43,7 +43,6 @@
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
 import org.jabref.gui.groups.GroupViewMode;
 import org.jabref.gui.groups.GroupsPreferences;
-import org.jabref.gui.keyboard.EmacsKeyPreferences;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.maintable.ColumnPreferences;
 import org.jabref.gui.maintable.MainTableColumnModel;
@@ -2456,25 +2455,6 @@ public void storeNameFormatterPreferences(NameFormatterPreferences preferences)
         putStringList(NAME_FORMATTER_VALUE, preferences.getNameFormatterValue());
     }
 
-    @Override
-    public EmacsKeyPreferences getEmacsKeyPreferences() {
-        return new EmacsKeyPreferences(
-                getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS),
-                getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CA),
-                getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CF),
-                getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CN),
-                getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_AU));
-    }
-
-    @Override
-    public void storeEmacsKeyPreferences(EmacsKeyPreferences preferences) {
-        putBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS, preferences.useEmacsKeyBindings());
-        putBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CA, preferences.shouldRebindCA());
-        putBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CF, preferences.shouldRebindCF());
-        putBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CN, preferences.shouldRebindCN());
-        putBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_AU, preferences.shouldRebindAU());
-    }
-
     @Override
     public AutoCompletePreferences getAutoCompletePreferences() {
         AutoCompletePreferences.NameFormat nameFormat = AutoCompletePreferences.NameFormat.BOTH;
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 2a7778d7a26..b8151f6fda1 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -10,7 +10,6 @@
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
 import org.jabref.gui.groups.GroupViewMode;
 import org.jabref.gui.groups.GroupsPreferences;
-import org.jabref.gui.keyboard.EmacsKeyPreferences;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.maintable.ColumnPreferences;
 import org.jabref.gui.maintable.MainTableNameFormatPreferences;
@@ -299,10 +298,6 @@ public interface PreferencesService {
 
     void storeNameFormatterPreferences(NameFormatterPreferences preferences);
 
-    EmacsKeyPreferences getEmacsKeyPreferences();
-
-    void storeEmacsKeyPreferences(EmacsKeyPreferences preferences);
-
     AutoCompletePreferences getAutoCompletePreferences();
 
     void storeAutoCompletePreferences(AutoCompletePreferences autoCompletePreferences);
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index c9b0b8603bb..82320fca68d 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -662,14 +662,6 @@ Quit\ JabRef=Quit JabRef
 
 Read\ only=Read only
 
-Rebind\ C-a=Rebind C-a
-
-Rebind\ C-f=Rebind C-f
-
-Rebind\ C-n=Rebind C-n
-
-Rebind\ A-u=Rebind A-u
-
 Redo=Redo
 
 Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\ group\ and\ its\ supergroup=Refine supergroup: When selected, view entries contained in both this group and its supergroup
@@ -899,8 +891,6 @@ Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Upgrade external PD
 usage=usage
 Use\ autocompletion=Use autocompletion
 
-Use\ Emacs\ key\ bindings= Use Emacs key bindings
-
 Use\ regular\ expression\ search=Use regular expression search
 
 Username=Username
@@ -2117,10 +2107,11 @@ Move\ the\ caret\ down=Move the caret down
 Move\ the\ caret\ to\ the\ beginning\ of\ text=Move the caret to the beginning of text
 Move\ the\ caret\ to\ the\ end\ of\ text=Move the caret to the end of text
 Move\ the\ caret\ up=Move the caret up
-Remove\ current\ word\ forwards=Remove current word forwards
 Remove\ line\ after\ caret=Remove line after caret
+Remove\ characters\ until\ next\ word=Remove characters until next word
 Remove\ the\ current\ word\ backwards=Remove the current word backwards
 
+Text\ editor=Text editor
 
 Search\ ShortScience=Search ShortScience
 Unable\ to\ open\ ShortScience.=Unable to open ShortScience.
diff --git a/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java b/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java
index bcdcac3b4ce..193f7aaaf7f 100644
--- a/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java
+++ b/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java
@@ -1,6 +1,6 @@
 package org.jabref.logic.bst;
 
-import org.jabref.logic.bst.BibtexCaseChanger.FORMAT_MODE;
+import org.jabref.logic.bst.BibtexCaseChanger.FormatMode;
 
 import org.junit.jupiter.api.Test;
 
@@ -121,14 +121,14 @@ public void testTitleCase() {
     }
 
     private void assertCaseChangerTitleLowers(final String string, final String string2) {
-        assertEquals(string, BibtexCaseChanger.changeCase(string2, FORMAT_MODE.TITLE_LOWERS));
+        assertEquals(string, BibtexCaseChanger.changeCase(string2, FormatMode.TITLE_LOWERS));
     }
 
     private void assertCaseChangerAllLowers(final String string, final String string2) {
-        assertEquals(string, BibtexCaseChanger.changeCase(string2, FORMAT_MODE.ALL_LOWERS));
+        assertEquals(string, BibtexCaseChanger.changeCase(string2, FormatMode.ALL_LOWERS));
     }
 
     private void assertCaseChangerAllUppers(final String string, final String string2) {
-        assertEquals(string, BibtexCaseChanger.changeCase(string2, FORMAT_MODE.ALL_UPPERS));
+        assertEquals(string, BibtexCaseChanger.changeCase(string2, FormatMode.ALL_UPPERS));
     }
 }
diff --git a/src/test/java/org/jabref/logic/util/strings/EmacsStringManipulatorTest.java b/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
similarity index 76%
rename from src/test/java/org/jabref/logic/util/strings/EmacsStringManipulatorTest.java
rename to src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
index b668e76742f..2b7294447c8 100644
--- a/src/test/java/org/jabref/logic/util/strings/EmacsStringManipulatorTest.java
+++ b/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
@@ -1,19 +1,19 @@
 package org.jabref.logic.util.strings;
 
-import org.jabref.model.util.ResultingEmacsState;
+import org.jabref.model.util.ResultingStringState;
 
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class EmacsStringManipulatorTest {
+public class StringManipulatorTest {
 
     @Test
     public void capitalizePreservesNewlines() {
         int pos = 5; // Position of the caret, between the two ll in the first hellO"
         String textInput = "hello\n\nhELLO";
         String whatTextShouldBe = "hello\n\nHello";
-        ResultingEmacsState textOutput = EmacsStringManipulator.capitalize(pos, textInput);
+        ResultingStringState textOutput = StringManipulator.capitalize(pos, textInput);
         assertEquals(whatTextShouldBe, textOutput.text);
     }
 
@@ -22,7 +22,7 @@ public void uppercasePreservesSpace() {
         int pos = 3; // Position of the caret, between the two ll in the first hello
         String textInput = "hello hello";
         String whatTextShouldBe = "helLO hello";
-        ResultingEmacsState textOutput = EmacsStringManipulator.uppercase(pos, textInput);
+        ResultingStringState textOutput = StringManipulator.uppercase(pos, textInput);
         assertEquals(whatTextShouldBe, textOutput.text);
     }
 
@@ -31,7 +31,7 @@ public void uppercasePreservesNewlines() {
         int pos = 3; // Position of the caret, between the two ll in the first hello
         String textInput = "hello\nhello";
         String whatTextShouldBe = "helLO\nhello";
-        ResultingEmacsState textOutput = EmacsStringManipulator.uppercase(pos, textInput);
+        ResultingStringState textOutput = StringManipulator.uppercase(pos, textInput);
         assertEquals(whatTextShouldBe, textOutput.text);
     }
 
@@ -40,7 +40,7 @@ public void uppercasePreservesTab() {
         int pos = 3; // Position of the caret, between the two ll in the first hello
         String textInput = "hello\thello";
         String whatTextShouldBe = "helLO\thello";
-        ResultingEmacsState textOutput = EmacsStringManipulator.uppercase(pos, textInput);
+        ResultingStringState textOutput = StringManipulator.uppercase(pos, textInput);
         assertEquals(whatTextShouldBe, textOutput.text);
     }
 
@@ -49,7 +49,7 @@ public void uppercasePreservesDoubleSpace() {
         int pos = 5; // Position of the caret, at the first space
         String textInput = "hello  hello";
         String whatTextShouldBe = "hello  HELLO";
-        ResultingEmacsState textOutput = EmacsStringManipulator.uppercase(pos, textInput);
+        ResultingStringState textOutput = StringManipulator.uppercase(pos, textInput);
         assertEquals(whatTextShouldBe, textOutput.text);
     }
 
@@ -58,7 +58,7 @@ public void uppercaseIgnoresTrailingWhitespace() {
         int pos = 5; // First space
         String textInput = "hello  ";
         String whatTextShouldBe = "hello  ";
-        ResultingEmacsState textOutput = EmacsStringManipulator.uppercase(pos, textInput);
+        ResultingStringState textOutput = StringManipulator.uppercase(pos, textInput);
         assertEquals(whatTextShouldBe, textOutput.text);
         // Expected caret position is right after the last space, which is index 7
         assertEquals(7, textOutput.caretPos);
@@ -69,7 +69,7 @@ public void killWordTrimsTrailingWhitespace() {
         int pos = 5; // First space
         String textInput = "hello  ";
         String whatTextShouldBe = "hello";
-        ResultingEmacsState textOutput = EmacsStringManipulator.killWord(pos, textInput);
+        ResultingStringState textOutput = StringManipulator.killWord(pos, textInput);
         assertEquals(whatTextShouldBe, textOutput.text);
         assertEquals(pos, textOutput.caretPos);
     }
@@ -80,7 +80,7 @@ public void backwardsKillWordTrimsPreceedingWhitespace() {
         String textInput = "  hello";
         // One space should be preserved since we are deleting everything preceding the second space.
         String whatTextShouldBe = " hello";
-        ResultingEmacsState textOutput = EmacsStringManipulator.backwardKillWord(pos, textInput);
+        ResultingStringState textOutput = StringManipulator.backwardKillWord(pos, textInput);
         assertEquals(whatTextShouldBe, textOutput.text);
         // The caret should have been moved to the start.
         assertEquals(0, textOutput.caretPos);
@@ -91,7 +91,7 @@ public void uppercasePreservesMixedSpaceNewLineTab() {
         int pos = 5; // Position of the caret, after first hello
         String textInput = "hello \n\thello";
         String whatTextShouldBe = "hello \n\tHELLO";
-        ResultingEmacsState textOutput = EmacsStringManipulator.uppercase(pos, textInput);
+        ResultingStringState textOutput = StringManipulator.uppercase(pos, textInput);
         assertEquals(whatTextShouldBe, textOutput.text);
     }
 
@@ -100,7 +100,7 @@ public void lowercaseEditsTheNextWord() {
         int pos = 5; // Position of the caret, right at the space
         String textInput = "hello HELLO";
         String whatTextShouldBe = "hello hello";
-        ResultingEmacsState textOutput = EmacsStringManipulator.lowercase(pos, textInput);
+        ResultingStringState textOutput = StringManipulator.lowercase(pos, textInput);
         assertEquals(whatTextShouldBe, textOutput.text);
     }
 
@@ -109,7 +109,7 @@ public void killWordRemovesFromPositionUpToNextWord() {
         int pos = 3; // Position of the caret, between the two "ll in the first hello"
         String textInput = "hello hello";
         String whatTextShouldBe = "hel hello";
-        ResultingEmacsState textOutput = EmacsStringManipulator.killWord(pos, textInput);
+        ResultingStringState textOutput = StringManipulator.killWord(pos, textInput);
         assertEquals(whatTextShouldBe, textOutput.text);
     }
 
@@ -118,7 +118,7 @@ public void killWordRemovesNextWordIfPositionIsInSpace() {
         int pos = 5; // Position of the caret, atfer the first hello"
         String textInput = "hello person";
         String whatTextShouldBe = "hello";
-        ResultingEmacsState textOutput = EmacsStringManipulator.killWord(pos, textInput);
+        ResultingStringState textOutput = StringManipulator.killWord(pos, textInput);
         assertEquals(whatTextShouldBe, textOutput.text);
     }
 

From 4b0a3eb98cfb4d76f9a41f32ba471ce688360aa7 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Fri, 23 Oct 2020 00:57:29 +0200
Subject: [PATCH 07/16] Removed some artifacts

---
 .../gui/preferences/EntryEditorTabViewModel.java       |  5 -----
 .../java/org/jabref/preferences/JabRefPreferences.java | 10 ----------
 2 files changed, 15 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java b/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
index 3c673441008..b3ccf7c58ec 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
@@ -32,11 +32,6 @@ public class EntryEditorTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty firstNameModeAbbreviatedProperty = new SimpleBooleanProperty();
     private final BooleanProperty firstNameModeFullProperty = new SimpleBooleanProperty();
     private final BooleanProperty firstNameModeBothProperty = new SimpleBooleanProperty();
-    private final BooleanProperty enableEmacsKeyBindingsProperty = new SimpleBooleanProperty();
-    private final BooleanProperty enableEmacsRebindCAProperty = new SimpleBooleanProperty();
-    private final BooleanProperty enableEmacsRebindCFProperty = new SimpleBooleanProperty();
-    private final BooleanProperty enableEmacsRebindCNProperty = new SimpleBooleanProperty();
-    private final BooleanProperty enableEmacsRebindAUProperty = new SimpleBooleanProperty();
 
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 3c59f48aa5b..97ef0bce820 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -172,11 +172,6 @@ public class JabRefPreferences implements PreferencesService {
     public static final String IMPORT_WORKING_DIRECTORY = "importWorkingDirectory";
     public static final String EXPORT_WORKING_DIRECTORY = "exportWorkingDirectory";
     public static final String WORKING_DIRECTORY = "workingDirectory";
-    public static final String EDITOR_EMACS_KEYBINDINGS = "editorEMACSkeyBindings";
-    public static final String EDITOR_EMACS_KEYBINDINGS_REBIND_CA = "editorEMACSkeyBindingsRebindCA";
-    public static final String EDITOR_EMACS_KEYBINDINGS_REBIND_CF = "editorEMACSkeyBindingsRebindCF";
-    public static final String EDITOR_EMACS_KEYBINDINGS_REBIND_CN = "editorEMACSkeyBindingsRebindCN";
-    public static final String EDITOR_EMACS_KEYBINDINGS_REBIND_AU = "editorEMACSkeyBindingsRebindAU";
     public static final String GROUPS_DEFAULT_FIELD = "groupsDefaultField";
 
     public static final String KEYWORD_SEPARATOR = "groupKeywordSeparator";
@@ -527,11 +522,6 @@ private JabRefPreferences() {
         defaults.put(SEND_OS_DATA, Boolean.FALSE);
         defaults.put(SEND_TIMEZONE_DATA, Boolean.FALSE);
         defaults.put(VALIDATE_IN_ENTRY_EDITOR, Boolean.TRUE);
-        defaults.put(EDITOR_EMACS_KEYBINDINGS, Boolean.FALSE);
-        defaults.put(EDITOR_EMACS_KEYBINDINGS_REBIND_CA, Boolean.TRUE);
-        defaults.put(EDITOR_EMACS_KEYBINDINGS_REBIND_CF, Boolean.TRUE);
-        defaults.put(EDITOR_EMACS_KEYBINDINGS_REBIND_CN, Boolean.TRUE);
-        defaults.put(EDITOR_EMACS_KEYBINDINGS_REBIND_AU, Boolean.TRUE);
         defaults.put(AUTO_COMPLETE, Boolean.FALSE);
         defaults.put(AUTOCOMPLETER_FIRSTNAME_MODE, AutoCompleteFirstNameMode.BOTH.name());
         defaults.put(AUTOCOMPLETER_FIRST_LAST, Boolean.FALSE); // "Autocomplete names in 'Firstname Lastname' format only"

From df1889e893354d78afdc553c9dc031698d658f8b Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Wed, 4 Nov 2020 21:33:14 +0100
Subject: [PATCH 08/16] First attempt to fix backwardKillWord

---
 .../gui/keyboard/EditorKeyBindings.java       |  10 +-
 .../logic/util/strings/StringManipulator.java | 196 +++++++++++-------
 .../model/util/ResultingStringState.java      |   6 +-
 .../util/strings/StringManipulatorTest.java   | 169 ++++++++-------
 4 files changed, 218 insertions(+), 163 deletions(-)

diff --git a/src/main/java/org/jabref/gui/keyboard/EditorKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/EditorKeyBindings.java
index 327a2dc244d..9be658964e2 100644
--- a/src/main/java/org/jabref/gui/keyboard/EditorKeyBindings.java
+++ b/src/main/java/org/jabref/gui/keyboard/EditorKeyBindings.java
@@ -58,21 +58,21 @@ public static void call(Scene scene, KeyEvent event, PreferencesService preferen
                     String text = focusedTextField.getText(0, focusedTextField.getText().length());
                     ResultingStringState res = StringManipulator.capitalize(pos, text);
                     focusedTextField.setText(res.text);
-                    focusedTextField.positionCaret(res.caretPos);
+                    focusedTextField.positionCaret(res.caretPosition);
                     event.consume();
                 } else if (binding == KeyBinding.EDITOR_LOWERCASE) {
                     int pos = focusedTextField.getCaretPosition();
                     String text = focusedTextField.getText(0, focusedTextField.getText().length());
                     ResultingStringState res = StringManipulator.lowercase(pos, text);
                     focusedTextField.setText(res.text);
-                    focusedTextField.positionCaret(res.caretPos);
+                    focusedTextField.positionCaret(res.caretPosition);
                     event.consume();
                 } else if (binding == KeyBinding.EDITOR_UPPERCASE) {
                     int pos = focusedTextField.getCaretPosition();
                     String text = focusedTextField.getText(0, focusedTextField.getText().length());
                     ResultingStringState res = StringManipulator.uppercase(pos, text);
                     focusedTextField.setText(res.text);
-                    focusedTextField.positionCaret(res.caretPos);
+                    focusedTextField.positionCaret(res.caretPosition);
                     event.consume();
                 } else if (binding == KeyBinding.EDITOR_KILL_LINE) {
                     int pos = focusedTextField.getCaretPosition();
@@ -84,14 +84,14 @@ public static void call(Scene scene, KeyEvent event, PreferencesService preferen
                     String text = focusedTextField.getText(0, focusedTextField.getText().length());
                     ResultingStringState res = StringManipulator.killWord(pos, text);
                     focusedTextField.setText(res.text);
-                    focusedTextField.positionCaret(res.caretPos);
+                    focusedTextField.positionCaret(res.caretPosition);
                     event.consume();
                 } else if (binding == KeyBinding.EDITOR_KILL_WORD_BACKWARD) {
                     int pos = focusedTextField.getCaretPosition();
                     String text = focusedTextField.getText(0, focusedTextField.getText().length());
                     ResultingStringState res = StringManipulator.backwardKillWord(pos, text);
                     focusedTextField.setText(res.text);
-                    focusedTextField.positionCaret(res.caretPos);
+                    focusedTextField.positionCaret(res.caretPosition);
                     event.consume();
                 }
             });
diff --git a/src/main/java/org/jabref/logic/util/strings/StringManipulator.java b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
index e8adaab22a0..bce96ef2bd3 100644
--- a/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
+++ b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
@@ -12,15 +12,32 @@ private enum LetterCase {
         CAPITALIZED
     }
 
-    private enum Direction {
-        NEXT, PREVIOUS
+    public enum Direction {
+        NEXT(1),
+        PREVIOUS(-1);
+
+        public final int OFFSET;
+
+        Direction(int offset) {
+            this.OFFSET = offset;
+        }
     }
 
-    private static ResultingStringState setWordCase(String text, int pos, LetterCase targetCase) {
+    /**
+     * Change word casing in a string from the given position to the next word boundary.
+     *
+     * @param text          The text to manipulate.
+     * @param caretPosition The index to start from.
+     * @param targetCase    The case mode the string should be changed to.
+     *
+     * @return              The resulting text and caret position.
+     */
+    private static ResultingStringState setWordCase(String text, int caretPosition, LetterCase targetCase) {
         StringBuilder result = new StringBuilder();
-        int i = pos;
 
-        // swallow whitespaces
+        int i = caretPosition;
+
+        // Swallow whitespaces
         while (i < text.length() && Character.isWhitespace(text.charAt(i))) {
             result.append(text.charAt(i));
             i++;
@@ -29,8 +46,8 @@ private static ResultingStringState setWordCase(String text, int pos, LetterCase
             return new ResultingStringState(i, text);
         }
 
+        // Read the next word
         StringBuilder nextWord = new StringBuilder();
-        // read next word
         char currentChar = text.charAt(i);
         while ((Character.isLetterOrDigit(currentChar) || Character.toString(currentChar).equals("_"))) {
             nextWord.append(currentChar);
@@ -48,121 +65,140 @@ private static ResultingStringState setWordCase(String text, int pos, LetterCase
             case CAPITALIZED -> (new CapitalizeFormatter()).format(nextWord.toString());
         };
 
-        String res = text.substring(0, pos) + result.toString() + changedString + text.substring(i);
-        return new ResultingStringState(i, res);
+        return new ResultingStringState(
+                i,
+                text.substring(0, caretPosition) + result.toString() + changedString + text.substring(i));
     }
 
     /**
      * Delete all characters in a string from the given position to the next word boundary.
      *
-     * @param pos The index to start from.
-     * @param text The text to manipulate.
-     * @param dir The direction to search.
-     * @return The resulting text and caret position.
+     * @param caretPosition The index to start from.
+     * @param text          The text to manipulate.
+     * @param direction     The direction to search.
+     *
+     * @return              The resulting text and caret position.
      */
-    public static ResultingStringState deleteUntilWordBoundary(int pos, String text, Direction dir) {
-        StringBuilder res = new StringBuilder();
-        int offset;
-        int wordBreak;
-        switch (dir) {
-            case NEXT -> {
-                res.append(text, 0, pos);
-                offset = 1;
-                wordBreak = text.length();
-            }
-            case PREVIOUS -> {
-                res.append(text, pos, text.length());
-                offset = -1;
-                wordBreak = 0;
+    public static ResultingStringState deleteUntilWordBoundary(int caretPosition, String text, Direction direction) {
+        // Define cutout range
+
+        int nextWordBoundary = getNextWordBoundary(caretPosition, text, direction);
+
+        // Construct new string without cutout
+        return switch (direction) {
+            case NEXT -> new ResultingStringState(
+                    caretPosition,
+                    text.substring(0, caretPosition) + text.substring(nextWordBoundary));
+            case PREVIOUS -> new ResultingStringState(
+                    nextWordBoundary,  // include breaking whitespace
+                    text.substring(0, nextWordBoundary) + text.substring(caretPosition));
+        };
+    }
+
+    /**
+     * Utility method to find the next whitespace position in string after text
+     * @param caretPosition The current caret Position
+     * @param text          The string to search in
+     * @param direction     The direction to move through string
+     *
+     * @return              The position of the next whitespace after a word
+     */
+    public static int getNextWordBoundary(int caretPosition, String text, Direction direction) {
+        int i = caretPosition;
+
+        if (direction == Direction.PREVIOUS) {
+            // Swallow whitespaces
+            while (i >= 0 && Character.isWhitespace((text.charAt(i + direction.OFFSET)))) {
+                i += direction.OFFSET;
             }
-            default -> throw new AssertionError("Missing case in switch deleteUntilWordBoundary");
-        }
 
-        for (int i = pos; i < text.length() && i >= 0; i += offset) {
-            if (i == pos) {
-                // Swallow whitespace until we hit a word character or newline.
-                while (i < text.length()
-                        && i >= 0
-                        && !String.valueOf(text.charAt(i)).matches("\\w|[\\r\\n]")) {
-                    i += offset;
-                }
+            // Read next word
+            while (i > 0 && !Character.isWhitespace(text.charAt(i + direction.OFFSET))) {
+                i += direction.OFFSET;
             }
-            if (!(i < text.length() && i >= 0) || Character.isWhitespace(text.charAt(i))) {
-                wordBreak = i;
-                break;
+        } else if (direction == Direction.NEXT) {
+            // Swallow whitespaces
+            while (i < text.length() && Character.isWhitespace(text.charAt(i))) {
+                i += direction.OFFSET;
             }
-        }
-        int caretPosition;
-        if (dir == Direction.NEXT) {
-            res.append(text, wordBreak, text.length());
-            // Since we deleted forward, we're in the right place already.
-            caretPosition = pos;
-
-        } else {
-            // Since we deleted backwards, we need to move the caret appropriately.
-            // We need to protect against having stepped beyond the string during the while-loop.
-            if (wordBreak != -1) {
-                res.append(text, 0, wordBreak);
-                caretPosition = wordBreak;
-            } else {
-                caretPosition = 0;
+
+            // Read next word
+            while (i < text.length() && !Character.isWhitespace((text.charAt(i)))) {
+                i += direction.OFFSET;
             }
         }
-        return new ResultingStringState(caretPosition, res.toString());
+
+        return i;
+
+        /*
+        while (i > 0 && i <= text.length() && Character.isWhitespace(text.charAt(i + direction.OFFSET))) {
+            i += direction.OFFSET;
+        } */
+
+        /* while (i > 0 && i < (text.length() - 1) && !Character.isWhitespace(text.charAt(i + direction.OFFSET))) {
+            i += direction.OFFSET;
+        } */
+
+        // return i;
     }
 
     /**
      * Capitalize the word on the right side of the cursor.
      *
-     * @param pos the position of the cursor
-     * @param text String to analyze
-     * @return String The resulting text and caret position.
+     * @param caretPosition The position of the cursor
+     * @param text          The string to manipulate
+     *
+     * @return String       The resulting text and caret position.
      */
-    public static ResultingStringState capitalize(int pos, String text) {
-        return setWordCase(text, pos, LetterCase.CAPITALIZED);
+    public static ResultingStringState capitalize(int caretPosition, String text) {
+        return setWordCase(text, caretPosition, LetterCase.CAPITALIZED);
     }
 
     /**
      * Make all characters in the word uppercase.
      *
-     * @param pos the position of the cursor
-     * @param text String to analyze
-     * @return String The resulting text and caret position.
+     * @param caretPosition The position of the cursor
+     * @param text          The string to manipulate
+     *
+     * @return String       The resulting text and caret position.
      */
-    public static ResultingStringState uppercase(int pos, String text) {
-        return setWordCase(text, pos, LetterCase.UPPER);
+    public static ResultingStringState uppercase(int caretPosition, String text) {
+        return setWordCase(text, caretPosition, LetterCase.UPPER);
     }
 
     /**
      * Make all characters in the word lowercase.
      *
-     * @param pos the position of the cursor
-     * @param text String to analyze
-     * @return String The resulting text and caret position.
+     * @param caretPosition The position of the cursor
+     * @param text          The string to manipulate
+     *
+     * @return String       The resulting text and caret position.
      */
-    public static ResultingStringState lowercase(int pos, String text) {
-        return setWordCase(text, pos, LetterCase.LOWER);
+    public static ResultingStringState lowercase(int caretPosition, String text) {
+        return setWordCase(text, caretPosition, LetterCase.LOWER);
     }
 
     /**
      * Remove the next word on the right side of the cursor.
      *
-     * @param pos the position of the cursor
-     * @param text String to analyze
-     * @return String The resulting text and caret position.
+     * @param caretPosition The position of the cursor
+     * @param text          The string to manipulate
+     *
+     * @return String       The resulting text and caret position.
      */
-    public static ResultingStringState killWord(int pos, String text) {
-        return deleteUntilWordBoundary(pos, text, Direction.NEXT);
+    public static ResultingStringState killWord(int caretPosition, String text) {
+        return deleteUntilWordBoundary(caretPosition, text, Direction.NEXT);
     }
 
     /**
      * Remove the previous word on the left side of the cursor.
      *
-     * @param pos the position of the cursor
-     * @param text String to analyze
-     * @return String The resulting text and caret position.
+     * @param caretPosition The position of the cursor
+     * @param text          The string to manipulate
+     *
+     * @return String       The resulting text and caret position.
      */
-    public static ResultingStringState backwardKillWord(int pos, String text) {
-        return deleteUntilWordBoundary(pos, text, Direction.PREVIOUS);
+    public static ResultingStringState backwardKillWord(int caretPosition, String text) {
+        return deleteUntilWordBoundary(caretPosition, text, Direction.PREVIOUS);
     }
 }
diff --git a/src/main/java/org/jabref/model/util/ResultingStringState.java b/src/main/java/org/jabref/model/util/ResultingStringState.java
index 78ddcdc3431..fc248cf7f8e 100644
--- a/src/main/java/org/jabref/model/util/ResultingStringState.java
+++ b/src/main/java/org/jabref/model/util/ResultingStringState.java
@@ -1,11 +1,11 @@
 package org.jabref.model.util;
 
 public class ResultingStringState {
-    public final int caretPos;
+    public final int caretPosition;
     public final String text;
 
-    public ResultingStringState(int pos, String text) {
-        this.caretPos = pos;
+    public ResultingStringState(int caretPosition, String text) {
+        this.caretPosition = caretPosition;
         this.text = text;
     }
 }
diff --git a/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java b/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
index 2b7294447c8..89a6ea8bf8f 100644
--- a/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
+++ b/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
@@ -9,117 +9,136 @@
 public class StringManipulatorTest {
 
     @Test
-    public void capitalizePreservesNewlines() {
-        int pos = 5; // Position of the caret, between the two ll in the first hellO"
-        String textInput = "hello\n\nhELLO";
-        String whatTextShouldBe = "hello\n\nHello";
-        ResultingStringState textOutput = StringManipulator.capitalize(pos, textInput);
-        assertEquals(whatTextShouldBe, textOutput.text);
+    public void testCapitalizePreservesNewlines() {
+        int caretPosition = 5; // Position of the caret, between the two ll in the first hellO"
+        String input = "hello\n\nhELLO";
+        String expectedResult = "hello\n\nHello";
+        ResultingStringState textOutput = StringManipulator.capitalize(caretPosition, input);
+        assertEquals(expectedResult, textOutput.text);
     }
 
     @Test
-    public void uppercasePreservesSpace() {
-        int pos = 3; // Position of the caret, between the two ll in the first hello
-        String textInput = "hello hello";
-        String whatTextShouldBe = "helLO hello";
-        ResultingStringState textOutput = StringManipulator.uppercase(pos, textInput);
-        assertEquals(whatTextShouldBe, textOutput.text);
+    public void testUppercasePreservesSpace() {
+        int caretPosition = 3; // Position of the caret, between the two ll in the first hello
+        String input = "hello hello";
+        String expectedResult = "helLO hello";
+        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
+        assertEquals(expectedResult, textOutput.text);
     }
 
     @Test
-    public void uppercasePreservesNewlines() {
-        int pos = 3; // Position of the caret, between the two ll in the first hello
-        String textInput = "hello\nhello";
-        String whatTextShouldBe = "helLO\nhello";
-        ResultingStringState textOutput = StringManipulator.uppercase(pos, textInput);
-        assertEquals(whatTextShouldBe, textOutput.text);
+    public void testUppercasePreservesNewlines() {
+        int caretPosition = 3; // Position of the caret, between the two ll in the first hello
+        String input = "hello\nhello";
+        String expectedResult = "helLO\nhello";
+        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
+        assertEquals(expectedResult, textOutput.text);
     }
 
     @Test
-    public void uppercasePreservesTab() {
-        int pos = 3; // Position of the caret, between the two ll in the first hello
-        String textInput = "hello\thello";
-        String whatTextShouldBe = "helLO\thello";
-        ResultingStringState textOutput = StringManipulator.uppercase(pos, textInput);
-        assertEquals(whatTextShouldBe, textOutput.text);
+    public void testUppercasePreservesTab() {
+        int caretPosition = 3; // Position of the caret, between the two ll in the first hello
+        String input = "hello\thello";
+        String expectedResult = "helLO\thello";
+        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
+        assertEquals(expectedResult, textOutput.text);
     }
 
     @Test
-    public void uppercasePreservesDoubleSpace() {
-        int pos = 5; // Position of the caret, at the first space
-        String textInput = "hello  hello";
-        String whatTextShouldBe = "hello  HELLO";
-        ResultingStringState textOutput = StringManipulator.uppercase(pos, textInput);
-        assertEquals(whatTextShouldBe, textOutput.text);
+    public void testUppercasePreservesDoubleSpace() {
+        int caretPosition = 5; // Position of the caret, at the first space
+        String input = "hello  hello";
+        String expectedResult = "hello  HELLO";
+        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
+        assertEquals(expectedResult, textOutput.text);
     }
 
     @Test
-    public void uppercaseIgnoresTrailingWhitespace() {
-        int pos = 5; // First space
-        String textInput = "hello  ";
-        String whatTextShouldBe = "hello  ";
-        ResultingStringState textOutput = StringManipulator.uppercase(pos, textInput);
-        assertEquals(whatTextShouldBe, textOutput.text);
+    public void testUppercaseIgnoresTrailingWhitespace() {
+        int caretPosition = 5; // First space
+        String input = "hello  ";
+        String expectedResult = "hello  ";
+        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
+        assertEquals(expectedResult, textOutput.text);
         // Expected caret position is right after the last space, which is index 7
-        assertEquals(7, textOutput.caretPos);
+        assertEquals(7, textOutput.caretPosition);
     }
 
     @Test
-    public void killWordTrimsTrailingWhitespace() {
-        int pos = 5; // First space
-        String textInput = "hello  ";
-        String whatTextShouldBe = "hello";
-        ResultingStringState textOutput = StringManipulator.killWord(pos, textInput);
-        assertEquals(whatTextShouldBe, textOutput.text);
-        assertEquals(pos, textOutput.caretPos);
+    public void testKillWordTrimsTrailingWhitespace() {
+        int caretPosition = 5; // First space
+        String input = "hello  ";
+        String expectedResult = "hello";
+        ResultingStringState textOutput = StringManipulator.killWord(caretPosition, input);
+        assertEquals(expectedResult, textOutput.text);
+        assertEquals(caretPosition, textOutput.caretPosition);
     }
 
     @Test
-    public void backwardsKillWordTrimsPreceedingWhitespace() {
-        int pos = 1; // Second space
-        String textInput = "  hello";
+    public void testBackwardsKillWordTrimsPreceedingWhitespace() {
+        int caretPosition = 1; // Second space
+        String input = "  hello";
         // One space should be preserved since we are deleting everything preceding the second space.
-        String whatTextShouldBe = " hello";
-        ResultingStringState textOutput = StringManipulator.backwardKillWord(pos, textInput);
-        assertEquals(whatTextShouldBe, textOutput.text);
+        String expectedResult = " hello";
+        ResultingStringState textOutput = StringManipulator.backwardKillWord(caretPosition, input);
+        assertEquals(expectedResult, textOutput.text);
         // The caret should have been moved to the start.
-        assertEquals(0, textOutput.caretPos);
+        assertEquals(0, textOutput.caretPosition);
     }
 
     @Test
-    public void uppercasePreservesMixedSpaceNewLineTab() {
-        int pos = 5; // Position of the caret, after first hello
-        String textInput = "hello \n\thello";
-        String whatTextShouldBe = "hello \n\tHELLO";
-        ResultingStringState textOutput = StringManipulator.uppercase(pos, textInput);
-        assertEquals(whatTextShouldBe, textOutput.text);
+    public void testUppercasePreservesMixedSpaceNewLineTab() {
+        int caretPosition = 5; // Position of the caret, after first hello
+        String input = "hello \n\thello";
+        String expectedResult = "hello \n\tHELLO";
+        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
+        assertEquals(expectedResult, textOutput.text);
     }
 
     @Test
-    public void lowercaseEditsTheNextWord() {
-        int pos = 5; // Position of the caret, right at the space
-        String textInput = "hello HELLO";
-        String whatTextShouldBe = "hello hello";
-        ResultingStringState textOutput = StringManipulator.lowercase(pos, textInput);
-        assertEquals(whatTextShouldBe, textOutput.text);
+    public void testLowercaseEditsTheNextWord() {
+        int caretPosition = 5; // Position of the caret, right at the space
+        String input = "hello HELLO";
+        String expectedResult = "hello hello";
+        ResultingStringState textOutput = StringManipulator.lowercase(caretPosition, input);
+        assertEquals(expectedResult, textOutput.text);
     }
 
     @Test
-    public void killWordRemovesFromPositionUpToNextWord() {
-        int pos = 3; // Position of the caret, between the two "ll in the first hello"
-        String textInput = "hello hello";
-        String whatTextShouldBe = "hel hello";
-        ResultingStringState textOutput = StringManipulator.killWord(pos, textInput);
-        assertEquals(whatTextShouldBe, textOutput.text);
+    public void testKillWordRemovesFromPositionUpToNextWord() {
+        int caretPosition = 3; // Position of the caret, between the two "ll in the first hello"
+        String input = "hello hello";
+        String expectedResult = "hel hello";
+        ResultingStringState textOutput = StringManipulator.killWord(caretPosition, input);
+        assertEquals(expectedResult, textOutput.text);
     }
 
     @Test
-    public void killWordRemovesNextWordIfPositionIsInSpace() {
-        int pos = 5; // Position of the caret, atfer the first hello"
-        String textInput = "hello person";
-        String whatTextShouldBe = "hello";
-        ResultingStringState textOutput = StringManipulator.killWord(pos, textInput);
-        assertEquals(whatTextShouldBe, textOutput.text);
+    public void testKillWordRemovesNextWordIfPositionIsInSpace() {
+        int caretPosition = 5; // Position of the caret, after the first hello"
+        String input = "hello person";
+        String expectedResult = "hello";
+        ResultingStringState textOutput = StringManipulator.killWord(caretPosition, input);
+        assertEquals(expectedResult, textOutput.text);
     }
 
+    @Test
+    public void testKillPreviousWord() {
+        int caretPosition = 8;
+        int expectedPosition = 6;
+        String input = "hello person";
+        String expectedResult = "hello rson";
+        ResultingStringState result = StringManipulator.backwardKillWord(caretPosition, input);
+        assertEquals(expectedResult, result.text);
+        assertEquals(expectedPosition, result.caretPosition);
+    }
+
+    @Test
+    void testGetNextWordBoundary() {
+        int caretPosition = 10;
+        int expectedPosition = 6;
+        String input = "hello person";
+        int result = StringManipulator.getNextWordBoundary(caretPosition, input, StringManipulator.Direction.PREVIOUS);
+        assertEquals(expectedPosition, result);
+    }
 }

From bf20143d479a483d87b24ed3ded333e5e43d33c9 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Wed, 4 Nov 2020 22:19:49 +0100
Subject: [PATCH 09/16] Fixed all StringManipulatorTests

---
 .../logic/util/strings/StringManipulator.java | 19 ++++---------------
 .../util/strings/StringManipulatorTest.java   |  4 ++--
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/jabref/logic/util/strings/StringManipulator.java b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
index bce96ef2bd3..c9d6a8293f4 100644
--- a/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
+++ b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
@@ -12,7 +12,7 @@ private enum LetterCase {
         CAPITALIZED
     }
 
-    public enum Direction {
+    enum Direction {
         NEXT(1),
         PREVIOUS(-1);
 
@@ -88,7 +88,7 @@ public static ResultingStringState deleteUntilWordBoundary(int caretPosition, St
         return switch (direction) {
             case NEXT -> new ResultingStringState(
                     caretPosition,
-                    text.substring(0, caretPosition) + text.substring(nextWordBoundary));
+                    text.substring(0, caretPosition) + text.substring(nextWordBoundary)); // Iclude whitespace
             case PREVIOUS -> new ResultingStringState(
                     nextWordBoundary,  // include breaking whitespace
                     text.substring(0, nextWordBoundary) + text.substring(caretPosition));
@@ -103,12 +103,12 @@ public static ResultingStringState deleteUntilWordBoundary(int caretPosition, St
      *
      * @return              The position of the next whitespace after a word
      */
-    public static int getNextWordBoundary(int caretPosition, String text, Direction direction) {
+    static int getNextWordBoundary(int caretPosition, String text, Direction direction) {
         int i = caretPosition;
 
         if (direction == Direction.PREVIOUS) {
             // Swallow whitespaces
-            while (i >= 0 && Character.isWhitespace((text.charAt(i + direction.OFFSET)))) {
+            while (i > 0 && Character.isWhitespace((text.charAt(i + direction.OFFSET)))) {
                 i += direction.OFFSET;
             }
 
@@ -129,17 +129,6 @@ public static int getNextWordBoundary(int caretPosition, String text, Direction
         }
 
         return i;
-
-        /*
-        while (i > 0 && i <= text.length() && Character.isWhitespace(text.charAt(i + direction.OFFSET))) {
-            i += direction.OFFSET;
-        } */
-
-        /* while (i > 0 && i < (text.length() - 1) && !Character.isWhitespace(text.charAt(i + direction.OFFSET))) {
-            i += direction.OFFSET;
-        } */
-
-        // return i;
     }
 
     /**
diff --git a/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java b/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
index 89a6ea8bf8f..1a2b26f221f 100644
--- a/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
+++ b/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
@@ -135,8 +135,8 @@ public void testKillPreviousWord() {
 
     @Test
     void testGetNextWordBoundary() {
-        int caretPosition = 10;
-        int expectedPosition = 6;
+        int caretPosition = 3;
+        int expectedPosition = 0;
         String input = "hello person";
         int result = StringManipulator.getNextWordBoundary(caretPosition, input, StringManipulator.Direction.PREVIOUS);
         assertEquals(expectedPosition, result);

From 83a384837dc0b311fe263c550419ac0c9b486814 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Wed, 4 Nov 2020 22:36:19 +0100
Subject: [PATCH 10/16] Added ParameterizedTests

---
 .../logic/util/strings/StringManipulator.java |  1 -
 .../util/strings/StringManipulatorTest.java   | 25 ++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/jabref/logic/util/strings/StringManipulator.java b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
index c9d6a8293f4..de1fd612107 100644
--- a/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
+++ b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
@@ -81,7 +81,6 @@ private static ResultingStringState setWordCase(String text, int caretPosition,
      */
     public static ResultingStringState deleteUntilWordBoundary(int caretPosition, String text, Direction direction) {
         // Define cutout range
-
         int nextWordBoundary = getNextWordBoundary(caretPosition, text, direction);
 
         // Construct new string without cutout
diff --git a/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java b/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
index 1a2b26f221f..fce0126c0b7 100644
--- a/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
+++ b/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
@@ -1,8 +1,13 @@
 package org.jabref.logic.util.strings;
 
+import java.util.stream.Stream;
+
 import org.jabref.model.util.ResultingStringState;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -133,12 +138,20 @@ public void testKillPreviousWord() {
         assertEquals(expectedPosition, result.caretPosition);
     }
 
-    @Test
-    void testGetNextWordBoundary() {
-        int caretPosition = 3;
-        int expectedPosition = 0;
-        String input = "hello person";
-        int result = StringManipulator.getNextWordBoundary(caretPosition, input, StringManipulator.Direction.PREVIOUS);
+    @ParameterizedTest
+    @MethodSource("wordBoundaryTestData")
+    void testGetNextWordBoundary(String text, int caretPosition, int expectedPosition, StringManipulator.Direction direction) {
+        int result = StringManipulator.getNextWordBoundary(caretPosition, text, direction);
         assertEquals(expectedPosition, result);
     }
+
+    private static Stream<Arguments> wordBoundaryTestData() {
+        return Stream.of(
+                Arguments.of("hello person", 3, 0, StringManipulator.Direction.PREVIOUS),
+                Arguments.of("hello person", 12, 6, StringManipulator.Direction.PREVIOUS),
+                Arguments.of("hello person", 0, 0, StringManipulator.Direction.PREVIOUS),
+                Arguments.of("hello person", 0, 5, StringManipulator.Direction.NEXT),
+                Arguments.of("hello person", 5, 12, StringManipulator.Direction.NEXT),
+                Arguments.of("hello person", 12, 12, StringManipulator.Direction.NEXT));
+    }
 }

From 09338561e5a54ee241f4526881f9a02fbd7322be Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Wed, 4 Nov 2020 23:52:16 +0100
Subject: [PATCH 11/16] Refactor setWordCase

---
 .../logic/util/strings/StringManipulator.java | 46 ++++++-------------
 1 file changed, 14 insertions(+), 32 deletions(-)

diff --git a/src/main/java/org/jabref/logic/util/strings/StringManipulator.java b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
index de1fd612107..cb1972de5e1 100644
--- a/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
+++ b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
@@ -33,41 +33,23 @@ enum Direction {
      * @return              The resulting text and caret position.
      */
     private static ResultingStringState setWordCase(String text, int caretPosition, LetterCase targetCase) {
-        StringBuilder result = new StringBuilder();
+        int nextWordBoundary = getNextWordBoundary(caretPosition, text, Direction.NEXT);
 
-        int i = caretPosition;
-
-        // Swallow whitespaces
-        while (i < text.length() && Character.isWhitespace(text.charAt(i))) {
-            result.append(text.charAt(i));
-            i++;
-        }
-        if (i >= text.length()) {
-            return new ResultingStringState(i, text);
-        }
-
-        // Read the next word
-        StringBuilder nextWord = new StringBuilder();
-        char currentChar = text.charAt(i);
-        while ((Character.isLetterOrDigit(currentChar) || Character.toString(currentChar).equals("_"))) {
-            nextWord.append(currentChar);
-            i++;
-
-            if (i >= text.length()) {
-                break;
-            }
-            currentChar = text.charAt(i);
+        // Preserve whitespaces
+        int wordStartPosition = caretPosition;
+        while (wordStartPosition < nextWordBoundary && Character.isWhitespace(text.charAt(wordStartPosition))) {
+            wordStartPosition++;
         }
 
-        String changedString = switch (targetCase) {
-            case UPPER -> (new UpperCaseFormatter()).format(nextWord.toString());
-            case LOWER -> (new LowerCaseFormatter()).format(nextWord.toString());
-            case CAPITALIZED -> (new CapitalizeFormatter()).format(nextWord.toString());
+        String result = switch (targetCase) {
+            case UPPER -> (new UpperCaseFormatter()).format(text.substring(wordStartPosition, nextWordBoundary));
+            case LOWER -> (new LowerCaseFormatter()).format(text.substring(wordStartPosition, nextWordBoundary));
+            case CAPITALIZED -> (new CapitalizeFormatter()).format(text.substring(wordStartPosition, nextWordBoundary));
         };
 
         return new ResultingStringState(
-                i,
-                text.substring(0, caretPosition) + result.toString() + changedString + text.substring(i));
+                nextWordBoundary,
+                text.substring(0, wordStartPosition) + result + text.substring(nextWordBoundary));
     }
 
     /**
@@ -79,7 +61,7 @@ private static ResultingStringState setWordCase(String text, int caretPosition,
      *
      * @return              The resulting text and caret position.
      */
-    public static ResultingStringState deleteUntilWordBoundary(int caretPosition, String text, Direction direction) {
+    static ResultingStringState deleteUntilWordBoundary(int caretPosition, String text, Direction direction) {
         // Define cutout range
         int nextWordBoundary = getNextWordBoundary(caretPosition, text, direction);
 
@@ -87,9 +69,9 @@ public static ResultingStringState deleteUntilWordBoundary(int caretPosition, St
         return switch (direction) {
             case NEXT -> new ResultingStringState(
                     caretPosition,
-                    text.substring(0, caretPosition) + text.substring(nextWordBoundary)); // Iclude whitespace
+                    text.substring(0, caretPosition) + text.substring(nextWordBoundary));
             case PREVIOUS -> new ResultingStringState(
-                    nextWordBoundary,  // include breaking whitespace
+                    nextWordBoundary,
                     text.substring(0, nextWordBoundary) + text.substring(caretPosition));
         };
     }

From ffcaeb6ceb48d772137b1263a53e8542a71f0984 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Thu, 5 Nov 2020 16:01:59 +0100
Subject: [PATCH 12/16] Removed artifacts and made cleanups

---
 .../gui/preferences/EntryEditorTab.fxml       |  1 +
 .../jabref/logic/bst/BibtexCaseChanger.java   | 51 +++++++++++--------
 .../jabref/logic/bst/ChangeCaseFunction.java  |  4 +-
 .../logic/bst/BibtexCaseChangersTest.java     |  8 +--
 4 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml b/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
index 0fda219a207..4458fb6ee94 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
@@ -27,6 +27,7 @@
     </CheckBox>
     <CheckBox fx:id="enableLatexCitationsTab" text="%Show 'LaTeX Citations' tab"/>
     <CheckBox fx:id="enableValidation" text="%Show validation messages"/>
+
     <Label styleClass="sectionHeader" text="%Autocompletion"/>
     <CheckBox fx:id="enableAutoComplete" text="%Use autocompletion"/>
     <VBox spacing="10.0">
diff --git a/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java b/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java
index acc6787f939..e05ce998e80 100644
--- a/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java
+++ b/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java
@@ -16,7 +16,7 @@ public final class BibtexCaseChanger {
     // global variable to store the current brace level
     private int braceLevel;
 
-    public enum FormatMode {
+    public enum FORMAT_MODE {
         // First character and character after a ":" as upper case - everything else in lower case. Obey {}.
         TITLE_LOWERS('t'),
 
@@ -40,7 +40,7 @@ public enum FormatMode {
 
         private final char asChar;
 
-        FormatMode(char asChar) {
+        FORMAT_MODE(char asChar) {
             this.asChar = asChar;
         }
 
@@ -53,8 +53,8 @@ public char asChar() {
          *
          * @throws IllegalArgumentException if char is not 't', 'l', 'u'
          */
-        public static FormatMode getFormatModeForBSTFormat(final char bstFormat) {
-            for (FormatMode mode : FormatMode.values()) {
+        public static FORMAT_MODE getFormatModeForBSTFormat(final char bstFormat) {
+            for (FORMAT_MODE mode : FORMAT_MODE.values()) {
                 if (mode.asChar == bstFormat) {
                     return mode;
                 }
@@ -72,11 +72,11 @@ private BibtexCaseChanger() {
      * @param s      the string to handle
      * @param format the format
      */
-    public static String changeCase(String s, FormatMode format) {
+    public static String changeCase(String s, FORMAT_MODE format) {
         return (new BibtexCaseChanger()).doChangeCase(s, format);
     }
 
-    private String doChangeCase(String s, FormatMode format) {
+    private String doChangeCase(String s, FORMAT_MODE format) {
         char[] c = s.toCharArray();
 
         StringBuilder sb = new StringBuilder();
@@ -93,7 +93,7 @@ private String doChangeCase(String s, FormatMode format) {
                     i++;
                     continue;
                 }
-                if ((format == FormatMode.TITLE_LOWERS) && ((i == 0) || (prevColon && Character.isWhitespace(c[i - 1])))) {
+                if ((format == FORMAT_MODE.TITLE_LOWERS) && ((i == 0) || (prevColon && Character.isWhitespace(c[i - 1])))) {
                     sb.append('{');
                     i++;
                     prevColon = false;
@@ -141,7 +141,7 @@ private String doChangeCase(String s, FormatMode format) {
      * @param format
      * @return
      */
-    private int convertSpecialChar(StringBuilder sb, char[] c, int start, FormatMode format) {
+    private int convertSpecialChar(StringBuilder sb, char[] c, int start, FORMAT_MODE format) {
         int i = start;
 
         sb.append(c[i]);
@@ -181,7 +181,7 @@ private int convertSpecialChar(StringBuilder sb, char[] c, int start, FormatMode
      * @param format
      * @return the new position
      */
-    private int convertAccented(char[] c, int start, String s, StringBuilder sb, FormatMode format) {
+    private int convertAccented(char[] c, int start, String s, StringBuilder sb, FORMAT_MODE format) {
         int pos = start;
         pos += s.length();
 
@@ -214,26 +214,29 @@ private int convertAccented(char[] c, int start, String s, StringBuilder sb, For
         return pos;
     }
 
-    private int convertNonControl(char[] c, int start, StringBuilder sb, FormatMode format) {
+    private int convertNonControl(char[] c, int start, StringBuilder sb, FORMAT_MODE format) {
         int pos = start;
         switch (format) {
-            case TITLE_LOWERS, ALL_LOWERS -> {
+            case TITLE_LOWERS:
+            case ALL_LOWERS:
                 sb.append(Character.toLowerCase(c[pos]));
                 pos++;
-            }
-            case ALL_UPPERS -> {
+                break;
+            case ALL_UPPERS:
                 sb.append(Character.toUpperCase(c[pos]));
                 pos++;
-            }
-            default -> LOGGER.info("convertNonControl - Unknown format: " + format);
+                break;
+            default:
+                LOGGER.info("convertNonControl - Unknown format: " + format);
+                break;
         }
         return pos;
     }
 
-    private int convertCharIfBraceLevelIsZero(char[] c, int start, StringBuilder sb, FormatMode format) {
+    private int convertCharIfBraceLevelIsZero(char[] c, int start, StringBuilder sb, FORMAT_MODE format) {
         int i = start;
         switch (format) {
-            case TITLE_LOWERS -> {
+            case TITLE_LOWERS:
                 if ((i == 0) || (prevColon && Character.isWhitespace(c[i - 1]))) {
                     sb.append(c[i]);
                 } else {
@@ -244,10 +247,16 @@ private int convertCharIfBraceLevelIsZero(char[] c, int start, StringBuilder sb,
                 } else if (!Character.isWhitespace(c[i])) {
                     prevColon = false;
                 }
-            }
-            case ALL_LOWERS -> sb.append(Character.toLowerCase(c[i]));
-            case ALL_UPPERS -> sb.append(Character.toUpperCase(c[i]));
-            default -> LOGGER.info("convertCharIfBraceLevelIsZero - Unknown format: " + format);
+                break;
+            case ALL_LOWERS:
+                sb.append(Character.toLowerCase(c[i]));
+                break;
+            case ALL_UPPERS:
+                sb.append(Character.toUpperCase(c[i]));
+                break;
+            default:
+                LOGGER.info("convertCharIfBraceLevelIsZero - Unknown format: " + format);
+                break;
         }
         i++;
         return i;
diff --git a/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java b/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java
index 1e1c923a6cc..65f4f64c619 100644
--- a/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java
+++ b/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java
@@ -3,7 +3,7 @@
 import java.util.Locale;
 import java.util.Stack;
 
-import org.jabref.logic.bst.BibtexCaseChanger.FormatMode;
+import org.jabref.logic.bst.BibtexCaseChanger.FORMAT_MODE;
 import org.jabref.logic.bst.VM.BstEntry;
 import org.jabref.logic.bst.VM.BstFunction;
 
@@ -60,6 +60,6 @@ public void execute(BstEntry context) {
         char format = ((String) o1).toLowerCase(Locale.ROOT).charAt(0);
         String s = (String) o2;
 
-        stack.push(BibtexCaseChanger.changeCase(s, FormatMode.getFormatModeForBSTFormat(format)));
+        stack.push(BibtexCaseChanger.changeCase(s, FORMAT_MODE.getFormatModeForBSTFormat(format)));
     }
 }
diff --git a/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java b/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java
index 193f7aaaf7f..bcdcac3b4ce 100644
--- a/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java
+++ b/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java
@@ -1,6 +1,6 @@
 package org.jabref.logic.bst;
 
-import org.jabref.logic.bst.BibtexCaseChanger.FormatMode;
+import org.jabref.logic.bst.BibtexCaseChanger.FORMAT_MODE;
 
 import org.junit.jupiter.api.Test;
 
@@ -121,14 +121,14 @@ public void testTitleCase() {
     }
 
     private void assertCaseChangerTitleLowers(final String string, final String string2) {
-        assertEquals(string, BibtexCaseChanger.changeCase(string2, FormatMode.TITLE_LOWERS));
+        assertEquals(string, BibtexCaseChanger.changeCase(string2, FORMAT_MODE.TITLE_LOWERS));
     }
 
     private void assertCaseChangerAllLowers(final String string, final String string2) {
-        assertEquals(string, BibtexCaseChanger.changeCase(string2, FormatMode.ALL_LOWERS));
+        assertEquals(string, BibtexCaseChanger.changeCase(string2, FORMAT_MODE.ALL_LOWERS));
     }
 
     private void assertCaseChangerAllUppers(final String string, final String string2) {
-        assertEquals(string, BibtexCaseChanger.changeCase(string2, FormatMode.ALL_UPPERS));
+        assertEquals(string, BibtexCaseChanger.changeCase(string2, FORMAT_MODE.ALL_UPPERS));
     }
 }

From eb6fc8ce2766721fccb28aba4e6301c75fe34648 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Thu, 5 Nov 2020 20:27:09 +0100
Subject: [PATCH 13/16] Added CodeAreaKeyBindings

---
 src/main/java/org/jabref/gui/JabRefGUI.java   |   6 +-
 .../org/jabref/gui/entryeditor/SourceTab.java |  19 ++-
 .../gui/keyboard/CodeAreaKeyBindings.java     | 113 ++++++++++++++++++
 .../gui/keyboard/EditorKeyBindings.java       | 100 ----------------
 .../gui/keyboard/TextInputKeyBindings.java    |  97 +++++++++++++++
 5 files changed, 220 insertions(+), 115 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java
 delete mode 100644 src/main/java/org/jabref/gui/keyboard/EditorKeyBindings.java
 create mode 100644 src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java

diff --git a/src/main/java/org/jabref/gui/JabRefGUI.java b/src/main/java/org/jabref/gui/JabRefGUI.java
index ed4f9c7dd30..a4dc5d1b284 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -17,7 +17,7 @@
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.importer.ParserResultWarningDialog;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
-import org.jabref.gui.keyboard.EditorKeyBindings;
+import org.jabref.gui.keyboard.TextInputKeyBindings;
 import org.jabref.gui.shared.SharedDatabaseUIManager;
 import org.jabref.logic.autosaveandbackup.BackupManager;
 import org.jabref.logic.importer.OpenDatabase;
@@ -89,8 +89,8 @@ private void openWindow(Stage mainStage) {
         Scene scene = new Scene(root, 800, 800);
         Globals.prefs.getTheme().installCss(scene);
 
-        // Handle Emacs key bindings
-        scene.addEventFilter(KeyEvent.KEY_PRESSED, event -> EditorKeyBindings.call(scene, event, Globals.prefs));
+        // Handle TextEditor key bindings
+        scene.addEventFilter(KeyEvent.KEY_PRESSED, event -> TextInputKeyBindings.call(scene, event));
 
         mainStage.setTitle(JabRefFrame.FRAME_TITLE);
         mainStage.getIcons().addAll(IconTheme.getLogoSetFX());
diff --git a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
index 66c32a2ad25..9161758a58d 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
@@ -18,6 +18,7 @@
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.InputMethodRequests;
+import javafx.scene.input.KeyEvent;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
@@ -26,6 +27,7 @@
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.keyboard.CodeAreaKeyBindings;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.undo.NamedCompound;
@@ -85,18 +87,10 @@ public EditAction(StandardActions command) {
         @Override
         public void execute() {
             switch (command) {
-                case COPY:
-                    codeArea.copy();
-                    break;
-                case CUT:
-                    codeArea.cut();
-                    break;
-                case PASTE:
-                    codeArea.paste();
-                    break;
-                case SELECT_ALL:
-                    codeArea.selectAll();
-                    break;
+                case COPY -> codeArea.copy();
+                case CUT -> codeArea.cut();
+                case PASTE -> codeArea.paste();
+                case SELECT_ALL -> codeArea.selectAll();
             }
             codeArea.requestFocus();
         }
@@ -178,6 +172,7 @@ private void setupSourceEditor() {
             }
         });
         codeArea.setId("bibtexSourceCodeArea");
+        codeArea.addEventFilter(KeyEvent.KEY_PRESSED, event -> CodeAreaKeyBindings.call(codeArea, event));
 
         ActionFactory factory = new ActionFactory(keyBindingRepository);
         ContextMenu contextMenu = new ContextMenu();
diff --git a/src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java
new file mode 100644
index 00000000000..d055eaed84c
--- /dev/null
+++ b/src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java
@@ -0,0 +1,113 @@
+package org.jabref.gui.keyboard;
+
+import javafx.scene.input.KeyEvent;
+
+import org.jabref.gui.Globals;
+import org.jabref.logic.util.strings.StringManipulator;
+import org.jabref.model.util.ResultingStringState;
+
+import org.fxmisc.richtext.CodeArea;
+import org.fxmisc.richtext.NavigationActions;
+
+public class CodeAreaKeyBindings {
+
+    public static void call(CodeArea codeArea, KeyEvent event) {
+        KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
+        keyBindingRepository.mapToKeyBinding(event).ifPresent(binding -> {
+            switch (binding) {
+                case EDITOR_DELETE -> {
+                    codeArea.deleteNextChar();
+                    event.consume();
+                }
+                case EDITOR_BACKWARD -> {
+                    codeArea.previousChar(NavigationActions.SelectionPolicy.CLEAR);
+                    event.consume();
+                }
+                case EDITOR_FORWARD -> {
+                    codeArea.nextChar(NavigationActions.SelectionPolicy.CLEAR);
+                    event.consume();
+                }
+                case EDITOR_WORD_BACKWARD -> {
+                    codeArea.wordBreaksBackwards(2, NavigationActions.SelectionPolicy.CLEAR);
+                    event.consume();
+                }
+                case EDITOR_WORD_FORWARD -> {
+                    codeArea.wordBreaksForwards(2, NavigationActions.SelectionPolicy.CLEAR);
+                    event.consume();
+                }
+                case EDITOR_BEGINNING_DOC -> {
+                    codeArea.start(NavigationActions.SelectionPolicy.CLEAR);
+                    event.consume();
+                }
+                case EDITOR_UP -> {
+                    codeArea.paragraphStart(NavigationActions.SelectionPolicy.CLEAR);
+                    event.consume();
+                }
+                case EDITOR_BEGINNING -> {
+                    codeArea.lineStart(NavigationActions.SelectionPolicy.CLEAR);
+                    event.consume();
+                }
+                case EDITOR_END_DOC -> {
+                    codeArea.end(NavigationActions.SelectionPolicy.CLEAR);
+                    event.consume();
+                }
+                case EDITOR_DOWN -> {
+                    codeArea.paragraphEnd(NavigationActions.SelectionPolicy.CLEAR);
+                    event.consume();
+                }
+                case EDITOR_END -> {
+                    codeArea.lineEnd(NavigationActions.SelectionPolicy.CLEAR);
+                    event.consume();
+                }
+                case EDITOR_CAPITALIZE -> {
+                    int pos = codeArea.getCaretPosition();
+                    String text = codeArea.getText(0, codeArea.getText().length());
+                    ResultingStringState res = StringManipulator.capitalize(pos, text);
+                    codeArea.replaceText(res.text);
+                    codeArea.displaceCaret(res.caretPosition);
+                    event.consume();
+                }
+                case EDITOR_LOWERCASE -> {
+                    int pos = codeArea.getCaretPosition();
+                    String text = codeArea.getText(0, codeArea.getText().length());
+                    ResultingStringState res = StringManipulator.lowercase(pos, text);
+                    codeArea.replaceText(res.text);
+                    codeArea.displaceCaret(res.caretPosition);
+                    event.consume();
+                }
+                case EDITOR_UPPERCASE -> {
+                    int pos = codeArea.getCaretPosition();
+                    String text = codeArea.getText(0, codeArea.getText().length());
+                    ResultingStringState res = StringManipulator.uppercase(pos, text);
+                    codeArea.clear();
+                    codeArea.replaceText(res.text);
+                    codeArea.displaceCaret(res.caretPosition);
+                    event.consume();
+                }
+                case EDITOR_KILL_LINE -> {
+                    int pos = codeArea.getCaretPosition();
+                    codeArea.replaceText(codeArea.getText(0, pos));
+                    codeArea.displaceCaret(pos);
+                    event.consume();
+                }
+                case EDITOR_KILL_WORD -> {
+                    int pos = codeArea.getCaretPosition();
+                    String text = codeArea.getText(0, codeArea.getText().length());
+                    ResultingStringState res = StringManipulator.killWord(pos, text);
+                    codeArea.replaceText(res.text);
+                    codeArea.displaceCaret(res.caretPosition);
+                    event.consume();
+                }
+                case EDITOR_KILL_WORD_BACKWARD -> {
+                    int pos = codeArea.getCaretPosition();
+                    String text = codeArea.getText(0, codeArea.getText().length());
+                    ResultingStringState res = StringManipulator.backwardKillWord(pos, text);
+                    codeArea.replaceText(res.text);
+                    codeArea.displaceCaret(res.caretPosition);
+                    event.consume();
+                }
+            }
+        });
+    }
+}
+
diff --git a/src/main/java/org/jabref/gui/keyboard/EditorKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/EditorKeyBindings.java
deleted file mode 100644
index 9be658964e2..00000000000
--- a/src/main/java/org/jabref/gui/keyboard/EditorKeyBindings.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.jabref.gui.keyboard;
-
-import java.util.Optional;
-
-import javafx.scene.Scene;
-import javafx.scene.control.TextInputControl;
-import javafx.scene.input.KeyEvent;
-
-import org.jabref.gui.Globals;
-import org.jabref.logic.util.strings.StringManipulator;
-import org.jabref.model.util.ResultingStringState;
-import org.jabref.preferences.PreferencesService;
-
-public class EditorKeyBindings {
-
-    public static void call(Scene scene, KeyEvent event, PreferencesService preferencesService) {
-        if (scene.focusOwnerProperty().get() instanceof TextInputControl) {
-
-            KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
-            TextInputControl focusedTextField = (TextInputControl) scene.focusOwnerProperty().get();
-            Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
-            keyBinding.ifPresent(binding -> {
-                if (binding.equals(KeyBinding.EDITOR_DELETE)) {
-                    focusedTextField.deleteNextChar();
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_BACKWARD) {
-                    focusedTextField.backward();
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_FORWARD) {
-                    focusedTextField.forward();
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_WORD_BACKWARD) {
-                    focusedTextField.previousWord();
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_WORD_FORWARD) {
-                    focusedTextField.nextWord();
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_BEGINNING) {
-                    focusedTextField.home();
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_END) {
-                    focusedTextField.end();
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_BEGINNING_DOC) {
-                    focusedTextField.home();
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_END_DOC) {
-                    focusedTextField.end();
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_UP) {
-                    focusedTextField.home();
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_DOWN) {
-                    focusedTextField.end();
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_CAPITALIZE) {
-                    int pos = focusedTextField.getCaretPosition();
-                    String text = focusedTextField.getText(0, focusedTextField.getText().length());
-                    ResultingStringState res = StringManipulator.capitalize(pos, text);
-                    focusedTextField.setText(res.text);
-                    focusedTextField.positionCaret(res.caretPosition);
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_LOWERCASE) {
-                    int pos = focusedTextField.getCaretPosition();
-                    String text = focusedTextField.getText(0, focusedTextField.getText().length());
-                    ResultingStringState res = StringManipulator.lowercase(pos, text);
-                    focusedTextField.setText(res.text);
-                    focusedTextField.positionCaret(res.caretPosition);
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_UPPERCASE) {
-                    int pos = focusedTextField.getCaretPosition();
-                    String text = focusedTextField.getText(0, focusedTextField.getText().length());
-                    ResultingStringState res = StringManipulator.uppercase(pos, text);
-                    focusedTextField.setText(res.text);
-                    focusedTextField.positionCaret(res.caretPosition);
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_KILL_LINE) {
-                    int pos = focusedTextField.getCaretPosition();
-                    focusedTextField.setText(focusedTextField.getText(0, pos));
-                    focusedTextField.positionCaret(pos);
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_KILL_WORD) {
-                    int pos = focusedTextField.getCaretPosition();
-                    String text = focusedTextField.getText(0, focusedTextField.getText().length());
-                    ResultingStringState res = StringManipulator.killWord(pos, text);
-                    focusedTextField.setText(res.text);
-                    focusedTextField.positionCaret(res.caretPosition);
-                    event.consume();
-                } else if (binding == KeyBinding.EDITOR_KILL_WORD_BACKWARD) {
-                    int pos = focusedTextField.getCaretPosition();
-                    String text = focusedTextField.getText(0, focusedTextField.getText().length());
-                    ResultingStringState res = StringManipulator.backwardKillWord(pos, text);
-                    focusedTextField.setText(res.text);
-                    focusedTextField.positionCaret(res.caretPosition);
-                    event.consume();
-                }
-            });
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java
new file mode 100644
index 00000000000..d195f0bdef8
--- /dev/null
+++ b/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java
@@ -0,0 +1,97 @@
+package org.jabref.gui.keyboard;
+
+import javafx.scene.Scene;
+import javafx.scene.control.TextInputControl;
+import javafx.scene.input.KeyEvent;
+
+import org.jabref.gui.Globals;
+import org.jabref.logic.util.strings.StringManipulator;
+import org.jabref.model.util.ResultingStringState;
+
+public class TextInputKeyBindings {
+
+    public static void call(Scene scene, KeyEvent event) {
+        if (scene.focusOwnerProperty().get() instanceof TextInputControl) {
+            KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
+            TextInputControl focusedTextField = (TextInputControl) scene.focusOwnerProperty().get();
+            keyBindingRepository.mapToKeyBinding(event).ifPresent(binding -> {
+                switch (binding) {
+                    case EDITOR_DELETE -> {
+                        focusedTextField.deleteNextChar();
+                        event.consume();
+                    }
+                    case EDITOR_BACKWARD -> {
+                        focusedTextField.backward();
+                        event.consume();
+                    }
+                    case EDITOR_FORWARD -> {
+                        focusedTextField.forward();
+                        event.consume();
+                    }
+                    case EDITOR_WORD_BACKWARD -> {
+                        focusedTextField.previousWord();
+                        event.consume();
+                    }
+                    case EDITOR_WORD_FORWARD -> {
+                        focusedTextField.nextWord();
+                        event.consume();
+                    }
+                    case EDITOR_BEGINNING, EDITOR_UP, EDITOR_BEGINNING_DOC -> {
+                        focusedTextField.home();
+                        event.consume();
+                    }
+                    case EDITOR_END, EDITOR_DOWN, EDITOR_END_DOC -> {
+                        focusedTextField.end();
+                        event.consume();
+                    }
+                    case EDITOR_CAPITALIZE -> {
+                        int pos = focusedTextField.getCaretPosition();
+                        String text = focusedTextField.getText(0, focusedTextField.getText().length());
+                        ResultingStringState res = StringManipulator.capitalize(pos, text);
+                        focusedTextField.setText(res.text);
+                        focusedTextField.positionCaret(res.caretPosition);
+                        event.consume();
+                    }
+                    case EDITOR_LOWERCASE -> {
+                        int pos = focusedTextField.getCaretPosition();
+                        String text = focusedTextField.getText(0, focusedTextField.getText().length());
+                        ResultingStringState res = StringManipulator.lowercase(pos, text);
+                        focusedTextField.setText(res.text);
+                        focusedTextField.positionCaret(res.caretPosition);
+                        event.consume();
+                    }
+                    case EDITOR_UPPERCASE -> {
+                        int pos = focusedTextField.getCaretPosition();
+                        String text = focusedTextField.getText(0, focusedTextField.getText().length());
+                        ResultingStringState res = StringManipulator.uppercase(pos, text);
+                        focusedTextField.setText(res.text);
+                        focusedTextField.positionCaret(res.caretPosition);
+                        event.consume();
+                    }
+                    case EDITOR_KILL_LINE -> {
+                        int pos = focusedTextField.getCaretPosition();
+                        focusedTextField.setText(focusedTextField.getText(0, pos));
+                        focusedTextField.positionCaret(pos);
+                        event.consume();
+                    }
+                    case EDITOR_KILL_WORD -> {
+                        int pos = focusedTextField.getCaretPosition();
+                        String text = focusedTextField.getText(0, focusedTextField.getText().length());
+                        ResultingStringState res = StringManipulator.killWord(pos, text);
+                        focusedTextField.setText(res.text);
+                        focusedTextField.positionCaret(res.caretPosition);
+                        event.consume();
+                    }
+                    case EDITOR_KILL_WORD_BACKWARD -> {
+                        int pos = focusedTextField.getCaretPosition();
+                        String text = focusedTextField.getText(0, focusedTextField.getText().length());
+                        ResultingStringState res = StringManipulator.backwardKillWord(pos, text);
+                        focusedTextField.setText(res.text);
+                        focusedTextField.positionCaret(res.caretPosition);
+                        event.consume();
+                    }
+                }
+            });
+        }
+    }
+}

From a9384e02be6dbf86c314205b63ac28f42482d9b6 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Thu, 5 Nov 2020 22:38:53 +0100
Subject: [PATCH 14/16] Added KeyBindingPreset

---
 .../org/jabref/gui/keyboard/KeyBinding.java   | 34 +++++++--------
 .../gui/keyboard/KeyBindingViewModel.java     | 20 +++++++--
 .../gui/keyboard/KeyBindingsDialog.fxml       | 27 ++++++++++--
 .../gui/keyboard/KeyBindingsDialogView.java   | 22 +++++++++-
 .../keyboard/KeyBindingsDialogViewModel.java  | 26 ++++++++++++
 .../presets/BashKeyBindingPreset.java         | 42 +++++++++++++++++++
 .../keyboard/presets/KeyBindingPreset.java    | 11 +++++
 src/main/resources/l10n/JabRef_en.properties  |  3 ++
 8 files changed, 159 insertions(+), 26 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/keyboard/presets/BashKeyBindingPreset.java
 create mode 100644 src/main/java/org/jabref/gui/keyboard/presets/KeyBindingPreset.java

diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
index b17f0bc4027..4c3363c9c6e 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -3,24 +3,24 @@
 import org.jabref.logic.l10n.Localization;
 
 public enum KeyBinding {
-    EDITOR_DELETE("Delete", Localization.lang("Delete text"), "ctrl+D", KeyBindingCategory.EDITOR),
+    EDITOR_DELETE("Delete", Localization.lang("Delete text"), "", KeyBindingCategory.EDITOR),
     // DELETE BACKWARDS = Rubout
-    EDITOR_BACKWARD("Move caret left", Localization.lang("Move caret left"), "ctrl+B", KeyBindingCategory.EDITOR),
-    EDITOR_FORWARD("Move caret right", Localization.lang("Move caret right"), "ctrl+F", KeyBindingCategory.EDITOR),
-    EDITOR_WORD_BACKWARD("Move caret to previous word", Localization.lang("Move caret to previous word"), "alt+B", KeyBindingCategory.EDITOR),
-    EDITOR_WORD_FORWARD("Move caret to next word", Localization.lang("Move caret to next word"), "alt+F", KeyBindingCategory.EDITOR),
-    EDITOR_BEGINNING("Move caret to beginning of line", Localization.lang("Move caret to beginning of line"), "ctrl+A", KeyBindingCategory.EDITOR),
-    EDITOR_END("Move caret to  of line", Localization.lang("Move caret to end of line"), "ctrl+E", KeyBindingCategory.EDITOR),
-    EDITOR_BEGINNING_DOC("Move caret to beginning of text", Localization.lang("Move the caret to the beginning of text"), "alt+LESS", KeyBindingCategory.EDITOR),
-    EDITOR_END_DOC("Move caret to end of text", Localization.lang("Move the caret to the end of text"), "alt+shift+LESS", KeyBindingCategory.EDITOR),
-    EDITOR_UP("Move caret up", Localization.lang("Move the caret up"), "ctrl+P", KeyBindingCategory.EDITOR),
-    EDITOR_DOWN("Move caret down", Localization.lang("Move the caret down"), "ctrl+N", KeyBindingCategory.EDITOR),
-    EDITOR_CAPITALIZE("Capitalize word", Localization.lang("Capitalize current word"), "alt+C", KeyBindingCategory.EDITOR),
-    EDITOR_LOWERCASE("Lowercase word", Localization.lang("Make current word lowercase"), "alt+L", KeyBindingCategory.EDITOR),
-    EDITOR_UPPERCASE("Uppercase word", Localization.lang("Make current word uppercase"), "alt+U", KeyBindingCategory.EDITOR),
-    EDITOR_KILL_LINE("Remove all characters caret to end of line", Localization.lang("Remove line after caret"), "ctrl+K", KeyBindingCategory.EDITOR),
-    EDITOR_KILL_WORD("Remove characters until next word", Localization.lang("Remove characters until next word"), "alt+D", KeyBindingCategory.EDITOR),
-    EDITOR_KILL_WORD_BACKWARD("Characters until previous word", Localization.lang("Remove the current word backwards"), "alt+DELETE", KeyBindingCategory.EDITOR),
+    EDITOR_BACKWARD("Move caret left", Localization.lang("Move caret left"), "", KeyBindingCategory.EDITOR),
+    EDITOR_FORWARD("Move caret right", Localization.lang("Move caret right"), "", KeyBindingCategory.EDITOR),
+    EDITOR_WORD_BACKWARD("Move caret to previous word", Localization.lang("Move caret to previous word"), "", KeyBindingCategory.EDITOR),
+    EDITOR_WORD_FORWARD("Move caret to next word", Localization.lang("Move caret to next word"), "", KeyBindingCategory.EDITOR),
+    EDITOR_BEGINNING("Move caret to beginning of line", Localization.lang("Move caret to beginning of line"), "", KeyBindingCategory.EDITOR),
+    EDITOR_END("Move caret to  of line", Localization.lang("Move caret to end of line"), "", KeyBindingCategory.EDITOR),
+    EDITOR_BEGINNING_DOC("Move caret to beginning of text", Localization.lang("Move the caret to the beginning of text"), "", KeyBindingCategory.EDITOR),
+    EDITOR_END_DOC("Move caret to end of text", Localization.lang("Move the caret to the end of text"), "", KeyBindingCategory.EDITOR),
+    EDITOR_UP("Move caret up", Localization.lang("Move the caret up"), "", KeyBindingCategory.EDITOR),
+    EDITOR_DOWN("Move caret down", Localization.lang("Move the caret down"), "", KeyBindingCategory.EDITOR),
+    EDITOR_CAPITALIZE("Capitalize word", Localization.lang("Capitalize current word"), "", KeyBindingCategory.EDITOR),
+    EDITOR_LOWERCASE("Lowercase word", Localization.lang("Make current word lowercase"), "", KeyBindingCategory.EDITOR),
+    EDITOR_UPPERCASE("Uppercase word", Localization.lang("Make current word uppercase"), "", KeyBindingCategory.EDITOR),
+    EDITOR_KILL_LINE("Remove all characters caret to end of line", Localization.lang("Remove line after caret"), "", KeyBindingCategory.EDITOR),
+    EDITOR_KILL_WORD("Remove characters until next word", Localization.lang("Remove characters until next word"), "", KeyBindingCategory.EDITOR),
+    EDITOR_KILL_WORD_BACKWARD("Characters until previous word", Localization.lang("Remove the current word backwards"), "", KeyBindingCategory.EDITOR),
 
     ABBREVIATE("Abbreviate", Localization.lang("Abbreviate journal names"), "ctrl+alt+A", KeyBindingCategory.TOOLS),
     AUTOGENERATE_CITATION_KEYS("Autogenerate citation keys", Localization.lang("Autogenerate citation keys"), "ctrl+G", KeyBindingCategory.QUALITY),
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingViewModel.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingViewModel.java
index 9ece69df0dd..92ff3bb95f6 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingViewModel.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingViewModel.java
@@ -64,11 +64,11 @@ public String getBinding() {
     private void setBinding(String bind) {
         this.realBinding = bind;
         String[] parts = bind.split(" ");
-        String displayBind = "";
+        StringBuilder displayBind = new StringBuilder();
         for (String part : parts) {
-            displayBind += CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, part) + " ";
+            displayBind.append(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, part)).append(" ");
         }
-        this.shownBinding.set(displayBind.trim().replace(" ", " + "));
+        this.shownBinding.set(displayBind.toString().trim().replace(" ", " + "));
     }
 
     private void setDisplayName() {
@@ -135,7 +135,19 @@ public void resetToDefault() {
         }
     }
 
-    public Optional<JabRefIcon> getIcon() {
+    public void clear() {
+        if (!isCategory()) {
+            String key = getKeyBinding().getConstant();
+            keyBindingRepository.put(key, "");
+            setBinding(keyBindingRepository.get(key));
+        }
+    }
+
+    public Optional<JabRefIcon> getResetIcon() {
+        return isCategory() ? Optional.empty() : Optional.of(IconTheme.JabRefIcons.REFRESH);
+    }
+
+    public Optional<JabRefIcon> getClearIcon() {
         return isCategory() ? Optional.empty() : Optional.of(IconTheme.JabRefIcons.CLEANUP_ENTRIES);
     }
 }
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialog.fxml b/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialog.fxml
index 99983bb67aa..1f95533a47f 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialog.fxml
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialog.fxml
@@ -1,24 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.control.TreeTableColumn?>
 <?import javafx.scene.control.TreeTableView?>
+<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import org.jabref.gui.icon.JabRefIconView?>
 <DialogPane xmlns:fx="http://javafx.com/fxml/1" minHeight="450.0" minWidth="375.0" prefHeight="450.0" prefWidth="407.0"
             xmlns="http://javafx.com/javafx/8.0.65" fx:controller="org.jabref.gui.keyboard.KeyBindingsDialogView">
     <content>
-        <VBox>
+        <VBox spacing="4">
             <TreeTableView fx:id="keyBindingsTable" showRoot="false" styleClass="keybinding-table">
                 <columns>
-                    <TreeTableColumn fx:id="actionColumn" prefWidth="75.0" text="%Action"/>
-                    <TreeTableColumn fx:id="shortcutColumn" prefWidth="75.0" text="%Shortcut"/>
-                    <TreeTableColumn fx:id="resetColumn" maxWidth="600.0" prefWidth="75.0"/>
+                    <TreeTableColumn fx:id="actionColumn" prefWidth="200.0" text="%Action"/>
+                    <TreeTableColumn fx:id="shortcutColumn" prefWidth="100.0" text="%Shortcut"/>
+                    <TreeTableColumn fx:id="resetColumn" maxWidth="25.0" prefWidth="25.0" minWidth="25.0"/>
+                    <TreeTableColumn fx:id="clearColumn" maxWidth="25.0" prefWidth="25.0" minWidth="25.0"/>
                 </columns>
                 <columnResizePolicy>
                     <TreeTableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
                 </columnResizePolicy>
             </TreeTableView>
+            <HBox spacing="4" alignment="CENTER_RIGHT">
+                <Label text="%Preset:"/>
+                <ComboBox fx:id="preset"/>
+                <Button onAction="#loadPreset" styleClass="icon-button,narrow">
+                    <graphic>
+                        <JabRefIconView glyph="REFRESH"/>
+                    </graphic>
+                    <tooltip>
+                        <Tooltip text="%Load preset"/>
+                    </tooltip>
+                </Button>
+            </HBox>
         </VBox>
     </content>
     <ButtonType fx:id="resetButton" text="%Reset Bindings" buttonData="LEFT"/>
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java
index 21170bad2f1..08ce648f648 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java
@@ -4,6 +4,7 @@
 
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.SelectionModel;
 import javafx.scene.control.TreeItem;
@@ -12,9 +13,11 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.JabRefIcon;
+import org.jabref.gui.keyboard.presets.KeyBindingPreset;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.RecursiveTreeItem;
+import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.gui.util.ViewModelTreeTableCellFactory;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.PreferencesService;
@@ -24,12 +27,14 @@
 
 public class KeyBindingsDialogView extends BaseDialog<Void> {
 
+    @FXML private ComboBox<KeyBindingPreset> preset;
     @FXML private ButtonType resetButton;
     @FXML private ButtonType saveButton;
     @FXML private TreeTableView<KeyBindingViewModel> keyBindingsTable;
     @FXML private TreeTableColumn<KeyBindingViewModel, String> actionColumn;
     @FXML private TreeTableColumn<KeyBindingViewModel, String> shortcutColumn;
     @FXML private TreeTableColumn<KeyBindingViewModel, KeyBindingViewModel> resetColumn;
+    @FXML private TreeTableColumn<KeyBindingViewModel, KeyBindingViewModel> clearColumn;
 
     @Inject private KeyBindingRepository keyBindingRepository;
     @Inject private DialogService dialogService;
@@ -66,9 +71,19 @@ private void initialize() {
         actionColumn.setCellValueFactory(cellData -> cellData.getValue().getValue().nameProperty());
         shortcutColumn.setCellValueFactory(cellData -> cellData.getValue().getValue().shownBindingProperty());
         new ViewModelTreeTableCellFactory<KeyBindingViewModel>()
-                .withGraphic(keyBinding -> keyBinding.getIcon().map(JabRefIcon::getGraphicNode).orElse(null))
+                .withGraphic(keyBinding -> keyBinding.getResetIcon().map(JabRefIcon::getGraphicNode).orElse(null))
                 .withOnMouseClickedEvent(keyBinding -> evt -> keyBinding.resetToDefault())
                 .install(resetColumn);
+        new ViewModelTreeTableCellFactory<KeyBindingViewModel>()
+                .withGraphic(keyBinding -> keyBinding.getClearIcon().map(JabRefIcon::getGraphicNode).orElse(null))
+                .withOnMouseClickedEvent(keyBinding -> evt -> keyBinding.clear())
+                .install(clearColumn);
+
+        new ViewModelListCellFactory<KeyBindingPreset>()
+                .withText(KeyBindingPreset::getName)
+                .install(preset);
+        preset.itemsProperty().bind(viewModel.keyBindingPresets());
+        preset.valueProperty().bindBidirectional(viewModel.selectedKeyBindingPreset());
     }
 
     @FXML
@@ -86,4 +101,9 @@ private void saveKeyBindingsAndCloseDialog() {
     private void setDefaultBindings() {
         viewModel.resetToDefault();
     }
+
+    @FXML
+    public void loadPreset() {
+        viewModel.loadPreset();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java
index 6125b01230a..5b18ce244fd 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java
@@ -1,10 +1,14 @@
 package org.jabref.gui.keyboard;
 
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
+import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
@@ -12,6 +16,8 @@
 
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
+import org.jabref.gui.keyboard.presets.BashKeyBindingPreset;
+import org.jabref.gui.keyboard.presets.KeyBindingPreset;
 import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.PreferencesService;
@@ -22,6 +28,9 @@ public class KeyBindingsDialogViewModel extends AbstractViewModel {
     private final PreferencesService preferences;
     private final OptionalObjectProperty<KeyBindingViewModel> selectedKeyBinding = OptionalObjectProperty.empty();
     private final ObjectProperty<KeyBindingViewModel> rootKeyBinding = new SimpleObjectProperty<>();
+    private final ListProperty<KeyBindingPreset> keyBindingPresets = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final SimpleObjectProperty<KeyBindingPreset> selectedKeyBindingPreset = new SimpleObjectProperty<>();
+
     private final DialogService dialogService;
 
     public KeyBindingsDialogViewModel(KeyBindingRepository keyBindingRepository, DialogService dialogService, PreferencesService preferences) {
@@ -29,6 +38,7 @@ public KeyBindingsDialogViewModel(KeyBindingRepository keyBindingRepository, Dia
         this.dialogService = Objects.requireNonNull(dialogService);
         this.preferences = Objects.requireNonNull(preferences);
         populateTable();
+        keyBindingPresets.add(new BashKeyBindingPreset());
     }
 
     public OptionalObjectProperty<KeyBindingViewModel> selectedKeyBindingProperty() {
@@ -94,4 +104,20 @@ public void resetToDefault() {
             }
         });
     }
+
+    public void loadPreset() {
+        if (selectedKeyBindingPreset.isNotNull().get()) {
+            Map<KeyBinding, String> preset = selectedKeyBindingPreset.get().getKeyBindings();
+            preset.forEach(keyBindingRepository::put);
+            populateTable();
+        }
+    }
+
+    public ListProperty<KeyBindingPreset> keyBindingPresets() {
+        return keyBindingPresets;
+    }
+
+    public SimpleObjectProperty<KeyBindingPreset> selectedKeyBindingPreset() {
+        return selectedKeyBindingPreset;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/keyboard/presets/BashKeyBindingPreset.java b/src/main/java/org/jabref/gui/keyboard/presets/BashKeyBindingPreset.java
new file mode 100644
index 00000000000..15528af1023
--- /dev/null
+++ b/src/main/java/org/jabref/gui/keyboard/presets/BashKeyBindingPreset.java
@@ -0,0 +1,42 @@
+package org.jabref.gui.keyboard.presets;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jabref.gui.keyboard.KeyBinding;
+
+public class BashKeyBindingPreset implements KeyBindingPreset {
+
+    private static final Map<KeyBinding, String> KEY_BINDINGS = new HashMap<>();
+
+    static {
+        KEY_BINDINGS.put(KeyBinding.EDITOR_DELETE, "ctrl+D");
+        // DELETE BACKWARDS = Rubout
+        KEY_BINDINGS.put(KeyBinding.EDITOR_BACKWARD, "ctrl+B");
+        KEY_BINDINGS.put(KeyBinding.EDITOR_FORWARD, "ctrl+F");
+        KEY_BINDINGS.put(KeyBinding.EDITOR_WORD_BACKWARD, "alt+B");
+        KEY_BINDINGS.put(KeyBinding.EDITOR_WORD_FORWARD, "alt+F");
+        KEY_BINDINGS.put(KeyBinding.EDITOR_BEGINNING, "ctrl+A");
+        KEY_BINDINGS.put(KeyBinding.EDITOR_END, "ctrl+E");
+        KEY_BINDINGS.put(KeyBinding.EDITOR_BEGINNING_DOC, "alt+LESS");
+        KEY_BINDINGS.put(KeyBinding.EDITOR_END_DOC, "alt+shift+LESS");
+        KEY_BINDINGS.put(KeyBinding.EDITOR_UP, "ctrl+P");
+        KEY_BINDINGS.put(KeyBinding.EDITOR_DOWN, "ctrl+N");
+        KEY_BINDINGS.put(KeyBinding.EDITOR_CAPITALIZE, "alt+C");
+        KEY_BINDINGS.put(KeyBinding.EDITOR_LOWERCASE, "alt+L");
+        KEY_BINDINGS.put(KeyBinding.EDITOR_UPPERCASE, "alt+U");
+        KEY_BINDINGS.put(KeyBinding.EDITOR_KILL_LINE, "ctrl+K");
+        KEY_BINDINGS.put(KeyBinding.EDITOR_KILL_WORD, "alt+D");
+        KEY_BINDINGS.put(KeyBinding.EDITOR_KILL_WORD_BACKWARD, "alt+DELETE");
+    }
+
+    @Override
+    public String getName() {
+        return "Bash";
+    }
+
+    @Override
+    public Map<KeyBinding, String> getKeyBindings() {
+        return KEY_BINDINGS;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/keyboard/presets/KeyBindingPreset.java b/src/main/java/org/jabref/gui/keyboard/presets/KeyBindingPreset.java
new file mode 100644
index 00000000000..abea89b1c16
--- /dev/null
+++ b/src/main/java/org/jabref/gui/keyboard/presets/KeyBindingPreset.java
@@ -0,0 +1,11 @@
+package org.jabref.gui.keyboard.presets;
+
+import java.util.Map;
+
+import org.jabref.gui.keyboard.KeyBinding;
+
+public interface KeyBindingPreset {
+    String getName();
+
+    Map<KeyBinding, String> getKeyBindings();
+}
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 82320fca68d..dab466025c2 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2291,6 +2291,9 @@ The\ query\ cannot\ contain\ a\ year\ and\ year-range\ field.=The query cannot c
 This\ query\ uses\ unsupported\ fields.=This query uses unsupported fields.
 This\ query\ uses\ unsupported\ syntax.=This query uses unsupported syntax.
 
+Preset\:=Preset:
+Load\ preset=Load preset
+
 Check\ Proxy\ Setting=Check Proxy Setting
 Check\ connection=Check connection
 Connection\ failed\!=Connection failed\!

From 0d3a9d091f4763620d76d21642efb7c76aa884f3 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Fri, 6 Nov 2020 15:05:18 +0100
Subject: [PATCH 15/16] Changed preset combobox to menubutton

---
 .../gui/keyboard/KeyBindingsDialog.fxml       | 17 ++------------
 .../gui/keyboard/KeyBindingsDialogView.java   | 23 ++++++++-----------
 .../keyboard/KeyBindingsDialogViewModel.java  | 17 +++++---------
 src/main/resources/l10n/JabRef_en.properties  |  3 +--
 4 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialog.fxml b/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialog.fxml
index 1f95533a47f..076e1465146 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialog.fxml
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialog.fxml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonType?>
-<?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Tooltip?>
+<?import javafx.scene.control.MenuButton?>
 <?import javafx.scene.control.TreeTableColumn?>
 <?import javafx.scene.control.TreeTableView?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<?import org.jabref.gui.icon.JabRefIconView?>
 <DialogPane xmlns:fx="http://javafx.com/fxml/1" minHeight="450.0" minWidth="375.0" prefHeight="450.0" prefWidth="407.0"
             xmlns="http://javafx.com/javafx/8.0.65" fx:controller="org.jabref.gui.keyboard.KeyBindingsDialogView">
     <content>
@@ -27,16 +23,7 @@
                 </columnResizePolicy>
             </TreeTableView>
             <HBox spacing="4" alignment="CENTER_RIGHT">
-                <Label text="%Preset:"/>
-                <ComboBox fx:id="preset"/>
-                <Button onAction="#loadPreset" styleClass="icon-button,narrow">
-                    <graphic>
-                        <JabRefIconView glyph="REFRESH"/>
-                    </graphic>
-                    <tooltip>
-                        <Tooltip text="%Load preset"/>
-                    </tooltip>
-                </Button>
+                <MenuButton fx:id="presetsButton" text="%Presets"/>
             </HBox>
         </VBox>
     </content>
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java
index 08ce648f648..da62dd47d78 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java
@@ -4,7 +4,8 @@
 
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
-import javafx.scene.control.ComboBox;
+import javafx.scene.control.MenuButton;
+import javafx.scene.control.MenuItem;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.SelectionModel;
 import javafx.scene.control.TreeItem;
@@ -17,7 +18,6 @@
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.RecursiveTreeItem;
-import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.gui.util.ViewModelTreeTableCellFactory;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.PreferencesService;
@@ -27,7 +27,6 @@
 
 public class KeyBindingsDialogView extends BaseDialog<Void> {
 
-    @FXML private ComboBox<KeyBindingPreset> preset;
     @FXML private ButtonType resetButton;
     @FXML private ButtonType saveButton;
     @FXML private TreeTableView<KeyBindingViewModel> keyBindingsTable;
@@ -35,6 +34,7 @@ public class KeyBindingsDialogView extends BaseDialog<Void> {
     @FXML private TreeTableColumn<KeyBindingViewModel, String> shortcutColumn;
     @FXML private TreeTableColumn<KeyBindingViewModel, KeyBindingViewModel> resetColumn;
     @FXML private TreeTableColumn<KeyBindingViewModel, KeyBindingViewModel> clearColumn;
+    @FXML private MenuButton presetsButton;
 
     @Inject private KeyBindingRepository keyBindingRepository;
     @Inject private DialogService dialogService;
@@ -79,11 +79,13 @@ private void initialize() {
                 .withOnMouseClickedEvent(keyBinding -> evt -> keyBinding.clear())
                 .install(clearColumn);
 
-        new ViewModelListCellFactory<KeyBindingPreset>()
-                .withText(KeyBindingPreset::getName)
-                .install(preset);
-        preset.itemsProperty().bind(viewModel.keyBindingPresets());
-        preset.valueProperty().bindBidirectional(viewModel.selectedKeyBindingPreset());
+        viewModel.keyBindingPresets().forEach(preset -> presetsButton.getItems().add(createMenuItem(preset)));
+    }
+
+    private MenuItem createMenuItem(KeyBindingPreset preset) {
+        MenuItem item = new MenuItem(preset.getName());
+        item.setOnAction((event) -> viewModel.loadPreset(preset));
+        return item;
     }
 
     @FXML
@@ -101,9 +103,4 @@ private void saveKeyBindingsAndCloseDialog() {
     private void setDefaultBindings() {
         viewModel.resetToDefault();
     }
-
-    @FXML
-    public void loadPreset() {
-        viewModel.loadPreset();
-    }
 }
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java
index 5b18ce244fd..e88c9c7e8ba 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.keyboard;
 
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -29,7 +28,6 @@ public class KeyBindingsDialogViewModel extends AbstractViewModel {
     private final OptionalObjectProperty<KeyBindingViewModel> selectedKeyBinding = OptionalObjectProperty.empty();
     private final ObjectProperty<KeyBindingViewModel> rootKeyBinding = new SimpleObjectProperty<>();
     private final ListProperty<KeyBindingPreset> keyBindingPresets = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final SimpleObjectProperty<KeyBindingPreset> selectedKeyBindingPreset = new SimpleObjectProperty<>();
 
     private final DialogService dialogService;
 
@@ -105,19 +103,16 @@ public void resetToDefault() {
         });
     }
 
-    public void loadPreset() {
-        if (selectedKeyBindingPreset.isNotNull().get()) {
-            Map<KeyBinding, String> preset = selectedKeyBindingPreset.get().getKeyBindings();
-            preset.forEach(keyBindingRepository::put);
-            populateTable();
+    public void loadPreset(KeyBindingPreset preset) {
+        if (preset == null) {
+            return;
         }
+
+        preset.getKeyBindings().forEach(keyBindingRepository::put);
+        populateTable();
     }
 
     public ListProperty<KeyBindingPreset> keyBindingPresets() {
         return keyBindingPresets;
     }
-
-    public SimpleObjectProperty<KeyBindingPreset> selectedKeyBindingPreset() {
-        return selectedKeyBindingPreset;
-    }
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index dab466025c2..bfdd78a2ee4 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2291,8 +2291,7 @@ The\ query\ cannot\ contain\ a\ year\ and\ year-range\ field.=The query cannot c
 This\ query\ uses\ unsupported\ fields.=This query uses unsupported fields.
 This\ query\ uses\ unsupported\ syntax.=This query uses unsupported syntax.
 
-Preset\:=Preset:
-Load\ preset=Load preset
+Presets
 
 Check\ Proxy\ Setting=Check Proxy Setting
 Check\ connection=Check connection

From 0c59a82f35fec85408ac85450424e7ef42d8e7b1 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Fri, 6 Nov 2020 20:33:50 +0100
Subject: [PATCH 16/16] l10n and CHANGELOG.md

---
 CHANGELOG.md                                 | 1 +
 src/main/resources/l10n/JabRef_en.properties | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ac0763c54e..33c53b44973 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ to the page field for cases where the page numbers are missing. [#7019](https://
 - We added a new fetcher to enable users to search jstor.org [#6627](https://github.com/JabRef/jabref/issues/6627)
 - We added an error message in the New Entry dialog that is shown in case the fetcher did not find anything . [#7000](https://github.com/JabRef/jabref/issues/7000)
 - We added a new formatter to output shorthand month format. [#6579](https://github.com/JabRef/jabref/issues/6579)
+- We reintroduced emacs/bash-like keybindings. [#6017](https://github.com/JabRef/jabref/issues/6017)
 
 ### Changed
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index bfdd78a2ee4..61ed00ff4cb 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2291,7 +2291,7 @@ The\ query\ cannot\ contain\ a\ year\ and\ year-range\ field.=The query cannot c
 This\ query\ uses\ unsupported\ fields.=This query uses unsupported fields.
 This\ query\ uses\ unsupported\ syntax.=This query uses unsupported syntax.
 
-Presets
+Presets=Presets
 
 Check\ Proxy\ Setting=Check Proxy Setting
 Check\ connection=Check connection