Skip to content
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

Add special handling for small letter in KatakanaEndHypen #787

Merged
merged 2 commits into from
Jun 17, 2017
Merged

Add special handling for small letter in KatakanaEndHypen #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05706a2
Add handling for small letter
takahi-i Jun 13, 2017
e79984d
Tiny refactoring
takahi-i Jun 17, 2017
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
15 changes: 10 additions & 5 deletions redpen-core/src/main/java/cc/redpen/validator/sentence/KatakanaEndHyphenValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ public final class KatakanaEndHyphenValidator extends DictionaryValidator {
*/
private static final char KATAKANA_MIDDLE_DOT = '・';

public static boolean isKatakanaEndHyphen(String katakana) {
return (DEFAULT_KATAKANA_LIMIT_LENGTH < katakana.length()
&& katakana.charAt(katakana.length() - 1) == HYPHEN);
}

@Override
public List<String> getSupportedLanguages() {
return singletonList(Locale.JAPANESE.getLanguage());
Expand All @@ -85,6 +80,16 @@ public void validate(Sentence sentence) {
this.checkKatakanaEndHyphen(sentence, katakana.toString(), sentence.getContent().length() - 1);
}

public static boolean isKatakanaEndHyphen(String katakana) {
return (DEFAULT_KATAKANA_LIMIT_LENGTH < katakana.length() &&
katakana.charAt(katakana.length() - 1) == HYPHEN &&
checkCharacterBeforeHyphen(katakana.charAt(katakana.length() - 2)));
}

private static boolean checkCharacterBeforeHyphen(char c) {
return c != 'ュ' && c != 'ャ' && c != 'ョ';
}

private void checkKatakanaEndHyphen(Sentence sentence, String katakana, int position) {
Set<String> customSkipList = getSet("list");
if (customSkipList.isEmpty() || !customSkipList.contains(katakana)) {
Expand Down
27 changes: 27 additions & 0 deletions redpen-core/src/test/java/cc/redpen/validator/sentence/KatakanaEndHyphenValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,15 @@ public void testKatakanaOfLength2() {
assertEquals(str.toString(), 0, errors.size());
}

@Test
public void testKatakanaOfLength2andHyphen() {
Sentence str = new Sentence("ポー", 0);
List<ValidationError> errors = new ArrayList<>();
validator.setErrorList(errors);
validator.validate(str);
assertEquals(str.toString(), 0, errors.size());
}

@Test
public void testKatakanaOfLength3andHyphen() {
Sentence str = new Sentence("ミラー", 0);
Expand Down Expand Up @@ -190,4 +199,22 @@ public void testHonorsSkipWordDict() throws RedPenException {
Map<Document, List<ValidationError>> errors = redPen.validate(documents);
assertEquals(0, errors.get(documents.get(0)).size());
}

@Test
public void testEndWithSmallLetter() throws RedPenException {
Configuration config = Configuration.builder("ja")
.addValidatorConfig(new ValidatorConfiguration("KatakanaEndHyphen"))
.build();

List<Document> documents = new ArrayList<>();documents.add(
Document.builder()
.addSection(1)
.addParagraph()
.addSentence(new Sentence("メニューは必要ですか", 1))
.build());

RedPen redPen = new RedPen(config);
Map<Document, List<ValidationError>> errors = redPen.validate(documents);
assertEquals(0, errors.get(documents.get(0)).size());
}
}