-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Add support for transliterated citation keys #13893
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
501e6fe
feat(citation-key-generator): add support for transliterating fields …
InAnYan 84ca04a
feat(citation-key-generator): add transliteration action + refactor t…
InAnYan 23a8ab7
chore(test): better format comments in TransliterationTest
InAnYan da7b436
chore(changelog): add changelog entry for transliteration
InAnYan ccb3839
refactor(transliteration): refactor code after reviewing PR changes
InAnYan 4444c8b
refactor(transliteration): address review comments
InAnYan 0788e28
chore(transliteration): reformat files
InAnYan e77c85f
Merge branch 'main' into feat/11377
subhramit e0c3b86
Merge branch 'upstream-main' into feat/11377
InAnYan 4291d3f
Merge branch 'feat/11377' of github.com:InAnYan/jabref into feat/11377
InAnYan 315b4ef
refactor(citationkey): append "for citation key" to "Transliterate fi…
InAnYan 2c76705
chore(changelog): update CHANGELOG.md
InAnYan 5e33c8d
Merge branch 'main' into feat/11377
InAnYan 012d6f0
Update CHANGELOG.md
InAnYan e083119
fix(citationkey): address review comments
InAnYan 30f3406
Merge branch 'feat/11377' of github.com:InAnYan/jabref into feat/11377
InAnYan b21d02e
Fix duplicate entry in CHANGELOG.md
InAnYan 35a9c47
Merge branch 'upstream-main' into feat/11377
InAnYan 318c43b
Merge branch 'feat/11377' of github.com:InAnYan/jabref into feat/11377
InAnYan da3bd6e
chore(submodules): fix submodules
InAnYan 45c6cf1
refactor(citationkey): change true to false
InAnYan 23a78b9
chore(submodules): fix submodules
InAnYan 2388e91
Merge branch 'main' into feat/11377
Siedlerchr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
jablib/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTestUtils.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package org.jabref.logic.citationkeypattern; | ||
|
|
||
| import static org.jabref.logic.citationkeypattern.CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS; | ||
|
|
||
| public class CitationKeyGeneratorTestUtils { | ||
|
|
||
| public static CitationKeyPatternPreferences getInstanceForTesting() { | ||
| return new CitationKeyPatternPreferences( | ||
| true, | ||
| false, | ||
| false, | ||
| false, | ||
| CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A, | ||
| "", | ||
| "", | ||
| DEFAULT_UNWANTED_CHARACTERS, | ||
| GlobalCitationKeyPatterns.fromPattern("[auth][year]"), | ||
| "", | ||
| ',' | ||
| ); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/TransliterateFormatter.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package org.jabref.logic.formatter.bibtexfields; | ||
|
|
||
| import org.jabref.logic.cleanup.Formatter; | ||
| import org.jabref.logic.l10n.Localization; | ||
| import org.jabref.logic.util.strings.Transliteration; | ||
|
|
||
| public class TransliterateFormatter extends Formatter { | ||
| @Override | ||
| public String getName() { | ||
| return Localization.lang("Transliterate"); | ||
| } | ||
|
|
||
| @Override | ||
| public String getKey() { | ||
| return "transliterate"; | ||
| } | ||
|
|
||
| @Override | ||
| public String format(String value) { | ||
| return Transliteration.transliterate(value); | ||
| } | ||
|
|
||
| @Override | ||
| public String getDescription() { | ||
| return Localization.lang("Converts non-Latin characters to their Latin equivalents."); | ||
| } | ||
|
|
||
| @Override | ||
| public String getExampleInput() { | ||
| return "Карпенко Надежда"; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
jablib/src/main/java/org/jabref/logic/util/strings/Transliteration.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package org.jabref.logic.util.strings; | ||
|
|
||
| import org.jabref.logic.citationkeypattern.CitationKeyGenerator; | ||
|
|
||
| import com.ibm.icu.text.Transliterator; | ||
|
|
||
| public class Transliteration { | ||
|
|
||
| // This transliterator configuration will transliterate from any language to Latin script | ||
| // that uses only allowed characters for citation keys. | ||
| private static final String TRANSLITERATOR_CONFIG = buildTransliteratorConfig(); | ||
| private static final Transliterator TRANSLITERATOR = Transliterator.getInstance(TRANSLITERATOR_CONFIG); | ||
|
|
||
| public static String transliterate(String input) { | ||
| return TRANSLITERATOR.transliterate(input); | ||
| } | ||
|
|
||
| private static String buildTransliteratorConfig() { | ||
| StringBuilder pattern = new StringBuilder(); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Using StringBuilder for simple string concatenation can be replaced with StringJoiner for better readability and maintainability.
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Really? |
||
|
|
||
| for (Character c : CitationKeyGenerator.DISALLOWED_CHARACTERS) { | ||
| // Generally, only characters like `-` or `[` need to be escaped with a backslash, | ||
| // but for future proofing we escape all characters. | ||
| pattern.append("\\").append(c); | ||
| } | ||
|
|
||
| return "Any-Latin; Latin-ASCII; [" + pattern + "] Remove"; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.