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

Refactoring css declarations

Browse source
This commit is contained in:
Georgy Litvinov 2020-01-30 09:55:41 +01:00
parent 79784f0f7c
commit 13ea9b9fb1
9 changed files with 55 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,10 +61,10 @@ public class FrameStyleParser extends StyleWithPropertiesParser {
/** Convert style information for used styles
* @param sIndent a String of spaces to add before each line
*/
public String getStyleSelectors() {
public String composeStyleDeclarations() {
if (bConvertStyles) {
StringBuilder buf = new StringBuilder();
buf.append(super.getStyleSelectors());
buf.append(super.composeStyleDeclarations());
Enumeration<String> names = styleNames.keys();
while (names.hasMoreElements()) {
String sDisplayName = names.nextElement();

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

@ -56,7 +56,7 @@ public class HeadingStyleParser extends StyleParser {
}
@Override
public String getStyleSelectors() {
public String composeStyleDeclarations() {
if (!bConvertStyles) {
return "";
}

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

@ -90,7 +90,7 @@ public class ListStyleParser extends StyleParser {
/** <p>Convert style information for used styles</p>
* @param sIndent a String of spaces to add before each line
*/
public String getStyleSelectors() {
public String composeStyleDeclarations() {
if (!bConvertStyles) {
return "";
}

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

@ -132,7 +132,7 @@ public class PageStyleParser extends StyleParser {
/** Convert style information for used styles
* @param sIndent a String of spaces to add before each line
*/
public String getStyleSelectors() {
public String composeStyleDeclarations() {
StringBuilder buf = new StringBuilder();
// This will be master pages for presentations only

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

@ -86,12 +86,12 @@ public class PresentationStyleParser extends FrameStyleParser {
/** <p>Convert style information for used styles</p>
* @param sIndent a String of spaces to add before each line
*/
public String getStyleSelectors() {
public String composeStyleDeclarations() {
if (!bConvertStyles) {
return "";
}
StringBuilder buf = new StringBuilder();
buf.append(super.getStyleSelectors());
buf.append(super.composeStyleDeclarations());
Enumeration<String> names = outlineStyleNames.keys();
while (names.hasMoreElements()) {
String sDisplayName = names.nextElement();

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

@ -123,6 +123,6 @@ public abstract class StyleParser extends Parser {
/** <p>Convert style information for used styles</p>
* @param sIndent a String of spaces to add before each line
*/
public abstract String getStyleSelectors();
public abstract String composeStyleDeclarations();
}

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

@ -95,7 +95,7 @@ public abstract class StyleWithPropertiesParser extends StyleParser {
/** Convert style information for used styles
* @param sIndent a String of spaces to add before each line
*/
public String getStyleSelectors() {
public String composeStyleDeclarations() {
if (!bConvertStyles) {
return "";
}
@ -103,26 +103,42 @@ public abstract class StyleWithPropertiesParser extends StyleParser {
Enumeration<String> names = styleNames.keys();
while (names.hasMoreElements()) {
String sDisplayName = names.nextElement();
StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(sDisplayName);
if (!style.isAutomatic()) {
CSVList props = new CSVList(";");
applyProperties(style, props, true);
buf.append(indent);
buf.append(getStyleTag());
buf.append(".");
buf.append(getClassNamePrefix());
styleNames.addName(sDisplayName);
buf.append(styleNames.getName(sDisplayName));
buf.append(" {");
buf.append(props.toString());
buf.append("}");
buf.append(prettyPrint ? "\n" : " ");
// TODO: Create a method "getStyleDeclarationsInner"
// to be used by eg. FrameStyleConverter
}
buf.append(composeStyleDeclaration(sDisplayName));
}
return buf.toString();
}
private String composeStyleDeclaration( String displayName) {
StringBuilder declaration = new StringBuilder();
StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(displayName);
if (!style.isAutomatic()) {
declaration.append(indent);
declaration.append(selector(displayName));
declaration.append(" {");
declaration.append(declarations(displayName));
declaration.append("}" + (prettyPrint ? "\n" : " "));
// TODO: Create a method "getStyleDeclarationsInner"
// to be used by eg. FrameStyleConverter
}
return declaration.toString();
}
private String declarations(String displayName) {
StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(displayName);
CSVList props = new CSVList(";");
applyProperties(style, props, true);
return props.toString();
}
private String selector(String displayName) {
styleNames.addName(displayName);
return getStyleTag() + "." + getClassNamePrefix() + styleNames.getName(displayName);
}
/** Return a prefix to be used in generated css class names
* @return the prefix

22
src/main/java/writer2latex/xhtml/style/Styles.java
View file

@ -140,17 +140,17 @@ public class Styles extends Parser {
// Text documents: text, par, list, frame
// Spreadsheet documents: cell
// Presentation documents: frame, presentation, page
buf.append(textStyleParser.getStyleSelectors());
buf.append(parStyleParser.getStyleSelectors());
buf.append(headingStyleParser.getStyleSelectors());
buf.append(listStyleParser.getStyleSelectors());
buf.append(sectionStyleParser.getStyleSelectors());
buf.append(cellStyleParser.getStyleSelectors());
buf.append(tableStyleParser.getStyleSelectors());
buf.append(rowStyleParser.getStyleSelectors());
buf.append(frameStyleParser.getStyleSelectors());
buf.append(presentationStyleParser.getStyleSelectors());
buf.append(pageStyleParser.getStyleSelectors());
buf.append(textStyleParser.composeStyleDeclarations());
buf.append(parStyleParser.composeStyleDeclarations());
buf.append(headingStyleParser.composeStyleDeclarations());
buf.append(listStyleParser.composeStyleDeclarations());
buf.append(sectionStyleParser.composeStyleDeclarations());
buf.append(cellStyleParser.composeStyleDeclarations());
buf.append(tableStyleParser.composeStyleDeclarations());
buf.append(rowStyleParser.composeStyleDeclarations());
buf.append(frameStyleParser.composeStyleDeclarations());
buf.append(presentationStyleParser.composeStyleDeclarations());
buf.append(pageStyleParser.composeStyleDeclarations());
return buf.toString();
}

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

@ -155,8 +155,8 @@ public class TextStyleParser extends StyleWithPropertiesParser {
* @param sIndent a String of spaces to add before each line
*/
StringBuilder buf = new StringBuilder();
public String getStyleSelectors() {
buf.append(super.getStyleSelectors());
public String composeStyleDeclarations() {
buf.append(super.composeStyleDeclarations());
if (bConvertStyles) {
// Export anchor styles
// Default is always the styles "Internet link" and "Visited Internet Link"(?)