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

Removed sections stack, refactoring

Browse source
This commit is contained in:
Georgy Litvinov 2020-02-19 08:47:39 +01:00
parent 8af696bc6a
commit eb9c8fc8ef
2 changed files with 124 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -104,7 +104,6 @@ public class Converter extends BasicConverter {
private int outFileIndex;
private XhtmlDocument htmlDoc; // current outfile
private Document htmlDOM; // current DOM, usually within htmlDoc
private boolean bNeedHeaderFooter = false;
public PageContainer pageContainer = null;
//private int nTocFileIndex = -1;
//private int nAlphabeticalIndex = -1;
@ -253,8 +252,6 @@ public class Converter extends BasicConverter {
outFiles = new Vector<XhtmlDocument>();
outFileIndex = -1;
bNeedHeaderFooter = !bOPS && (ofr.isSpreadsheet() || ofr.isPresentation() || config.getXhtmlSplitLevel()>0 || config.getXhtmlUplink().length()>0);
l10n = new L10n();
if (isOPS()) {
@ -655,30 +652,17 @@ public class Converter extends BasicConverter {
htmlDoc = new XhtmlDocument(getOutFileName(++outFileIndex,false),nType);
htmlDoc.setConfig(config);
if (template!=null) { htmlDoc.readFromTemplate(template); }
/*else if (bNeedHeaderFooter) { htmlDoc.createHeaderFooter(); }*/
outFiles.add(outFileIndex,htmlDoc);
converterResult.addDocument(htmlDoc);
// Create head + body
htmlDOM = htmlDoc.getContentDOM();
Element rootElement = htmlDOM.getDocumentElement();
styles.applyDefaultLanguage(rootElement);
Element rootElement = createHeadAndBody();
addEpubNs(rootElement);
rootElement.insertBefore(htmlDOM.createComment(
"This file was converted to xhtml by "
+ (ofr.isText() ? "Writer" : (ofr.isSpreadsheet() ? "Calc" : "Impress"))
+ "2xhtml ver. " + ConverterFactory.getVersion() +
". See http://writer2latex.sourceforge.net for more info."),
rootElement.getFirstChild());
// Apply default writing direction
if (!ofr.isPresentation()) {
StyleInfo pageInfo = new StyleInfo();
styles.getPageSc().applyDefaultWritingDirection(pageInfo);
styles.getPageSc().writeStyle(pageInfo,htmlDoc.getContentNode());
applyWritingDirection();
addTitle();
addHeadData();
return htmlDoc.getContentNode();
}
// Add title (required by xhtml)
private void addTitle() {
Element title = htmlDoc.getTitleNode();
if (title!=null) {
String sTitle = metaData.getTitle();
@ -687,7 +671,24 @@ public class Converter extends BasicConverter {
}
title.appendChild( htmlDOM.createTextNode(sTitle) );
}
}
private Element createHeadAndBody() {
htmlDOM = htmlDoc.getContentDOM();
Element rootElement = htmlDOM.getDocumentElement();
styles.applyDefaultLanguage(rootElement);
return rootElement;
}
private void applyWritingDirection() {
if (!ofr.isPresentation()) {
StyleInfo pageInfo = new StyleInfo();
styles.getPageSc().applyDefaultWritingDirection(pageInfo);
styles.getPageSc().writeStyle(pageInfo,htmlDoc.getContentNode());
}
}
private void addHeadData() {
Element head = htmlDoc.getHeadNode();
if (head!=null) {
// Declare charset (we need this for XHTML 1.0 strict and HTML5 because we have no <?xml ... ?>)
@ -779,23 +780,6 @@ public class Converter extends BasicConverter {
}
}
// Recreate nested sections, if any
if (!textParser.sections.isEmpty()) {
Iterator<Node> iter = textParser.sections.iterator();
while (iter.hasNext()) {
Element section = (Element) iter.next();
String sStyleName = Misc.getAttribute(section,XMLString.TEXT_STYLE_NAME);
Element div = htmlDOM.createElement("div");
htmlDoc.getContentNode().appendChild(div);
htmlDoc.setContentNode(div);
StyleInfo sectionInfo = new StyleInfo();
styles.getSectionSc().readStyle(sStyleName,sectionInfo);
styles.getSectionSc().writeStyle(sectionInfo,div);
}
}
return htmlDoc.getContentNode();
}
// Add epub namespace for the purpose of semantic inflection in EPUB 3

1
src/main/java/writer2latex/xhtml/content/TextParser.java
View file

@ -71,7 +71,6 @@ public class TextParser extends Parser {
private int nLastSplitLevel = 1; // The outline level at which the last split occurred
private int nDontSplitLevel = 0; // if > 0 splitting is forbidden
boolean bAfterHeading=false; // last element was a top level heading
public Stack<Node> sections = new Stack<Node>(); // stack of nested sections
Element[] currentHeading = new Element[7]; // Last headings (repeated when splitting)
private int nCharacterCount = 0; // The number of text characters in the current document