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

Refactored ListStyleParser css declarations

Browse source
This commit is contained in:
Georgy Litvinov 2020-01-30 11:50:40 +01:00
parent 5eb9f2186c
commit 66360146d7
1 changed files with 61 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,43 +97,71 @@ public class ListStyleParser extends StyleParser {
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
Enumeration<String> names = styleNames.keys(); Enumeration<String> names = styleNames.keys();
while (names.hasMoreElements()) { while (names.hasMoreElements()) {
String sDisplayName = names.nextElement(); String displayName = names.nextElement();
ListStyle style = (ListStyle) getStyles().getStyleByDisplayName(sDisplayName); buf.append(composeDeclaration(displayName));
if (!style.isAutomatic()) { if (config.listFormatting() == XhtmlConfig.HARD_LABELS) {
for (int nLevel = 1; nLevel < 10; nLevel++) { buf.append(composeHardDeclaration(displayName));
CSVList props = new CSVList(";"); }
cssList(style, nLevel, props); }
buf.append(indent); return buf.toString();
buf.append(".listlevel"); }
buf.append(nLevel); public String composeDeclaration(String displayName) {
styleNames.addName(sDisplayName); StringBuilder buf = new StringBuilder();
buf.append(styleNames.getName(sDisplayName)); ListStyle style = (ListStyle) getStyles().getStyleByDisplayName(displayName);
buf.append(" {"); if (!style.isAutomatic()) {
buf.append(props.toString()); for (int level = 1; level < 10; level++) {
buf.append("}"); String selector = composeSelector(displayName, level);
buf.append(prettyPrint ? "\n" : " "); String declarationBlock = composeDeclarationBlock(displayName, level);
if (config.listFormatting() == XhtmlConfig.HARD_LABELS) { if (!selector.isEmpty() && !declarationBlock.isEmpty()) {
// Apply left margin and text indent to the paragraphs contained in buf.append(indent + selector + " {" + declarationBlock + "}" + (prettyPrint ? "\n" : " "));
// the list
CSVList parProps = new CSVList(";");
cssListParMargins(style, nLevel, parProps);
if (!parProps.isEmpty()) {
buf.append(indent);
buf.append(".listlevel");
buf.append(nLevel);
styleNames.addName(sDisplayName);
buf.append(styleNames.getName(sDisplayName));
buf.append(" p {");
buf.append(parProps.toString());
buf.append("}");
buf.append(prettyPrint ? "\n" : " ");
}
}
} }
} }
} }
return buf.toString(); return buf.toString();
} }
public String composeHardDeclaration(String displayName) {
StringBuilder buf = new StringBuilder();
ListStyle style = (ListStyle) getStyles().getStyleByDisplayName(displayName);
if (!style.isAutomatic()) {
for (int level = 1; level < 10; level++) {
String declarationBlock = composeHardDeclarationBlock(displayName, level);
String selector = composeHardSelector(displayName, level);
// Apply left margin and text indent to the paragraphs contained in
// the list
if (!declarationBlock.isEmpty() && !selector.isEmpty()) {
buf.append(indent + selector + "{" + declarationBlock + "}" + (prettyPrint ? "\n" : " "));
}
}
}
return buf.toString();
}
private String composeHardSelector(String displayName, int level) {
styleNames.addName(displayName);
return ".listlevel" + level + styleNames.getName(displayName) + " p ";
}
private String composeSelector(String displayName, int level) {
styleNames.addName(displayName);
return ".listlevel" + level + styleNames.getName(displayName);
}
private String composeHardDeclarationBlock(String displayName, int level) {
ListStyle style = (ListStyle) getStyles().getStyleByDisplayName(displayName);
CSVList props = new CSVList(";");
cssListParMargins(style, level, props);
return props.toString();
}
private String composeDeclarationBlock(String displayName, int level) {
ListStyle style = (ListStyle) getStyles().getStyleByDisplayName(displayName);
CSVList props = new CSVList(";");
cssList(style, level, props);
return props.toString();
}
/** Get the family of list styles /** Get the family of list styles
* @return the style family * @return the style family