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 08:54:14 +01:00
parent 0bde7de8c3
commit 9c2e95425e
3 changed files with 76 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/main/java/writer2latex/xhtml/FrameStyleConverter.java
View file

@ -59,36 +59,38 @@ public class FrameStyleConverter extends StyleWithPropertiesConverterHelper {
/** 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 getStyleDeclarations(String sIndent) { public String getStyleDeclarations(String sIndent) {
if (bConvertStyles) { if (bConvertStyles) {
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
buf.append(super.getStyleDeclarations(sIndent)); buf.append(super.getStyleDeclarations(sIndent));
Enumeration<String> names = styleNames.keys(); Enumeration<String> names = styleNames.keys();
while (names.hasMoreElements()) { while (names.hasMoreElements()) {
String sDisplayName = names.nextElement(); String sDisplayName = names.nextElement();
StyleWithProperties style = (StyleWithProperties) StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(sDisplayName);
getStyles().getStyleByDisplayName(sDisplayName); if (!style.isAutomatic()) {
if (!style.isAutomatic()) { // Apply style to paragraphs contained in this frame
// Apply style to paragraphs contained in this frame CSVList props = new CSVList(";");
CSVList props = new CSVList(";"); getFrameSc().cssMargins(style, props, true);
getFrameSc().cssMargins(style,props,true); getParSc().cssPar(style, props, true);
getParSc().cssPar(style,props,true); getTextSc().cssTextCommon(style, props, true);
getTextSc().cssTextCommon(style,props,true); if (!props.isEmpty()) {
if (!props.isEmpty()) { buf.append(sIndent);
buf.append(sIndent) buf.append(getDefaultTagName(null));
.append(getDefaultTagName(null)) buf.append(".");
.append(".").append(getClassNamePrefix()) buf.append(getClassNamePrefix());
.append(styleNames.addToExport(sDisplayName)) buf.append(styleNames.addToExport(sDisplayName));
.append(" p {").append(props.toString()).append("}").append(config.prettyPrint() ? "\n" : " "); buf.append(" p {");
} buf.append(props.toString());
} buf.append("}");
} buf.append(config.prettyPrint() ? "\n" : " ");
return buf.toString(); }
} }
else { }
return ""; 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

61
src/main/java/writer2latex/xhtml/HeadingStyleConverter.java
View file

@ -53,31 +53,42 @@ public class HeadingStyleConverter extends StyleConverterHelper {
@Override @Override
public String getStyleDeclarations(String sIndent) { public String getStyleDeclarations(String sIndent) {
if (bConvertStyles) { if (bConvertStyles) {
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
for (int i=1; i<=6; i++) { for (int i = 1; i <= 6; i++) {
// Convert main style for this level // Convert main style for this level
if (ofr.getHeadingStyle(i)!=null) { if (ofr.getHeadingStyle(i) != null) {
CSVList props = new CSVList(";"); CSVList props = new CSVList(";");
getParSc().applyProperties(ofr.getHeadingStyle(i),props,true); getParSc().applyProperties(ofr.getHeadingStyle(i), props, true);
props.addValue("clear","left"); props.addValue("clear", "left");
buf.append(sIndent).append("h").append(i) buf.append(sIndent);
.append(" {").append(props.toString()).append("}").append(config.prettyPrint() ? "\n" : " "); buf.append("h");
} buf.append(i);
// Convert other styles for this level buf.append(" {");
for (String sDisplayName : otherLevelStyles.get(i)) { buf.append(props.toString());
StyleWithProperties style = (StyleWithProperties) buf.append("}");
getStyles().getStyleByDisplayName(sDisplayName); buf.append(config.prettyPrint() ? "\n" : " ");
CSVList props = new CSVList(";"); }
getParSc().applyProperties(style,props,true); // Convert other styles for this level
props.addValue("clear","left"); for (String sDisplayName : otherLevelStyles.get(i)) {
buf.append(sIndent).append("h").append(i).append(".").append(styleNames.addToExport(sDisplayName)) StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(sDisplayName);
.append(" {").append(props.toString()).append("}").append(config.prettyPrint() ? "\n" : " "); CSVList props = new CSVList(";");
} getParSc().applyProperties(style, props, true);
} props.addValue("clear", "left");
return buf.toString(); buf.append(sIndent);
} buf.append("h");
return ""; buf.append(i);
buf.append(".");
buf.append(styleNames.addToExport(sDisplayName));
buf.append(" {");
buf.append(props.toString());
buf.append("}");
buf.append(config.prettyPrint() ? "\n" : " ");
}
}
return buf.toString();
}
return "";
} }
@Override @Override

13
src/main/java/writer2latex/xhtml/ListStyleConverter.java
View file

@ -111,11 +111,14 @@ public class ListStyleConverter extends StyleConverterHelper {
CSVList parProps = new CSVList(";"); CSVList parProps = new CSVList(";");
cssListParMargins(style,nLevel,parProps); cssListParMargins(style,nLevel,parProps);
if (!parProps.isEmpty()) { if (!parProps.isEmpty()) {
buf.append(sIndent) buf.append(sIndent);
.append(".listlevel") buf.append(".listlevel");
.append(nLevel) buf.append(nLevel);
.append(styleNames.addToExport(sDisplayName)) buf.append(styleNames.addToExport(sDisplayName));
.append(" p {").append(parProps.toString()).append("}").append(config.prettyPrint() ? "\n" : " "); buf.append(" p {");
buf.append(parProps.toString());
buf.append("}");
buf.append(config.prettyPrint() ? "\n" : " ");
} }
} }
} }