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 11:06:34 +01:00
parent 13ea9b9fb1
commit 5eb9f2186c
3 changed files with 72 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,39 +62,45 @@ public class FrameStyleParser extends StyleWithPropertiesParser {
* @param sIndent a String of spaces to add before each line * @param sIndent a String of spaces to add before each line
*/ */
public String composeStyleDeclarations() { public String composeStyleDeclarations() {
if (bConvertStyles) { if (!bConvertStyles) {
StringBuilder buf = new StringBuilder();
buf.append(super.composeStyleDeclarations());
Enumeration<String> names = styleNames.keys();
while (names.hasMoreElements()) {
String sDisplayName = names.nextElement();
StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(sDisplayName);
if (!style.isAutomatic()) {
// Apply style to paragraphs contained in this frame
CSVList props = new CSVList(";");
getFrameSc().cssMargins(style, props, true);
getParSc().cssPar(style, props, true);
getTextSc().cssTextCommon(style, props, true);
if (!props.isEmpty()) {
buf.append(indent);
buf.append(getStyleTag());
buf.append(".");
buf.append(getClassNamePrefix());
styleNames.addName(sDisplayName);
buf.append(styleNames.getName(sDisplayName));
buf.append(" p {");
buf.append(props.toString());
buf.append("}");
buf.append(config.prettyPrint() ? "\n" : " ");
}
}
}
return buf.toString();
} else {
return ""; return "";
} }
StringBuilder buf = new StringBuilder();
buf.append(super.composeStyleDeclarations());
Enumeration<String> names = styleNames.keys();
while (names.hasMoreElements()) {
String displayName = names.nextElement();
buf.append(composeDeclaration(displayName));
}
return buf.toString();
} }
private String composeDeclaration(String displayName) {
String declaration = "";
StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(displayName);
String declarationBlock = composeDeclarationBlock(displayName);
String selector = composeSelector(displayName);
if (!style.isAutomatic() && !selector.isEmpty() && !declarationBlock.isEmpty()) {
declaration = indent + selector + "{" + declarationBlock + "}" + (prettyPrint ? "\n" : " ");
}
return declaration;
}
private String composeSelector(String displayName) {
styleNames.addName(displayName);
return getStyleTag() + "." + getClassNamePrefix() + styleNames.getName(displayName) + " p ";
}
private String composeDeclarationBlock( String sDisplayName) {
StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(sDisplayName);
CSVList props = new CSVList(";");
getFrameSc().cssMargins(style, props, true);
getParSc().cssPar(style, props, true);
getTextSc().cssTextCommon(style, props, true);
return props.toString();
}
/** 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
*/ */

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

@ -94,30 +94,39 @@ public class PresentationStyleParser extends FrameStyleParser {
buf.append(super.composeStyleDeclarations()); buf.append(super.composeStyleDeclarations());
Enumeration<String> names = outlineStyleNames.keys(); Enumeration<String> names = outlineStyleNames.keys();
while (names.hasMoreElements()) { while (names.hasMoreElements()) {
String sDisplayName = names.nextElement(); String displayName = names.nextElement();
StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(sDisplayName); buf.append(composeDeclaration(displayName));
if (!style.isAutomatic()) {
// Apply style to paragraphs within a list item with this class
CSVList props = new CSVList(";");
getFrameSc().cssMargins(style, props, true);
getParSc().cssPar(style, props, true);
getTextSc().cssTextCommon(style, props, true);
if (!props.isEmpty()) {
buf.append(indent);
buf.append("li.outline");
styleNames.addName(sDisplayName);
buf.append(styleNames.getName(sDisplayName));
buf.append(" p {");
buf.append(props.toString());
buf.append("}");
buf.append(config.prettyPrint() ? "\n" : " ");
}
}
} }
return buf.toString(); return buf.toString();
} }
private String composeDeclaration(String displayName) {
String declaration = "";
StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(displayName);
String declarationBlock = composeDeclarationBlock(displayName);
String selector = composeSelector(displayName);;
if (!style.isAutomatic() && !selector.isEmpty() && !declarationBlock.isEmpty()) {
// Apply style to paragraphs within a list item with this class
declaration = indent + selector + "{" + declarationBlock + "}" + (prettyPrint ? "\n" : " ");
}
return declaration;
}
private String composeSelector(String displayName) {
styleNames.addName(displayName);
return "li.outline" + styleNames.getName(displayName) + " p ";
}
private String composeDeclarationBlock(String displayName) {
StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(displayName);
CSVList props = new CSVList(";");
getFrameSc().cssMargins(style, props, true);
getParSc().cssPar(style, props, true);
getTextSc().cssTextCommon(style, props, true);
return props.toString();
}
public void enterOutline(String sStyleName) { public void enterOutline(String sStyleName) {
sCurrentOutlineStyle = sStyleName; sCurrentOutlineStyle = sStyleName;

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

@ -103,39 +103,32 @@ public abstract class StyleWithPropertiesParser extends StyleParser {
Enumeration<String> names = styleNames.keys(); Enumeration<String> names = styleNames.keys();
while (names.hasMoreElements()) { while (names.hasMoreElements()) {
String sDisplayName = names.nextElement(); String sDisplayName = names.nextElement();
buf.append(composeStyleDeclaration(sDisplayName)); buf.append(composeDeclaration(sDisplayName));
} }
return buf.toString(); return buf.toString();
} }
private String composeStyleDeclaration( String displayName) { private String composeDeclaration( String displayName) {
StringBuilder declaration = new StringBuilder(); String declaration = "";
StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(displayName); StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(displayName);
if (!style.isAutomatic()) { String selector = composeSelector(displayName);
String declarationBlock = composeDeclarationBlock(displayName);
declaration.append(indent); if (!style.isAutomatic() && !selector.isEmpty() && !declarationBlock.isEmpty()) {
declaration = indent + selector + " {" + declarationBlock + "}" + (prettyPrint ? "\n" : " ");
declaration.append(selector(displayName));
declaration.append(" {");
declaration.append(declarations(displayName));
declaration.append("}" + (prettyPrint ? "\n" : " "));
// TODO: Create a method "getStyleDeclarationsInner" // TODO: Create a method "getStyleDeclarationsInner"
// to be used by eg. FrameStyleConverter // to be used by eg. FrameStyleConverter
} }
return declaration.toString(); return declaration.toString();
} }
private String declarations(String displayName) { private String composeDeclarationBlock(String displayName) {
StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(displayName); StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(displayName);
CSVList props = new CSVList(";"); CSVList props = new CSVList(";");
applyProperties(style, props, true); applyProperties(style, props, true);
return props.toString(); return props.toString();
} }
private String selector(String displayName) { private String composeSelector(String displayName) {
styleNames.addName(displayName); styleNames.addName(displayName);
return getStyleTag() + "." + getClassNamePrefix() + styleNames.getName(displayName); return getStyleTag() + "." + getClassNamePrefix() + styleNames.getName(displayName);
} }