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

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

@ -66,8 +66,7 @@ public class FrameStyleConverter extends StyleWithPropertiesConverterHelper {
Enumeration<String> names = styleNames.keys();
while (names.hasMoreElements()) {
String sDisplayName = names.nextElement();
StyleWithProperties style = (StyleWithProperties)
getStyles().getStyleByDisplayName(sDisplayName);
StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(sDisplayName);
if (!style.isAutomatic()) {
// Apply style to paragraphs contained in this frame
CSVList props = new CSVList(";");
@ -75,17 +74,20 @@ public class FrameStyleConverter extends StyleWithPropertiesConverterHelper {
getParSc().cssPar(style, props, true);
getTextSc().cssTextCommon(style, props, true);
if (!props.isEmpty()) {
buf.append(sIndent)
.append(getDefaultTagName(null))
.append(".").append(getClassNamePrefix())
.append(styleNames.addToExport(sDisplayName))
.append(" p {").append(props.toString()).append("}").append(config.prettyPrint() ? "\n" : " ");
buf.append(sIndent);
buf.append(getDefaultTagName(null));
buf.append(".");
buf.append(getClassNamePrefix());
buf.append(styleNames.addToExport(sDisplayName));
buf.append(" p {");
buf.append(props.toString());
buf.append("}");
buf.append(config.prettyPrint() ? "\n" : " ");
}
}
}
return buf.toString();
}
else {
} else {
return "";
}
}

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

@ -61,18 +61,29 @@ public class HeadingStyleConverter extends StyleConverterHelper {
CSVList props = new CSVList(";");
getParSc().applyProperties(ofr.getHeadingStyle(i), props, true);
props.addValue("clear", "left");
buf.append(sIndent).append("h").append(i)
.append(" {").append(props.toString()).append("}").append(config.prettyPrint() ? "\n" : " ");
buf.append(sIndent);
buf.append("h");
buf.append(i);
buf.append(" {");
buf.append(props.toString());
buf.append("}");
buf.append(config.prettyPrint() ? "\n" : " ");
}
// Convert other styles for this level
for (String sDisplayName : otherLevelStyles.get(i)) {
StyleWithProperties style = (StyleWithProperties)
getStyles().getStyleByDisplayName(sDisplayName);
StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(sDisplayName);
CSVList props = new CSVList(";");
getParSc().applyProperties(style, props, true);
props.addValue("clear", "left");
buf.append(sIndent).append("h").append(i).append(".").append(styleNames.addToExport(sDisplayName))
.append(" {").append(props.toString()).append("}").append(config.prettyPrint() ? "\n" : " ");
buf.append(sIndent);
buf.append("h");
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();

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

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