litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Fixed wrong paragraph styles priorities

Browse source
This commit is contained in:
Georgy Litvinov 2021-03-24 10:51:37 +01:00
parent 0babf899ee
commit a4d510caa7
10 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/w2phtml/xhtml/content/TextParser.java
View file

@ -572,8 +572,8 @@ public class TextParser extends Parser {
// Apply style // Apply style
StyleInfo info = new StyleInfo(); StyleInfo info = new StyleInfo();
info.sTagName = "h" + nLevel; info.sTagName = "h" + nLevel;
getHeadingSP().readParentStyle(nLevel, sStyleName, info);
getHeadingSP().applyStyle(nLevel, sStyleName, info); getHeadingSP().applyStyle(nLevel, sStyleName, info);
getHeadingSP().readParentStyle(nLevel, sStyleName, info);
// add root element // add root element
Element heading = converter.createElement(info.sTagName); Element heading = converter.createElement(info.sTagName);

2
src/main/java/w2phtml/xhtml/style/StyleWithPropertiesParser.java
View file

@ -73,8 +73,8 @@ public abstract class StyleWithPropertiesParser extends StyleParser {
applyDirection(style, info); applyDirection(style, info);
if (style.isAutomatic()) { if (style.isAutomatic()) {
// Apply parent style + hard formatting // Apply parent style + hard formatting
readStyle(style.getParentName(), info);
applyProperties(style, info.props, false); applyProperties(style, info.props, false);
readStyle(style.getParentName(), info);
} else { } else {
String displayName = style.getDisplayName(); String displayName = style.getDisplayName();

2
src/r_tests/java/w2phtml/regressionTests/html5/Sections.java → src/r_tests/java/w2phtml/regressionTests/html5/HeadingWithSections.java
View file

@ -10,7 +10,7 @@ import org.apache.commons.io.FileUtils;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
public class Sections { public class HeadingWithSections {
@Test @Test
@DisplayName("Heading with sections") @DisplayName("Heading with sections")
void testExample() throws Exception{ void testExample() throws Exception{

4
src/r_tests/java/w2phtml/regressionTests/html5/PageSectionStyles.java → src/r_tests/java/w2phtml/regressionTests/html5/ImageAfterSection.java
View file

@ -10,9 +10,9 @@ import org.apache.commons.io.FileUtils;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
public class PageSectionStyles { public class ImageAfterSection {
@Test @Test
@DisplayName("Page styles and sections") @DisplayName("image after section")
void testExample() throws Exception { void testExample() throws Exception {
String testName = "image_after_section"; String testName = "image_after_section";
List<String> arguments = new ArrayList<String>(); List<String> arguments = new ArrayList<String>();

BIN
testdocuments/input/image_after_section.odt
View file

Binary file not shown.

6
testdocuments/model/image_after_section.html
View file

File diff suppressed because one or more lines are too long

2
testdocuments/model/list.html
View file

@ -30,7 +30,7 @@
<div class="pageBreak" style="height:3em;margin-top:1em;margin-bottom:1em;background-color:red;"> </div> <div class="pageBreak" style="height:3em;margin-top:1em;margin-bottom:1em;background-color:red;"> </div>
<div class="pageNum" page="3"> <div class="pageNum" page="3">
<div class="pageContainer" style="column-count: 1;"> <div class="pageContainer" style="column-count: 1;">
<p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:2.1259842rem;font-size:3.3333335rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">fadfasdf</p> <p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:0;font-size:3.3333335rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">fadfasdf</p>
</div> </div>
</div> </div>
</body> </body>

4
testdocuments/model/list_in_section.html
View file

@ -29,7 +29,7 @@
<div class="pageBreak" style="height:3em;margin-top:1em;margin-bottom:1em;background-color:red;"> </div> <div class="pageBreak" style="height:3em;margin-top:1em;margin-bottom:1em;background-color:red;"> </div>
<div class="pageNum" page="2"> <div class="pageNum" page="2">
<div class="pageContainer" style="column-count: 1;"> <div class="pageContainer" style="column-count: 1;">
<p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:2.1259842rem;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">2text text text text text text text text text test test test test test test test test test test test test test test test test test test2 </p> <p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:0;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">2text text text text text text text text text test test test test test test test test test test test test test test test test test test2 </p>
</div> </div>
</div> </div>
<div class="pageNum" page="2"> <div class="pageNum" page="2">
@ -41,7 +41,7 @@
<div class="pageBreak" style="height:3em;margin-top:1em;margin-bottom:1em;background-color:red;"> </div> <div class="pageBreak" style="height:3em;margin-top:1em;margin-bottom:1em;background-color:red;"> </div>
<div class="pageNum" page="3"> <div class="pageNum" page="3">
<div class="pageContainer" style="column-count: 1;"> <div class="pageContainer" style="column-count: 1;">
<p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:2.1259842rem;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">3test test test test test test www</p> <p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:0;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">3test test test test test test www</p>
<ul start="3" style="list-style-type:disc;clear:left;margin-top:0;font-family:OpenSymbol;margin-bottom:0;"> <ul start="3" style="list-style-type:disc;clear:left;margin-top:0;font-family:OpenSymbol;margin-bottom:0;">
<li> <li>
<p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:2.1259842rem;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">text</p> <p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:2.1259842rem;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">text</p>

2
testdocuments/model/list_in_table.html
View file

@ -32,7 +32,7 @@
<tbody> <tbody>
<tr> <tr>
<td style="border:0.004166667rem solid #000000;padding:0.11574804rem;vertical-align:top;"> <td style="border:0.004166667rem solid #000000;padding:0.11574804rem;vertical-align:top;">
<p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:2.1259842rem;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;"><span style="font-size:3.3333335rem;font-family:&apos;IPH Astra Serif&apos;,serif;">2ext text</span></p> <p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:0;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;"><span style="font-size:3.3333335rem;font-family:&apos;IPH Astra Serif&apos;,serif;">2ext text</span></p>
</td> </td>
</tr> </tr>
</tbody> </tbody>

8
testdocuments/model/list_in_table_in_section.html
View file

@ -46,7 +46,7 @@
<p style="margin:0;font-size:1px"> </p> <p style="margin:0;font-size:1px"> </p>
</td> </td>
<td style="vertical-align:top;"> <td style="vertical-align:top;">
<p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:2.1259842rem;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">2text text text text text text text text text text text text2 </p> <p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:0;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">2text text text text text text text text text text text text2 </p>
</td> </td>
</tr> </tr>
</tbody> </tbody>
@ -73,7 +73,7 @@
<p style="margin:0;font-size:1px"> </p> <p style="margin:0;font-size:1px"> </p>
</td> </td>
<td style="vertical-align:top;"> <td style="vertical-align:top;">
<p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:2.1259842rem;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">3text text text text text text text text text text text text3 </p> <p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:0;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">3text text text text text text text text text text text text3 </p>
</td> </td>
</tr> </tr>
</tbody> </tbody>
@ -99,7 +99,7 @@
<td style="vertical-align:top;"> <td style="vertical-align:top;">
<p style="margin:0;font-size:1px"> </p> <p style="margin:0;font-size:1px"> </p>
</td> </td>
<td style="vertical-align:top;"><p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:2.1259842rem;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">4text text text text text text text text</p><ul start="3" style="list-style-type:disc;clear:left;margin-top:0;font-family:OpenSymbol;margin-bottom:0;"><li><p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:2.1259842rem;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;"> text text text text4  </p></li></ul></td> <td style="vertical-align:top;"><p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:0;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">4text text text text text text text text</p><ul start="3" style="list-style-type:disc;clear:left;margin-top:0;font-family:OpenSymbol;margin-bottom:0;"><li><p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:2.1259842rem;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;"> text text text text4  </p></li></ul></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -125,7 +125,7 @@
<p style="margin:0;font-size:1px"> </p> <p style="margin:0;font-size:1px"> </p>
</td> </td>
<td style="vertical-align:top;"> <td style="vertical-align:top;">
<p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:2.1259842rem;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">5text text 5</p> <p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:0;font-size:1.0rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">5text text 5</p>
</td> </td>
</tr> </tr>
<tr> <tr>