Skip to content

[WIP] Fix for issue 3920 and tests #5132

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.

Sign up for GitHub

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

Closed
wants to merge 3 commits into from
Closed

[WIP] Fix for issue 3920 and tests #5132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95be16e
Fix for issue 3920 and tests
clodoaldoBasaglia Jul 15, 2019
98e0ec5
Import the class that was missing
clodoaldoBasaglia Jul 15, 2019
716d654
Removed the empty lines
clodoaldoBasaglia Jul 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,8 +811,11 @@ public static String authEtal(String authorField, String delim,
} else if (tokens.length > 2) {
author.append(append);
}

return author.toString();
if (author.toString().split("\\s")[1].charAt(0) == '{') {
return author.toString().split("\\s")[1].replace("EtAl", "");
} else {
return (author.toString().split("\\s")[1]);
}
}

/**
Expand Down
10 changes: 10 additions & 0 deletions src/test/java/org/jabref/model/entry/AuthorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

import static org.junit.jupiter.api.Assertions.assertEquals;

import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;

class AuthorTest {

@Test
Expand Down Expand Up @@ -39,4 +41,12 @@ void addDotIfAbbreviationDoNotAddDot() {
assertEquals("Moore, O. and O. Moore", Author.addDotIfAbbreviation("Moore, O. and O. Moore"));
assertEquals("Moore, O. and O. Moore and Moore, O. O.", Author.addDotIfAbbreviation("Moore, O. and O. Moore and Moore, O. O."));
}

@Test
public void testAuthEtAlBraces() {
assertEquals("{\\v{S}}pan{\\v{e}}l",
BibtexKeyGenerator.authEtal("Patrik {\\v{S}}pan{\\v{e}}l and Kseniya Dryahina and David Smith", "", "EtAl"));
assertEquals("\\v{S}pan\\v{e}lEtAl",
BibtexKeyGenerator.authEtal("Patrik \\v{S}pan\\v{e}l and Kseniya Dryahina and David Smith", "", "EtAl"));
}
}