From e8acf863563421792eb1d75d15cdd4e774efb059 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 3 Jul 2023 19:31:34 +0100 Subject: Fix writing of embedded style maps when default encoding is not UTF-8 --- .github/workflows/tests.yml | 4 +++- NEWS | 2 ++ src/main/java/org/zwobble/mammoth/internal/xml/XmlWriter.java | 2 +- 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; -- cgit v1.2.3