diff --git a/src/main/java/w2phtml/project.properties b/src/main/java/w2phtml/project.properties index 5c2b35e..6d16e13 100644 --- a/src/main/java/w2phtml/project.properties +++ b/src/main/java/w2phtml/project.properties @@ -1,3 +1,3 @@ -#Tue Mar 10 14:02:00 CET 2020 +#Tue Mar 10 14:37:23 CET 2020 releaseVersion=0.5.4 -releaseDate=14\:02\:00 10-03-2020 +releaseDate=14\:37\:23 10-03-2020 diff --git a/src/main/java/w2phtml/xhtml/Converter.java b/src/main/java/w2phtml/xhtml/Converter.java index 00d6b84..661c048 100644 --- a/src/main/java/w2phtml/xhtml/Converter.java +++ b/src/main/java/w2phtml/xhtml/Converter.java @@ -459,7 +459,7 @@ public class Converter extends BasicConverter { } // Export styles - if (config.xhtmlFormatting() > XhtmlConfig.IGNORE_STYLES) { + if (isOPS()) { // EPUB CssDocument cssDoc = new CssDocument(EPUB_STYLESHEET); cssDoc.read(styles.allStyleSelectors(false)); @@ -469,8 +469,7 @@ public class Converter extends BasicConverter { cssDoc.read(styles.allStyleSelectors(false)); converterResult.addDocument(cssDoc); } - } - + } private void addNavigationLink(Document dom, Node node, String s, int nIndex) { @@ -709,7 +708,7 @@ public class Converter extends BasicConverter { } // Add link to generated stylesheet if producing normal XHTML and the user wants separate css - if (!bOPS && config.separateStylesheet() && config.xhtmlFormatting()>XhtmlConfig.IGNORE_STYLES) { + if (!bOPS && config.separateStylesheet()) { Element htmlStyle = htmlDOM.createElement("link"); htmlStyle.setAttribute("rel","stylesheet"); htmlStyle.setAttribute("type","text/css"); @@ -728,7 +727,7 @@ public class Converter extends BasicConverter { } // Add link to generated stylesheet if producing OPS content - if (isOPS() && config.xhtmlFormatting()>XhtmlConfig.IGNORE_STYLES) { + if (isOPS()) { Element htmlStyle = htmlDOM.createElement("link"); htmlStyle.setAttribute("rel","stylesheet"); htmlStyle.setAttribute("type","text/css"); diff --git a/src/main/java/w2phtml/xhtml/XhtmlConfig.java b/src/main/java/w2phtml/xhtml/XhtmlConfig.java index 4b88afe..9661f94 100644 --- a/src/main/java/w2phtml/xhtml/XhtmlConfig.java +++ b/src/main/java/w2phtml/xhtml/XhtmlConfig.java @@ -40,7 +40,7 @@ import w2phtml.util.Misc; public class XhtmlConfig extends w2phtml.base.ConfigBase { // Implement configuration methods - protected int getOptionCount() { return 64; } + protected int getOptionCount() { return 63; } protected String getDefaultConfigPath() { return "/writer2latex/xhtml/config/"; } // Override setOption: To be backwards compatible, we must accept options @@ -113,7 +113,7 @@ public class XhtmlConfig extends w2phtml.base.ConfigBase { private static final int TEMPLATE_IDS = 11; private static final int SEPARATE_STYLESHEET = 12; private static final int CUSTOM_STYLESHEET = 13; - private static final int FORMATTING = 14; + private static final int ALIGN_SPLITS_TO_PAGES = 14; private static final int FRAME_FORMATTING = 15; private static final int SECTION_FORMATTING = 16; private static final int TABLE_FORMATTING = 17; @@ -162,8 +162,7 @@ public class XhtmlConfig extends w2phtml.base.ConfigBase { private static final int PAGINATION = 60; private static final int MIN_LETTER_SPACING = 61; private static final int PAGE_BREAK_STYLE = 62; - private static final int ALIGN_SPLITS_TO_PAGES = 63; - + protected ComplexOption xheading = addComplexOption("heading-map"); protected ComplexOption xpar = addComplexOption("paragraph-map"); protected ComplexOption xtext = addComplexOption("text-map"); @@ -196,7 +195,6 @@ public class XhtmlConfig extends w2phtml.base.ConfigBase { options[TEMPLATE_IDS] = new Option("template_ids",""); options[SEPARATE_STYLESHEET] = new BooleanOption("separate_stylesheet","false"); options[CUSTOM_STYLESHEET] = new Option("custom_stylesheet",""); - options[FORMATTING] = new XhtmlFormatOption("formatting","convert_all"); options[FRAME_FORMATTING] = new XhtmlFormatOption("frame_formatting","convert_all"); options[SECTION_FORMATTING] = new XhtmlFormatOption("section_formatting","convert_all"); options[TABLE_FORMATTING] = new XhtmlFormatOption("table_formatting","convert_all"); @@ -394,7 +392,6 @@ public class XhtmlConfig extends w2phtml.base.ConfigBase { public String templateIds() { return options[TEMPLATE_IDS].getString(); } public boolean separateStylesheet() { return ((BooleanOption) options[SEPARATE_STYLESHEET]).getValue(); } public String xhtmlCustomStylesheet() { return options[CUSTOM_STYLESHEET].getString(); } - public int xhtmlFormatting() { return ((XhtmlFormatOption) options[FORMATTING]).getValue(); } public int xhtmlFrameFormatting() { return ((XhtmlFormatOption) options[FRAME_FORMATTING]).getValue(); } public int xhtmlSectionFormatting() { return ((XhtmlFormatOption) options[SECTION_FORMATTING]).getValue(); } public int xhtmlTableFormatting() { return ((XhtmlFormatOption) options[TABLE_FORMATTING]).getValue(); } diff --git a/src/main/java/w2phtml/xhtml/content/ListParser.java b/src/main/java/w2phtml/xhtml/content/ListParser.java index efd5fcd..834e593 100644 --- a/src/main/java/w2phtml/xhtml/content/ListParser.java +++ b/src/main/java/w2phtml/xhtml/content/ListParser.java @@ -214,55 +214,7 @@ public class ListParser extends Parser { } private void traverseListItem(Node onode, int nLevel, String styleName, Node hnode) { - // First check if we have a single paragraph to be omitted - // This should happen if we ignore styles and have no style-map - // for the paragraph style used - if (config.xhtmlFormatting()!=XhtmlConfig.CONVERT_ALL && onode.hasChildNodes()) { - NodeList list = onode.getChildNodes(); - int nLen = list.getLength(); - int nParCount = 0; - boolean bNoPTag = true; - for (int i=0; i0) { Element span = converter.createElement("span"); diff --git a/src/main/java/w2phtml/xhtml/style/CellStyleParser.java b/src/main/java/w2phtml/xhtml/style/CellStyleParser.java index 3b4e48f..5229ef1 100644 --- a/src/main/java/w2phtml/xhtml/style/CellStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/CellStyleParser.java @@ -52,8 +52,6 @@ public class CellStyleParser extends StyleWithPropertiesParser { // Style maps for Cells are currently not supported. // (In OOo, cell styles are only supported by Calc) this.styleMap = new XhtmlStyleMap(); - this.bConvertStyles = config.xhtmlTableFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlTableFormatting()==XhtmlConfig.IGNORE_HARD; - this.bConvertHard = config.xhtmlTableFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlTableFormatting()==XhtmlConfig.IGNORE_STYLES; } /** Get the family of cell styles diff --git a/src/main/java/w2phtml/xhtml/style/FrameStyleParser.java b/src/main/java/w2phtml/xhtml/style/FrameStyleParser.java index 9651217..4d924fc 100644 --- a/src/main/java/w2phtml/xhtml/style/FrameStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/FrameStyleParser.java @@ -54,17 +54,12 @@ public class FrameStyleParser extends StyleWithPropertiesParser { public FrameStyleParser(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) { super(ofr,config,converter,nType); this.styleMap = config.getXFrameStyleMap(); - this.bConvertStyles = config.xhtmlFrameFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlFrameFormatting()==XhtmlConfig.IGNORE_HARD; - this.bConvertHard = config.xhtmlFrameFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlFrameFormatting()==XhtmlConfig.IGNORE_STYLES; } /** Convert style information for used styles * @param sIndent a String of spaces to add before each line */ public String composeStyleDeclarations() { - if (!bConvertStyles) { - return ""; - } StringBuilder buf = new StringBuilder(); buf.append(super.composeStyleDeclarations()); Enumeration names = styleNames.keys(); diff --git a/src/main/java/w2phtml/xhtml/style/HeadingStyleParser.java b/src/main/java/w2phtml/xhtml/style/HeadingStyleParser.java index 0d1769e..9dacd2f 100644 --- a/src/main/java/w2phtml/xhtml/style/HeadingStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/HeadingStyleParser.java @@ -48,8 +48,6 @@ public class HeadingStyleParser extends StyleParser { Converter converter, int nType) { super(ofr, config, converter, nType); this.styleMap = config.getXHeadingStyleMap(); - 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.otherLevelStyles = new ArrayList>(); this.inlineCSS = config.inlineCSS(); for (int i=0; i<=6; i++) { @@ -59,7 +57,7 @@ public class HeadingStyleParser extends StyleParser { @Override public String composeStyleDeclarations() { - if (!bConvertStyles || inlineCSS) { + if (inlineCSS) { return ""; } StringBuilder result = new StringBuilder(); @@ -127,9 +125,7 @@ public class HeadingStyleParser extends StyleParser { if (style.isAutomatic()) { // Apply parent style + hard formatting applyStyle(nLevel, style.getParentName(), info); - if (bConvertHard) { getParSP().applyProperties(style, info.props, false); - } } else { String sDisplayName = style.getDisplayName(); if (styleMap.contains(sDisplayName)) { diff --git a/src/main/java/w2phtml/xhtml/style/ListStyleParser.java b/src/main/java/w2phtml/xhtml/style/ListStyleParser.java index f35ae9f..811e7a0 100644 --- a/src/main/java/w2phtml/xhtml/style/ListStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/ListStyleParser.java @@ -57,8 +57,6 @@ public class ListStyleParser extends StyleParser { public ListStyleParser(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) { super(ofr,config,converter,nType); 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(); } @@ -67,7 +65,7 @@ public class ListStyleParser extends StyleParser { if (style!=null) { if (style.isAutomatic()) { applyStyle(nLevel,style.getParentName(),info); - if (bConvertHard) { cssList(style,nLevel,info.props); } + cssList(style,nLevel,info.props); } else { String sDisplayName = style.getDisplayName(); @@ -94,7 +92,7 @@ public class ListStyleParser extends StyleParser { * @param sIndent a String of spaces to add before each line */ public String composeStyleDeclarations() { - if (!bConvertStyles || inlineCSS) { + if (inlineCSS) { return ""; } StringBuilder buf = new StringBuilder(); diff --git a/src/main/java/w2phtml/xhtml/style/PageStyleParser.java b/src/main/java/w2phtml/xhtml/style/PageStyleParser.java index 207df57..921a7fd 100644 --- a/src/main/java/w2phtml/xhtml/style/PageStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/PageStyleParser.java @@ -62,7 +62,6 @@ 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(); } @@ -142,10 +141,8 @@ public class PageStyleParser extends StyleParser { String sDisplayName = names.nextElement(); buf.append(composeDeclaration(sDisplayName)); } - if (ofr.isText() && bConvertStyles) { - // Export page formatting for first master page in text documents - buf.append(composeFirstPageDeclaration()); - } + // Export page formatting for first master page in text documents + buf.append(composeFirstPageDeclaration()); return buf.toString(); } diff --git a/src/main/java/w2phtml/xhtml/style/ParStyleParser.java b/src/main/java/w2phtml/xhtml/style/ParStyleParser.java index 30ef544..2f4bd24 100644 --- a/src/main/java/w2phtml/xhtml/style/ParStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/ParStyleParser.java @@ -57,8 +57,6 @@ public class ParStyleParser extends StyleWithPropertiesParser { public ParStyleParser(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) { super(ofr,config,converter,nType); this.styleMap = config.getXParStyleMap(); - this.bConvertStyles = config.xhtmlFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlFormatting()==XhtmlConfig.IGNORE_HARD; - this.bConvertHard = config.xhtmlFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlFormatting()==XhtmlConfig.IGNORE_STYLES; } /** Get the family of paragraph styles diff --git a/src/main/java/w2phtml/xhtml/style/PresentationStyleParser.java b/src/main/java/w2phtml/xhtml/style/PresentationStyleParser.java index b7164c7..0902148 100644 --- a/src/main/java/w2phtml/xhtml/style/PresentationStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/PresentationStyleParser.java @@ -87,9 +87,7 @@ public class PresentationStyleParser extends FrameStyleParser { * @param sIndent a String of spaces to add before each line */ public String composeStyleDeclarations() { - if (!bConvertStyles) { - return ""; - } + StringBuilder buf = new StringBuilder(); buf.append(super.composeStyleDeclarations()); Enumeration names = outlineStyleNames.keys(); diff --git a/src/main/java/w2phtml/xhtml/style/RowStyleParser.java b/src/main/java/w2phtml/xhtml/style/RowStyleParser.java index ec92a26..90ff149 100644 --- a/src/main/java/w2phtml/xhtml/style/RowStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/RowStyleParser.java @@ -51,8 +51,6 @@ public class RowStyleParser extends StyleWithPropertiesParser { super(ofr,config,converter,nType); // Style maps for rows are currently not supported. this.styleMap = new XhtmlStyleMap(); - this.bConvertStyles = config.xhtmlTableFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlTableFormatting()==XhtmlConfig.IGNORE_HARD; - this.bConvertHard = config.xhtmlTableFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlTableFormatting()==XhtmlConfig.IGNORE_STYLES; } /** Get the family of row styles diff --git a/src/main/java/w2phtml/xhtml/style/SectionStyleParser.java b/src/main/java/w2phtml/xhtml/style/SectionStyleParser.java index f89d8c1..ea956ba 100644 --- a/src/main/java/w2phtml/xhtml/style/SectionStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/SectionStyleParser.java @@ -52,10 +52,6 @@ public class SectionStyleParser extends StyleWithPropertiesParser { // Style maps for sections are currently not supported. // (Section styles are not supported by OOo yet) this.styleMap = new XhtmlStyleMap(); - this.bConvertStyles = config.xhtmlSectionFormatting()==XhtmlConfig.CONVERT_ALL - || config.xhtmlSectionFormatting()==XhtmlConfig.IGNORE_HARD; - this.bConvertHard = config.xhtmlSectionFormatting()==XhtmlConfig.CONVERT_ALL - || config.xhtmlSectionFormatting()==XhtmlConfig.IGNORE_STYLES; } /** Get the family of section styles diff --git a/src/main/java/w2phtml/xhtml/style/StyleParser.java b/src/main/java/w2phtml/xhtml/style/StyleParser.java index 76e41b2..e6770bf 100644 --- a/src/main/java/w2phtml/xhtml/style/StyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/StyleParser.java @@ -49,10 +49,6 @@ public abstract class StyleParser extends Parser { // Style map to use protected XhtmlStyleMap styleMap; - // Should we convert styles resp. hard formatting? - protected boolean bConvertStyles = true; - protected boolean bConvertHard = true; - // The type of xhtml document protected int nType; protected boolean prettyPrint = true; diff --git a/src/main/java/w2phtml/xhtml/style/StyleWithPropertiesParser.java b/src/main/java/w2phtml/xhtml/style/StyleWithPropertiesParser.java index 8bd1096..fed7276 100644 --- a/src/main/java/w2phtml/xhtml/style/StyleWithPropertiesParser.java +++ b/src/main/java/w2phtml/xhtml/style/StyleWithPropertiesParser.java @@ -74,9 +74,7 @@ public abstract class StyleWithPropertiesParser extends StyleParser { if (style.isAutomatic()) { // Apply parent style + hard formatting readStyle(style.getParentName(), info); - if (bConvertHard) { - applyProperties(style, info.props, false); - } + applyProperties(style, info.props, false); } else { String displayName = style.getDisplayName(); @@ -93,9 +91,7 @@ public abstract class StyleWithPropertiesParser extends StyleParser { // Generate class name from display name styleNames.addName(displayName); info.sClass = getClassNamePrefix() + styleNames.getName(displayName); - if (bConvertHard) { - applyProperties(style, info.props, false); - } + applyProperties(style, info.props, false); } } @@ -140,9 +136,6 @@ public abstract class StyleWithPropertiesParser extends StyleParser { * @param sIndent a String of spaces to add before each line */ public String composeStyleDeclarations() { - if (!bConvertStyles) { - return ""; - } if (inlineCSS) { return ""; } diff --git a/src/main/java/w2phtml/xhtml/style/Styles.java b/src/main/java/w2phtml/xhtml/style/Styles.java index a4a34aa..75dc047 100644 --- a/src/main/java/w2phtml/xhtml/style/Styles.java +++ b/src/main/java/w2phtml/xhtml/style/Styles.java @@ -182,9 +182,7 @@ public class Styles extends Parser { private void exportDefaultStyle(StringBuilder buf, String sIndent) { // Export default style - if (config.xhtmlCustomStylesheet().length()==0 && - (config.xhtmlFormatting()==XhtmlConfig.CONVERT_ALL || - config.xhtmlFormatting()==XhtmlConfig.IGNORE_HARD)) { + if (config.xhtmlCustomStylesheet().length()==0) { Properties props = new Properties(";"); // Default paragraph/cell/frame style is applied to the body element diff --git a/src/main/java/w2phtml/xhtml/style/TableStyleParser.java b/src/main/java/w2phtml/xhtml/style/TableStyleParser.java index 91f3e0d..d81194a 100644 --- a/src/main/java/w2phtml/xhtml/style/TableStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/TableStyleParser.java @@ -52,8 +52,6 @@ public class TableStyleParser extends StyleWithPropertiesParser { super(ofr,config,converter,nType); // Style maps for tables are currently not supported. this.styleMap = new XhtmlStyleMap(); - this.bConvertStyles = config.xhtmlTableFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlTableFormatting()==XhtmlConfig.IGNORE_HARD; - this.bConvertHard = config.xhtmlTableFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlTableFormatting()==XhtmlConfig.IGNORE_STYLES; } /** Get the family of table styles diff --git a/src/main/java/w2phtml/xhtml/style/TextStyleParser.java b/src/main/java/w2phtml/xhtml/style/TextStyleParser.java index 16e32a2..ab0ca2c 100644 --- a/src/main/java/w2phtml/xhtml/style/TextStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/TextStyleParser.java @@ -88,8 +88,6 @@ public class TextStyleParser extends StyleWithPropertiesParser { public TextStyleParser(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) { super(ofr,config,converter,nType); this.styleMap = config.getXTextStyleMap(); - 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.bRelativeFontSize = converter.isOPS() && config.relativeFontSize(); this.sFontScaling = config.fontScaling(); StyleWithProperties defaultStyle = ofr.getDefaultParStyle(); @@ -158,9 +156,6 @@ public class TextStyleParser extends StyleWithPropertiesParser { public String composeStyleDeclarations() { StringBuilder buf = new StringBuilder(); buf.append(super.composeStyleDeclarations()); - if (!bConvertStyles) { - return ""; - } // Export anchor styles // Default is always the styles "Internet link" and "Visited Internet // Link"(?)