From e5e260320397ebae70aee424fab5db470df23c5f Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Mon, 27 Jan 2020 17:43:11 +0100
Subject: [PATCH] Reverted last commit

---
 .../writer2latex/xhtml/TextConverter.java     | 27 ++-----------------
 .../java/writer2latex/xhtml/XhtmlConfig.java  | 11 +-------
 2 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/src/main/java/writer2latex/xhtml/TextConverter.java b/src/main/java/writer2latex/xhtml/TextConverter.java
index d07cf3b..6217239 100644
--- a/src/main/java/writer2latex/xhtml/TextConverter.java
+++ b/src/main/java/writer2latex/xhtml/TextConverter.java
@@ -119,7 +119,6 @@ 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);
@@ -132,7 +131,6 @@ 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() ? 
@@ -284,7 +282,6 @@ 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);
@@ -333,7 +330,6 @@ public class TextConverter extends ConverterHelper {
                 }
                 else if(nodeName.equals(TEXT_H)) {
                 	StyleWithProperties style = ofr.getParStyle(Misc.getAttribute(child,TEXT_STYLE_NAME));
-                    footnotesBeforeThisOutline(child,hnode);
                     Node rememberNode = hnode;
                     hnode = processPageBreaks(child, hnode, style);
                     //hnode = maybeSplit(hnode,style,nOutlineLevel);
@@ -458,20 +454,7 @@ public class TextConverter extends ConverterHelper {
         return hnode;
     }
     
-    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) {
+    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) {
@@ -1727,9 +1710,7 @@ public class TextConverter extends ConverterHelper {
 			hnode = docSep.processOutlineLevel(currentNode, hnode, pageNum);
 		} else if (hasMasterPage(style) || hasBreakBefore(style) || breakBeforeNextNode) {
 			// Insert footnotes
-			if (!footnotesAtEndOfChapter()) {
-				insertFootnotes(hnode,false);	
-			}
+			insertFootnotes(hnode,false);	
 			
 			// Add previous MP footer
 			//hnode = exitPageContainer((Element) hnode);
@@ -1773,10 +1754,6 @@ public class TextConverter extends ConverterHelper {
 		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);
diff --git a/src/main/java/writer2latex/xhtml/XhtmlConfig.java b/src/main/java/writer2latex/xhtml/XhtmlConfig.java
index c7f3500..bde70eb 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 64; }
+    protected int getOptionCount() { return 63; }
     protected String getDefaultConfigPath() { return "/writer2latex/xhtml/config/"; }
 	
     // Override setOption: To be backwards compatible, we must accept options
@@ -162,7 +162,6 @@ 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");
@@ -300,12 +299,6 @@ 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);
-        	}
-        };
 
     }
     
@@ -457,8 +450,6 @@ 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); }