Fixes generated bibtex key and display of institute authors

CHANGELOG.md

@@ -72,6 +72,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where brackets in regular expressions were not working. [6469](https://github.com/JabRef/jabref/pull/6469)
 - We fixed an issue where LaTeX citations for specific commands (\autocites) of biblatex-mla were not recognized. [#6476](https://github.com/JabRef/jabref/issues/6476)
 - We fixed an issue where drag and drop was not working on empty database. [#6487](https://github.com/JabRef/jabref/issues/6487)
+- We fixed an issue where "null" appeared in generated BibTeX keys. [#6459](https://github.com/JabRef/jabref/issues/6459)
+- We fixed an issue where the authors' names were incorrectly displayed in the authors' column when they were bracketed. [#6465](https://github.com/JabRef/jabref/issues/6465) [#6459](https://github.com/JabRef/jabref/issues/6459)
 
 ### Removed
 

src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java

@@ -115,28 +115,27 @@ public ObservableValue<String> getFields(OrFields fields) {
         ObservableValue<String> value = fieldValues.get(fields);
         if (value != null) {
             return value;
-        } else {
-            value = Bindings.createStringBinding(() -> {
-                boolean isName = false;
+        }
 
-                Optional<String> content = Optional.empty();
-                for (Field field : fields) {
-                    content = entry.getResolvedFieldOrAliasLatexFree(field, database);
-                    if (content.isPresent()) {
-                        isName = field.getProperties().contains(FieldProperty.PERSON_NAMES);
-                        break;
-                    }
-                }
+        value = Bindings.createStringBinding(() -> {
+            for (Field field : fields) {
+                if (field.getProperties().contains(FieldProperty.PERSON_NAMES)) {
+                    Optional<String> name = entry.getResolvedFieldOrAlias(field, database);
 
-                String result = content.orElse(null);
-                if (isName) {
-                    return nameFormatter.formatName(result);
+                    if (name.isPresent()) {
+                        return nameFormatter.formatNameLatexFree(name.get());
+                    }
                 } else {
-                    return result;
+                    Optional<String> content = entry.getResolvedFieldOrAliasLatexFree(field, database);
+
+                    if (content.isPresent()) {
+                        return content.get();
+                    }
                 }
-            }, entry.getObservables());
-            fieldValues.put(fields, value);
-            return value;
-        }
+            }
+            return "";
+        }, entry.getObservables());
+        fieldValues.put(fields, value);
+        return value;
     }
 }

src/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java

@@ -20,26 +20,28 @@ public class MainTableNameFormatter {
     }
 
     /**
-     * Format a name field for the table, according to user preferences.
+     * Format a name field for the table, according to user preferences and with latex expressions translated if
+     * possible.
      *
      * @param nameToFormat The contents of the name field.
      * @return The formatted name field.
      */
-    public String formatName(final String nameToFormat) {
+    public String formatNameLatexFree(final String nameToFormat) {
         if (nameToFormat == null) {
             return null;
         }
+        AuthorList authors = AuthorList.parse(nameToFormat);
 
         if (namesAsIs) {
             return nameToFormat;
         } else if (namesNatbib) {
-            return AuthorList.fixAuthorNatbib(nameToFormat);
+            return authors.getAsNatbibLatexFree();
         } else if (namesLastOnly) {
-            return AuthorList.fixAuthorLastNameOnlyCommas(nameToFormat, false);
+            return authors.getAsLastNamesLatexFree(false);
         } else if (namesFf) {
-            return AuthorList.fixAuthorFirstNameFirstCommas(nameToFormat, abbrAuthorNames, false);
+            return authors.getAsFirstLastNamesLatexFree(abbrAuthorNames, false);
         } else {
-            return AuthorList.fixAuthorLastNameFirstCommas(nameToFormat, abbrAuthorNames, false);
+            return authors.getAsLastFirstNamesLatexFree(abbrAuthorNames, false);
         }
     }
 }