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

Renamings

Browse source
This commit is contained in:
Georgy Litvinov 2020-01-29 12:50:36 +01:00
parent 2ee1d5ff40
commit 625cbaa031
10 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -101,7 +101,7 @@ public class Converter extends BasicConverter {
public int nType = XhtmlDocument.XHTML10; // the doctype
private boolean bOPS = false; // Do we need to be OPS conforming?
Vector<XhtmlDocument> outFiles;
private int nOutFileIndex;
private int outFileIndex;
private XhtmlDocument htmlDoc; // current outfile
private Document htmlDOM; // current DOM, usually within htmlDoc
private boolean bNeedHeaderFooter = false;
@ -203,7 +203,7 @@ public class Converter extends BasicConverter {
public boolean isHTML5() { return nType==XhtmlDocument.HTML5; }
public int getOutFileIndex() { return nOutFileIndex; }
public int getOutFileIndex() { return outFileIndex; }
public void addContentEntry(String sTitle, int nLevel, String sTarget) {
converterResult.addContentEntry(new ContentEntryImpl(sTitle,nLevel,htmlDoc,sTarget));
@ -251,7 +251,7 @@ public class Converter extends BasicConverter {
sTargetFileName = Misc.trimDocumentName(sTargetFileName,XhtmlDocument.getExtension(nType));
outFiles = new Vector<XhtmlDocument>();
nOutFileIndex = -1;
outFileIndex = -1;
bNeedHeaderFooter = !bOPS && (ofr.isSpreadsheet() || ofr.isPresentation() || config.getXhtmlSplitLevel()>0 || config.pageBreakSplit()>XhtmlConfig.NONE || config.getXhtmlUplink().length()>0);
@ -348,10 +348,10 @@ public class Converter extends BasicConverter {
// Export styles (XHTML)
if (!isOPS() && !config.separateStylesheet()) {
for (int i=0; i<=nOutFileIndex; i++) {
for (int i=0; i<=outFileIndex; i++) {
Element head = outFiles.get(i).getHeadNode();
if (head!=null) {
Node styles = styleCv.exportStyles(outFiles.get(i).getContentDOM());
Node styles = styleCv.getStyleSelectors(outFiles.get(i).getContentDOM());
if (styles!=null) {
head.appendChild(styles);
}
@ -362,7 +362,7 @@ public class Converter extends BasicConverter {
// Load MathJax
// TODO: Should we support different configurations of MathJax?
if ((nType==XhtmlDocument.HTML5 || nType==XhtmlDocument.XHTML_MATHML) && config.useMathJax()) {
for (int i=0; i<=nOutFileIndex; i++) {
for (int i=0; i<=outFileIndex; i++) {
if (outFiles.get(i).hasMath()) {
XhtmlDocument doc = outFiles.get(i);
Element head = doc.getHeadNode();
@ -378,7 +378,7 @@ public class Converter extends BasicConverter {
// Create headers & footers (if nodes are available)
if (ofr.isSpreadsheet()) {
for (int i=0; i<=nOutFileIndex; i++) {
for (int i=0; i<=outFileIndex; i++) {
XhtmlDocument doc = outFiles.get(i);
Document dom = doc.getContentDOM();
@ -418,8 +418,8 @@ public class Converter extends BasicConverter {
if (footer!=null) { footer.appendChild(footerPar); }
}
}
else if (nOutFileIndex>0) {
for (int i=0; i<=nOutFileIndex; i++) {
else if (outFileIndex>0) {
for (int i=0; i<=outFileIndex; i++) {
XhtmlDocument doc = outFiles.get(i);
Document dom = doc.getContentDOM();
//Element content = doc.getContentNode();
@ -441,7 +441,7 @@ public class Converter extends BasicConverter {
addNavigationLink(dom,header,l10n.get(L10n.FIRST),0);
addNavigationLink(dom,header,l10n.get(L10n.PREVIOUS),i-1);
addNavigationLink(dom,header,l10n.get(L10n.NEXT),i+1);
addNavigationLink(dom,header,l10n.get(L10n.LAST),nOutFileIndex);
addNavigationLink(dom,header,l10n.get(L10n.LAST),outFileIndex);
if (textCv.getTocIndex()>=0) {
addNavigationLink(dom,header,l10n.get(L10n.CONTENTS),textCv.getTocIndex());
}
@ -464,7 +464,7 @@ public class Converter extends BasicConverter {
addNavigationLink(dom,footer,l10n.get(L10n.FIRST),0);
addNavigationLink(dom,footer,l10n.get(L10n.PREVIOUS),i-1);
addNavigationLink(dom,footer,l10n.get(L10n.NEXT),i+1);
addNavigationLink(dom,footer,l10n.get(L10n.LAST),nOutFileIndex);
addNavigationLink(dom,footer,l10n.get(L10n.LAST),outFileIndex);
if (textCv.getTocIndex()>=0) {
addNavigationLink(dom,footer,l10n.get(L10n.CONTENTS),textCv.getTocIndex());
}
@ -475,7 +475,7 @@ public class Converter extends BasicConverter {
}
}
else if (config.getXhtmlUplink().length()>0) {
for (int i=0; i<=nOutFileIndex; i++) {
for (int i=0; i<=outFileIndex; i++) {
XhtmlDocument doc = outFiles.get(i);
Document dom = doc.getContentDOM();
//Element content = doc.getContentNode();
@ -504,12 +504,12 @@ public class Converter extends BasicConverter {
if (config.xhtmlFormatting()>XhtmlConfig.IGNORE_STYLES) {
if (isOPS()) { // EPUB
CssDocument cssDoc = new CssDocument(EPUB_STYLESHEET);
cssDoc.read(styleCv.exportStyles(false));
cssDoc.read(styleCv.allStyleSelectors(false));
converterResult.addDocument(cssDoc);
}
else if (config.separateStylesheet()) { // XHTML
CssDocument cssDoc = new CssDocument(sTargetFileName+"-styles.css");
cssDoc.read(styleCv.exportStyles(false));
cssDoc.read(styleCv.allStyleSelectors(false));
converterResult.addDocument(cssDoc);
}
}
@ -517,7 +517,7 @@ public class Converter extends BasicConverter {
}
private void addNavigationLink(Document dom, Node node, String s, int nIndex) {
if (nIndex>=0 && nIndex<=nOutFileIndex) {
if (nIndex>=0 && nIndex<=outFileIndex) {
Element a = dom.createElement("a");
a.setAttribute("href",Misc.makeHref(getOutFileName(nIndex,true)));
a.appendChild(dom.createTextNode(s));
@ -631,7 +631,7 @@ public class Converter extends BasicConverter {
// Use another document. TODO: This is very ugly; clean it up!!!
public void changeOutFile(int nIndex) {
nOutFileIndex = nIndex;
outFileIndex = nIndex;
htmlDoc = outFiles.get(nIndex);
htmlDOM = htmlDoc.getContentDOM();
}
@ -650,11 +650,11 @@ public class Converter extends BasicConverter {
}
// Prepare next output file
public Element nextOutFile() {
htmlDoc = new XhtmlDocument(getOutFileName(++nOutFileIndex,false),nType);
htmlDoc = new XhtmlDocument(getOutFileName(++outFileIndex,false),nType);
htmlDoc.setConfig(config);
if (template!=null) { htmlDoc.readFromTemplate(template); }
/*else if (bNeedHeaderFooter) { htmlDoc.createHeaderFooter(); }*/
outFiles.add(nOutFileIndex,htmlDoc);
outFiles.add(outFileIndex,htmlDoc);
converterResult.addDocument(htmlDoc);
// Create head + body
@ -814,21 +814,21 @@ public class Converter extends BasicConverter {
public Element createTarget(String sId) {
Element a = htmlDOM.createElement("a");
a.setAttribute("id",targetNames.addToExport(sId));
targets.put(sId, new Integer(nOutFileIndex));
targets.put(sId, new Integer(outFileIndex));
return a;
}
// put a target id on an existing element
public void addTarget(Element node,String sId) {
node.setAttribute("id",targetNames.addToExport(sId));
targets.put(sId, new Integer(nOutFileIndex));
targets.put(sId, new Integer(outFileIndex));
}
// create an internal link
public Element createLink(String sId) {
Element a = htmlDOM.createElement("a");
LinkDescriptor ld = new LinkDescriptor();
ld.element = a; ld.sId = sId; ld.nIndex = nOutFileIndex;
ld.element = a; ld.sId = sId; ld.nIndex = outFileIndex;
links.add(ld);
return a;
}

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

@ -61,10 +61,10 @@ public class FrameStyleParser extends StyleWithPropertiesParser {
/** Convert style information for used styles
* @param sIndent a String of spaces to add before each line
*/
public String getStyleDeclarations(String sIndent) {
public String getStyleSelectors(String sIndent) {
if (bConvertStyles) {
StringBuilder buf = new StringBuilder();
buf.append(super.getStyleDeclarations(sIndent));
buf.append(super.getStyleSelectors(sIndent));
Enumeration<String> names = styleNames.keys();
while (names.hasMoreElements()) {
String sDisplayName = names.nextElement();

2
src/main/java/writer2latex/xhtml/style/HeadingStyleParser.java
View file

@ -56,7 +56,7 @@ public class HeadingStyleParser extends StyleFamilyParser {
}
@Override
public String getStyleDeclarations(String sIndent) {
public String getStyleSelectors(String sIndent) {
if (bConvertStyles) {
StringBuilder buf = new StringBuilder();
for (int i = 1; i <= 6; i++) {

2
src/main/java/writer2latex/xhtml/style/ListStyleFamilyParser.java
View file

@ -90,7 +90,7 @@ public class ListStyleFamilyParser extends StyleFamilyParser {
/** <p>Convert style information for used styles</p>
* @param sIndent a String of spaces to add before each line
*/
public String getStyleDeclarations(String sIndent) {
public String getStyleSelectors(String sIndent) {
if (bConvertStyles) {
StringBuilder buf = new StringBuilder();
Enumeration<String> names = styleNames.keys();

2
src/main/java/writer2latex/xhtml/style/PageStyleParser.java
View file

@ -131,7 +131,7 @@ public class PageStyleParser extends StyleFamilyParser {
/** Convert style information for used styles
* @param sIndent a String of spaces to add before each line
*/
public String getStyleDeclarations(String sIndent) {
public String getStyleSelectors(String sIndent) {
StringBuilder buf = new StringBuilder();
// This will be master pages for presentations only

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

@ -86,10 +86,10 @@ public class PresentationStyleParser extends FrameStyleParser {
/** <p>Convert style information for used styles</p>
* @param sIndent a String of spaces to add before each line
*/
public String getStyleDeclarations(String sIndent) {
public String getStyleSelectors(String sIndent) {
if (bConvertStyles) {
StringBuilder buf = new StringBuilder();
buf.append(super.getStyleDeclarations(sIndent));
buf.append(super.getStyleSelectors(sIndent));
Enumeration<String> names = outlineStyleNames.keys();
while (names.hasMoreElements()) {
String sDisplayName = names.nextElement();

2
src/main/java/writer2latex/xhtml/style/StyleFamilyParser.java
View file

@ -120,6 +120,6 @@ public abstract class StyleFamilyParser extends Parser {
/** <p>Convert style information for used styles</p>
* @param sIndent a String of spaces to add before each line
*/
public abstract String getStyleDeclarations(String sIndent);
public abstract String getStyleSelectors(String sIndent);
}

44
src/main/java/writer2latex/xhtml/style/StyleParser.java
View file

@ -128,7 +128,7 @@ public class StyleParser extends Parser {
* @param bIndent true if the CSS code should be indented
* @return the CSS code
*/
public String exportStyles(boolean bIndent) {
public String allStyleSelectors(boolean bIndent) {
String sIndent = bIndent ? " " : "";
StringBuilder buf = new StringBuilder();
@ -139,17 +139,17 @@ public class StyleParser extends Parser {
// Text documents: text, par, list, frame
// Spreadsheet documents: cell
// Presentation documents: frame, presentation, page
buf.append(getTextSc().getStyleDeclarations(sIndent));
buf.append(getParSc().getStyleDeclarations(sIndent));
buf.append(getHeadingSc().getStyleDeclarations(sIndent));
buf.append(getListSc().getStyleDeclarations(sIndent));
buf.append(getSectionSc().getStyleDeclarations(sIndent));
buf.append(getCellSc().getStyleDeclarations(sIndent));
buf.append(getTableSc().getStyleDeclarations(sIndent));
buf.append(getRowSc().getStyleDeclarations(sIndent));
buf.append(getFrameSc().getStyleDeclarations(sIndent));
buf.append(getPresentationSc().getStyleDeclarations(sIndent));
buf.append(getPageSc().getStyleDeclarations(sIndent));
buf.append(textSc.getStyleSelectors(sIndent));
buf.append(parSc.getStyleSelectors(sIndent));
buf.append(headingSc.getStyleSelectors(sIndent));
buf.append(listSc.getStyleSelectors(sIndent));
buf.append(sectionSc.getStyleSelectors(sIndent));
buf.append(cellSc.getStyleSelectors(sIndent));
buf.append(tableSc.getStyleSelectors(sIndent));
buf.append(rowSc.getStyleSelectors(sIndent));
buf.append(frameSc.getStyleSelectors(sIndent));
buf.append(presentationSc.getStyleSelectors(sIndent));
buf.append(pageSc.getStyleSelectors(sIndent));
return buf.toString();
}
@ -158,18 +158,18 @@ public class StyleParser extends Parser {
* @param htmlDOM the XHTML DOM to which the generated element belongs
* @return the style element
*/
public Node exportStyles(Document htmlDOM) {
String sStyles = exportStyles(config.prettyPrint());
public Node getStyleSelectors(Document htmlDOM) {
String styleSelectors = allStyleSelectors(config.prettyPrint());
// Create node
if (sStyles.length()>0) {
Element htmlStyle = htmlDOM.createElement("style");
htmlStyle.setAttribute("media","all");
htmlStyle.setAttribute("type","text/css");
htmlStyle.appendChild(htmlDOM.createTextNode(config.prettyPrint() ? "\n" : " "));
htmlStyle.appendChild(htmlDOM.createTextNode(sStyles));
if (config.prettyPrint()) { htmlStyle.appendChild(htmlDOM.createTextNode(" ")); }
return htmlStyle;
if (styleSelectors.length()>0) {
Element styleElement = htmlDOM.createElement("style");
styleElement.setAttribute("media","all");
styleElement.setAttribute("type","text/css");
styleElement.appendChild(htmlDOM.createTextNode(config.prettyPrint() ? "\n" : " "));
styleElement.appendChild(htmlDOM.createTextNode(styleSelectors));
if (config.prettyPrint()) { styleElement.appendChild(htmlDOM.createTextNode(" ")); }
return styleElement;
}
else {
return null;

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

@ -95,7 +95,7 @@ public abstract class StyleWithPropertiesParser
/** Convert style information for used styles
* @param sIndent a String of spaces to add before each line
*/
public String getStyleDeclarations(String sIndent) {
public String getStyleSelectors(String sIndent) {
if (bConvertStyles) {
StringBuilder buf = new StringBuilder();
Enumeration<String> names = styleNames.keys();

4
src/main/java/writer2latex/xhtml/style/TextStyleParser.java
View file

@ -153,8 +153,8 @@ public class TextStyleParser extends StyleWithPropertiesParser {
* @param sIndent a String of spaces to add before each line
*/
StringBuilder buf = new StringBuilder();
public String getStyleDeclarations(String sIndent) {
buf.append(super.getStyleDeclarations(sIndent));
public String getStyleSelectors(String sIndent) {
buf.append(super.getStyleSelectors(sIndent));
if (bConvertStyles) {
// Export anchor styles
// Default is always the styles "Internet link" and "Visited Internet Link"(?)