Merge remote-tracking branch 'upstream/main' into addNoopReader

* upstream/main:
  Added static (stream & preferences) constructors to BibDatabaseContext (#13694)
  New Crowdin updates (#13698)
  fix git modules requires and uses (#13696)
  Focus "Specify Bib(La)TeX" when Bib(La)TeX is in clipboard (#13633)

Author: Siedlerchr

CHANGELOG.md

@@ -73,10 +73,11 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We introduced walkthrough functionality [#12664](https://github.com/JabRef/jabref/issues/12664)
 
 ### Fixed
-  
+
+- We fixed an issue where "Specify Bib(La)TeX" tab was not focused when Bib(La)TeX was in the clipboard [#13597](https://github.com/JabRef/jabref/issues/13597)
 - We fixed an issue whereby the 'About' dialog was not honouring the user's configured font preferences. [#13558](https://github.com/JabRef/jabref/issues/13558)
 - We fixed an issue where the Pagetotal column was sorting the values alphabetically instead of numerically. [#12533](https://github.com/JabRef/jabref/issues/12533)
-- We fixed dark mode of BibTeX Source dialog in Citation Relations tab. [#13599](https://github.com/JabRef/jabref/issues/13599)
+- We fixed the dark mode of the BibTeX Source dialog in the Citation Relations tab. [#13599](https://github.com/JabRef/jabref/issues/13599)
 - We fixed an issue where the LibreOffice integration did not support citation keys containing Unicode characters. [#13301](https://github.com/JabRef/jabref/issues/13301)
 - We fixed an issue where the "Search ShortScience" action did not convert LaTeX-formatted titles to Unicode. [#13418](https://github.com/JabRef/jabref/issues/13418)
 - We fixed an issue where LaTeX file directories were not properly shared between different users on the same host. [#9990](https://github.com/JabRef/jabref/issues/9990)

jabgui/src/main/java/org/jabref/gui/newentry/NewEntryView.java

@@ -74,6 +74,9 @@
 import jakarta.inject.Inject;
 
 public class NewEntryView extends BaseDialog<BibEntry> {
+    private static final String BIBTEX_REGEX = "^@([A-Za-z]+)\\{,";
+    private static final String LINE_BREAK = "\n";
+
     private NewEntryViewModel viewModel;
 
     private final NewEntryDialogTab initialApproach;
@@ -164,6 +167,8 @@ private void finalizeTabs() {
                     approach = NewEntryDialogTab.ENTER_IDENTIFIER;
                     interpretText.setText(clipboardText);
                     interpretText.selectAll();
+                } else if (clipboardText.split(LINE_BREAK)[0].matches(BIBTEX_REGEX)) {
+                    approach = NewEntryDialogTab.SPECIFY_BIBTEX;
                 } else {
                     approach = preferences.getLatestApproach();
                 }
@@ -288,7 +293,7 @@ private void initializeLookupIdentifier() {
                     Tooltip.uninstall(idText, idTextTooltip);
                 }
             });
-            
+
             idText.setText(ClipBoardManager.getContents().trim());
             idText.selectAll();
 

jablib/src/main/java/org/jabref/model/database/BibDatabaseContext.java

@@ -1,6 +1,9 @@
 package org.jabref.model.database;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -282,14 +285,25 @@ public Path getFulltextIndexPath() {
         return indexPath;
     }
 
-    public static BibDatabaseContext of(String bibContent, ImportFormatPreferences importFormatPreferences) throws JabRefException {
+    public static BibDatabaseContext of(Reader bibContentReader, ImportFormatPreferences importFormatPreferences) throws JabRefException {
         BibtexParser parser = new BibtexParser(importFormatPreferences);
         try {
-            Reader reader = Reader.of(bibContent);
-            ParserResult result = parser.parse(reader);
+            ParserResult result = parser.parse(bibContentReader);
             return result.getDatabaseContext();
         } catch (IOException e) {
-            throw new JabRefException("Failed to parse BibTeX content", e);
+            throw new JabRefException("Failed to parse BibTeX", e);
+        }
+    }
+
+    public static BibDatabaseContext of(String bibContent, ImportFormatPreferences importFormatPreferences) throws JabRefException {
+        return of(Reader.of(bibContent), importFormatPreferences);
+    }
+
+    public static BibDatabaseContext of(InputStream bibContentStream, ImportFormatPreferences importFormatPreferences) throws JabRefException {
+        try (Reader reader = new BufferedReader(new InputStreamReader(bibContentStream))) {
+            return of(reader, importFormatPreferences);
+        } catch (IOException e) {
+            throw new JabRefException("Failed to close stream", e);
         }
     }
 

jablib/src/main/resources/l10n/JabRef_fr.properties

@@ -1086,8 +1086,11 @@ Waiting\ for\ background\ tasks\ to\ finish.\ Quit\ anyway?=En attente de la fin
 Find\ and\ remove\ duplicate\ citation\ keys=Rechercher et supprimer les clefs de citation dupliquées
 
 Library-specific\ file\ directory=Répertoire spécifique au fichier
+Library-specific\ file\ directory\:\ %0=Répertoire spécifique aux fichiers bibliographiques \: %0
 LaTeX\ file\ directory=Répertoire de fichiers LaTeX
+LaTeX\ file\ directory\:\ %0=Répertoire de fichiers LaTeX \: %0
 User-specific\ file\ directory=Répertoire de fichiers spécifique à l'utilisateur
+User-specific\ file\ directory\:\ %0=Répertoire spécifique des fichiers de l'utilisateur \: %0
 
 Path\ %0\ could\ not\ be\ resolved.\ Using\ working\ directory.=Le chemin %0 n'a pas pu être trouvé. Utilisation du répertoire de travail.
 Switch\ to\ absolute\ path\:\ converts\ the\ path\ to\ an\ absolute\ path.=Basculer vers un chemin absolu \: convertit le chemin vers un chemin absolu.

jablib/src/main/resources/l10n/JabRef_pt_BR.properties

@@ -1086,8 +1086,11 @@ Waiting\ for\ background\ tasks\ to\ finish.\ Quit\ anyway?=Aguardando a finaliz
 Find\ and\ remove\ duplicate\ citation\ keys=Localizar e remover chaves de citação duplicadas
 
 Library-specific\ file\ directory=Diretório de arquivos específicos da biblioteca
+Library-specific\ file\ directory\:\ %0=Diretório de arquivo específico de biblioteca\: %0
 LaTeX\ file\ directory=Diretório de arquivos LaTeX
+LaTeX\ file\ directory\:\ %0=Diretório de arquivos LaTeX\: %0
 User-specific\ file\ directory=Diretório de arquivo específico do usuário
+User-specific\ file\ directory\:\ %0=Diretório do arquivo específico do usuário\: %0
 
 Path\ %0\ could\ not\ be\ resolved.\ Using\ working\ directory.=Caminho %0 não pode ser resolvido. Usando o diretório de trabalho.
 Switch\ to\ absolute\ path\:\ converts\ the\ path\ to\ an\ absolute\ path.=Alternar para caminho absoluto\: converte o caminho para um caminho absoluto.

jablib/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java

@@ -2,17 +2,15 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
 
+import org.jabref.logic.JabRefException;
 import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
 import org.junit.jupiter.api.AfterEach;
@@ -39,13 +37,11 @@ void tearDown() {
     }
 
     @Test
-    void normal() throws URISyntaxException, IOException {
-        InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
-        Path auxFile = Path.of(AuxParserTest.class.getResource("paper.aux").toURI());
-        try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
-            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
-
-            AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
+    void normal() throws URISyntaxException, IOException, JabRefException {
+        try (InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib")) {
+            Path auxFile = Path.of(AuxParserTest.class.getResource("paper.aux").toURI());
+            final BibDatabaseContext bibDatabaseContext = BibDatabaseContext.of(originalStream, importFormatPreferences);
+            AuxParser auxParser = new DefaultAuxParser(bibDatabaseContext.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
 
             assertTrue(auxResult.getGeneratedBibDatabase().hasEntries());
@@ -64,15 +60,12 @@ void normal() throws URISyntaxException, IOException {
     }
 
     @Test
-    void twoArgMacro() throws URISyntaxException, IOException {
+    void twoArgMacro() throws URISyntaxException, IOException, JabRefException {
         // Result should be identical to that of testNormal
-
-        InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
-        Path auxFile = Path.of(AuxParserTest.class.getResource("papertwoargmacro.aux").toURI());
-        try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
-            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
-
-            AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
+        try (InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib")) {
+            Path auxFile = Path.of(AuxParserTest.class.getResource("papertwoargmacro.aux").toURI());
+            final BibDatabaseContext bibDatabaseContext = BibDatabaseContext.of(originalStream, importFormatPreferences);
+            AuxParser auxParser = new DefaultAuxParser(bibDatabaseContext.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
 
             assertTrue(auxResult.getGeneratedBibDatabase().hasEntries());
@@ -91,13 +84,11 @@ void twoArgMacro() throws URISyntaxException, IOException {
     }
 
     @Test
-    void notAllFound() throws URISyntaxException, IOException {
-        InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
-        Path auxFile = Path.of(AuxParserTest.class.getResource("badpaper.aux").toURI());
-        try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
-            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
-
-            AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
+    void notAllFound() throws URISyntaxException, IOException, JabRefException {
+        try (InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib")) {
+            Path auxFile = Path.of(AuxParserTest.class.getResource("badpaper.aux").toURI());
+            final BibDatabaseContext bibDatabaseContext = BibDatabaseContext.of(originalStream, importFormatPreferences);
+            AuxParser auxParser = new DefaultAuxParser(bibDatabaseContext.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
 
             assertTrue(auxResult.getGeneratedBibDatabase().hasEntries());
@@ -113,13 +104,11 @@ void notAllFound() throws URISyntaxException, IOException {
     }
 
     @Test
-    void duplicateBibDatabaseConfiguration() throws URISyntaxException, IOException {
-        InputStream originalStream = AuxParserTest.class.getResourceAsStream("config.bib");
-        Path auxFile = Path.of(AuxParserTest.class.getResource("paper.aux").toURI());
-        try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
-            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
-
-            AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
+    void duplicateBibDatabaseConfiguration() throws URISyntaxException, IOException, JabRefException {
+        try (InputStream originalStream = AuxParserTest.class.getResourceAsStream("config.bib")) {
+            Path auxFile = Path.of(AuxParserTest.class.getResource("paper.aux").toURI());
+            final BibDatabaseContext bibDatabaseContext = BibDatabaseContext.of(originalStream, importFormatPreferences);
+            AuxParser auxParser = new DefaultAuxParser(bibDatabaseContext.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
             BibDatabase db = auxResult.getGeneratedBibDatabase();
 
@@ -129,13 +118,11 @@ void duplicateBibDatabaseConfiguration() throws URISyntaxException, IOException
     }
 
     @Test
-    void nestedAux() throws URISyntaxException, IOException {
-        InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
-        Path auxFile = Path.of(AuxParserTest.class.getResource("nested.aux").toURI());
-        try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
-            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
-
-            AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
+    void nestedAux() throws URISyntaxException, IOException, JabRefException {
+        try (InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib")) {
+            Path auxFile = Path.of(AuxParserTest.class.getResource("nested.aux").toURI());
+            final BibDatabaseContext bibDatabaseContext = BibDatabaseContext.of(originalStream, importFormatPreferences);
+            AuxParser auxParser = new DefaultAuxParser(bibDatabaseContext.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
 
             assertTrue(auxResult.getGeneratedBibDatabase().hasEntries());
@@ -151,13 +138,11 @@ void nestedAux() throws URISyntaxException, IOException {
     }
 
     @Test
-    void crossRef() throws URISyntaxException, IOException {
-        InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
-        Path auxFile = Path.of(AuxParserTest.class.getResource("crossref.aux").toURI());
-        try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
-            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
-
-            AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
+    void crossRef() throws URISyntaxException, IOException, JabRefException {
+        try (InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib")) {
+            Path auxFile = Path.of(AuxParserTest.class.getResource("crossref.aux").toURI());
+            final BibDatabaseContext bibDatabaseContext = BibDatabaseContext.of(originalStream, importFormatPreferences);
+            AuxParser auxParser = new DefaultAuxParser(bibDatabaseContext.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
 
             assertTrue(auxResult.getGeneratedBibDatabase().hasEntries());