diff --git a/src/main/java/writer2latex/xhtml/TextConverter.java b/src/main/java/writer2latex/xhtml/TextConverter.java index c3f9715..d07cf3b 100644 --- a/src/main/java/writer2latex/xhtml/TextConverter.java +++ b/src/main/java/writer2latex/xhtml/TextConverter.java @@ -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 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; } diff --git a/src/main/java/writer2latex/xhtml/XhtmlConfig.java b/src/main/java/writer2latex/xhtml/XhtmlConfig.java index 667a474..c7f3500 100644 --- a/src/main/java/writer2latex/xhtml/XhtmlConfig.java +++ b/src/main/java/writer2latex/xhtml/XhtmlConfig.java @@ -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); }