Some preparation for #151

sylvainhalle · Mar 31, 2021 · e37cdb8 · e37cdb8
1 parent 3d77030
commit e37cdb8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Source/Core/src/ca/uqac/lif/textidote/Main.java b/Source/Core/src/ca/uqac/lif/textidote/Main.java
@@ -150,6 +150,7 @@ public static int mainLoop(String[] args, InputStream in, PrintStream out, Print
 
 		// Setup command line parser and arguments
 		CliParser cli_parser = new CliParser();
+		//cli_parser.addArgument(new Argument().withLongName("autocheck").withDescription("Checks grammar in auto-detected language"));
 		cli_parser.addArgument(new Argument().withLongName("check").withArgument("lang").withDescription("Checks grammar in language lang"));
 		cli_parser.addArgument(new Argument().withLongName("firstlang").withArgument("lang").withDescription("Checks for false friends with the author's first language lang and the language specified in --check"));
 		cli_parser.addArgument(new Argument().withLongName("clean").withDescription("Remove markup from input file"));
@@ -458,9 +459,12 @@ else if (input_type == Linter.Language.MARKDOWN || filename.endsWith(".md"))
 		List<String> dictionary = new ArrayList<String>();
 		String lang_s = "";
 		String firstlang_s = "";
-		if (map.hasOption("check"))
+		if (map.hasOption("check") || map.hasOption("autocheck"))
 		{
-			lang_s = map.getOptionValue("check");
+			if (map.hasOption("check"))
+			{
+				lang_s = map.getOptionValue("check");
+			}
 			// Try to read dictionary from an Aspell file
 			try
 			{

diff --git a/Source/Core/src/ca/uqac/lif/textidote/cleaning/latex/LatexCleaner.java b/Source/Core/src/ca/uqac/lif/textidote/cleaning/latex/LatexCleaner.java
@@ -349,7 +349,7 @@ protected AnnotatedString removeMarkup(AnnotatedString as_out, int line_pos)
 		// Footnotes (ignore)
 		as_out = as_out.replaceAll("\\\\footnote\\{.*?\\}", "");
 		// Replace citations by dummy placeholder
-		as_out = as_out.replaceAll("\\\\(cite|citep|citel|parencite)(\\[.*?\\])*\\{.*?\\}", "[0]");
+		as_out = as_out.replaceAll("\\\\(cite|citep|citel|parencite|textcite)(\\[.*?\\])*\\{.*?\\}", "[0]");
 		// Replace verbatim by dummy placeholder
 		as_out = as_out.replaceAll("\\\\verb\\+[^\\+]*?\\+", "[0]");
 		as_out = as_out.replaceAll("\\\\verb\"[^\"]*?\"", "[0]");

diff --git a/Source/CoreTest/src/ca/uqac/lif/textidote/rules/CheckRegexTest.java b/Source/CoreTest/src/ca/uqac/lif/textidote/rules/CheckRegexTest.java
@@ -265,10 +265,10 @@ public void testNoin2()
 	@Test
 	public void testNoin3()
 	{
-		AnnotatedString in_string = AnnotatedString.read(new Scanner("from~\\cite{foo}"));
+		AnnotatedString in_string = AnnotatedString.read(new Scanner("from \\cite[Section 1.2]{foo}"));
 		Rule r = m_rules.get("sh:c:noin");
 		List<Advice> ad_list = r.evaluate(in_string, in_string);
-		assertFalse(ad_list.isEmpty());
+		assertTrue(ad_list.isEmpty());
 	}
 
 	@Test