From 2ffc31d5a6bf96f2bd43b728f2066b5f8cff9c0b Mon Sep 17 00:00:00 2001 From: Michael Schierl Date: Mon, 19 Aug 2024 23:44:27 +0200 Subject: [PATCH] Re-enable indenting for CCEL and BebliaXML These XML formats do not use mixed content and are therefure (hopefully) not affected by the behaviour change across Java versions. --- .../src/main/java/biblemulticonverter/format/BebliaXML.java | 2 +- .../src/main/java/biblemulticonverter/versification/CCEL.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/biblemulticonverter/src/main/java/biblemulticonverter/format/BebliaXML.java b/biblemulticonverter/src/main/java/biblemulticonverter/format/BebliaXML.java index 5ac137f..008da5a 100644 --- a/biblemulticonverter/src/main/java/biblemulticonverter/format/BebliaXML.java +++ b/biblemulticonverter/src/main/java/biblemulticonverter/format/BebliaXML.java @@ -154,7 +154,7 @@ public void doExport(Bible bible, String... exportArgs) throws Exception { m.setSchema(getSchema()); m.marshal(xmlbible, doc); Transformer transformer = TransformerFactory.newInstance().newTransformer(); - if (Boolean.getBoolean("biblemulticonverter.indentxml")) { + if (System.getProperty("biblemulticonverter.indentxml") == null || Boolean.getBoolean("biblemulticonverter.indentxml")) { transformer.setOutputProperty(OutputKeys.INDENT, "yes"); transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2"); } diff --git a/biblemulticonverter/src/main/java/biblemulticonverter/versification/CCEL.java b/biblemulticonverter/src/main/java/biblemulticonverter/versification/CCEL.java index fb59e17..39b7718 100644 --- a/biblemulticonverter/src/main/java/biblemulticonverter/versification/CCEL.java +++ b/biblemulticonverter/src/main/java/biblemulticonverter/versification/CCEL.java @@ -429,7 +429,7 @@ public void doExport(File outputFile, List versifications, List