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

Apply style properties recursively

Browse source
This commit is contained in:
Georgy Litvinov 2020-02-05 15:08:11 +01:00
parent 59edc98c5e
commit 79f8d700e3
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1646,6 +1646,7 @@ public class TextParser extends Parser {
StyleInfo info = new StyleInfo();
StyleWithProperties style = ofr.getParStyle(styleName);
getParSP().readStyle(styleName,info);
getParSP().readParentStyle(styleName,info);
Element para = converter.createElement(info.sTagName);
node.appendChild(para);
@ -1680,7 +1681,7 @@ public class TextParser extends Parser {
protected Element createInline(Element node, String sStyleName) {
StyleInfo info = new StyleInfo();
getTextSP().readStyle(sStyleName,info);
getTextSP().readParentStyle(sStyleName,info);
Element newNode = node;
if (info.hasAttributes() || !"span".equals(info.sTagName)) {
// We (probably) need to create a new element

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

@ -96,13 +96,35 @@ public abstract class StyleWithPropertiesParser extends StyleParser {
info.sClass = getClassNamePrefix() + styleNames.getName(displayName);
}
}
if (info.sClass != null && !info.sClass.equals(sStyleName)) {
StyleWithProperties classStyle = (StyleWithProperties) getStyles().getStyle(info.sClass);
if (classStyle != null && inlineCSS) {
applyProperties(classStyle, info.props, true);
}
}
public void readParentStyle(String styleName, StyleInfo info) {
if (!inlineCSS || styleName == null) {
return;
}
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);
}
}
}
StyleWithProperties style = (StyleWithProperties) getStyles().getStyle(styleName);
if (style == null) {
return;
}
String displayName = style.getDisplayName();
String exportName = styleNames.getName(displayName);
if (exportName != null && !exportName.trim().equals("null")) {
applyProperties(style, info.props, true);
}
String parentName = style.getParentName();
if (parentName != null && !parentName.equals(styleName)) {
readParentStyle(style.getParentName(), info);
}
}
/** Convert style information for used styles