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

Note converter store origin info

Browse source
This commit is contained in:
Georgy Litvinov 2020-01-21 18:16:03 +01:00
parent cb27f715b3
commit 6242ed2235
3 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/writer2latex/xhtml/EndnoteConverter.java
View file

@ -39,12 +39,12 @@ class EndnoteConverter extends NoteConverter {
* *
* @param hnode a block HTML element to contain the endnotes * @param hnode a block HTML element to contain the endnotes
*/ */
void insertEndnotes(Node hnode) { void insertEndnotes(Node hnode, String section) {
if (hasNotes()) { if (hasNotes()) {
if (config.getXhtmlSplitLevel()>0) { hnode = converter.nextOutFile(); } if (config.getXhtmlSplitLevel()>0) { hnode = converter.nextOutFile(); }
Element section = createNoteSection(hnode, "rearnotes"); Element sectionElement = createNoteSection(hnode, "rearnotes");
insertNoteHeading(section, config.getEndnotesHeading(), "endnotes"); insertNoteHeading(sectionElement, config.getEndnotesHeading(), "endnotes");
flushNotes(section,"rearnote"); flushNotes(sectionElement,"rearnote",section);
} }
} }
} }

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

@ -53,23 +53,23 @@ class FootnoteConverter extends NoteConverter {
void insertFootnotes(Node hnode, boolean bFinal) { void insertFootnotes(Node hnode, boolean bFinal) {
if (hasNotes()) { if (hasNotes()) {
if (bFootnotesAtPage) { if (bFootnotesAtPage) {
Element section = createNoteSection(hnode, "footnotes"); Element sectionElement = createNoteSection(hnode, "footnotes");
// Add footnote rule // Add footnote rule
Element rule = converter.createElement("hr"); Element rule = converter.createElement("hr");
StyleInfo info = new StyleInfo(); StyleInfo info = new StyleInfo();
getPageSc().applyFootnoteRuleStyle(info); getPageSc().applyFootnoteRuleStyle(info);
getPageSc().applyStyle(info, rule); getPageSc().applyStyle(info, rule);
section.appendChild(rule); sectionElement.appendChild(rule);
flushNotes(section,"footnote"); flushAllNotes(sectionElement,"footnote");
} }
else if (bFinal) { else if (bFinal) {
// New page if required for footnotes as endnotes // New page if required for footnotes as endnotes
if (config.getXhtmlSplitLevel()>0) { hnode = converter.nextOutFile(); } if (config.getXhtmlSplitLevel()>0) { hnode = converter.nextOutFile(); }
Element section = createNoteSection(hnode, "footnotes"); Element sectionElement = createNoteSection(hnode, "footnotes");
insertNoteHeading(section, config.getFootnotesHeading(), "footnotes"); insertNoteHeading(sectionElement, config.getFootnotesHeading(), "footnotes");
flushNotes(section,"footnote"); flushAllNotes(sectionElement,"footnote");
} }
} }
} }

31
src/main/java/writer2latex/xhtml/NoteConverter.java
View file

@ -25,7 +25,10 @@
package writer2latex.xhtml; package writer2latex.xhtml;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map.Entry;
import org.w3c.dom.Element; import org.w3c.dom.Element;
import org.w3c.dom.Node; import org.w3c.dom.Node;
@ -43,8 +46,8 @@ class NoteConverter extends ConverterHelper {
private PropertySet noteConfig; private PropertySet noteConfig;
// The collection of notes // The collection of notes
private List<Node> notes = new ArrayList<Node>(); //private List<Node> notes = new ArrayList<Node>();
private HashMap<String, List<Node>> notes = new HashMap<String, List<Node>>();
/** Construct a new note converter /** Construct a new note converter
* *
* @param ofr the office reader used to read the source document * @param ofr the office reader used to read the source document
@ -62,7 +65,7 @@ class NoteConverter extends ConverterHelper {
* @param onode a text:note element * @param onode a text:note element
* @param hnode the inline HTML element to contain the citation * @param hnode the inline HTML element to contain the citation
*/ */
void handleNote(Node onode, Node hnode) { void handleNote(Node onode, Node hnode, String section) {
// Create a style span for the citation // Create a style span for the citation
String sCitBodyStyle = noteConfig.getProperty(XMLString.TEXT_CITATION_BODY_STYLE_NAME); String sCitBodyStyle = noteConfig.getProperty(XMLString.TEXT_CITATION_BODY_STYLE_NAME);
Element span = getTextCv().createInline((Element) hnode,sCitBodyStyle); Element span = getTextCv().createInline((Element) hnode,sCitBodyStyle);
@ -85,7 +88,12 @@ class NoteConverter extends ConverterHelper {
getTextCv().traversePCDATA(citation,link); getTextCv().traversePCDATA(citation,link);
} }
// Remember the actual note // Remember the actual note
notes.add(onode); List<Node> noteList = notes.get(section);
if (noteList == null) {
noteList = new ArrayList<Node>();
notes.put(section, noteList);
}
noteList.add(onode);
} }
boolean hasNotes() { boolean hasNotes() {
@ -117,11 +125,17 @@ class NoteConverter extends ConverterHelper {
} }
} }
} }
public void flushAllNotes(Node hnode, String sEpubType) {
for (Entry<String, List<Node>> entry : notes.entrySet()) {
flushNotes(hnode, sEpubType, entry.getKey());
}
}
void flushNotes(Node hnode, String sEpubType) { public void flushNotes(Node hnode, String sEpubType, String section) {
int nSize = notes.size(); List<Node> noteList = notes.get(section);
int nSize = noteList.size();
for (int i=0; i<nSize; i++) { for (int i=0; i<nSize; i++) {
Node note = notes.get(i); Node note = noteList.get(i);
// Create container // Create container
Element aside = converter.createElement(converter.isHTML5() ? "aside" : "div"); Element aside = converter.createElement(converter.isHTML5() ? "aside" : "div");
hnode.appendChild(aside); hnode.appendChild(aside);
@ -148,7 +162,8 @@ class NoteConverter extends ConverterHelper {
createAnchor(sId,citation); createAnchor(sId,citation);
getTextCv().traverseBlockText(body,aside); getTextCv().traverseBlockText(body,aside);
} }
notes.clear(); //noteList.clear();
notes.remove(section);
} }
private void createAnchor(String sId, Node citation) { private void createAnchor(String sId, Node citation) {