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-02-10 13:01:19 +01:00
parent 9692bcd340
commit b602751024
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -301,7 +301,7 @@ public class Converter extends BasicConverter {
Element body = ofr.getContent(); Element body = ofr.getContent();
if (ofr.isSpreadsheet()) { tableParser.convertTableContent(body); } if (ofr.isSpreadsheet()) { tableParser.convertTableContent(body); }
else if (ofr.isPresentation()) { drawParser.convertDrawContent(body); } else if (ofr.isPresentation()) { drawParser.convertDrawContent(body); }
else { textParser.convertTextContent(body); } else { textParser.convertDocumentContent(body); }
// Set the title page and text page entries // Set the title page and text page entries
if (converterResult.getContent().isEmpty()) { if (converterResult.getContent().isEmpty()) {

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

@ -67,7 +67,7 @@ public class TextParser extends Parser {
private int nPageBreakSplit = XhtmlConfig.NONE; // Should we split at page breaks? private int nPageBreakSplit = XhtmlConfig.NONE; // Should we split at page breaks?
// TODO: Collect soft page breaks between table rows // TODO: Collect soft page breaks between table rows
private boolean bPendingPageBreak = false; // We have encountered a page break which should be inserted asap private boolean bPendingPageBreak = false; // We have encountered a page break which should be inserted asap
private int nSplit = 0; // The outline level at which to split files (0=no split) private int splitResultsLevel = 0; // The outline level at which to split files (0=no split)
private int nRepeatLevels = 5; // The number of levels to repeat when splitting (0=no repeat) private int nRepeatLevels = 5; // The number of levels to repeat when splitting (0=no repeat)
private int nLastSplitLevel = 1; // The outline level at which the last split occurred private int nLastSplitLevel = 1; // The outline level at which the last split occurred
private int nDontSplitLevel = 0; // if > 0 splitting is forbidden private int nDontSplitLevel = 0; // if > 0 splitting is forbidden
@ -89,7 +89,7 @@ public class TextParser extends Parser {
private int nFloatMode; private int nFloatMode;
// Converter helpers used to handle all sorts of indexes // Converter helpers used to handle all sorts of indexes
private TOCParser tocCv; private TOCParser tocParser;
private LOFParser lofCv; private LOFParser lofCv;
private LOTParser lotCv; private LOTParser lotCv;
private AlphabeticalIndexParser indexCv; private AlphabeticalIndexParser indexCv;
@ -132,7 +132,7 @@ public class TextParser extends Parser {
public TextParser(OfficeReader ofr, XhtmlConfig config, Converter converter) { public TextParser(OfficeReader ofr, XhtmlConfig config, Converter converter) {
super(ofr,config,converter); super(ofr,config,converter);
tocCv = new TOCParser(ofr, config, converter); tocParser = new TOCParser(ofr, config, converter);
lofCv = new LOFParser(ofr, config, converter); lofCv = new LOFParser(ofr, config, converter);
lotCv = new LOTParser(ofr, config, converter); lotCv = new LOTParser(ofr, config, converter);
bibCv = new BibliographyParser(ofr, config, converter); bibCv = new BibliographyParser(ofr, config, converter);
@ -141,7 +141,7 @@ public class TextParser extends Parser {
endCv = new EndnoteParser(ofr, config, converter); endCv = new EndnoteParser(ofr, config, converter);
nSplitAfter = 1000*config.splitAfter(); nSplitAfter = 1000*config.splitAfter();
nPageBreakSplit = config.pageBreakSplit(); nPageBreakSplit = config.pageBreakSplit();
nSplit = config.getXhtmlSplitLevel(); splitResultsLevel = config.getXhtmlSplitLevel();
nRepeatLevels = converter.isOPS() ? 0 : config.getXhtmlRepeatLevels(); // never repeat headings in EPUB nRepeatLevels = converter.isOPS() ? 0 : config.getXhtmlRepeatLevels(); // never repeat headings in EPUB
nFloatMode = ofr.isText() && config.xhtmlFloatObjects() ? nFloatMode = ofr.isText() && config.xhtmlFloatObjects() ?
DrawParser.FLOATING : DrawParser.ABSOLUTE; DrawParser.FLOATING : DrawParser.ABSOLUTE;
@ -156,11 +156,11 @@ public class TextParser extends Parser {
* *
* @param onode the Office node containing the content to convert * @param onode the Office node containing the content to convert
*/ */
public void convertTextContent(Element onode) { public void convertDocumentContent(Element onode) {
Element hnode = converter.nextOutFile(); Element hnode = converter.nextOutFile();
// Create form // Create form
if (nSplit==0) { if (splitResultsLevel==0) {
Element form = getDrawCv().createForm(); Element form = getDrawCv().createForm();
if (form!=null) { if (form!=null) {
hnode.appendChild(form); hnode.appendChild(form);
@ -191,14 +191,14 @@ public class TextParser extends Parser {
hnode = (Element) docSep.endDocument(hnode); hnode = (Element) docSep.endDocument(hnode);
// Generate all indexes // Generate all indexes
bInToc = true; bInToc = true;
tocCv.generate(); tocParser.generate();
bInToc = false; bInToc = false;
// Generate navigation links // Generate navigation links
generateHeaders(); generateHeaders();
generateFooters(); generateFooters();
bInToc = true; bInToc = true;
tocCv.generatePanels(nSplit); tocParser.generatePanels(splitResultsLevel);
bInToc = false; bInToc = false;
} }
@ -245,7 +245,7 @@ public class TextParser extends Parser {
return; return;
} }
public int getTocIndex() { return tocCv.getFileIndex(); } public int getTocIndex() { return tocParser.getFileIndex(); }
public int getAlphabeticalIndex() { return indexCv.getFileIndex(); } public int getAlphabeticalIndex() { return indexCv.getFileIndex(); }
@ -418,7 +418,7 @@ public class TextParser extends Parser {
if (!ofr.getTocReader((Element)child).isByChapter()) { if (!ofr.getTocReader((Element)child).isByChapter()) {
// hnode = maybeSplit(hnode,null,1); // hnode = maybeSplit(hnode,null,1);
} }
tocCv.handleIndex((Element)child,(Element)hnode); tocParser.handleIndex((Element)child,(Element)hnode);
} }
else if (nodeName.equals(TEXT_ILLUSTRATION_INDEX)) { else if (nodeName.equals(TEXT_ILLUSTRATION_INDEX)) {
lofCv.handleLOF(child,hnode); lofCv.handleLOF(child,hnode);
@ -524,7 +524,7 @@ public class TextParser extends Parser {
// TODO: Something wrong here....nLastSplitLevel is never set??? // TODO: Something wrong here....nLastSplitLevel is never set???
return (Element) node; return (Element) node;
} }
if (nSplit>=nLevel && converter.outFileHasContent()) { if (splitResultsLevel>=nLevel && converter.outFileHasContent()) {
// No objections, this is a level that causes splitting // No objections, this is a level that causes splitting
nCharacterCount = 0; nCharacterCount = 0;
bPendingPageBreak = false; bPendingPageBreak = false;
@ -660,7 +660,7 @@ public class TextParser extends Parser {
// Export the heading // Export the heading
if (!bTocOnly) { if (!bTocOnly) {
// If split output, add headings of higher levels // If split output, add headings of higher levels
if (bAfterSplit && nSplit > 0) { if (bAfterSplit && splitResultsLevel > 0) {
int nFirst = nLevel - nRepeatLevels; int nFirst = nLevel - nRepeatLevels;
if (nFirst < 0) { if (nFirst < 0) {
nFirst = 0; nFirst = 0;
@ -702,7 +702,7 @@ public class TextParser extends Parser {
// Add to toc // Add to toc
if (!bInToc) { if (!bInToc) {
tocCv.handleHeading(onode, heading, sLabel); tocParser.handleHeading(onode, heading, sLabel);
} }
// Convert content // Convert content
@ -726,7 +726,7 @@ public class TextParser extends Parser {
} }
} else { } else {
if (!bInToc) { if (!bInToc) {
tocCv.handleHeadingExternal(onode, hnode, sLabel); tocParser.handleHeadingExternal(onode, hnode, sLabel);
} }
// Keep track of current headings for split output // Keep track of current headings for split output
currentHeading[nLevel] = null; currentHeading[nLevel] = null;
@ -764,7 +764,7 @@ public class TextParser extends Parser {
} }
// Maybe add to toc // Maybe add to toc
tocCv.handleParagraph((Element)onode, par, sCurrentListLabel); tocParser.handleParagraph((Element)onode, par, sCurrentListLabel);
if (!bIsEmpty) { if (!bIsEmpty) {
par = createTextBackground(par, styleName); par = createTextBackground(par, styleName);
@ -1350,10 +1350,10 @@ public class TextParser extends Parser {
if (!bInToc) { indexCv.handleIndexMarkStart(child,hnode); } if (!bInToc) { indexCv.handleIndexMarkStart(child,hnode); }
} }
else if (sName.equals(TEXT_TOC_MARK)) { else if (sName.equals(TEXT_TOC_MARK)) {
tocCv.handleTocMark(child,hnode); tocParser.handleTocMark(child,hnode);
} }
else if (sName.equals(TEXT_TOC_MARK_START)) { else if (sName.equals(TEXT_TOC_MARK_START)) {
tocCv.handleTocMark(child,hnode); tocParser.handleTocMark(child,hnode);
} }
else if (sName.equals(TEXT_BIBLIOGRAPHY_MARK)) { else if (sName.equals(TEXT_BIBLIOGRAPHY_MARK)) {
handleBibliographyMark(child,hnode); handleBibliographyMark(child,hnode);