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

Refactoring

Browse source
This commit is contained in:
Georgy Litvinov 2020-01-29 17:02:15 +01:00
parent bd32335e71
commit 3365665d23
11 changed files with 72 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,7 +66,7 @@ public class CellStyleParser extends StyleWithPropertiesParser {
* @param style to use * @param style to use
* @return the tag name. * @return the tag name.
*/ */
public String getDefaultTagName(StyleWithProperties style) { public String getStyleTag() {
return "td"; return "td";
} }

4
src/main/java/writer2latex/xhtml/style/FrameStyleParser.java
View file

@ -77,7 +77,7 @@ public class FrameStyleParser extends StyleWithPropertiesParser {
getTextSc().cssTextCommon(style, props, true); getTextSc().cssTextCommon(style, props, true);
if (!props.isEmpty()) { if (!props.isEmpty()) {
buf.append(indent); buf.append(indent);
buf.append(getDefaultTagName(null)); buf.append(getStyleTag());
buf.append("."); buf.append(".");
buf.append(getClassNamePrefix()); buf.append(getClassNamePrefix());
buf.append(styleNames.addToExport(sDisplayName)); buf.append(styleNames.addToExport(sDisplayName));
@ -110,7 +110,7 @@ public class FrameStyleParser extends StyleWithPropertiesParser {
* @param style to use * @param style to use
* @return the tag name. * @return the tag name.
*/ */
public String getDefaultTagName(StyleWithProperties style) { public String getStyleTag() {
return ""; return "";
} }

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

@ -110,7 +110,7 @@ public class ListStyleParser extends StyleParser {
buf.append(" {"); buf.append(" {");
buf.append(props.toString()); buf.append(props.toString());
buf.append("}"); buf.append("}");
buf.append(config.prettyPrint() ? "\n" : " "); buf.append(prettyPrint ? "\n" : " ");
if (config.listFormatting() == XhtmlConfig.HARD_LABELS) { if (config.listFormatting() == XhtmlConfig.HARD_LABELS) {
// Apply left margin and text indent to the paragraphs contained in // Apply left margin and text indent to the paragraphs contained in
// the list // the list
@ -124,7 +124,7 @@ public class ListStyleParser extends StyleParser {
buf.append(" p {"); buf.append(" p {");
buf.append(parProps.toString()); buf.append(parProps.toString());
buf.append("}"); buf.append("}");
buf.append(config.prettyPrint() ? "\n" : " "); buf.append(prettyPrint ? "\n" : " ");
} }
} }
} }

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

@ -71,7 +71,7 @@ public class ParStyleParser extends StyleWithPropertiesParser {
* @param style to use * @param style to use
* @return the tag name. * @return the tag name.
*/ */
public String getDefaultTagName(StyleWithProperties style) { public String getStyleTag() {
return "p"; return "p";
} }

64
src/main/java/writer2latex/xhtml/style/PresentationStyleParser.java
View file

@ -79,45 +79,43 @@ public class PresentationStyleParser extends FrameStyleParser {
* @param style to use * @param style to use
* @return the tag name. * @return the tag name.
*/ */
public String getDefaultTagName(StyleWithProperties style) { public String getStyleTag() {
return "div"; return "div";
} }
/** <p>Convert style information for used styles</p> /** <p>Convert style information for used styles</p>
* @param sIndent a String of spaces to add before each line * @param sIndent a String of spaces to add before each line
*/ */
public String getStyleSelectors() { public String getStyleSelectors() {
if (bConvertStyles) { if (!bConvertStyles) {
StringBuilder buf = new StringBuilder(); return "";
buf.append(super.getStyleSelectors()); }
Enumeration<String> names = outlineStyleNames.keys(); StringBuilder buf = new StringBuilder();
while (names.hasMoreElements()) { buf.append(super.getStyleSelectors());
String sDisplayName = names.nextElement(); Enumeration<String> names = outlineStyleNames.keys();
StyleWithProperties style = (StyleWithProperties) while (names.hasMoreElements()) {
getStyles().getStyleByDisplayName(sDisplayName); String sDisplayName = names.nextElement();
if (!style.isAutomatic()) { StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(sDisplayName);
// Apply style to paragraphs within a list item with this class if (!style.isAutomatic()) {
CSVList props = new CSVList(";"); // Apply style to paragraphs within a list item with this class
getFrameSc().cssMargins(style,props,true); CSVList props = new CSVList(";");
getParSc().cssPar(style,props,true); getFrameSc().cssMargins(style, props, true);
getTextSc().cssTextCommon(style,props,true); getParSc().cssPar(style, props, true);
if (!props.isEmpty()) { getTextSc().cssTextCommon(style, props, true);
buf.append(indent); if (!props.isEmpty()) {
buf.append("li.outline"); buf.append(indent);
buf.append(styleNames.addToExport(sDisplayName)); buf.append("li.outline");
buf.append(" p {"); buf.append(styleNames.addToExport(sDisplayName));
buf.append(props.toString()); buf.append(" p {");
buf.append("}"); buf.append(props.toString());
buf.append(config.prettyPrint() ? "\n" : " "); buf.append("}");
} buf.append(config.prettyPrint() ? "\n" : " ");
} }
} }
return buf.toString(); }
} return buf.toString();
else {
return ""; }
}
}
public void enterOutline(String sStyleName) { public void enterOutline(String sStyleName) {

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

@ -66,7 +66,7 @@ public class RowStyleParser extends StyleWithPropertiesParser {
* @param style to use * @param style to use
* @return the tag name. * @return the tag name.
*/ */
public String getDefaultTagName(StyleWithProperties style) { public String getStyleTag() {
return "tr"; return "tr";
} }

2
src/main/java/writer2latex/xhtml/style/SectionStyleParser.java
View file

@ -70,7 +70,7 @@ public class SectionStyleParser extends StyleWithPropertiesParser {
* @return the tag name. If the style is null, a default result should be * @return the tag name. If the style is null, a default result should be
* returned. * returned.
*/ */
public String getDefaultTagName(StyleWithProperties style) { public String getStyleTag() {
return "div"; return "div";
} }

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

@ -55,8 +55,8 @@ public abstract class StyleParser extends Parser {
// The type of xhtml document // The type of xhtml document
protected int nType; protected int nType;
private boolean prettyPrint = true; protected boolean prettyPrint = true;
String indent = null; protected String indent = null;
// Scaling and unit transformation to use // Scaling and unit transformation to use
private String sScale; private String sScale;
private String sColScale; private String sColScale;

61
src/main/java/writer2latex/xhtml/style/StyleWithPropertiesParser.java
View file

@ -61,7 +61,7 @@ public abstract class StyleWithPropertiesParser extends StyleParser {
*/ */
public void applyStyle(String sStyleName, StyleInfo info) { public void applyStyle(String sStyleName, StyleInfo info) {
StyleWithProperties style = (StyleWithProperties) getStyles().getStyle(sStyleName); StyleWithProperties style = (StyleWithProperties) getStyles().getStyle(sStyleName);
info.sTagName = getDefaultTagName(style); info.sTagName = getStyleTag();
if (style!=null) { if (style!=null) {
if (config.multilingual()) { applyLang(style,info); } if (config.multilingual()) { applyLang(style,info); }
applyDirection(style,info); applyDirection(style,info);
@ -94,36 +94,33 @@ public abstract class StyleWithPropertiesParser extends StyleParser {
/** Convert style information for used styles /** Convert style information for used styles
* @param sIndent a String of spaces to add before each line * @param sIndent a String of spaces to add before each line
*/ */
public String getStyleSelectors() { public String getStyleSelectors() {
if (bConvertStyles) { if (!bConvertStyles) {
StringBuilder buf = new StringBuilder(); return "";
Enumeration<String> names = styleNames.keys(); }
while (names.hasMoreElements()) { StringBuilder buf = new StringBuilder();
String sDisplayName = names.nextElement(); Enumeration<String> names = styleNames.keys();
StyleWithProperties style = (StyleWithProperties) while (names.hasMoreElements()) {
getStyles().getStyleByDisplayName(sDisplayName); String sDisplayName = names.nextElement();
if (!style.isAutomatic()) { StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(sDisplayName);
CSVList props = new CSVList(";"); if (!style.isAutomatic()) {
applyProperties(style,props,true); CSVList props = new CSVList(";");
buf.append(indent); applyProperties(style, props, true);
buf.append(getDefaultTagName(null)); buf.append(indent);
buf.append("."); buf.append(getStyleTag());
buf.append(getClassNamePrefix()); buf.append(".");
buf.append(styleNames.addToExport(sDisplayName)); buf.append(getClassNamePrefix());
buf.append(" {"); buf.append(styleNames.addToExport(sDisplayName));
buf.append(props.toString()); buf.append(" {");
buf.append("}"); buf.append(props.toString());
buf.append(config.prettyPrint() ? "\n" : " "); buf.append("}");
// TODO: Create a method "getStyleDeclarationsInner" buf.append(prettyPrint ? "\n" : " ");
// to be used by eg. FrameStyleConverter // TODO: Create a method "getStyleDeclarationsInner"
} // to be used by eg. FrameStyleConverter
} }
return buf.toString(); }
} return buf.toString();
else { }
return "";
}
}
/** Return a prefix to be used in generated css class names /** Return a prefix to be used in generated css class names
* @return the prefix * @return the prefix
@ -136,7 +133,7 @@ public abstract class StyleWithPropertiesParser extends StyleParser {
* @return the tag name. If the style is null, a default result should be * @return the tag name. If the style is null, a default result should be
* returned. * returned.
*/ */
public abstract String getDefaultTagName(StyleWithProperties style); public abstract String getStyleTag();
/** Convert formatting properties for a specific style. /** Convert formatting properties for a specific style.
* @param style the style to convert * @param style the style to convert

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

@ -66,7 +66,7 @@ public class TableStyleParser extends StyleWithPropertiesParser {
* @param style to use * @param style to use
* @return the tag name * @return the tag name
*/ */
public String getDefaultTagName(StyleWithProperties style) { public String getStyleTag() {
return "table"; return "table";
} }

2
src/main/java/writer2latex/xhtml/style/TextStyleParser.java
View file

@ -232,7 +232,7 @@ public class TextStyleParser extends StyleWithPropertiesParser {
* @param style to use * @param style to use
* @return the tag name. * @return the tag name.
*/ */
public String getDefaultTagName(StyleWithProperties style) { public String getStyleTag() {
return "span"; return "span";
} }