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

Renamed dubious method to fix misleading name.

Browse source
This commit is contained in:
Georgy Litvinov 2020-01-15 22:45:50 +01:00
parent c7bb1056c3
commit 06e9835f2a
18 changed files with 75 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/writer2latex/xhtml/Converter.java
View file

@ -320,11 +320,11 @@ public class Converter extends ConverterBase {
if (targetIndex!=null) {
int nTargetIndex = targetIndex.intValue();
if (nTargetIndex == ld.nIndex) { // same file
ld.element.setAttribute("href","#"+targetNames.getExportName(ld.sId));
ld.element.setAttribute("href","#"+targetNames.addToExport(ld.sId));
}
else {
ld.element.setAttribute("href",getOutFileName(nTargetIndex,true)
+"#"+targetNames.getExportName(ld.sId));
+"#"+targetNames.addToExport(ld.sId));
}
}
}
@ -804,14 +804,14 @@ public class Converter extends ConverterBase {
// create a target
public Element createTarget(String sId) {
Element a = htmlDOM.createElement("a");
a.setAttribute("id",targetNames.getExportName(sId));
a.setAttribute("id",targetNames.addToExport(sId));
targets.put(sId, new Integer(nOutFileIndex));
return a;
}
// put a target id on an existing element
public void addTarget(Element node,String sId) {
node.setAttribute("id",targetNames.getExportName(sId));
node.setAttribute("id",targetNames.addToExport(sId));
targets.put(sId, new Integer(nOutFileIndex));
}

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

@ -78,7 +78,7 @@ public class FrameStyleConverter extends StyleWithPropertiesConverterHelper {
buf.append(sIndent)
.append(getDefaultTagName(null))
.append(".").append(getClassNamePrefix())
.append(styleNames.getExportName(sDisplayName))
.append(styleNames.addToExport(sDisplayName))
.append(" p {").append(props.toString()).append("}").append(config.prettyPrint() ? "\n" : " ");
}
}

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

@ -71,7 +71,7 @@ public class HeadingStyleConverter extends StyleConverterHelper {
CSVList props = new CSVList(";");
getParSc().applyProperties(style,props,true);
props.addValue("clear","left");
buf.append(sIndent).append("h").append(i).append(".").append(styleNames.getExportName(sDisplayName))
buf.append(sIndent).append("h").append(i).append(".").append(styleNames.addToExport(sDisplayName))
.append(" {").append(props.toString()).append("}").append(config.prettyPrint() ? "\n" : " ");
}
}
@ -113,7 +113,7 @@ public class HeadingStyleConverter extends StyleConverterHelper {
}
else if (style!=ofr.getHeadingStyle(nLevel)) {
// This is not the main style for this level, add class and remember
info.sClass = styleNames.getExportName(sDisplayName);
info.sClass = styleNames.addToExport(sDisplayName);
if (1<=nLevel && nLevel<=6) {
otherLevelStyles.get(nLevel).add(sDisplayName);
}

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

@ -73,7 +73,7 @@ public class ListStyleConverter extends StyleConverterHelper {
}
else {
info.sClass = "listlevel"+Integer.toString(nLevel)
+styleNames.getExportName(sDisplayName);
+styleNames.addToExport(sDisplayName);
}
}
}
@ -99,7 +99,7 @@ public class ListStyleConverter extends StyleConverterHelper {
buf.append(sIndent);
buf.append(".listlevel");
buf.append(nLevel);
buf.append(styleNames.getExportName(sDisplayName));
buf.append(styleNames.addToExport(sDisplayName));
buf.append(" {");
buf.append(props.toString());
buf.append("}");
@ -112,7 +112,7 @@ public class ListStyleConverter extends StyleConverterHelper {
buf.append(sIndent)
.append(".listlevel")
.append(nLevel)
.append(styleNames.getExportName(sDisplayName))
.append(styleNames.addToExport(sDisplayName))
.append(" p {").append(parProps.toString()).append("}").append(config.prettyPrint() ? "\n" : " ");
}
}

4
src/main/java/writer2latex/xhtml/PageStyleConverter.java
View file

@ -120,7 +120,7 @@ public class PageStyleConverter extends StyleConverterHelper {
String sDisplayName = masterPage.getDisplayName();
if (ofr.isPresentation()) {
// Always generates class name
info.sClass="masterpage"+styleNames.getExportName(sDisplayName);
info.sClass="masterpage"+styleNames.addToExport(sDisplayName);
}
}
}
@ -152,7 +152,7 @@ public class PageStyleConverter extends StyleConverterHelper {
}
// Then export the results
buf.append(sIndent)
.append(".masterpage").append(styleNames.getExportName(sDisplayName))
.append(".masterpage").append(styleNames.addToExport(sDisplayName))
.append(" {").append(info.props.toString()).append("}")
.append(config.prettyPrint() ? "\n" : " ");
}

4
src/main/java/writer2latex/xhtml/PresentationStyleConverter.java
View file

@ -100,7 +100,7 @@ public class PresentationStyleConverter extends FrameStyleConverter {
if (!props.isEmpty()) {
buf.append(sIndent)
.append("li.outline")
.append(styleNames.getExportName(sDisplayName))
.append(styleNames.addToExport(sDisplayName))
.append(" p {").append(props.toString()).append("}")
.append(config.prettyPrint() ? "\n" : " ");
}
@ -147,7 +147,7 @@ public class PresentationStyleConverter extends FrameStyleConverter {
public void applyOutlineStyle(int nLevel, StyleInfo info) {
if (2<=nLevel && nLevel<=9 && sCurrentOutlineStyle!=null) {
if (outlineStyles.containsKey(sCurrentOutlineStyle)) {
info.sClass = "outline"+outlineStyleNames.getExportName(outlineStyles.get(sCurrentOutlineStyle)[nLevel]);
info.sClass = "outline"+outlineStyleNames.addToExport(outlineStyles.get(sCurrentOutlineStyle)[nLevel]);
}
}
}

4
src/main/java/writer2latex/xhtml/StyleWithPropertiesConverterHelper.java
View file

@ -83,7 +83,7 @@ public abstract class StyleWithPropertiesConverterHelper
else {
// Generate class name from display name
info.sClass = getClassNamePrefix()
+ styleNames.getExportName(sDisplayName);
+ styleNames.addToExport(sDisplayName);
}
}
}
@ -107,7 +107,7 @@ public abstract class StyleWithPropertiesConverterHelper
buf.append(getDefaultTagName(null));
buf.append(".");
buf.append(getClassNamePrefix());
buf.append(styleNames.getExportName(sDisplayName));
buf.append(styleNames.addToExport(sDisplayName));
buf.append(" {");
buf.append(props.toString());
buf.append("}");

6
src/main/java/writer2latex/xhtml/TextStyleConverter.java
View file

@ -132,11 +132,11 @@ public class TextStyleConverter extends StyleWithPropertiesConverterHelper {
// This combination is not seen before, but the base style may be known
// In that case, use the visited style name as well
if (anchorStyleNames.containsName(sStyleName)) {
sExportName = anchorStyleNames.getExportName(sStyleName)
+anchorVisitedStyleNames.getExportName(sVisitedStyleName);
sExportName = anchorStyleNames.addToExport(sStyleName)
+anchorVisitedStyleNames.addToExport(sVisitedStyleName);
}
else {
sExportName = anchorStyleNames.getExportName(sStyleName);
sExportName = anchorStyleNames.addToExport(sStyleName);
}
anchorCombinedStyleNames.put(sName,sExportName);
orgAnchorStyleNames.put(sExportName,sStyleName);