Skip to content

Commit 60011cc

Browse files
committed
merged RELEASE-NOTES
2 parents d45adc8 + 188effc commit 60011cc

4 files changed

Lines changed: 18 additions & 3 deletions

File tree

RELEASE-NOTES-NEXT.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ Fixed bug in `ami section --extract
55
## Changes in this Release
66
- changed `table` to `tab` in `org.contentmine.ami.tools.AMISectionTool.FloatType`
77
- continued to add tests and checking results
8+
- [#58] Ensure ANSI colors when running `ami` in Windows Command Prompt.

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@
8282
<log4j.version>2.13.3</log4j.version>
8383
<pdfbox2.version>2.0.19</pdfbox2.version>
8484
<pdfbox-tools.version>2.0.19</pdfbox-tools.version>
85-
<picocli.version>4.4.0</picocli.version>
85+
<picocli.version>4.5.0</picocli.version>
86+
<picocli.jansi.graalvm.version>1.2.0</picocli.jansi.graalvm.version>
8687
<resteasy.client>4.5.3.Final</resteasy.client>
8788
<Saxon-HE.version>10.0</Saxon-HE.version>
8889
<selenium-java.version>4.0.0-alpha-5</selenium-java.version>
@@ -398,6 +399,11 @@
398399
<artifactId>picocli</artifactId>
399400
<version>${picocli.version}</version>
400401
</dependency>
402+
<dependency>
403+
<groupId>info.picocli</groupId>
404+
<artifactId>picocli-jansi-graalvm</artifactId>
405+
<version>${picocli.jansi.graalvm.version}</version>
406+
</dependency>
401407
<!--
402408
<dependency>
403409
<groupId>javax.media</groupId>

src/main/java/org/contentmine/ami/tools/AMI.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import picocli.CommandLine.ParameterException;
2424
import picocli.CommandLine.ParseResult;
2525
import picocli.CommandLine.Spec;
26+
import picocli.jansi.graalvm.AnsiConsole;
2627

2728
import java.io.File;
2829
import java.io.PrintWriter;
@@ -119,7 +120,10 @@ public static void main(String args) {
119120
}
120121

121122
public static void main(String... args) {
122-
int exitCode = createCommandLine().execute(logArgs(args));
123+
int exitCode;
124+
try (AnsiConsole ansi = AnsiConsole.windowsInstall()) { // enable colors on Windows
125+
exitCode = createCommandLine().execute(logArgs(args));
126+
}
123127
if (System.getProperty("ami.no.exit") == null) {
124128
System.exit(exitCode);
125129
}

src/main/java/org/contentmine/ami/tools/AMIDict.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import picocli.CommandLine.Option;
3535
import picocli.CommandLine.ParameterException;
3636
import picocli.CommandLine.Spec;
37+
import picocli.jansi.graalvm.AnsiConsole;
3738

3839
@Command(name = "amidict",
3940
description = {
@@ -81,7 +82,10 @@ public void run() {
8182
}
8283

8384
public static void main(String... args) {
84-
int exitCode = createCommandLine().execute(logArgs(args));
85+
int exitCode;
86+
try (AnsiConsole ansi = AnsiConsole.windowsInstall()) { // enable colors on Windows
87+
exitCode = createCommandLine().execute(logArgs(args));
88+
}
8589
if (System.getProperty("ami.no.exit") == null) {
8690
System.exit(exitCode);
8791
}

0 commit comments

Comments
 (0)