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

Rearranged packages

Browse source
This commit is contained in:
Georgy Litvinov 2020-01-29 11:40:29 +01:00
parent 6180585f9a
commit 3e53edd42a
33 changed files with 227 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/writer2latex/xhtml/BatchConverterImpl.java → src/main/java/writer2latex/xhtml/BatchConverter.java
View file

@ -42,7 +42,7 @@ import writer2latex.xhtml.l10n.L10n;
* Implementation of <code>writer2latex.api.BatchConverter</code> for
* xhtml 1.0 strict
*/
public class BatchConverterImpl extends BatchConverterBase {
public class BatchConverter extends BatchConverterBase {
private XhtmlConfig config;
private XhtmlDocument template;
@ -51,7 +51,7 @@ public class BatchConverterImpl extends BatchConverterBase {
private String sDefaultCountry;
private L10n l10n;
public BatchConverterImpl() {
public BatchConverter() {
super();
config = new XhtmlConfig();
template = null;

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

@ -56,7 +56,12 @@ import writer2latex.office.StyleWithProperties;
import writer2latex.office.XMLString;
import writer2latex.util.ExportNameCollection;
import writer2latex.util.Misc;
import writer2latex.xhtml.content.DrawParser;
import writer2latex.xhtml.content.MathParser;
import writer2latex.xhtml.content.TableParser;
import writer2latex.xhtml.content.TextParser;
import writer2latex.xhtml.l10n.L10n;
import writer2latex.xhtml.style.StyleParser;
/**
* <p>This class converts an OpenDocument file to an XHTML(+MathML) or EPUB document.</p>
@ -92,7 +97,7 @@ public class Converter extends BasicConverter {
private Set<ResourceDocument> resources = new HashSet<ResourceDocument>();
// The xhtml output file(s)
protected int nType = XhtmlDocument.XHTML10; // the doctype
public int nType = XhtmlDocument.XHTML10; // the doctype
private boolean bOPS = false; // Do we need to be OPS conforming?
Vector<XhtmlDocument> outFiles;
private int nOutFileIndex;
@ -164,43 +169,43 @@ public class Converter extends BasicConverter {
readResource(new FileInputStream(file), sFileName, sMediaType);
}
protected String getContentWidth() {
public String getContentWidth() {
return contentWidth.peek();
}
protected String pushContentWidth(String sWidth) {
public String pushContentWidth(String sWidth) {
return contentWidth.push(sWidth);
}
protected void popContentWidth() {
public void popContentWidth() {
contentWidth.pop();
}
protected boolean isTopLevel() {
public boolean isTopLevel() {
return contentWidth.size()==1;
}
protected StyleParser getStyleCv() { return styleCv; }
public StyleParser getStyleCv() { return styleCv; }
protected TextParser getTextCv() { return textCv; }
public TextParser getTextCv() { return textCv; }
protected TableParser getTableCv() { return tableCv; }
public TableParser getTableCv() { return tableCv; }
protected DrawParser getDrawCv() { return drawCv; }
public DrawParser getDrawCv() { return drawCv; }
protected MathParser getMathCv() { return mathCv; }
public MathParser getMathCv() { return mathCv; }
protected int getType() { return nType; }
public int getType() { return nType; }
public boolean isHTML5() { return nType==XhtmlDocument.HTML5; }
protected int getOutFileIndex() { return nOutFileIndex; }
public int getOutFileIndex() { return nOutFileIndex; }
protected void addContentEntry(String sTitle, int nLevel, String sTarget) {
public void addContentEntry(String sTitle, int nLevel, String sTarget) {
converterResult.addContentEntry(new ContentEntryImpl(sTitle,nLevel,htmlDoc,sTarget));
}
protected void setTocFile(String sTarget) {
public void setTocFile(String sTarget) {
converterResult.setTocFile(new ContentEntryImpl(l10n.get(L10n.CONTENTS),1,htmlDoc,sTarget));
//nTocFileIndex = nOutFileIndex;
}
@ -213,26 +218,26 @@ public class Converter extends BasicConverter {
converterResult.setLotFile(new ContentEntryImpl("Tables",1,htmlDoc,sTarget));
}
protected void setIndexFile(String sTarget) {
public void setIndexFile(String sTarget) {
converterResult.setIndexFile(new ContentEntryImpl(l10n.get(L10n.INDEX),1,htmlDoc,sTarget));
//nAlphabeticalIndex = nOutFileIndex;
}
protected void setCoverFile(String sTarget) {
public void setCoverFile(String sTarget) {
converterResult.setCoverFile(new ContentEntryImpl("Cover",0,htmlDoc,sTarget));
}
protected void setCoverImageFile(OutputFile file, String sTarget) {
public void setCoverImageFile(OutputFile file, String sTarget) {
converterResult.setCoverImageFile(new ContentEntryImpl("Cover image",0,file,sTarget));
}
protected Element createElement(String s) { return htmlDOM.createElement(s); }
public Element createElement(String s) { return htmlDOM.createElement(s); }
protected Text createTextNode(String s) { return htmlDOM.createTextNode(s); }
public Text createTextNode(String s) { return htmlDOM.createTextNode(s); }
protected Node importNode(Node node, boolean bDeep) { return htmlDOM.importNode(node,bDeep); }
public Node importNode(Node node, boolean bDeep) { return htmlDOM.importNode(node,bDeep); }
protected L10n getL10n() { return l10n; }
public L10n getL10n() { return l10n; }
public void setOPS(boolean b) { bOPS = true; }
@ -538,7 +543,7 @@ public class Converter extends BasicConverter {
}
/* get inline text, ignoring any draw objects, footnotes, formatting and hyperlinks */
protected String getPlainInlineText(Node node) {
public String getPlainInlineText(Node node) {
StringBuilder buf = new StringBuilder();
Node child = node.getFirstChild();
while (child!=null) {

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

@ -14,7 +14,7 @@ public class PageSplitter {
static Node truncatedListItemNodeContent = null;
static OfficeReader officeReader = null;
protected static Node splitSoftPageBreak(Node onode,OfficeReader ofr){
public static Node splitSoftPageBreak(Node onode,OfficeReader ofr){
//Find par node with soft page break inside and split it
officeReader = ofr;
Document document = onode.getOwnerDocument();

60
src/main/java/writer2latex/xhtml/Parser.java
View file

@ -28,15 +28,31 @@ package writer2latex.xhtml;
import org.w3c.dom.Element;
import writer2latex.office.OfficeReader;
import writer2latex.xhtml.content.DrawParser;
import writer2latex.xhtml.content.MathParser;
import writer2latex.xhtml.content.TableParser;
import writer2latex.xhtml.content.TextParser;
import writer2latex.xhtml.style.CellStyleParser;
import writer2latex.xhtml.style.FrameStyleParser;
import writer2latex.xhtml.style.HeadingStyleParser;
import writer2latex.xhtml.style.ListStyleFamilyParser;
import writer2latex.xhtml.style.PageStyleParser;
import writer2latex.xhtml.style.ParStyleParser;
import writer2latex.xhtml.style.PresentationStyleParser;
import writer2latex.xhtml.style.RowStyleParser;
import writer2latex.xhtml.style.SectionStyleParser;
import writer2latex.xhtml.style.StyleParser;
import writer2latex.xhtml.style.TableStyleParser;
import writer2latex.xhtml.style.TextStyleParser;
/** A <code>ConverterHelper</code> is responsible for conversion of some specific content into XHTML.
*/
class Parser {
public class Parser {
// Member variables providing our content (set in constructor)
OfficeReader ofr;
XhtmlConfig config;
Converter converter;
protected OfficeReader ofr;
protected XhtmlConfig config;
protected Converter converter;
/** Construct a new converter helper based on a
*
@ -44,7 +60,7 @@ class Parser {
* @param config the configuration to use
* @param converter the main converter to which the helper belongs
*/
Parser(OfficeReader ofr, XhtmlConfig config, Converter converter) {
protected Parser(OfficeReader ofr, XhtmlConfig config, Converter converter) {
this.ofr = ofr;
this.config = config;
this.converter = converter;
@ -52,44 +68,44 @@ class Parser {
// Convenience accessor methods to other converter helpers (only needed to save some typing)
StyleParser getStyleCv() { return converter.getStyleCv(); }
protected StyleParser getStyleCv() { return converter.getStyleCv(); }
TextStyleParser getTextSc() { return converter.getStyleCv().getTextSc(); }
protected TextStyleParser getTextSc() { return converter.getStyleCv().getTextSc(); }
ParStyleParser getParSc() { return converter.getStyleCv().getParSc(); }
protected ParStyleParser getParSc() { return converter.getStyleCv().getParSc(); }
HeadingStyleParser getHeadingSc() { return converter.getStyleCv().getHeadingSc(); }
protected HeadingStyleParser getHeadingSc() { return converter.getStyleCv().getHeadingSc(); }
ListStyleFamilyParser getListSc() { return converter.getStyleCv().getListSc(); }
protected ListStyleFamilyParser getListSc() { return converter.getStyleCv().getListSc(); }
SectionStyleParser getSectionSc() { return converter.getStyleCv().getSectionSc(); }
protected SectionStyleParser getSectionSc() { return converter.getStyleCv().getSectionSc(); }
TableStyleParser getTableSc() { return converter.getStyleCv().getTableSc(); }
protected TableStyleParser getTableSc() { return converter.getStyleCv().getTableSc(); }
RowStyleParser getRowSc() { return converter.getStyleCv().getRowSc(); }
protected RowStyleParser getRowSc() { return converter.getStyleCv().getRowSc(); }
CellStyleParser getCellSc() { return converter.getStyleCv().getCellSc(); }
protected CellStyleParser getCellSc() { return converter.getStyleCv().getCellSc(); }
FrameStyleParser getFrameSc() { return converter.getStyleCv().getFrameSc(); }
protected FrameStyleParser getFrameSc() { return converter.getStyleCv().getFrameSc(); }
PresentationStyleParser getPresentationSc() { return converter.getStyleCv().getPresentationSc(); }
protected PresentationStyleParser getPresentationSc() { return converter.getStyleCv().getPresentationSc(); }
PageStyleParser getPageSc() { return converter.getStyleCv().getPageSc(); }
protected PageStyleParser getPageSc() { return converter.getStyleCv().getPageSc(); }
TextParser getTextCv() { return converter.getTextCv(); }
protected TextParser getTextCv() { return converter.getTextCv(); }
TableParser getTableCv() { return converter.getTableCv(); }
protected TableParser getTableCv() { return converter.getTableCv(); }
DrawParser getDrawCv() { return converter.getDrawCv(); }
protected DrawParser getDrawCv() { return converter.getDrawCv(); }
MathParser getMathCv() { return converter.getMathCv(); }
protected MathParser getMathCv() { return converter.getMathCv(); }
/** Apply style information to an XHTML node
*
* @param info the style to apply
* @param hnode the XHTML node
*/
void applyStyle(StyleInfo info, Element hnode) {
public void applyStyle(StyleInfo info, Element hnode) {
if (info.sClass!=null) {
hnode.setAttribute("class",info.sClass);
}

16
src/main/java/writer2latex/xhtml/DocumentSeparator.java → src/main/java/writer2latex/xhtml/Separator.java
View file

@ -15,7 +15,7 @@ import static writer2latex.util.Misc.*;
//LinkedList<String> stringList = new LinkedList<String>();
public class DocumentSeparator {
public class Separator {
private static final String NONE = "none";
private static final String SECTIONS = "sections";
@ -37,7 +37,7 @@ public class DocumentSeparator {
private Node prevPageNode = null;
private List<String> pageContanerStyles = new ArrayList<String>(Arrays.asList(""));
public DocumentSeparator(XhtmlConfig config,Converter converter) {
public Separator(XhtmlConfig config,Converter converter) {
this.config = config;
this.converter = converter;
headingSeparation = config.getHeadingTags();
@ -47,7 +47,7 @@ public class DocumentSeparator {
breakStyle = config.getPageBreakStyle();
}
protected Node processOutlineLevel(Node currentNode, Node hnode, int pageNum) {
public Node processOutlineLevel(Node currentNode, Node hnode, int pageNum) {
//Get outline level
String sLevel = getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL);
@ -105,7 +105,7 @@ public class DocumentSeparator {
return false;
}
protected Node processPageBreak(Node currentNode, Node hnode, Integer pageNum){
public Node processPageBreak(Node currentNode, Node hnode, Integer pageNum){
if (noPageSeparation()){
return hnode;
}
@ -123,7 +123,7 @@ public class DocumentSeparator {
/**
* Opens main document section heading tag
*/
protected Node startDocument(Node hnode, String title, int pageNum){
public Node startDocument(Node hnode, String title, int pageNum){
if (noHeadingSeparation() && noPageSeparation()){
return hnode;
}
@ -136,7 +136,7 @@ public class DocumentSeparator {
return hnode;
}
//Method to close open tags at the end of the document
protected Node endDocument(Node hnode){
public Node endDocument(Node hnode){
if (noHeadingSeparation() && noPageSeparation()){
return hnode;
}
@ -294,7 +294,7 @@ public class DocumentSeparator {
}
}
}
protected Node closePage(Node hnode){
public Node closePage(Node hnode){
if (pageOpened == false) {
return hnode;
}
@ -313,7 +313,7 @@ public class DocumentSeparator {
pageOpened = false;
return hnode;
}
protected Node openPage(Node hnode, Integer pageNum){
public Node openPage(Node hnode, Integer pageNum){
if (pageOpened == true) {
return hnode;
}

4
src/main/java/writer2latex/xhtml/AlphabeticalIndexParser.java → src/main/java/writer2latex/xhtml/content/AlphabeticalIndexParser.java
View file

@ -22,7 +22,7 @@
* Version 1.6 (2015-06-19)
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.content;
import java.util.ArrayList;
import java.util.Collections;
@ -35,6 +35,8 @@ import writer2latex.office.OfficeReader;
import writer2latex.office.XMLString;
import writer2latex.util.Misc;
import writer2latex.util.StringComparator;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.XhtmlConfig;
// Helper class (a struct) to contain information about an alphabetical index entry.
final class AlphabeticalEntry {

4
src/main/java/writer2latex/xhtml/BibliographyParser.java → src/main/java/writer2latex/xhtml/content/BibliographyParser.java
View file

@ -22,7 +22,7 @@
* Version 1.6 (2015-06-16)
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.content;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@ -30,6 +30,8 @@ import org.w3c.dom.Node;
import writer2latex.office.OfficeReader;
import writer2latex.office.XMLString;
import writer2latex.util.Misc;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.XhtmlConfig;
/** This class handles the export of the bibliography. Most of the work is delegated to the
* {@link XhtmlBibliographyGenerator}

7
src/main/java/writer2latex/xhtml/DrawParser.java → src/main/java/writer2latex/xhtml/content/DrawParser.java
View file

@ -37,7 +37,7 @@
* export notes (part of draw-page)
* export list-style-image for image bullets!
*/
package writer2latex.xhtml;
package writer2latex.xhtml.content;
import java.util.HashMap;
import java.util.Iterator;
@ -60,6 +60,11 @@ import writer2latex.util.Calc;
import writer2latex.util.Misc;
import writer2latex.util.CSVList;
import writer2latex.util.SimpleXMLParser;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.Parser;
import writer2latex.xhtml.StyleInfo;
import writer2latex.xhtml.XhtmlConfig;
import writer2latex.xhtml.XhtmlDocument;
import writer2latex.base.BinaryGraphicsDocument;
import writer2latex.office.EmbeddedObject;
import writer2latex.office.EmbeddedXMLObject;

4
src/main/java/writer2latex/xhtml/EndnoteParser.java → src/main/java/writer2latex/xhtml/content/EndnoteParser.java
View file

@ -22,12 +22,14 @@
* Version 1.6 (2015-06-12)
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.content;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import writer2latex.office.OfficeReader;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.XhtmlConfig;
class EndnoteParser extends NoteParser {

5
src/main/java/writer2latex/xhtml/FootnoteParser.java → src/main/java/writer2latex/xhtml/content/FootnoteParser.java
View file

@ -22,7 +22,7 @@
* Version 1.6 (2015-06-14)
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.content;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@ -30,6 +30,9 @@ import org.w3c.dom.Node;
import writer2latex.office.OfficeReader;
import writer2latex.office.PropertySet;
import writer2latex.office.XMLString;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.StyleInfo;
import writer2latex.xhtml.XhtmlConfig;
class FootnoteParser extends NoteParser {

6
src/main/java/writer2latex/xhtml/IndexParser.java → src/main/java/writer2latex/xhtml/content/IndexParser.java
View file

@ -23,7 +23,7 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.content;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@ -31,6 +31,10 @@ import org.w3c.dom.Node;
import writer2latex.office.OfficeReader;
import writer2latex.office.XMLString;
import writer2latex.util.Misc;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.Parser;
import writer2latex.xhtml.StyleInfo;
import writer2latex.xhtml.XhtmlConfig;
/** This is a base class for conversion of indexes (table of contents, bibliography, alphabetical index,
* list of tables, list of figures)

5
src/main/java/writer2latex/xhtml/LOFParser.java → src/main/java/writer2latex/xhtml/content/LOFParser.java
View file

@ -22,11 +22,14 @@
* Version 1.6 (2015-06-10)
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.content;
import org.w3c.dom.Node;
import writer2latex.office.OfficeReader;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.Parser;
import writer2latex.xhtml.XhtmlConfig;
public class LOFParser extends Parser {

5
src/main/java/writer2latex/xhtml/LOTParser.java → src/main/java/writer2latex/xhtml/content/LOTParser.java
View file

@ -22,11 +22,14 @@
* Version 1.6 (2015-06-10)
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.content;
import org.w3c.dom.Node;
import writer2latex.office.OfficeReader;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.Parser;
import writer2latex.xhtml.XhtmlConfig;
public class LOTParser extends Parser {

6
src/main/java/writer2latex/xhtml/MathParser.java → src/main/java/writer2latex/xhtml/content/MathParser.java
View file

@ -23,7 +23,7 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.content;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@ -32,6 +32,10 @@ import org.w3c.dom.NamedNodeMap;
import writer2latex.office.*;
import writer2latex.util.Misc;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.Parser;
import writer2latex.xhtml.XhtmlConfig;
import writer2latex.xhtml.XhtmlDocument;
import writer2latex.base.BinaryGraphicsDocument;
//import writer2latex.latex.StarMathConverter;

6
src/main/java/writer2latex/xhtml/NoteParser.java → src/main/java/writer2latex/xhtml/content/NoteParser.java
View file

@ -22,7 +22,7 @@
* Version 1.6 (2015-06-14)
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.content;
import java.util.ArrayList;
import java.util.HashMap;
@ -37,6 +37,10 @@ import writer2latex.office.OfficeReader;
import writer2latex.office.PropertySet;
import writer2latex.office.XMLString;
import writer2latex.util.Misc;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.Parser;
import writer2latex.xhtml.StyleInfo;
import writer2latex.xhtml.XhtmlConfig;
/** This is a base class handles the conversion of footnotes and endnotes
*/

4
src/main/java/writer2latex/xhtml/TOCParser.java → src/main/java/writer2latex/xhtml/content/TOCParser.java
View file

@ -22,7 +22,7 @@
* Version 1.6 (2015-07-23)
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.content;
import java.util.ArrayList;
import java.util.List;
@ -35,6 +35,8 @@ import writer2latex.office.OfficeReader;
import writer2latex.office.TocReader;
import writer2latex.office.XMLString;
import writer2latex.util.Misc;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.XhtmlConfig;
import writer2latex.xhtml.l10n.L10n;
//Helper class (a struct) to contain information about a toc entry (ie. a heading, other paragraph or toc-mark)

9
src/main/java/writer2latex/xhtml/TableParser.java → src/main/java/writer2latex/xhtml/content/TableParser.java
View file

@ -23,7 +23,7 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.content;
import java.util.Vector;
@ -34,6 +34,11 @@ import org.w3c.dom.Element;
import writer2latex.util.Calc;
import writer2latex.util.Misc;
import writer2latex.util.SimpleInputBuffer;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.Parser;
import writer2latex.xhtml.StyleInfo;
import writer2latex.xhtml.XhtmlConfig;
import writer2latex.xhtml.XhtmlDocument;
import writer2latex.office.XMLString;
import writer2latex.office.StyleWithProperties;
import writer2latex.office.OfficeReader;
@ -46,7 +51,7 @@ public class TableParser extends Parser {
// The collection of all table names
// TODO: Navigation should be handled here rather than in Converter.java
protected Vector<String> sheetNames = new Vector<String>();
public Vector<String> sheetNames = new Vector<String>();
public TableParser(OfficeReader ofr, XhtmlConfig config, Converter converter) {
super(ofr,config,converter);

28
src/main/java/writer2latex/xhtml/TextParser.java → src/main/java/writer2latex/xhtml/content/TextParser.java
View file

@ -23,7 +23,7 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.content;
import java.util.Hashtable;
import java.util.Stack;
@ -32,13 +32,19 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Element;
import writer2latex.util.CSVList;
import writer2latex.util.Misc;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.Separator;
import writer2latex.xhtml.PageSplitter;
import writer2latex.xhtml.Parser;
import writer2latex.xhtml.StyleInfo;
import writer2latex.xhtml.XhtmlConfig;
import writer2latex.xhtml.XhtmlStyleMap;
import writer2latex.xhtml.XhtmlStyleMapItem;
import writer2latex.office.FontDeclaration;
import writer2latex.office.MasterPage;
import writer2latex.office.OfficeStyle;
import writer2latex.office.PageLayout;
import writer2latex.office.XMLString;
import writer2latex.office.ListCounter;
import writer2latex.office.ListStyle;
import writer2latex.office.StyleWithProperties;
@ -64,7 +70,7 @@ public class TextParser extends Parser {
private int nLastSplitLevel = 1; // The outline level at which the last split occurred
private int nDontSplitLevel = 0; // if > 0 splitting is forbidden
boolean bAfterHeading=false; // last element was a top level heading
protected Stack<Node> sections = new Stack<Node>(); // stack of nested sections
public Stack<Node> sections = new Stack<Node>(); // stack of nested sections
Element[] currentHeading = new Element[7]; // Last headings (repeated when splitting)
private int nCharacterCount = 0; // The number of text characters in the current document
@ -74,7 +80,7 @@ public class TextParser extends Parser {
private String sCurrentListLabel = null;
private ListStyle currentListStyle = null;
private int nCurrentListLevel = 0;
DocumentSeparator docSep = null;
Separator docSep = null;
// Mode used to handle floats (depends on source doc type and config)
@ -138,7 +144,7 @@ public class TextParser extends Parser {
outlineNumbering = new ListCounter(ofr.getOutlineStyle());
bDisplayHiddenText = config.displayHiddenText();
docSep = new DocumentSeparator(config, converter);
docSep = new Separator(config, converter);
}
/** Converts an office node as a complete text document
@ -233,9 +239,9 @@ public class TextParser extends Parser {
return;
}
protected int getTocIndex() { return tocCv.getFileIndex(); }
public int getTocIndex() { return tocCv.getFileIndex(); }
protected int getAlphabeticalIndex() { return indexCv.getFileIndex(); }
public int getAlphabeticalIndex() { return indexCv.getFileIndex(); }
protected void setAsapNode(Element node) {
asapNode = node;
@ -257,10 +263,10 @@ public class TextParser extends Parser {
////////////////////////////////////////////////////////////////////////
public Node traverseBlockText(Node onode, Node hnode) {
return traverseText(onode,0,null,hnode);
return parseText(onode,0,null,hnode);
}
private Node traverseText(Node onode, int nLevel, String styleName, Node hnode) {
private Node parseText(Node onode, int nLevel, String styleName, Node hnode) {
if (!onode.hasChildNodes()) { return hnode; }
bAfterHeading = false;
NodeList nList = onode.getChildNodes();
@ -1040,7 +1046,7 @@ public class TextParser extends Parser {
}
}
// Still here? - traverse block text as usual!
traverseText(onode,nLevel,styleName,hnode);
parseText(onode,nLevel,styleName,hnode);
}
///////////////////////////////////////////////////////////////////////////

3
src/main/java/writer2latex/xhtml/XhtmlBibliographyGenerator.java → src/main/java/writer2latex/xhtml/content/XhtmlBibliographyGenerator.java
View file

@ -23,12 +23,13 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.content;
import org.w3c.dom.Element;
import writer2latex.base.BibliographyGenerator;
import writer2latex.office.OfficeReader;
import writer2latex.xhtml.Converter;
class XhtmlBibliographyGenerator extends BibliographyGenerator {

5
src/main/java/writer2latex/xhtml/CellStyleParser.java → src/main/java/writer2latex/xhtml/style/CellStyleParser.java
View file

@ -23,13 +23,16 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.style;
import writer2latex.office.OfficeReader;
import writer2latex.office.OfficeStyleFamily;
import writer2latex.office.StyleWithProperties;
import writer2latex.office.XMLString;
import writer2latex.util.CSVList;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.XhtmlConfig;
import writer2latex.xhtml.XhtmlStyleMap;
/**
* This class converts OpenDocument cell styles to CSS2 styles.

4
src/main/java/writer2latex/xhtml/FrameStyleParser.java → src/main/java/writer2latex/xhtml/style/FrameStyleParser.java
View file

@ -23,7 +23,7 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.style;
import java.util.Enumeration;
@ -35,6 +35,8 @@ import writer2latex.util.CSVList;
import writer2latex.util.Calc;
//import writer2latex.util.Misc;
import writer2latex.util.SimpleInputBuffer;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.XhtmlConfig;
/**
* This class converts OpenDocument graphic (frame) styles to CSS2 styles.

6
src/main/java/writer2latex/xhtml/HeadingStyleParser.java → src/main/java/writer2latex/xhtml/style/HeadingStyleParser.java
View file

@ -22,7 +22,7 @@
* Version 1.6 (2015-06-10)
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.style;
import java.util.ArrayList;
import java.util.HashSet;
@ -33,6 +33,10 @@ import writer2latex.office.OfficeReader;
import writer2latex.office.OfficeStyleFamily;
import writer2latex.office.StyleWithProperties;
import writer2latex.util.CSVList;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.StyleInfo;
import writer2latex.xhtml.XhtmlConfig;
import writer2latex.xhtml.XhtmlStyleMapItem;
public class HeadingStyleParser extends StyleFamilyParser {

6
src/main/java/writer2latex/xhtml/ListStyleFamilyParser.java → src/main/java/writer2latex/xhtml/style/ListStyleFamilyParser.java
View file

@ -23,7 +23,7 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.style;
import java.util.Enumeration;
//import java.util.Hashtable;
@ -35,6 +35,10 @@ import writer2latex.office.OfficeStyleFamily;
import writer2latex.office.StyleWithProperties;
import writer2latex.office.XMLString;
import writer2latex.util.CSVList;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.StyleInfo;
import writer2latex.xhtml.XhtmlConfig;
import writer2latex.xhtml.XhtmlStyleMapItem;
/**
* This class converts OpenDocument list styles to

5
src/main/java/writer2latex/xhtml/PageStyleParser.java → src/main/java/writer2latex/xhtml/style/PageStyleParser.java
View file

@ -23,7 +23,7 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.style;
import java.util.Enumeration;
@ -35,6 +35,9 @@ import writer2latex.office.StyleWithProperties;
import writer2latex.office.XMLString;
import writer2latex.util.CSVList;
import writer2latex.util.Calc;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.StyleInfo;
import writer2latex.xhtml.XhtmlConfig;
/**
* This class converts OpenDocument page styles to CSS2 styles.

4
src/main/java/writer2latex/xhtml/ParStyleParser.java → src/main/java/writer2latex/xhtml/style/ParStyleParser.java
View file

@ -23,13 +23,15 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.style;
import writer2latex.office.OfficeReader;
import writer2latex.office.OfficeStyleFamily;
import writer2latex.office.StyleWithProperties;
import writer2latex.office.XMLString;
import writer2latex.util.CSVList;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.XhtmlConfig;
/*
TODO: drop caps (contained in a child of the style:properties element)

6
src/main/java/writer2latex/xhtml/PresentationStyleParser.java → src/main/java/writer2latex/xhtml/style/PresentationStyleParser.java
View file

@ -23,7 +23,7 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.style;
import java.util.Enumeration;
import java.util.Hashtable;
@ -34,6 +34,10 @@ import writer2latex.office.StyleWithProperties;
//import writer2latex.office.XMLString;
import writer2latex.util.CSVList;
import writer2latex.util.ExportNameCollection;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.StyleInfo;
import writer2latex.xhtml.XhtmlConfig;
import writer2latex.xhtml.XhtmlStyleMap;
/**
* This class converts OpenDocument presentation styles to CSS2 styles.

5
src/main/java/writer2latex/xhtml/RowStyleParser.java → src/main/java/writer2latex/xhtml/style/RowStyleParser.java
View file

@ -23,13 +23,16 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.style;
import writer2latex.office.OfficeReader;
import writer2latex.office.OfficeStyleFamily;
import writer2latex.office.StyleWithProperties;
//import writer2latex.office.XMLString;
import writer2latex.util.CSVList;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.XhtmlConfig;
import writer2latex.xhtml.XhtmlStyleMap;
/**
* This class converts OpenDocument row styles to CSS2 styles.

5
src/main/java/writer2latex/xhtml/SectionStyleParser.java → src/main/java/writer2latex/xhtml/style/SectionStyleParser.java
View file

@ -23,13 +23,16 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.style;
import writer2latex.office.OfficeReader;
import writer2latex.office.OfficeStyleFamily;
import writer2latex.office.StyleWithProperties;
//import writer2latex.office.XMLString;
import writer2latex.util.CSVList;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.XhtmlConfig;
import writer2latex.xhtml.XhtmlStyleMap;
/**
* This class converts OpenDocument section styles to CSS2 styles.

11
src/main/java/writer2latex/xhtml/StyleFamilyParser.java → src/main/java/writer2latex/xhtml/style/StyleFamilyParser.java
View file

@ -23,7 +23,7 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.style;
import writer2latex.office.OfficeReader;
import writer2latex.office.OfficeStyleFamily;
@ -31,6 +31,11 @@ import writer2latex.office.StyleWithProperties;
import writer2latex.office.XMLString;
import writer2latex.util.Calc;
import writer2latex.util.ExportNameCollection;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.Parser;
import writer2latex.xhtml.StyleInfo;
import writer2latex.xhtml.XhtmlConfig;
import writer2latex.xhtml.XhtmlStyleMap;
/**
* <p>This is an abstract base class to convert an OpenDocument style family to
@ -70,7 +75,7 @@ public abstract class StyleFamilyParser extends Parser {
bConvertToPx = config.xhtmlConvertToPx();
}
protected String scale(String s) {
public String scale(String s) {
if (bConvertToPx) {
return Calc.length2px(Calc.multiply(sScale,s));
}
@ -79,7 +84,7 @@ public abstract class StyleFamilyParser extends Parser {
}
}
protected String colScale(String s) {
public String colScale(String s) {
return scale(Calc.multiply(sColScale,s));
}

38
src/main/java/writer2latex/xhtml/StyleParser.java → src/main/java/writer2latex/xhtml/style/StyleParser.java
View file

@ -23,7 +23,7 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.style;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@ -31,6 +31,10 @@ import org.w3c.dom.Node;
import writer2latex.office.*;
import writer2latex.util.*;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.Parser;
import writer2latex.xhtml.StyleInfo;
import writer2latex.xhtml.XhtmlConfig;
/** This class converts OpenDocument styles to CSS2 styles.
* Note that some elements in OpenDocument has attributes that also maps to CSS2 properties.
@ -38,7 +42,7 @@ import writer2latex.util.*;
* Also note, that some OpenDocument style properties cannot be mapped to CSS2 without creating an additional inline element.
* The class uses one helper class per OpenDocument style family (paragraph, frame etc.)
*/
class StyleParser extends Parser {
public class StyleParser extends Parser {
// Helpers for text styles
private TextStyleParser textSc;
@ -66,7 +70,7 @@ class StyleParser extends Parser {
* @param converter the main converter
* @param nType the XHTML type
*/
StyleParser(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) {
public StyleParser(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) {
super(ofr,config,converter);
// Create the helpers
textSc = new TextStyleParser(ofr,config,converter,nType);
@ -84,33 +88,33 @@ class StyleParser extends Parser {
// Accessor methods for helpers: We need to override the style helper accessors
TextStyleParser getTextSc() { return textSc; }
public TextStyleParser getTextSc() { return textSc; }
ParStyleParser getParSc() { return parSc; }
public ParStyleParser getParSc() { return parSc; }
HeadingStyleParser getHeadingSc() { return headingSc; }
public HeadingStyleParser getHeadingSc() { return headingSc; }
ListStyleFamilyParser getListSc() { return listSc; }
public ListStyleFamilyParser getListSc() { return listSc; }
SectionStyleParser getSectionSc() { return sectionSc; }
public SectionStyleParser getSectionSc() { return sectionSc; }
TableStyleParser getTableSc() { return tableSc; }
public TableStyleParser getTableSc() { return tableSc; }
RowStyleParser getRowSc() { return rowSc; }
public RowStyleParser getRowSc() { return rowSc; }
CellStyleParser getCellSc() { return cellSc; }
public CellStyleParser getCellSc() { return cellSc; }
FrameStyleParser getFrameSc() { return frameSc; }
public FrameStyleParser getFrameSc() { return frameSc; }
PresentationStyleParser getPresentationSc() { return presentationSc; }
public PresentationStyleParser getPresentationSc() { return presentationSc; }
PageStyleParser getPageSc() { return pageSc; }
public PageStyleParser getPageSc() { return pageSc; }
/** Apply the default language of the source document on an XHTML element
*
* @param node the XHTML element
*/
void applyDefaultLanguage(Element node) {
public void applyDefaultLanguage(Element node) {
StyleWithProperties style = getDefaultStyle();
if (style!=null) {
StyleInfo info = new StyleInfo();
@ -124,7 +128,7 @@ class StyleParser extends Parser {
* @param bIndent true if the CSS code should be indented
* @return the CSS code
*/
String exportStyles(boolean bIndent) {
public String exportStyles(boolean bIndent) {
String sIndent = bIndent ? " " : "";
StringBuilder buf = new StringBuilder();
@ -154,7 +158,7 @@ class StyleParser extends Parser {
* @param htmlDOM the XHTML DOM to which the generated element belongs
* @return the style element
*/
Node exportStyles(Document htmlDOM) {
public Node exportStyles(Document htmlDOM) {
String sStyles = exportStyles(config.prettyPrint());
// Create node

7
src/main/java/writer2latex/xhtml/StyleWithPropertiesParser.java → src/main/java/writer2latex/xhtml/style/StyleWithPropertiesParser.java
View file

@ -23,7 +23,7 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.style;
import java.util.Enumeration;
//import java.util.Hashtable;
@ -32,7 +32,10 @@ import java.util.Enumeration;
import writer2latex.office.OfficeReader;
import writer2latex.office.StyleWithProperties;
import writer2latex.util.CSVList;
//import writer2latex.util.ExportNameCollection;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.StyleInfo;
import writer2latex.xhtml.XhtmlConfig;
import writer2latex.xhtml.XhtmlStyleMapItem;
/**
* <p>This is an abstract class to convert an OpenDocument style family

5
src/main/java/writer2latex/xhtml/TableStyleParser.java → src/main/java/writer2latex/xhtml/style/TableStyleParser.java
View file

@ -23,13 +23,16 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.style;
import writer2latex.office.OfficeReader;
import writer2latex.office.OfficeStyleFamily;
import writer2latex.office.StyleWithProperties;
import writer2latex.office.XMLString;
import writer2latex.util.CSVList;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.XhtmlConfig;
import writer2latex.xhtml.XhtmlStyleMap;
/**
* This class converts OpenDocument table styles to CSS2 styles.

6
src/main/java/writer2latex/xhtml/TextStyleParser.java → src/main/java/writer2latex/xhtml/style/TextStyleParser.java
View file

@ -23,7 +23,7 @@
*
*/
package writer2latex.xhtml;
package writer2latex.xhtml.style;
import java.util.Enumeration;
import java.util.Hashtable;
@ -36,6 +36,10 @@ import writer2latex.office.XMLString;
import writer2latex.util.CSVList;
import writer2latex.util.Calc;
import writer2latex.util.ExportNameCollection;
import writer2latex.xhtml.Converter;
import writer2latex.xhtml.StyleInfo;
import writer2latex.xhtml.XhtmlConfig;
import writer2latex.xhtml.XhtmlStyleMapItem;
/**
* This class converts OpenDocument text styles to CSS2 styles.