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 93d2c7d..a70c5e6 100644 Binary files a/testdocuments/input/image_after_section.odt and b/testdocuments/input/image_after_section.odt differ 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