diff --git a/CHANGELOG.md b/CHANGELOG.md index 40d3bd3a5d99..9c79e863617d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve ### Changed +- We improved the Latex2Unicode conversion [#8639](https://github.com/JabRef/jabref/pull/8639) + ### Fixed ### Removed diff --git a/build.gradle b/build.gradle index b21e70c741c7..804acc3aa342 100644 --- a/build.gradle +++ b/build.gradle @@ -53,12 +53,6 @@ application { mainModule.set('org.jabref') } -// TODO: Ugly workaround to temporarily ignore build errors to dependencies of latex2unicode -// These should be removed, as well as the files in the lib folder, as soon as they have valid module names -modularity.patchModule("test", "fastparse_2.12-1.0.0.jar") -modularity.patchModule("test2", "fastparse-utils_2.12-1.0.0.jar") -modularity.patchModule("test3", "sourcecode_2.12-0.1.4.jar") - // Workaround for https://github.com/openjfx/javafx-gradle-plugin/issues/89 // See also https://github.com/java9-modularity/gradle-modules-plugin/issues/165 modularity.disableEffectiveArgumentsAdjustment() @@ -191,8 +185,8 @@ dependencies { implementation group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '3.0.1' implementation group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2' - implementation ('com.github.tomtung:latex2unicode_2.12:0.2.6') { - exclude module: 'fastparse_2.12' + implementation ('com.github.tomtung:latex2unicode_2.13:0.3.2') { + exclude module: 'fastparse_2.13' } implementation group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.4.1' diff --git a/lib/fastparse-1.0.0.jar b/lib/fastparse-1.0.0.jar deleted file mode 100644 index 7c38dac21c68..000000000000 Binary files a/lib/fastparse-1.0.0.jar and /dev/null differ diff --git a/lib/fastparse-2.3.3.jar b/lib/fastparse-2.3.3.jar new file mode 100644 index 000000000000..2bcb25233f87 Binary files /dev/null and b/lib/fastparse-2.3.3.jar differ diff --git a/lib/fastparse-utils-1.0.0.jar b/lib/fastparse-utils-1.0.0.jar deleted file mode 100644 index 58d520f52fb8..000000000000 Binary files a/lib/fastparse-utils-1.0.0.jar and /dev/null differ diff --git a/lib/geny-0.6.10.jar b/lib/geny-0.6.10.jar new file mode 100644 index 000000000000..02846e358aea Binary files /dev/null and b/lib/geny-0.6.10.jar differ diff --git a/lib/sourcecode-0.1.4.jar b/lib/sourcecode-0.1.4.jar deleted file mode 100644 index 2aa74d89a0d4..000000000000 Binary files a/lib/sourcecode-0.1.4.jar and /dev/null differ diff --git a/lib/sourcecode-0.2.3.jar b/lib/sourcecode-0.2.3.jar new file mode 100644 index 000000000000..a0a649fca58c Binary files /dev/null and b/lib/sourcecode-0.2.3.jar differ diff --git a/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java b/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java index c8bfb0a3a6b8..01c4c304ef29 100644 --- a/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java +++ b/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java @@ -6,7 +6,7 @@ import java.util.regex.Pattern; import com.github.tomtung.latex2unicode.LaTeX2Unicode; -import fastparse.core.Parsed; +import fastparse.Parsed; /** * Adapter class for the latex2unicode lib. This is an alternative to our LatexToUnicode class