Merge branch 'JabRef:main' into fix-for-issue-12296

Author: AbdoMostfa2

.github/workflows/on-issue-comment.yml

@@ -16,7 +16,7 @@ jobs:
         uses: takanome-dev/assign-issue-action@edge
         with:
           github_token: '${{ secrets.GITHUB_TOKEN }}'
-          days_until_unassign: 45
+          days_until_unassign: 14
           maintainers: 'koppor,Siedlerchr,ThiloteE,calixtus,HoussemNasri,subhramit,LinusDietz'
           assigned_comment: |
             👋 Hey @{{ handle }}, thank you for your interest in this issue! 🎉
@@ -29,7 +29,7 @@ jobs:
 
             Happy coding! 🚀
 
-            ⏳ Please note, you will be automatically unassigned if the issue isn't closed within **{{ total_days }} days** (by **{{ unassigned_date }}**). A maintainer can also add the "**{{ pin_label }}**" label to prevent automatic unassignment.
+            ⏳ Please note, you will be automatically unassigned if there is not a (draft) pull request within **{{ total_days }} days** (by **{{ unassigned_date }}**).
           assignment_suggestion_comment: >
             👋 Hey @{{ handle }}, looks like you’re eager to work on this issue—great! 🎉
             It also looks like you skipped reading our [CONTRIBUTING.md](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md), which explains exactly how to participate. No worries, it happens to the best of us.

.github/workflows/on-pr-closed.yml

@@ -56,6 +56,10 @@ jobs:
         run: gh issue edit ${{ steps.get_issue_number.outputs.ticketNumber }} --remove-label "📍 Assigned"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Remove pinned label
+        run: gh issue edit ${{ steps.get_issue_number.outputs.ticketNumber }} --remove-label "📌 Pinned"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Remove FirstTimeCodeContribution label
         run: gh issue edit ${{ steps.get_issue_number.outputs.ticketNumber }} --remove-label "FirstTimeCodeContribution"
         env:

.github/workflows/on-pr-opened.yml

@@ -49,7 +49,12 @@ jobs:
         with:
           show-progress: 'false'
       - name: Assign PR creator to issue
-        run: gh issue edit ${{ steps.get_issue_number.outputs.ticketNumber }} --add-assignee ${{ github.event.pull_request.user.login }}
+        # "gh issue edit" cannot be used - workaround found at https://github.com/cli/cli/issues/9620#issuecomment-2703135049
+        run: gh api -X PATCH /repos/JabRef/jabref/issues/${{ steps.get_issue_number.outputs.ticketNumber }} -f assignee=${{ github.event.pull_request.user.login }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Add label "📌 Pinned"
+        run: gh issue edit ${{ steps.get_issue_number.outputs.ticketNumber }} --add-label "📌 Pinned"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   conflicts_with_target:

.github/workflows/tests.yml

@@ -392,7 +392,7 @@ jobs:
 
   unmodified_submodules:
     name: Submodules not modified
-    if: github.actor != 'dependabot[bot]'
+    if: github.actor != 'dependabot[bot]' && github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/unassign-issues.yml

@@ -19,7 +19,7 @@ jobs:
         uses: takanome-dev/assign-issue-action@edge
         with:
           github_token: '${{ secrets.GITHUB_TOKEN }}'
-          days_until_unassign: 45
+          days_until_unassign: 14
   move_unassigned_issues:
     needs: unassign_issues
     if: ${{ needs.unassign_issues.outputs.unassigned_issues != '[]' }}

CHANGELOG.md

@@ -22,6 +22,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We added an integrity check if a URL appears in a title. [#12354](https://github.com/JabRef/jabref/issues/12354)
 - We added a feature for enabling drag-and-drop of files into groups  [#12540](https://github.com/JabRef/jabref/issues/12540)
 - We added support for reordering keywords via drag and drop, automatic alphabetical ordering, and improved pasting and editing functionalities in the keyword editor. [#10984](https://github.com/JabRef/jabref/issues/10984)
+- We added a new functionality where author names having multiple spaces in-between will be considered as separate user block as it does for " and ". [#12701](https://github.com/JabRef/jabref/issues/12701)
 
 ### Changed
 

src/main/java/org/jabref/logic/importer/AuthorListParser.java

@@ -39,6 +39,10 @@ public class AuthorListParser {
 
     private static final Pattern STARTS_WITH_CAPITAL_LETTER_DOT_OR_DASH = Pattern.compile("^[A-Z](\\.[ -]| ?-)");
 
+    private static final Pattern MULTIPLE_SPACE_PATTERN = Pattern.compile("\\s{2,}");
+
+    private static final Pattern NEW_LINE_PATTERN = Pattern.compile("\\s*\\n\\s*");
+
     /**
      * the raw bibtex author/editor field
      */
@@ -100,6 +104,10 @@ private record SimpleNormalFormResult(String authors, boolean andOthersPresent)
 
     private static SimpleNormalFormResult getSimpleNormalForm(String listOfNames) {
         listOfNames = listOfNames.replace(" -", "-").trim();
+        if (!listOfNames.contains(",") && (MULTIPLE_SPACE_PATTERN.matcher(listOfNames).find() || listOfNames.contains("\n"))) {
+            listOfNames = NEW_LINE_PATTERN.matcher(listOfNames).replaceAll(" and ");
+            listOfNames = MULTIPLE_SPACE_PATTERN.matcher(listOfNames).replaceAll(" and ");
+        }
 
         // Handling of "and others"
         // Remove it from the list; it will be added at the very end of this method as special Author.OTHERS

src/test/java/org/jabref/logic/importer/AuthorListParserTest.java

@@ -79,7 +79,37 @@ private static Stream<Arguments> parseMultipleCorrectly() {
                                 new Author("Thomas", "T.", null, "Lai", null)
                         ),
                         "U, Vivian and Lai, Thomas"
-                )
+                ),
+                Arguments.of(
+                        AuthorList.of(
+                                new Author("I.", "I.", null, "Podadera", null),
+                                new Author("J. M.", "J. M.", null, "Carmona", null),
+                                new Author("A.", "A.", null, "Ibarra", null),
+                                new Author("J.", "J.", null, "Molla", null)
+                        ),
+                        "I. Podadera      J. M. Carmona     A. Ibarra     J. Molla"),
+                Arguments.of(
+                        AuthorList.of(
+                                new Author("Alexander", "A.", null, "Artemenko", null),
+                                new Author("I.", "I.", null, "Podadera", null),
+                                new Author("J. M.", "J. M.", null, "Carmona", null)
+                        ),
+                        """
+                        Alexander Artemenko
+                        I. Podadera
+                        J. M. Carmona
+                        """),
+                Arguments.of(
+                        AuthorList.of(
+                                new Author("First1", "F.", null, "Last1", null),
+                                new Author("First2", "F.", null, "Last2", null),
+                                new Author("First3", "F.", null, "Last3", null)
+                        ),
+                        """
+                        First1 Last1
+                            First2 Last2
+                            First3 Last3
+                        """)
         );
     }