From fd90a2bdd667e1df1e99331ecec9cabf88596012 Mon Sep 17 00:00:00 2001 From: Jonatan Asketorp <2598631+k3KAW8Pnf7mkmdSMPHz27@users.noreply.github.com> Date: Mon, 2 Aug 2021 16:38:28 -0400 Subject: [PATCH 1/3] Add test --- .../logic/citationkeypattern/BracketedPatternTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java b/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java index de02294c736..5d84f2c45a1 100644 --- a/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java +++ b/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java @@ -386,6 +386,13 @@ void expandBracketsWithTestCasesFromRegExpBasedFileFinder() { BracketedPattern.expandBrackets("[author] have published [title] in [journal].", ',', entry, database)); } + @Test + void expandBracketsWithoutProtectiveBracesUsingUnprotectTermsModifier() { + BibEntry bibEntry = new BibEntry() + .withField(StandardField.JOURNAL, "{ACS} Medicinal Chemistry Letters"); + assertEquals("ACS Medicinal Chemistry Letters", BracketedPattern.expandBrackets("[JOURNAL:unprotect_terms]", null, bibEntry, null)); + } + @ParameterizedTest @MethodSource("provideArgumentsForFallback") void expandBracketsWithFallback(String expandResult, String pattern) { From 4608a4e64216e87d16181d3d2700781bfa52fcca Mon Sep 17 00:00:00 2001 From: Jonatan Asketorp <2598631+k3KAW8Pnf7mkmdSMPHz27@users.noreply.github.com> Date: Mon, 2 Aug 2021 16:38:35 -0400 Subject: [PATCH 2/3] Add `unprotect_terms` to available modifiers --- src/main/java/org/jabref/logic/formatter/Formatters.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/logic/formatter/Formatters.java b/src/main/java/org/jabref/logic/formatter/Formatters.java index a97c3a85235..0eddde42194 100644 --- a/src/main/java/org/jabref/logic/formatter/Formatters.java +++ b/src/main/java/org/jabref/logic/formatter/Formatters.java @@ -29,6 +29,7 @@ import org.jabref.logic.formatter.casechanger.LowerCaseFormatter; import org.jabref.logic.formatter.casechanger.SentenceCaseFormatter; import org.jabref.logic.formatter.casechanger.TitleCaseFormatter; +import org.jabref.logic.formatter.casechanger.UnprotectTermsFormatter; import org.jabref.logic.formatter.casechanger.UpperCaseFormatter; import org.jabref.logic.formatter.minifier.MinifyNameListFormatter; import org.jabref.logic.formatter.minifier.TruncateFormatter; @@ -74,7 +75,8 @@ public static List getOthers() { new UnitsToLatexFormatter(), new EscapeUnderscoresFormatter(), new EscapeAmpersandsFormatter(), - new ShortenDOIFormatter() + new ShortenDOIFormatter(), + new UnprotectTermsFormatter() ); } From d292d54a6012f900eaaa2afa22aa13951635ccf4 Mon Sep 17 00:00:00 2001 From: Jonatan Asketorp <2598631+k3KAW8Pnf7mkmdSMPHz27@users.noreply.github.com> Date: Mon, 2 Aug 2021 16:48:19 -0400 Subject: [PATCH 3/3] Add changes to CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd26fa03dce..65c4601922b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve - We added the option to copy the DOI of an entry directly from the context menu copy submenu. [#7826](https://github.com/JabRef/jabref/issues/7826) - We added a fulltext search feature. [#2838](https://github.com/JabRef/jabref/pull/2838) +- We added unprotect_terms to the list of bracketed pattern modifiers [#7826](https://github.com/JabRef/jabref/pull/7960) ### Changed