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

Inline style properties for lists and footnotes

Browse source
This commit is contained in:
Georgy Litvinov 2020-02-05 17:56:42 +01:00
parent 4f07882f87
commit d55c60b030
4 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -874,6 +874,7 @@ public class TextParser extends Parser {
Element list = converter.createElement("ol"); Element list = converter.createElement("ol");
StyleInfo listInfo = new StyleInfo(); StyleInfo listInfo = new StyleInfo();
getListSc().applyStyle(nLevel,sStyleName,listInfo); getListSc().applyStyle(nLevel,sStyleName,listInfo);
getListSc().readParentStyle(nLevel, sStyleName, listInfo);
writeStyle(listInfo,list); writeStyle(listInfo,list);
hnode.appendChild(list); hnode.appendChild(list);
traverseList(onode,nLevel,sStyleName,list); traverseList(onode,nLevel,sStyleName,list);

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

@ -155,9 +155,6 @@ public class HeadingStyleParser extends StyleParser {
if (!inlineCSS || styleName == null) { if (!inlineCSS || styleName == null) {
return; return;
} }
if (info.sClass != null && info.sClass.equals("qwertyc")) {
System.out.println(info.toString());
}
StyleWithProperties style = (StyleWithProperties) getStyles().getStyle(styleName); StyleWithProperties style = (StyleWithProperties) getStyles().getStyle(styleName);
getParSP().applyProperties(style, info.props, true); getParSP().applyProperties(style, info.props, true);
info.props.addProperty("clear", "left"); info.props.addProperty("clear", "left");

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

@ -47,6 +47,7 @@ import writer2latex.xhtml.style.properties.Properties;
*/ */
public class ListStyleParser extends StyleParser { public class ListStyleParser extends StyleParser {
private boolean inlineCSS;
/** Create a new <code>ListStyleConverter</code> /** Create a new <code>ListStyleConverter</code>
* @param ofr an <code>OfficeReader</code> to read style information from * @param ofr an <code>OfficeReader</code> to read style information from
* @param config the configuration to use * @param config the configuration to use
@ -58,6 +59,7 @@ public class ListStyleParser extends StyleParser {
this.styleMap = config.getXListStyleMap(); this.styleMap = config.getXListStyleMap();
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.inlineCSS = config.inlineCSS();
} }
public void applyStyle(int nLevel, String sStyleName, StyleInfo info) { public void applyStyle(int nLevel, String sStyleName, StyleInfo info) {
@ -92,7 +94,7 @@ public class ListStyleParser extends StyleParser {
* @param sIndent a String of spaces to add before each line * @param sIndent a String of spaces to add before each line
*/ */
public String composeStyleDeclarations() { public String composeStyleDeclarations() {
if (!bConvertStyles) { if (!bConvertStyles || inlineCSS) {
return ""; return "";
} }
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
@ -162,7 +164,13 @@ public class ListStyleParser extends StyleParser {
return props.toString(); return props.toString();
} }
public void readParentStyle(int level,String styleName, StyleInfo info) {
if (!inlineCSS || styleName == null) {
return;
}
ListStyle style = (ListStyle) getStyles().getStyle(styleName);
cssList(style, level, info.props);
}
/** Get the family of list styles /** Get the family of list styles
* @return the style family * @return the style family

14
src/main/java/writer2latex/xhtml/style/PageStyleParser.java
View file

@ -51,6 +51,7 @@ import writer2latex.xhtml.style.properties.Properties;
*/ */
public class PageStyleParser extends StyleParser { public class PageStyleParser extends StyleParser {
private boolean inlineCSS;
private boolean hasFootnoteRules = false; private boolean hasFootnoteRules = false;
/** Create a new <code>PageStyleConverter</code> /** Create a new <code>PageStyleConverter</code>
@ -62,6 +63,7 @@ public class PageStyleParser extends StyleParser {
public PageStyleParser(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) { public PageStyleParser(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) {
super(ofr,config,converter,nType); super(ofr,config,converter,nType);
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.inlineCSS = config.inlineCSS();
} }
/** Get the text width of the first master page (page width minus left and right margin) /** Get the text width of the first master page (page width minus left and right margin)
@ -97,6 +99,9 @@ public class PageStyleParser extends StyleParser {
public void applyFootnoteRuleStyle(StyleInfo info) { public void applyFootnoteRuleStyle(StyleInfo info) {
hasFootnoteRules = true; hasFootnoteRules = true;
info.sClass="footnoterule"; info.sClass="footnoterule";
MasterPage masterPage = ofr.getFirstMasterPage();
PageLayout pageLayout = ofr.getPageLayout(masterPage.getPageLayoutName());
cssFootnoteRule(pageLayout, info.props);
} }
/** Apply default writing direction (based on first master page) /** Apply default writing direction (based on first master page)
@ -162,10 +167,13 @@ public class PageStyleParser extends StyleParser {
buf.append(createDeclaration("body", pageDeclaration)); buf.append(createDeclaration("body", pageDeclaration));
} }
// Footnote rule // Footnote rule
String footnoteDeclaration = composeFootnoteDeclaration(); if (!inlineCSS) {
if (hasFootnoteRules && !footnoteDeclaration.isEmpty()) { String footnoteDeclaration = composeFootnoteDeclaration();
buf.append(createDeclaration("hr.footnoterule", footnoteDeclaration)); if (hasFootnoteRules && !footnoteDeclaration.isEmpty()) {
buf.append(createDeclaration("hr.footnoterule", footnoteDeclaration));
}
} }
return buf.toString(); return buf.toString();
} }