From d55c60b030c29e8e5a42f63637be33b13123ea2c Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Wed, 5 Feb 2020 17:56:42 +0100 Subject: [PATCH] Inline style properties for lists and footnotes --- .../writer2latex/xhtml/content/TextParser.java | 1 + .../xhtml/style/HeadingStyleParser.java | 3 --- .../writer2latex/xhtml/style/ListStyleParser.java | 12 ++++++++++-- .../writer2latex/xhtml/style/PageStyleParser.java | 14 +++++++++++--- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/main/java/writer2latex/xhtml/content/TextParser.java b/src/main/java/writer2latex/xhtml/content/TextParser.java index dcd9da2..b3d718e 100644 --- a/src/main/java/writer2latex/xhtml/content/TextParser.java +++ b/src/main/java/writer2latex/xhtml/content/TextParser.java @@ -874,6 +874,7 @@ public class TextParser extends Parser { Element list = converter.createElement("ol"); StyleInfo listInfo = new StyleInfo(); getListSc().applyStyle(nLevel,sStyleName,listInfo); + getListSc().readParentStyle(nLevel, sStyleName, listInfo); writeStyle(listInfo,list); hnode.appendChild(list); traverseList(onode,nLevel,sStyleName,list); diff --git a/src/main/java/writer2latex/xhtml/style/HeadingStyleParser.java b/src/main/java/writer2latex/xhtml/style/HeadingStyleParser.java index e5972df..1ccdbcf 100644 --- a/src/main/java/writer2latex/xhtml/style/HeadingStyleParser.java +++ b/src/main/java/writer2latex/xhtml/style/HeadingStyleParser.java @@ -155,9 +155,6 @@ public class HeadingStyleParser extends StyleParser { 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"); diff --git a/src/main/java/writer2latex/xhtml/style/ListStyleParser.java b/src/main/java/writer2latex/xhtml/style/ListStyleParser.java index 9802e10..65bf7e5 100644 --- a/src/main/java/writer2latex/xhtml/style/ListStyleParser.java +++ b/src/main/java/writer2latex/xhtml/style/ListStyleParser.java @@ -47,6 +47,7 @@ import writer2latex.xhtml.style.properties.Properties; */ public class ListStyleParser extends StyleParser { + private boolean inlineCSS; /** Create a new ListStyleConverter * @param ofr an OfficeReader to read style information from * @param config the configuration to use @@ -58,6 +59,7 @@ public class ListStyleParser extends StyleParser { this.styleMap = config.getXListStyleMap(); 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.inlineCSS = config.inlineCSS(); } 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 */ public String composeStyleDeclarations() { - if (!bConvertStyles) { + if (!bConvertStyles || inlineCSS) { return ""; } StringBuilder buf = new StringBuilder(); @@ -162,7 +164,13 @@ public class ListStyleParser extends StyleParser { 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 * @return the style family diff --git a/src/main/java/writer2latex/xhtml/style/PageStyleParser.java b/src/main/java/writer2latex/xhtml/style/PageStyleParser.java index 6522018..137bfed 100644 --- a/src/main/java/writer2latex/xhtml/style/PageStyleParser.java +++ b/src/main/java/writer2latex/xhtml/style/PageStyleParser.java @@ -51,6 +51,7 @@ import writer2latex.xhtml.style.properties.Properties; */ public class PageStyleParser extends StyleParser { + private boolean inlineCSS; private boolean hasFootnoteRules = false; /** Create a new PageStyleConverter @@ -62,6 +63,7 @@ public class PageStyleParser extends StyleParser { public PageStyleParser(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) { super(ofr,config,converter,nType); 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) @@ -97,6 +99,9 @@ public class PageStyleParser extends StyleParser { public void applyFootnoteRuleStyle(StyleInfo info) { hasFootnoteRules = true; 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) @@ -162,10 +167,13 @@ public class PageStyleParser extends StyleParser { buf.append(createDeclaration("body", pageDeclaration)); } // Footnote rule - String footnoteDeclaration = composeFootnoteDeclaration(); - if (hasFootnoteRules && !footnoteDeclaration.isEmpty()) { - buf.append(createDeclaration("hr.footnoterule", footnoteDeclaration)); + if (!inlineCSS) { + String footnoteDeclaration = composeFootnoteDeclaration(); + if (hasFootnoteRules && !footnoteDeclaration.isEmpty()) { + buf.append(createDeclaration("hr.footnoterule", footnoteDeclaration)); + } } + return buf.toString(); }