Fix Abbreviation for Escaped Ampersand #9288

ANUu7312578 · 2022-10-23T09:16:15Z

This pull request attempts to fix issue #8948. The main #8948 issue has 3 sub-components:

Abbreviations should always be without \& --> There is a CI check "necessary" at the abbrv repo
JabRef should be able to handle both & and \& when abbrevating and unabbreviating
When putting a result, \& should be used

The first sub-component, is currently being implemented by the pull request JabRef/abbrv.jabref.org#108. The changes highlighted in this pull request attempt to fix the second sub-component. It seems that the third component has already been implemented except that it has to be manually enabled by users.

A test which attempt to verify that unescaped ampersands in journal titles actually result in abbreviations has also been added.

Any feedback would be appreciated.

Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
Tests created for changes (if applicable)
Manually tested changed features in running JabRef (always required)
Screenshots added in PR description (for UI changes)
Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

… this may not be the correct understanding of how to fix the issue.

… of \& when checking if journal name is abbreviated.

…ue-8948

koppor

Minor comment, otherwise: Looks good to me.

The latexfreefield could not be used for checking the journal name? (org.jabref.model.entry.BibEntry#getResolvedFieldOrAliasLatexFree)

koppor · 2022-10-24T19:20:08Z

src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java

@@ -48,7 +49,8 @@ private static boolean isMatchedAbbreviated(String name, Abbreviation abbreviati
     * Letters) or its abbreviated form (e.g. Phys. Rev. Lett.).
     */
    public boolean isKnownName(String journalName) {
-        String journal = journalName.trim();
+        // Trims the String and also replaces any instances of "\&" with "&" for abbreviation search purposes


Trims the String and also replaces any instances of "\&" with "&" is a literal explanation of the code and can be removed.

Suggested change

// Trims the String and also replaces any instances of "\&" with "&" for abbreviation search purposes

// The journal lists contains unescaped only, thus "\&" is replaced by "&" for abbreviation search purposes

koppor · 2022-10-24T19:20:19Z

src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java

+        // Trims the String and also replaces any instances of "\&" with "&" for abbreviation search purposes
+        String journal = input.trim().replaceAll(Matcher.quoteReplacement("\\&"), "&");


See above 😇

…ue-8948

ANUu7312578 · 2022-10-26T08:59:27Z

@koppor I must admit that I did not understand exactly what org.jabref.model.entry.BibEntry#getResolvedFieldOrAliasLatexFree was doing or what its parameters meant. So, I just used replaceAll because it seemed easier 😅. I have pushed a commit which attempts to use org.jabref.model.entry.BibEntry#getResolvedFieldOrAliasLatexFree. Could you provide some feedback? From my testing, it seems to accomplish the same job that replaceAll does. Thanks!

Siedlerchr · 2022-10-26T20:24:57Z

@ANUu7312578 JabRef supports both BibTeX and biblatex. The old BibTeX format does not understand unicode and also special characters like & needs to be escaped using the special latex syntax.
The method GetResolvedFieldOrAlias does a few more things but the relevant part here is that it returns a latex command free value of the field (so basically the unicode)

koppor · 2022-10-26T22:46:40Z

I miss test cases for following BibTeX entry:

@article{test,
  journal = {ACS Applied Materials \\& Interfaces},
}

The result should be

@article{test,
  journal = {ACS Appl. Mater. Interfaces},
}

Second test:

@article{test,
  journal = {ACS Applied Materials & Interfaces},
}

The result should be

@article{test,
  journal = {ACS Appl. Mater. Interfaces},
}

Maybe, there are these tests, but better one more than no one.

ANUu7312578 · 2022-10-27T13:35:27Z

@koppor Hi! Sorry, but I'm not sure what you mean when you say that you miss test cases for the BibTeX entries. Do you mean that I should create tests which actually use a BibEntry object which is effectively

@article{test,
  journal = {ACS Applied Materials \\& Interfaces},
}

and try to abbreviate the BibEntry object journal title in order to test if it abbreviates into

@article{test,
  journal = {ACS Appl. Mater. Interfaces},
}

If so, I am not actually sure which function(s) to call to abbreviate the journal name in a BibEntry object. Would you be able to provide some pointers on this? It seems that org.jabref.gui.journals.UndoableAbbreviator is the only class which calls org.jabref.logic.journals.JournalAbbreviationRepository. However, this class seems to be more for the GUI and not for internal logic. If not, could you explain a bit more what you meant? Any clarification would be welcome!

Additionally, I am not sure I see the difference between the "first test" and the "second test". It seems that they both have the journal name as "ACS Applied Materials \\& Interfaces" and the abbreviated name as "ACS Appl. Mater. Interfaces". Also, I was wondering why the abbreviation of "ACS Applied Materials \\& Interfaces" would be "ACS Appl. Mater. Interfaces". Am I mistaken in thinking that the journal name should only abbreviate if the ampersand in the journal name is unescaped or only escaped once (e.g., "ACS Applied Materials \& Interfaces" -> "ACS Appl. Mater. Interfaces")?

Sorry for all the questions!

Siedlerchr · 2022-10-27T14:20:51Z

Hi,
yes it's a bit confusing. But I think of a kind of integration test here:
You would use the logic classes:
UndoableUnabbreviator and UndoableAbbreviator

Create a new BibEntry and a new databasecontext

koppor · 2022-10-27T20:36:42Z

@koppor Hi! Sorry, but I'm not sure what you mean when you say that you miss test cases for the BibTeX entries. Do you mean that I should create tests which actually use a BibEntry object

Yes.

Additionally, I am not sure I see the difference between the "first test" and the "second test".

I updated the second test to have not any escapings.

Am I mistaken in thinking that the journal name should only abbreviate if the ampersand in the journal name is unescaped or only escaped once (e.g., "ACS Applied Materials & Interfaces" -> "ACS Appl. Mater. Interfaces")?

The thing is, it should be able to abbreviate in both cases. This should be shown by a test.

…ntries

…ue-8948

ANUu7312578 · 2022-10-28T04:26:46Z

Hi! I've attempted to write some tests according to the test cases specified by @koppor and using UndoableUnabbreviator and UndoableAbbreviator as suggested by @Siedlerchr. Currently, these test cases reside in org.jabref.logic.bibtex.BibEntryWriterTest. However, this causes the restrictUsagesInLogic test to fail because a CompoundEdit object is required to abbreviate a journal title. Could I get some feedback as to whether the tests I wrote are what was actually wanted and if I should move these tests to another test class in order to stop restrictUsagesInLogic from failing? Or, if there is another way to resolve restrictUsagesInLogic, any advice would be appreciated. Thanks!

koppor · 2022-10-28T07:10:11Z

The tests test the Journal Abbreviations. Thus, they should be in the test class for the Journal Abbreviator.

An Exception to the ArchUnit rules can be added in this case. There needs to be some refinement so that one can abbreviate without using a gui class.

I was thinking, there is a method
In: BibEntry
out: BibEntry abbreviated

Seems that this resides in gui only?

Siedlerchr · 2022-10-28T07:25:43Z

@koppor The logic methods are in UndoableAbbreviator and UndoableUnabbreviator. They take an entry, a field and a databasecontext However, they require the swing compound edit for undoing

…reviationRepositoryTest

ANUu7312578 · 2022-10-28T14:58:00Z

I have moved the tests from the org.jabref.logic.bibtex.BibEntryWriterTest class to the org.jabref.logic.journals.JournalAbbreviationRepositoryTest class like @koppor suggested. Hopefully it is now in the appropriate test class.

Is there anything else which needs fixing? I am also not really sure how to add an exception to the ArchUnit rules 😅.

Siedlerchr · 2022-10-28T20:13:48Z

@ANUu7312578 For the test I would adapt this as follows:
Then you should be able to annotate the test class with @AllowedToUseSwing

  @ArchTest
   public static void restrictUsagesInLogic(JavaClasses classes) {
       noClasses().that().resideInAPackage(PACKAGE_ORG_JABREF_LOGIC)
                   .and().areNotAnnotatedWith(AllowedToUseSwing.class)
                  .should().dependOnClassesThat().resideInAPackage(PACKAGE_JAVAX_SWING)
                  .orShould().dependOnClassesThat().haveFullyQualifiedName(CLASS_ORG_JABREF_GLOBALS)
                  .check(classes);
   }

koppor

Thank you for the tests.

They are currently too complicated. I made another proposal

koppor · 2022-10-26T22:41:20Z

src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java

+    /**
+     * Returns the LaTeX free version of a journal (e.g., IEEE Design \& Test would be returned as IEEE Design & Test)
+     * i.e., the journal name should not contain any unnecessary LaTeX syntax such as escaped ampersands
+     *
+     * @param journal The journal name
+     * @return The LaTeX free version of the journal name
+     */
+    private String getLatexFreeJournal(String journal) {
+        BibEntry entry = new BibEntry();
+        entry.setField(StandardField.JOURNAL, journal);
+        if (entry.getResolvedFieldOrAliasLatexFree(StandardField.JOURNAL, null).isPresent()) {
+            journal = entry.getResolvedFieldOrAliasLatexFree(StandardField.JOURNAL, null).get();
+        }
+        return journal;
+    }
+


This was not the intention - sorry for that!

Your old code with the replacement was better!

I thought, you were reading the BibTeX field content at some place. Here, you seem to read the journal name from somewhere.

koppor · 2022-10-28T21:24:00Z

CHANGELOG.md

@@ -74,6 +74,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where hitting enter on the search field within the preferences dialog closed the dialog. [koppor#630](https://github.com/koppor/jabref/issues/630)
 - We fixed a typo within a connection error message. [koppor#625](https://github.com/koppor/jabref/issues/625)
 - We fixed an issue where the 'close dialog' key binding was not closing the Preferences dialog. [#8888](https://github.com/jabref/jabref/issues/8888)
+- We fixed an issue where journal abbreviations would not abbreviate journal titles with escaped ampersands (\\&) which are written in accordance with Latex format. [#8948](https://github.com/JabRef/jabref/issues/8948)


I would remove the last part, that information should be made available in the internet elsewhere 😃

Suggested change

- We fixed an issue where journal abbreviations would not abbreviate journal titles with escaped ampersands (\\&) which are written in accordance with Latex format. [#8948](https://github.com/JabRef/jabref/issues/8948)

- We fixed an issue where journal abbreviations would not abbreviate journal titles with escaped ampersands (\\&). [#8948](https://github.com/JabRef/jabref/issues/8948)

koppor · 2022-10-28T21:34:42Z

src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java

+        // @formatter:off
+        String expectedAbbreviatedJournalEntry = """
+                @Article{,
+                  journal = {ACS Appl. Mater. Interfaces},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
+        // @formatter:on
+
+        undoableAbbreviator.abbreviate(bibDatabase, entryWithEscapedAmpersandInJournal, StandardField.JOURNAL, new CompoundEdit());
+        bibEntryWriter.write(entryWithEscapedAmpersandInJournal, bibWriter, BibDatabaseMode.BIBLATEX);
+        assertEquals(expectedAbbreviatedJournalEntry, stringWriter.toString());


Comparison on a String bases should only be used for serialization tests.

In your case, do

Suggested change

// @formatter:off

String expectedAbbreviatedJournalEntry = """

@Article{,

journal = {ACS Appl. Mater. Interfaces},

}

""".replaceAll("\n", OS.NEWLINE);

// @formatter:on

undoableAbbreviator.abbreviate(bibDatabase, entryWithEscapedAmpersandInJournal, StandardField.JOURNAL, new CompoundEdit());

bibEntryWriter.write(entryWithEscapedAmpersandInJournal, bibWriter, BibDatabaseMode.BIBLATEX);

assertEquals(expectedAbbreviatedJournalEntry, stringWriter.toString());

undoableAbbreviator.abbreviate(bibDatabase, entryWithEscapedAmpersandInJournal, StandardField.JOURNAL, new CompoundEdit());

BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)

.withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces");

assertEquals(expectedAbbreviatedJournalEntry , entryWithEscapedAmpersandInJournal);

…sInLogic test changed to allow classes annotated with @AllowedToUseString. Test cases and escaped ampersand replacement in abbreviation changed.

…ue-8948

ANUu7312578 · 2022-10-29T06:46:21Z

Thanks to @Siedlerchr for the advice on how to add an exception to the ArchUnit rules! Hopefully, I've now accomplished everything @koppor asked for. The restrictUsagesInLogic test should no longer be failing. Please let me know if there is anything else that I should do! 😃

Siedlerchr · 2022-11-01T18:58:05Z

Thanks again for the quick follow up! From my side it looks already good from my side

koppor

Thank you for keeping working on this.

I added some comments 😇. - Since they are more general hints than really required, I go forward with a merge 😅. You can do a follow-up PR if you have time ^^

koppor · 2022-11-02T07:34:13Z

src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java

@@ -48,7 +49,7 @@ private static boolean isMatchedAbbreviated(String name, Abbreviation abbreviati
     * Letters) or its abbreviated form (e.g. Phys. Rev. Lett.).
     */
    public boolean isKnownName(String journalName) {
-        String journal = journalName.trim();
+        String journal = journalName.trim().replaceAll(Matcher.quoteReplacement("\\&"), "&");


I think, there is the possibility to pre-compile the Regex. Was it with the Pattern class?

koppor · 2022-11-02T07:34:56Z

src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java

+        assertEquals(new Abbreviation("ACS Applied Materials & Interfaces", "ACS Appl. Mater. Interfaces"), repository.get("ACS Applied Materials & Interfaces").get());
+        assertEquals(new Abbreviation("ACS Applied Materials & Interfaces", "ACS Appl. Mater. Interfaces"), repository.get("ACS Applied Materials \\& Interfaces").get());
+        assertEquals(new Abbreviation("Antioxidants & Redox Signaling", "Antioxid. Redox Signaling"), repository.get("Antioxidants & Redox Signaling").get());
+        assertEquals(new Abbreviation("Antioxidants & Redox Signaling", "Antioxid. Redox Signaling"), repository.get("Antioxidants \\& Redox Signaling").get());
+
+        repository.addCustomAbbreviation(new Abbreviation("Long & Name", "L. N.", "LN"));
+        assertEquals(new Abbreviation("Long & Name", "L. N.", "LN"), repository.get("Long & Name").get());
+        assertEquals(new Abbreviation("Long & Name", "L. N.", "LN"), repository.get("Long \\& Name").get());


Normally, we expect one assertation per test case. Thus, this method should be split into several ones. @ParamterizedTest is the the thign to use.

koppor · 2022-11-02T07:35:19Z

src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java

+        BibEntry entryWithEscapedAmpersandInJournal = new BibEntry(StandardEntryType.Article);
+        entryWithEscapedAmpersandInJournal.setField(StandardField.JOURNAL, "ACS Applied Materials \\& Interfaces");


Suggested change

BibEntry entryWithEscapedAmpersandInJournal = new BibEntry(StandardEntryType.Article);

entryWithEscapedAmpersandInJournal.setField(StandardField.JOURNAL, "ACS Applied Materials \\& Interfaces");

BibEntry entryWithEscapedAmpersandInJournal = new BibEntry(StandardEntryType.Article)

.withField(StandardField.JOURNAL, "ACS Applied Materials \\& Interfaces");

* upstream/main: (30 commits) New translations JabRef_en.properties (German) (JabRef#9336) Fix Abbreviation for Escaped Ampersand (JabRef#9288) Fix font size preference not updating in preference dialog 8386 (JabRef#9287) New Crowdin updates (JabRef#9333) Refresh example styles Squashed 'buildres/csl/csl-styles/' changes from 4eee79a..13fd98e Bump unirest-java from 3.13.11 to 3.13.12 (JabRef#9330) Bump checkstyle from 10.3.4 to 10.4 (JabRef#9331) Bump gittools/actions from 0.9.14 to 0.9.15 (JabRef#9332) Group context menu presents relevant options depending on number of subgroups (JabRef#9286) Removed BibTeX file type and included HTML and Markdown types (JabRef#9318) Fix issue: Auto-linking files with safe character replacements JabRef#9267 (JabRef#9316) Fix for issue 8806: Button highlights doesn't respect rounded corners (JabRef#9320) New Crowdin updates (JabRef#9324) Update CHANGELOG.md Try to relocate listener binding (JabRef#9238) Changed the messages after importing unlinked local files to past passive tense. (JabRef#9308) Changed the color of found text from red to high contrast (JabRef#9315) New Crowdin updates (JabRef#9317) Add skips for MacOS X build (JabRef#9305) ...

* upstream/main: (61 commits) Bump jackson-datatype-jsr310 from 2.13.4 to 2.14.0 (JabRef#9357) Bump jackson-dataformat-yaml from 2.13.4 to 2.14.0 (JabRef#9356) Bump tika-core from 2.5.0 to 2.6.0 (JabRef#9358) Refine guideline "Set up a local workspace" (JabRef#9355) Adds missing "requires" statement (JabRef#9354) Bind "Find unlinked files" default directory to the current library (JabRef#9290) Rename "Remote" to "Tele" (JabRef#9270) Fixed display of file field adjusting for the dark theme (JabRef#9343) Update sorting of entries in maintable by special fields immediately (JabRef#9338) New translations JabRef_en.properties (German) (JabRef#9336) Fix Abbreviation for Escaped Ampersand (JabRef#9288) Fix font size preference not updating in preference dialog 8386 (JabRef#9287) New Crowdin updates (JabRef#9333) Refresh example styles Squashed 'buildres/csl/csl-styles/' changes from 4eee79a..13fd98e Bump unirest-java from 3.13.11 to 3.13.12 (JabRef#9330) Bump checkstyle from 10.3.4 to 10.4 (JabRef#9331) Bump gittools/actions from 0.9.14 to 0.9.15 (JabRef#9332) Group context menu presents relevant options depending on number of subgroups (JabRef#9286) Removed BibTeX file type and included HTML and Markdown types (JabRef#9318) ...

* upstream/main: Add date format and respective test case (#9310) Bump jackson-datatype-jsr310 from 2.13.4 to 2.14.0 (#9357) Bump jackson-dataformat-yaml from 2.13.4 to 2.14.0 (#9356) Bump tika-core from 2.5.0 to 2.6.0 (#9358) Refine guideline "Set up a local workspace" (#9355) Adds missing "requires" statement (#9354) Bind "Find unlinked files" default directory to the current library (#9290) Rename "Remote" to "Tele" (#9270) Fixed display of file field adjusting for the dark theme (#9343) Update sorting of entries in maintable by special fields immediately (#9338) New translations JabRef_en.properties (German) (#9336) Fix Abbreviation for Escaped Ampersand (#9288) Fix font size preference not updating in preference dialog 8386 (#9287) # Conflicts: # CHANGELOG.md

* upstream/main: (55 commits) Update guidelines-for-setting-up-a-local-workspace.md Add link to good first issues (and fix link) Refine guidelines (and fix .md file linking) Extend ArXiv fetcher results by using data from related DOIs (JabRef#9170) New Crowdin updates (JabRef#9366) Fix token New translations JabRef_en.properties (Chinese Simplified) (JabRef#9364) Fix date field change causes an uncaught exception (JabRef#9365) Add date format and respective test case (JabRef#9310) Bump jackson-datatype-jsr310 from 2.13.4 to 2.14.0 (JabRef#9357) Bump jackson-dataformat-yaml from 2.13.4 to 2.14.0 (JabRef#9356) Bump tika-core from 2.5.0 to 2.6.0 (JabRef#9358) Refine guideline "Set up a local workspace" (JabRef#9355) Adds missing "requires" statement (JabRef#9354) Bind "Find unlinked files" default directory to the current library (JabRef#9290) Rename "Remote" to "Tele" (JabRef#9270) Fixed display of file field adjusting for the dark theme (JabRef#9343) Update sorting of entries in maintable by special fields immediately (JabRef#9338) New translations JabRef_en.properties (German) (JabRef#9336) Fix Abbreviation for Escaped Ampersand (JabRef#9288) ... # Conflicts: # CHANGELOG.md # src/main/java/org/jabref/preferences/AppearancePreferences.java # src/main/java/org/jabref/preferences/JabRefPreferences.java # src/test/java/org/jabref/gui/theme/ThemeManagerTest.java

* upstream/main: (40 commits) Update guidelines-for-setting-up-a-local-workspace.md Add link to good first issues (and fix link) Refine guidelines (and fix .md file linking) Extend ArXiv fetcher results by using data from related DOIs (#9170) New Crowdin updates (#9366) Fix token New translations JabRef_en.properties (Chinese Simplified) (#9364) Fix date field change causes an uncaught exception (#9365) Add date format and respective test case (#9310) Bump jackson-datatype-jsr310 from 2.13.4 to 2.14.0 (#9357) Bump jackson-dataformat-yaml from 2.13.4 to 2.14.0 (#9356) Bump tika-core from 2.5.0 to 2.6.0 (#9358) Refine guideline "Set up a local workspace" (#9355) Adds missing "requires" statement (#9354) Bind "Find unlinked files" default directory to the current library (#9290) Rename "Remote" to "Tele" (#9270) Fixed display of file field adjusting for the dark theme (#9343) Update sorting of entries in maintable by special fields immediately (#9338) New translations JabRef_en.properties (German) (#9336) Fix Abbreviation for Escaped Ampersand (#9288) ... # Conflicts: # CHANGELOG.md

AkshatJain9 and others added 11 commits October 14, 2022 15:37

Added Naive Ampersand Formatter, see last point in #8948 to-do

ed40cc2

Rudimentary attempt at allow \& in the journal abbreviation. However,…

3dc87ae

… this may not be the correct understanding of how to fix the issue.

Remove unnecessary code in BibWriter.java and unnecessary replacement…

e56af9e

… of \& when checking if journal name is abbreviated.

Merge branch 'main' of https://github.com/JabRef/jabref

ff15343

Merge branch 'main' of https://github.com/AkshatJain9/jabref into iss…

bc31f93

…ue-8948

Merge branch 'JabRef:main' into main

4479e19

Merge branch 'JabRef:main' into issue-8948

03a996b

Merge branch 'main' of https://github.com/AkshatJain9/jabref into iss…

1beef73

…ue-8948

Remove linebreak for checkstyle

26b6527

Updated CHANGELOG.md to reflect the changes made

97fdb55

Create tests for escaped ampersand in abbreviation

d34b5cd

ThiloteE added the bib(la)tex label Oct 24, 2022

koppor requested changes Oct 24, 2022

View reviewed changes

ANUu7312578 added 7 commits October 25, 2022 16:08

Merge branch 'main' of https://github.com/JabRef/jabref

d8d0850

Merge branch 'main' of https://github.com/AkshatJain9/jabref into iss…

64cc386

…ue-8948

Remove unnecessary comments

5426806

Convert to using getResolvedFieldOrAliasLatexFree instead of replace()

0ed991b

Added a javadoc to explain the function created

d8a69c8

Merge branch 'main' of https://github.com/JabRef/jabref

0efdc5a

Merge branch 'main' of https://github.com/AkshatJain9/jabref into iss…

18d7d8b

…ue-8948

ANUu7312578 requested a review from koppor October 26, 2022 09:00

ANUu7312578 added 3 commits October 28, 2022 15:04

Added 3 tests to BibEntryWriterTest which test abbreviating journal e…

e18c792

…ntries

Merge branch 'main' of https://github.com/JabRef/jabref

f4658bc

Merge branch 'main' of https://github.com/AkshatJain9/jabref into iss…

943fa5b

…ue-8948

Move journal abbreviation tests from BibEntryWriterTest to JournalAbb…

7815ba0

…reviationRepositoryTest

koppor requested changes Oct 28, 2022

View reviewed changes

ANUu7312578 added 3 commits October 29, 2022 16:05

CHANGELOG.md changed to remove unnecessary information. restrictUsage…

fc0907b

…sInLogic test changed to allow classes annotated with @AllowedToUseString. Test cases and escaped ampersand replacement in abbreviation changed.

Merge branch 'main' of https://github.com/JabRef/jabref

0657b7e

Merge branch 'main' of https://github.com/AkshatJain9/jabref into iss…

046498b

…ue-8948

ANUu7312578 requested a review from koppor October 30, 2022 00:03

Siedlerchr marked this pull request as ready for review November 1, 2022 18:58

Merge branch 'main' into issue-8948

098bdac

Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Nov 1, 2022

koppor approved these changes Nov 2, 2022

View reviewed changes

koppor merged commit 7367ee5 into JabRef:main Nov 2, 2022

koppor mentioned this pull request Jan 2, 2023

Remove escaping from ampersand timstaley/jabref-astro-abbreviations#3

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Abbreviation for Escaped Ampersand #9288

Fix Abbreviation for Escaped Ampersand #9288

ANUu7312578 commented Oct 23, 2022

koppor left a comment

koppor Oct 24, 2022

ANUu7312578 Oct 26, 2022

koppor Oct 24, 2022

ANUu7312578 commented Oct 26, 2022

Siedlerchr commented Oct 26, 2022

koppor commented Oct 26, 2022 •

edited

Loading

ANUu7312578 commented Oct 27, 2022

Siedlerchr commented Oct 27, 2022

koppor commented Oct 27, 2022

ANUu7312578 commented Oct 28, 2022

koppor commented Oct 28, 2022

Siedlerchr commented Oct 28, 2022

ANUu7312578 commented Oct 28, 2022

Siedlerchr commented Oct 28, 2022

koppor left a comment

koppor Oct 26, 2022

koppor Oct 28, 2022

koppor Oct 28, 2022

ANUu7312578 commented Oct 29, 2022

Siedlerchr commented Nov 1, 2022

koppor left a comment

koppor Nov 2, 2022

koppor Nov 2, 2022

koppor Nov 2, 2022

	// Trims the String and also replaces any instances of "\&" with "&" for abbreviation search purposes
	// The journal lists contains unescaped only, thus "\&" is replaced by "&" for abbreviation search purposes

		// Trims the String and also replaces any instances of "\&" with "&" for abbreviation search purposes
		String journal = input.trim().replaceAll(Matcher.quoteReplacement("\\&"), "&");

	- We fixed an issue where journal abbreviations would not abbreviate journal titles with escaped ampersands (\\&) which are written in accordance with Latex format. [#8948](https://github.com/JabRef/jabref/issues/8948)
	- We fixed an issue where journal abbreviations would not abbreviate journal titles with escaped ampersands (\\&). [#8948](https://github.com/JabRef/jabref/issues/8948)

		BibEntry entryWithEscapedAmpersandInJournal = new BibEntry(StandardEntryType.Article);
		entryWithEscapedAmpersandInJournal.setField(StandardField.JOURNAL, "ACS Applied Materials \\& Interfaces");

Fix Abbreviation for Escaped Ampersand #9288

Fix Abbreviation for Escaped Ampersand #9288

Conversation

ANUu7312578 commented Oct 23, 2022

koppor left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ANUu7312578 commented Oct 26, 2022

Siedlerchr commented Oct 26, 2022

koppor commented Oct 26, 2022 • edited Loading

ANUu7312578 commented Oct 27, 2022

Siedlerchr commented Oct 27, 2022

koppor commented Oct 27, 2022

ANUu7312578 commented Oct 28, 2022

koppor commented Oct 28, 2022

Siedlerchr commented Oct 28, 2022

ANUu7312578 commented Oct 28, 2022

Siedlerchr commented Oct 28, 2022

koppor left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ANUu7312578 commented Oct 29, 2022

Siedlerchr commented Nov 1, 2022

koppor left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

koppor commented Oct 26, 2022 •

edited

Loading