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

Remove formatting option

Browse source
This commit is contained in:
Georgy Litvinov 2020-03-10 14:38:10 +01:00
parent 3f98eaaa3c
commit 9d83418fae
19 changed files with 19 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/w2phtml/project.properties
View file

@ -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

9
src/main/java/w2phtml/xhtml/Converter.java
View file

@ -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");

9
src/main/java/w2phtml/xhtml/XhtmlConfig.java
View file

@ -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(); }

50
src/main/java/w2phtml/xhtml/content/ListParser.java
View file

@ -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; i<nLen; i++) {
if (list.item(i).getNodeType()==Node.ELEMENT_NODE) {
if (list.item(i).getNodeName().equals(TEXT_P)) {
nParCount++;
if (bNoPTag) {
String sDisplayName = ofr.getParStyles().getDisplayName(Misc.getAttribute(list.item(0),TEXT_STYLE_NAME));
if (config.getXParStyleMap().contains(sDisplayName)) {
bNoPTag = false;
}
}
}
else { // found non-text:p element
bNoPTag=false;
}
}
}
if (bNoPTag && nParCount<=1) {
// traverse the list
for (int i = 0; i < nLen; i++) {
Node child = list.item(i);
if (child.getNodeType() == Node.ELEMENT_NODE) {
String nodeName = child.getNodeName();
if (nodeName.equals(TEXT_P)) {
getTextParser().traverseInlineText(child,hnode);
}
if (nodeName.equals(TEXT_LIST)) { // oasis
handleList(child,nLevel+1,styleName,hnode);
}
if (nodeName.equals(TEXT_ORDERED_LIST)) { // old
handleOL(child,nLevel+1,styleName,hnode);
}
if (nodeName.equals(TEXT_UNORDERED_LIST)) { // old
handleUL(child,nLevel+1,styleName,hnode);
}
}
}
return;
}
}
// Still here? - traverse block text as usual!
//TODO:
getTextParser().parseText(onode,nLevel,styleName,hnode);

5
src/main/java/w2phtml/xhtml/content/TextParser.java
View file

@ -1084,8 +1084,6 @@ public class TextParser extends Parser {
/* apply hard formatting attribute style maps */
private Element applyAttributes(Element node, StyleWithProperties style) {
// Do nothing if we convert hard formatting
if (config.xhtmlFormatting()==XhtmlConfig.CONVERT_ALL || config.xhtmlFormatting()==XhtmlConfig.IGNORE_STYLES) { return node; }
// Do nothing if this is not an automatic style
if (style==null) { return node; }
if (!style.isAutomatic()) { return node; }
@ -1137,9 +1135,6 @@ public class TextParser extends Parser {
/* Create an inline node with background style from paragraph style */
private Element createTextBackground(Element node, String sStyleName) {
if (config.xhtmlFormatting()==XhtmlConfig.IGNORE_ALL || config.xhtmlFormatting()==XhtmlConfig.IGNORE_HARD) {
return node;
}
String sBack = getParSP().getTextBackground(sStyleName);
if (sBack.length()>0) {
Element span = converter.createElement("span");

2
src/main/java/w2phtml/xhtml/style/CellStyleParser.java
View file

@ -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

5
src/main/java/w2phtml/xhtml/style/FrameStyleParser.java
View file

@ -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<String> names = styleNames.keys();

6
src/main/java/w2phtml/xhtml/style/HeadingStyleParser.java
View file

@ -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<Set<String>>();
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)) {

6
src/main/java/w2phtml/xhtml/style/ListStyleParser.java
View file

@ -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();

7
src/main/java/w2phtml/xhtml/style/PageStyleParser.java
View file

@ -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();
}

2
src/main/java/w2phtml/xhtml/style/ParStyleParser.java
View file

@ -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

4
src/main/java/w2phtml/xhtml/style/PresentationStyleParser.java
View file

@ -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<String> names = outlineStyleNames.keys();

2
src/main/java/w2phtml/xhtml/style/RowStyleParser.java
View file

@ -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

4
src/main/java/w2phtml/xhtml/style/SectionStyleParser.java
View file

@ -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

4
src/main/java/w2phtml/xhtml/style/StyleParser.java
View file

@ -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;

11
src/main/java/w2phtml/xhtml/style/StyleWithPropertiesParser.java
View file

@ -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 "";
}

4
src/main/java/w2phtml/xhtml/style/Styles.java
View file

@ -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

2
src/main/java/w2phtml/xhtml/style/TableStyleParser.java
View file

@ -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

5
src/main/java/w2phtml/xhtml/style/TextStyleParser.java
View file

@ -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"(?)