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

Added footnotes output before specific outline

Browse source
This commit is contained in:
Georgy Litvinov 2020-01-27 17:09:47 +01:00
parent 274f1089c8
commit 75eda3d9dc
2 changed files with 52 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/main/java/writer2latex/xhtml/TextConverter.java
View file

@ -119,6 +119,7 @@ public class TextConverter extends ConverterHelper {
private boolean inFooter = false;
private String endnotesContext = null;
private String footnotesContext = null;
private int footnotesLevel = 0;
public TextConverter(OfficeReader ofr, XhtmlConfig config, Converter converter) {
super(ofr,config,converter);
@ -131,6 +132,7 @@ public class TextConverter extends ConverterHelper {
endCv = new EndnoteConverter(ofr, config, converter);
nSplitAfter = 1000*config.splitAfter();
nPageBreakSplit = config.pageBreakSplit();
footnotesLevel = config.getFootNotesLevel();
nSplit = config.getXhtmlSplitLevel();
nRepeatLevels = converter.isOPS() ? 0 : config.getXhtmlRepeatLevels(); // never repeat headings in EPUB
nFloatMode = ofr.isText() && config.xhtmlFloatObjects() ?
@ -282,6 +284,7 @@ public class TextConverter extends ConverterHelper {
getDrawCv().handleDrawElement((Element)child,(Element)hnode,null,nFloatMode);
}
else if (nodeName.equals(TEXT_P)) {
footnotesBeforeThisOutline(child,hnode);
StyleWithProperties style = ofr.getParStyle(Misc.getAttribute(child,TEXT_STYLE_NAME));
hnode = processPageBreaks(child, hnode,style);
//hnode = maybeSplit(hnode, style);
@ -330,7 +333,7 @@ public class TextConverter extends ConverterHelper {
}
else if(nodeName.equals(TEXT_H)) {
StyleWithProperties style = ofr.getParStyle(Misc.getAttribute(child,TEXT_STYLE_NAME));
int nOutlineLevel = getOutlineLevel((Element)child);
footnotesBeforeThisOutline(child,hnode);
Node rememberNode = hnode;
hnode = processPageBreaks(child, hnode, style);
//hnode = maybeSplit(hnode,style,nOutlineLevel);
@ -361,7 +364,7 @@ public class TextConverter extends ConverterHelper {
newPageNumberProperty = paraStyle.getParProperty(STYLE_PAGE_NUMBER, true);
}
newPageNumberProperty = paraStyle.getParProperty(STYLE_PAGE_NUMBER, true);
if (checkMasterPageBreak(paraStyle) || newPageNumberProperty != null){
if (hasMasterPage(paraStyle) || newPageNumberProperty != null){
style = paraStyle;
}
}
@ -370,7 +373,7 @@ public class TextConverter extends ConverterHelper {
if (headStyle != null) {
newPageNumberProperty = headStyle.getParProperty(STYLE_PAGE_NUMBER, true);
}
if (checkMasterPageBreak(headStyle) || newPageNumberProperty != null){
if (hasMasterPage(headStyle) || newPageNumberProperty != null){
style = headStyle;
}
}
@ -389,8 +392,8 @@ public class TextConverter extends ConverterHelper {
inList = false;
}
else if (nodeName.equals(TABLE_TABLE)) {
StyleWithProperties style = ofr.getTableStyle(Misc.getAttribute(child, TABLE_STYLE_NAME));
hnode = processPageBreaks(child, hnode,style);
StyleWithProperties style = ofr.getTableStyle(Misc.getAttribute(child, TABLE_STYLE_NAME));
hnode = processPageBreaks(child, hnode,style);
//hnode = maybeSplit(hnode,style);
inTable = true;
getTableCv().handleTable(child,hnode);
@ -455,7 +458,20 @@ public class TextConverter extends ConverterHelper {
return hnode;
}
private boolean getPageBreak(StyleWithProperties style) {
private void footnotesBeforeThisOutline(Node outlineNode, Node hnode) {
if (inEndnote || inFootnote) {
return;
}
int curLevel = getOutlineLevel((Element)outlineNode);
if (curLevel == 0) {
return;
}
if (footnotesAtEndOfChapter() && footnotesLevel >= curLevel) {
insertFootnotes(hnode, false);
}
}
private boolean getPageBreak(StyleWithProperties style) {
if (style!=null && nPageBreakSplit>XhtmlConfig.NONE) {
// If we don't consider manual page breaks, we may have to consider the parent style
if (style.isAutomatic() && nPageBreakSplit<XhtmlConfig.EXPLICIT) {
@ -1691,8 +1707,8 @@ public class TextConverter extends ConverterHelper {
protected int getOutlineLevel(Element node) {
return ofr.isOpenDocument() ?
Misc.getPosInteger(node.getAttribute(TEXT_OUTLINE_LEVEL),1):
Misc.getPosInteger(node.getAttribute(TEXT_LEVEL),1);
Misc.getPosInteger(node.getAttribute(TEXT_OUTLINE_LEVEL),0):
Misc.getPosInteger(node.getAttribute(TEXT_LEVEL),0);
}
private Node processPageBreaks(Node currentNode, Node hnode, StyleWithProperties style){
//Check for paragraph in current node in case currentNode is table
@ -1700,7 +1716,7 @@ public class TextConverter extends ConverterHelper {
//check for first para inside
// Check it's master page, pageNumber, Page break before - if we already set MP - throw it away
// And make a note to pass this paragraph next time you'll meet it.
if (inHeader || inFooter || inTable || inList || inFootnote || inEndnote ) {
if (inUnreakableElement() ) {
return hnode;
}
@ -1709,9 +1725,12 @@ public class TextConverter extends ConverterHelper {
if (currentMasterPage == null && style != null) {
hnode = startDocument(hnode, style, newPageNumber);
hnode = docSep.processOutlineLevel(currentNode, hnode, pageNum);
} else if (checkMasterPageBreak(style) || checkHardBreakBefore(style) || breakBeforeNextNode) {
} else if (hasMasterPage(style) || hasBreakBefore(style) || breakBeforeNextNode) {
// Insert footnotes
insertFootnotes(hnode,false);
if (!footnotesAtEndOfChapter()) {
insertFootnotes(hnode,false);
}
// Add previous MP footer
//hnode = exitPageContainer((Element) hnode);
addFooter(hnode);
@ -1750,6 +1769,14 @@ public class TextConverter extends ConverterHelper {
return hnode;
}
private boolean inUnreakableElement() {
return inHeader || inFooter || inTable || inList || inFootnote || inEndnote;
}
private boolean footnotesAtEndOfChapter() {
return !(footnotesLevel == 0);
}
private void insertFootnotes(Node hnode, boolean lastCall) {
inFootnote = true;
footCv.insertFootnotes(hnode, lastCall);
@ -1776,7 +1803,7 @@ public class TextConverter extends ConverterHelper {
private Node startDocument(Node hnode, StyleWithProperties style, Integer newPageNumber) {
if (checkMasterPageBreak(style)) {
if (hasMasterPage(style)) {
updateMasterPage(style);
} else {
currentMasterPage = "Standard";
@ -1826,7 +1853,7 @@ public class TextConverter extends ConverterHelper {
}
}
private boolean checkMasterPageBreak(StyleWithProperties style) {
private boolean hasMasterPage(StyleWithProperties style) {
// Page break was found before
if (style != null) {
@ -1840,7 +1867,7 @@ public class TextConverter extends ConverterHelper {
}
private void updateMasterPage(StyleWithProperties style) {
if (style != null && checkMasterPageBreak(style)) {
if (style != null && hasMasterPage(style)) {
String sMasterPage = style.getMasterPageName();
if (sMasterPage != null && sMasterPage.length() > 0) {
currentMasterPage = sMasterPage;
@ -1856,7 +1883,7 @@ public class TextConverter extends ConverterHelper {
}
private boolean checkHardBreakBefore(StyleWithProperties style) {
private boolean hasBreakBefore(StyleWithProperties style) {
if (style != null && "page".equals(style.getProperty(FO_BREAK_BEFORE))) {
return true;
}

12
src/main/java/writer2latex/xhtml/XhtmlConfig.java
View file

@ -40,7 +40,7 @@ import writer2latex.util.Misc;
public class XhtmlConfig extends writer2latex.base.ConfigBase {
// Implement configuration methods
protected int getOptionCount() { return 63; }
protected int getOptionCount() { return 64; }
protected String getDefaultConfigPath() { return "/writer2latex/xhtml/config/"; }
// Override setOption: To be backwards compatible, we must accept options
@ -162,6 +162,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
private static final int PAGE_TAGS = 60;
private static final int MIN_LETTER_SPACING = 61;
private static final int PAGE_BREAK_STYLE = 62;
private static final int FOOTNOTES_LEVEL = 63;
protected ComplexOption xheading = addComplexOption("heading-map");
protected ComplexOption xpar = addComplexOption("paragraph-map");
@ -299,7 +300,12 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
options[PAGE_TAGS] = new Option("page_tags","div");
options[MIN_LETTER_SPACING] = new Option("min_letter_spacing","");
options[PAGE_BREAK_STYLE] = new Option("page_break_style","");
options[FOOTNOTES_LEVEL] = new IntegerOption("footnotes_level","0"){
@Override public void setString(String sValue) {
super.setString(sValue);
nValue = Misc.getPosInteger(sValue, 0);
}
};
}
@ -451,6 +457,8 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
public String getPageTags() { return options[PAGE_TAGS].getString(); }
public String getMinLetterSpacing() { return ( options[MIN_LETTER_SPACING]).getString(); }
public String getPageBreakStyle() { return ( options[PAGE_BREAK_STYLE]).getString(); }
public int getFootNotesLevel() { return Integer.parseInt(( options[FOOTNOTES_LEVEL]).getString()); }
public XhtmlStyleMap getXParStyleMap() { return getStyleMap(xpar); }
public XhtmlStyleMap getXHeadingStyleMap() { return getStyleMap(xheading); }