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

Inline style properties for headings

Browse source
This commit is contained in:
Georgy Litvinov 2020-02-05 17:25:49 +01:00
parent 79f8d700e3
commit 4f07882f87
2 changed files with 45 additions and 29 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

@ -671,8 +671,9 @@ 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;
getHeadingSc().readParentStyle(nLevel, sStyleName, info);
getHeadingSc().applyStyle(nLevel, sStyleName, info); getHeadingSc().applyStyle(nLevel, sStyleName, info);
// add root element // add root element
Element heading = converter.createElement(info.sTagName); Element heading = converter.createElement(info.sTagName);
hnode.appendChild(heading); hnode.appendChild(heading);

71
src/main/java/writer2latex/xhtml/style/HeadingStyleParser.java
View file

@ -43,7 +43,7 @@ public class HeadingStyleParser extends StyleParser {
// Sets of additional styles (other than the main heading style for the level) // Sets of additional styles (other than the main heading style for the level)
private List<Set<String>> otherLevelStyles; private List<Set<String>> otherLevelStyles;
private boolean inlineCSS;
public HeadingStyleParser(OfficeReader ofr, XhtmlConfig config, public HeadingStyleParser(OfficeReader ofr, XhtmlConfig config,
Converter converter, int nType) { Converter converter, int nType) {
super(ofr, config, converter, nType); super(ofr, config, converter, nType);
@ -51,6 +51,7 @@ public class HeadingStyleParser extends StyleParser {
this.bConvertStyles = config.xhtmlFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlFormatting()==XhtmlConfig.IGNORE_HARD; this.bConvertStyles = config.xhtmlFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlFormatting()==XhtmlConfig.IGNORE_HARD;
this.bConvertHard = config.xhtmlFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlFormatting()==XhtmlConfig.IGNORE_STYLES; this.bConvertHard = config.xhtmlFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlFormatting()==XhtmlConfig.IGNORE_STYLES;
this.otherLevelStyles = new ArrayList<Set<String>>(); this.otherLevelStyles = new ArrayList<Set<String>>();
this.inlineCSS = config.inlineCSS();
for (int i=0; i<=6; i++) { for (int i=0; i<=6; i++) {
otherLevelStyles.add(new HashSet<String>()); otherLevelStyles.add(new HashSet<String>());
} }
@ -58,7 +59,7 @@ public class HeadingStyleParser extends StyleParser {
@Override @Override
public String composeStyleDeclarations() { public String composeStyleDeclarations() {
if (!bConvertStyles) { if (!bConvertStyles || inlineCSS) {
return ""; return "";
} }
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
@ -116,38 +117,52 @@ public class HeadingStyleParser extends StyleParser {
*/ */
public void applyStyle(int nLevel, String sStyleName, StyleInfo info) { public void applyStyle(int nLevel, String sStyleName, StyleInfo info) {
StyleWithProperties style = (StyleWithProperties) getStyles().getStyle(sStyleName); StyleWithProperties style = (StyleWithProperties) getStyles().getStyle(sStyleName);
if (style != null) { if (style == null) {
if (config.multilingual()) { return;
applyLang(style, info); }
if (config.multilingual()) {
applyLang(style, info);
}
applyDirection(style, info);
if (style.isAutomatic()) {
// Apply parent style + hard formatting
applyStyle(nLevel, style.getParentName(), info);
if (bConvertHard) {
getParSP().applyProperties(style, info.props, false);
} }
applyDirection(style, info); } else {
if (style.isAutomatic()) { String sDisplayName = style.getDisplayName();
// Apply parent style + hard formatting if (styleMap.contains(sDisplayName)) {
applyStyle(nLevel, style.getParentName(), info); // Apply attributes as specified in style map from user
if (bConvertHard) { XhtmlStyleMapItem map = styleMap.get(sDisplayName);
getParSP().applyProperties(style, info.props, false); info.sTagName = map.sBlockElement;
if (!"(none)".equals(map.sBlockCss)) {
info.sClass = map.sBlockCss;
} }
} else { } else if (style != ofr.getHeadingStyle(nLevel)) {
String sDisplayName = style.getDisplayName(); // This is not the main style for this level, add class and remember
if (styleMap.contains(sDisplayName)) { styleNames.addName(sDisplayName);
// Apply attributes as specified in style map from user info.sClass = styleNames.getName(sDisplayName);
XhtmlStyleMapItem map = styleMap.get(sDisplayName); if (1 <= nLevel && nLevel <= 6) {
info.sTagName = map.sBlockElement; otherLevelStyles.get(nLevel).add(sDisplayName);
if (!"(none)".equals(map.sBlockCss)) {
info.sClass = map.sBlockCss;
}
} else if (style != ofr.getHeadingStyle(nLevel)) {
// This is not the main style for this level, add class and remember
styleNames.addName(sDisplayName);
info.sClass = styleNames.getName(sDisplayName);
if (1 <= nLevel && nLevel <= 6) {
otherLevelStyles.get(nLevel).add(sDisplayName);
}
} }
} }
} }
}
}
public void readParentStyle(int level,String styleName, StyleInfo info) {
if (!inlineCSS || styleName == null) {
return;
}
if (info.sClass != null && info.sClass.equals("qwertyc")) {
System.out.println(info.toString());
}
StyleWithProperties style = (StyleWithProperties) getStyles().getStyle(styleName);
getParSP().applyProperties(style, info.props, true);
info.props.addProperty("clear", "left");
getParSP().applyProperties(ofr.getHeadingStyle(level), info.props, true);
}
/** Apply an inner style on a heading. The inner style surrounds the text content, excluding the numbering label. /** Apply an inner style on a heading. The inner style surrounds the text content, excluding the numbering label.
* Inner styles are not an OpenDocument feature, but is provided as an additional style hook for own style sheets. * Inner styles are not an OpenDocument feature, but is provided as an additional style hook for own style sheets.
* An inner style is only applied if there is an explicit style map for the style. * An inner style is only applied if there is an explicit style map for the style.