aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-07-03 19:31:34 +0100
committerMichael Williamson <mike@zwobble.org>2023-07-03 19:37:27 +0100
commite8acf863563421792eb1d75d15cdd4e774efb059 (patch)
treee9ddd16090db2ee0d4759b371132fad003e5e64e
parent5bee0ae599b099bc235a5fd519d62ceb0cdcb056 (diff)
Fix writing of embedded style maps when default encoding is not UTF-8
-rw-r--r--.github/workflows/tests.yml4
-rw-r--r--NEWS2
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/xml/XmlWriter.java2
3 files changed, 6 insertions, 2 deletions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 447782e..b36c701 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,4 +20,6 @@ jobs:
distribution: 'temurin'
java-version: ${{ matrix.java-version }}
- - run: mvn package
+ - run: mvn test package
+
+ - run: mvn -Dfile.encoding=Cp1252 test
diff --git a/NEWS b/NEWS
index 5ba16cf..3c24378 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
* Support merged paragraphs when revisions are tracked.
+* Fix writing of embedded style maps when default encoding is not UTF-8.
+
# 1.5.0
* Convert symbols in supported fonts to corresponding Unicode characters.
diff --git a/src/main/java/org/zwobble/mammoth/internal/xml/XmlWriter.java b/src/main/java/org/zwobble/mammoth/internal/xml/XmlWriter.java
index 7882258..8c37aff 100644
--- a/src/main/java/org/zwobble/mammoth/internal/xml/XmlWriter.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/XmlWriter.java
@@ -23,7 +23,7 @@ public class XmlWriter {
private static XMLStreamWriter createXmlWriter(ByteArrayOutputStream outputStream) throws XMLStreamException {
XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
- return outputFactory.createXMLStreamWriter(outputStream);
+ return outputFactory.createXMLStreamWriter(outputStream, "UTF-8");
}
private final XMLStreamWriter writer;