Author: ssteiner Date: Wed Mar 25 12:46:09 2020 New Revision: 1875639 URL: http://svn.apache.org/viewvc?rev=1875639&view=rev Log: FOP-2923: Allow to suppress fo:leader within empty paragaphs from structure tree
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverter.java xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverter.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverter.java?rev=1875639&r1=1875638&r2=1875639&view=diff ============================================================================== --- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverter.java (original) +++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverter.java Wed Mar 25 12:46:09 2020 @@ -686,7 +686,7 @@ public class FO2StructureTreeConverter e public void run() { eventHandler.startLeader(l); } - }, true); + }, false); super.startLeader(l); } Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java?rev=1875639&r1=1875638&r2=1875639&view=diff ============================================================================== --- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java (original) +++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java Wed Mar 25 12:46:09 2020 @@ -83,6 +83,7 @@ public class FO2StructureTreeConverterTe private static final String STRUCTURE_TREE_SEQUENCE_NAME = "structure-tree-sequence"; private FOLoader foLoader; + private boolean keepEmptyTags = true; @Test public void testCompleteDocument() throws Exception { @@ -139,6 +140,7 @@ public class FO2StructureTreeConverterTe @Test public void testRemoveBlocks() throws Exception { + keepEmptyTags = false; compare("<fo:root xmlns:fo=\"http://www.w3.org/1999/XSL/Format\">\n" + " <fo:layout-master-set>\n" + " <fo:simple-page-master master-name=\"simple\">\n" @@ -150,6 +152,8 @@ public class FO2StructureTreeConverterTe + " <fo:block/>" + " <fo:block><fo:block/></fo:block>\n" + " <fo:block>a</fo:block>\n" + + " <fo:block><fo:leader/></fo:block>\n" + + " <fo:block>a<fo:leader/></fo:block>\n" + " </fo:flow>\n" + " </fo:page-sequence>\n" + "</fo:root>\n", @@ -162,6 +166,9 @@ public class FO2StructureTreeConverterTe + "<fo:block>\n" + "<marked-content/>\n" + "</fo:block>\n" + + "<fo:block>\n" + + "<marked-content/>\n" + + "</fo:block>\n" + "</fo:flow>\n" + "</structure-tree>\n" + "</structure-tree-sequence>\n"); @@ -228,7 +235,7 @@ public class FO2StructureTreeConverterTe return actualStructureTree; } - private static void createStructureTreeFromDocument(InputStream foInputStream, + private void createStructureTreeFromDocument(InputStream foInputStream, Result result) throws Exception { TransformerHandler tHandler = createTransformerHandler(result); startStructureTreeSequence(tHandler); @@ -264,10 +271,10 @@ public class FO2StructureTreeConverterTe }); } - private static FOUserAgent createFOUserAgent(FODocumentParser documentParser) { + private FOUserAgent createFOUserAgent(FODocumentParser documentParser) { FOUserAgent userAgent = documentParser.createFOUserAgent(); userAgent.setAccessibility(true); - userAgent.setKeepEmptyTags(false); + userAgent.setKeepEmptyTags(keepEmptyTags); return userAgent; } --------------------------------------------------------------------- To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org