Fix CSL rendering in case of article

CHANGELOG.md

@@ -40,6 +40,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where opening the changelog from withing JabRef led to a 404 error [#8563](https://github.com/JabRef/jabref/issues/8563)
 - We fixed an issue where not all found unlinked local files were imported correctly due to some race condition. [#8444](https://github.com/JabRef/jabref/issues/8444)
 - We fixed an issue where Merge entries dialog exceeds screen boundaries.
+- We fixed the page ranges checker to detect article numbers (used at [Check Integrity](https://docs.jabref.org/finding-sorting-and-cleaning-entries/checkintegrity)).
 
 ### Removed
 

src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java

@@ -5,18 +5,21 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 
 import org.jabref.logic.formatter.bibtexfields.RemoveNewlinesFormatter;
+import org.jabref.logic.integrity.PagesChecker;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.LatexToUnicodeAdapter;
 
 import de.undercouch.citeproc.CSL;
@@ -72,14 +75,15 @@ public synchronized List<String> makeBibliography(List<BibEntry> bibEntries, Str
      * @throws IOException An error occurred in the underlying JavaScript framework
      */
     private void initialize(String newStyle, CitationStyleOutputFormat newFormat) throws IOException {
-        if ((cslInstance == null) || !Objects.equals(newStyle, style)) {
+        final boolean newCslInstanceNeedsToBeCreated = (cslInstance == null) || !Objects.equals(newStyle, style);
+        if (newCslInstanceNeedsToBeCreated) {
             // lang and forceLang are set to the default values of other CSL constructors
             cslInstance = new CSL(dataProvider, new JabRefLocaleProvider(),
                     new DefaultAbbreviationProvider(), newStyle, "en-US");
             style = newStyle;
         }
 
-        if (!Objects.equals(newFormat, format)) {
+        if (newCslInstanceNeedsToBeCreated || (!Objects.equals(newFormat, format))) {
             cslInstance.setOutputFormat(newFormat.getFormat());
             format = newFormat;
         }
@@ -98,7 +102,10 @@ private static class JabRefItemDataProvider implements ItemDataProvider {
         /**
          * Converts the {@link BibEntry} into {@link CSLItemData}.
          */
-        private static CSLItemData bibEntryToCSLItemData(BibEntry bibEntry, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager) {
+        private static CSLItemData bibEntryToCSLItemData(BibEntry originalBibEntry, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager) {
+            // We need to make a deep copy, because we modify the entry according to the logic presented at
+            // https://github.com/JabRef/jabref/issues/8372#issuecomment-1014941935
+            BibEntry bibEntry = (BibEntry) originalBibEntry.clone();
 
             String citeKey = bibEntry.getCitationKey().orElse("");
             BibTeXEntry bibTeXEntry = new BibTeXEntry(new Key(bibEntry.getType().getName()), new Key(citeKey));
@@ -108,8 +115,44 @@ private static CSLItemData bibEntryToCSLItemData(BibEntry bibEntry, BibDatabaseC
 
             Optional<BibEntryType> entryType = entryTypesManager.enrich(bibEntry.getType(), bibDatabaseContext.getMode());
 
-            Set<Field> fields = entryType.map(BibEntryType::getAllFields).orElse(bibEntry.getFields());
+            if (bibEntry.getType().equals(StandardEntryType.Article)) {
+                // Patch bibEntry to contain the right BibTeX (not BibLaTeX) fields
+                // Note that we do not need to convert from "pages" to "page", because CiteProc already handles it
+                // See BibTeXConverter
+                if (bibDatabaseContext.isBiblatexMode()) {
+                    // Move "number" to "issue" if "issue" does not exist
+                    Optional<String> numberField = bibEntry.getField(StandardField.NUMBER);
+                    numberField.ifPresent(number -> {
+                        if (!bibEntry.hasField(StandardField.ISSUE)) {
+                            bibEntry.setField(StandardField.ISSUE, number);
+                            bibEntry.clearField(StandardField.NUMBER);
+                        }
+                    });
+                    bibEntry.getField(StandardField.EID).ifPresent(eid -> {
+                        bibEntry.setField(StandardField.NUMBER, eid);
+                        bibEntry.clearField(StandardField.EID);
+                    });
+                } else {
+                    bibEntry.getField(StandardField.NUMBER).ifPresent(number -> {
+                        bibEntry.setField(StandardField.ISSUE, number);
+                        bibEntry.clearField(StandardField.NUMBER);
+                    });
+                    bibEntry.getField(StandardField.PAGES).ifPresent(pages -> {
+                        if (new PagesChecker(bibDatabaseContext).checkValue(pages).isPresent()) {
+                            // pages field contains no valid pages range
+                            // cut off "Article " if exists.
+                            if (pages.toLowerCase(Locale.ROOT).startsWith("article ")) {
+                                pages = pages.substring("Article ".length());
+                            }
+                            bibEntry.setField(StandardField.NUMBER, pages);
+                            bibEntry.clearField(StandardField.PAGES);
+                        }
+                    });
+                }
+            }
 
+            Set<Field> fields = entryType.map(BibEntryType::getAllFields).orElse(bibEntry.getFields());
+            fields.addAll(bibEntry.getFields());
             for (Field key : fields) {
                 bibEntry.getResolvedFieldOrAlias(key, bibDatabaseContext.getDatabase())
                         .map(removeNewlinesFormatter::format)

src/main/java/org/jabref/logic/integrity/PagesChecker.java

@@ -1,5 +1,6 @@
 package org.jabref.logic.integrity;
 
+import java.util.Arrays;
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
@@ -12,27 +13,22 @@ public class PagesChecker implements ValueChecker {
 
     private static final String PAGES_EXP_BIBTEX = ""
             + "\\A"                 // begin String
+            + "[A-Za-z]?\\d*"       // optional prefix and number
             + "("
-            + "[A-Za-z]?\\d*"     // optional prefix and number
-            + "("
-            + "\\+|-{2}"    // separator
-            + "[A-Za-z]?\\d*" // optional prefix and number
+            + "(\\+|-{2}|\u2013)"   // separator, must contain exactly two dashes
+            + "[A-Za-z]?\\d*"       // optional prefix and number
             + ")?"
-            + ",?"                // page range separation
-            + ")*"
             + "\\z";                // end String
 
+    // See https://packages.oth-regensburg.de/ctan/macros/latex/contrib/biblatex/doc/biblatex.pdf#subsubsection.3.15.3 for valid content
     private static final String PAGES_EXP_BIBLATEX = ""
-            + "\\A"                 // begin String
-            + "("
+            + "\\A"               // begin String
             + "[A-Za-z]?\\d*"     // optional prefix and number
             + "("
-            + "\\+|-{1,2}|\u2013" // separator
-            + "[A-Za-z]?\\d*" // optional prefix and number
+            + "(\\+|-{1,2}|\u2013)" // separator
+            + "[A-Za-z]?\\d*"     // optional prefix and number
             + ")?"
-            + ",?"                // page range separation
-            + ")*"
-            + "\\z";                // end String
+            + "\\z";              // end String
 
     private final Predicate<String> isValidPageNumber;
 
@@ -59,10 +55,11 @@ public Optional<String> checkValue(String value) {
             return Optional.empty();
         }
 
-        if (!isValidPageNumber.test(value.trim())) {
+        if (Arrays.stream(value.split(","))
+                .map(String::trim)
+                .anyMatch(pageRange -> !isValidPageNumber.test(pageRange))) {
             return Optional.of(Localization.lang("should contain a valid page number range"));
         }
-
         return Optional.empty();
     }
 }