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

Added set for style parents to prevent loops in styles ancestors

Browse source
This commit is contained in:
Georgy Litvinov 2020-02-06 16:41:47 +01:00
parent de9dc7e456
commit f54121c343
3 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/writer2latex/xhtml/StyleInfo.java
View file

@ -25,6 +25,8 @@
package writer2latex.xhtml;
import java.util.HashSet;
import writer2latex.xhtml.style.properties.Properties;
public class StyleInfo {
@ -33,6 +35,7 @@ public class StyleInfo {
public Properties props = new Properties(";");
public String sLang = null;
public String sDir = null;
public HashSet<String> ancestors;
public boolean hasAttributes() {
return !props.isEmpty() || sClass!=null || sLang!=null || sDir!=null;
@ -41,4 +44,16 @@ public class StyleInfo {
String out = "sTagName: " + sTagName + "\n sClass: " + sClass + "\n sLang: " + "\n sDir: " + sDir + "\n Props: "+ props;
return out;
}
public StyleInfo(){
ancestors = new HashSet<String>();
}
public boolean unknownAncestor(String ancestor) {
if (!ancestors.contains(ancestor)){
return true;
}
return false;
}
public void addAncestor(String ancestor) {
ancestors.add(ancestor);
}
}

6
src/main/java/writer2latex/xhtml/content/TextParser.java
View file

@ -30,6 +30,9 @@ import java.util.Stack;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import pro.litvinovg.xml.Debug;
import org.w3c.dom.Element;
import writer2latex.util.Misc;
@ -172,8 +175,9 @@ public class TextParser extends Parser {
extractRealTOC(onode);
}
//Split pages
if (!pageSeparator.equals("none")) {
onode = (Element) ODFPageSplitter.splitSoftPageBreak(onode,ofr);
onode = (Element) ODFPageSplitter.splitText(onode,ofr);
}
hnode = (Element)traverseBlockText(onode,hnode);

12
src/main/java/writer2latex/xhtml/style/StyleWithPropertiesParser.java
View file

@ -102,17 +102,20 @@ public abstract class StyleWithPropertiesParser extends StyleParser {
if (!inlineCSS || styleName == null) {
return;
}
StyleWithProperties style = (StyleWithProperties) getStyles().getStyle(styleName);
if (info.sClass != null && !info.sClass.equals(styleName)) {
StyleWithProperties classStyle = (StyleWithProperties) getStyles().getStyle(info.sClass);
if (classStyle != null) {
applyProperties(classStyle, info.props, true);
String parentName = classStyle.getParentName();
if (parentName != null && !parentName.equals(styleName)) {
readParentStyle(classStyle.getParentName(), info);
if (info.unknownAncestor(parentName)) {
info.addAncestor(parentName);
readParentStyle(parentName, info);
}
}
}
}
StyleWithProperties style = (StyleWithProperties) getStyles().getStyle(styleName);
if (style == null) {
return;
}
@ -123,7 +126,10 @@ public abstract class StyleWithPropertiesParser extends StyleParser {
}
String parentName = style.getParentName();
if (parentName != null && !parentName.equals(styleName)) {
readParentStyle(style.getParentName(), info);
if (info.unknownAncestor(parentName)) {
info.addAncestor(parentName);
readParentStyle(parentName, info);
}
}
}