From a4d510caa7d1521f167e03a1a72cf7b313b06087 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Wed, 24 Mar 2021 10:51:37 +0100 Subject: [PATCH] Fixed wrong paragraph styles priorities --- .../w2phtml/xhtml/content/TextParser.java | 2 +- .../style/StyleWithPropertiesParser.java | 2 +- ...Sections.java => HeadingWithSections.java} | 2 +- ...tionStyles.java => ImageAfterSection.java} | 4 ++-- testdocuments/input/image_after_section.odt | Bin 15720 -> 15739 bytes testdocuments/model/image_after_section.html | 6 +++--- testdocuments/model/list.html | 2 +- testdocuments/model/list_in_section.html | 4 ++-- testdocuments/model/list_in_table.html | 2 +- .../model/list_in_table_in_section.html | 8 ++++---- 10 files changed, 16 insertions(+), 16 deletions(-) rename src/r_tests/java/w2phtml/regressionTests/html5/{Sections.java => HeadingWithSections.java} (96%) rename src/r_tests/java/w2phtml/regressionTests/html5/{PageSectionStyles.java => ImageAfterSection.java} (93%) diff --git a/src/main/java/w2phtml/xhtml/content/TextParser.java b/src/main/java/w2phtml/xhtml/content/TextParser.java index d18236d..fb236c4 100644 --- a/src/main/java/w2phtml/xhtml/content/TextParser.java +++ b/src/main/java/w2phtml/xhtml/content/TextParser.java @@ -572,8 +572,8 @@ public class TextParser extends Parser { // Apply style StyleInfo info = new StyleInfo(); info.sTagName = "h" + nLevel; - getHeadingSP().readParentStyle(nLevel, sStyleName, info); getHeadingSP().applyStyle(nLevel, sStyleName, info); + getHeadingSP().readParentStyle(nLevel, sStyleName, info); // add root element Element heading = converter.createElement(info.sTagName); diff --git a/src/main/java/w2phtml/xhtml/style/StyleWithPropertiesParser.java b/src/main/java/w2phtml/xhtml/style/StyleWithPropertiesParser.java index fed7276..95ef3a9 100644 --- a/src/main/java/w2phtml/xhtml/style/StyleWithPropertiesParser.java +++ b/src/main/java/w2phtml/xhtml/style/StyleWithPropertiesParser.java @@ -73,8 +73,8 @@ public abstract class StyleWithPropertiesParser extends StyleParser { applyDirection(style, info); if (style.isAutomatic()) { // Apply parent style + hard formatting - readStyle(style.getParentName(), info); applyProperties(style, info.props, false); + readStyle(style.getParentName(), info); } else { String displayName = style.getDisplayName(); diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/Sections.java b/src/r_tests/java/w2phtml/regressionTests/html5/HeadingWithSections.java similarity index 96% rename from src/r_tests/java/w2phtml/regressionTests/html5/Sections.java rename to src/r_tests/java/w2phtml/regressionTests/html5/HeadingWithSections.java index 5288d4e..1f169f7 100644 --- a/src/r_tests/java/w2phtml/regressionTests/html5/Sections.java +++ b/src/r_tests/java/w2phtml/regressionTests/html5/HeadingWithSections.java @@ -10,7 +10,7 @@ import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -public class Sections { +public class HeadingWithSections { @Test @DisplayName("Heading with sections") void testExample() throws Exception{ diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/PageSectionStyles.java b/src/r_tests/java/w2phtml/regressionTests/html5/ImageAfterSection.java similarity index 93% rename from src/r_tests/java/w2phtml/regressionTests/html5/PageSectionStyles.java rename to src/r_tests/java/w2phtml/regressionTests/html5/ImageAfterSection.java index 62ac538..4419cbb 100644 --- a/src/r_tests/java/w2phtml/regressionTests/html5/PageSectionStyles.java +++ b/src/r_tests/java/w2phtml/regressionTests/html5/ImageAfterSection.java @@ -10,9 +10,9 @@ import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -public class PageSectionStyles { +public class ImageAfterSection { @Test - @DisplayName("Page styles and sections") + @DisplayName("image after section") void testExample() throws Exception { String testName = "image_after_section"; List arguments = new ArrayList(); diff --git a/testdocuments/input/image_after_section.odt b/testdocuments/input/image_after_section.odt index 93d2c7da0d127c00491d0a90e26f7cca7c5cf74b..a70c5e675a95f373cd9d55a26332b05980f67409 100644 GIT binary patch delta 5989 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 diff --git a/testdocuments/model/image_after_section.html b/testdocuments/model/image_after_section.html index 264ff68..878bdca 100644 --- a/testdocuments/model/image_after_section.html +++ b/testdocuments/model/image_after_section.html @@ -11,13 +11,13 @@
-

First column

-

second column

+

First column

+

second column

-

Изображение1

+

Изображение1