More math and TexMaths work
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@160 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust
parent
79ae252419
commit
3dff4f20b4
15 changed files with 514 additions and 525 deletions
|
|
@ -20,7 +20,7 @@
|
|||
*
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Version 1.4 (2014-08-06)
|
||||
* Version 1.4 (2014-08-13)
|
||||
*
|
||||
*/
|
||||
|
||||
|
|
@ -32,18 +32,13 @@ import java.io.FileNotFoundException;
|
|||
import java.io.InputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import org.w3c.dom.Node;
|
||||
|
||||
import writer2latex.api.GraphicConverter;
|
||||
import writer2latex.api.Converter;
|
||||
import writer2latex.api.ConverterResult;
|
||||
import writer2latex.api.OutputFile;
|
||||
import writer2latex.office.EmbeddedObject;
|
||||
import writer2latex.office.EmbeddedXMLObject;
|
||||
import writer2latex.office.ImageLoader;
|
||||
import writer2latex.office.MIMETypes;
|
||||
import writer2latex.office.MetaData;
|
||||
import writer2latex.office.OfficeDocument;
|
||||
import writer2latex.office.OfficeReader;
|
||||
|
|
@ -53,6 +48,8 @@ import writer2latex.util.Misc;
|
|||
/**<p>Abstract base implementation of <code>writer2latex.api.Converter</code></p>
|
||||
*/
|
||||
public abstract class ConverterBase implements Converter {
|
||||
|
||||
public enum TexMathsStyle {inline, display, latex};
|
||||
|
||||
// Helper
|
||||
protected GraphicConverter graphicConverter;
|
||||
|
|
@ -67,10 +64,6 @@ public abstract class ConverterBase implements Converter {
|
|||
protected String sTargetFileName;
|
||||
protected ConverterResultImpl converterResult;
|
||||
|
||||
// Result of latest parsing of a display equation
|
||||
private Element theEquation = null;
|
||||
private Element theSequence = null;
|
||||
|
||||
// Constructor
|
||||
public ConverterBase() {
|
||||
graphicConverter = null;
|
||||
|
|
@ -151,22 +144,6 @@ public abstract class ConverterBase implements Converter {
|
|||
return odDoc.getEmbeddedObject(sHref);
|
||||
}
|
||||
|
||||
/** Get the equation found by the last invocation of <code>parseDisplayEquation</code>
|
||||
*
|
||||
* @return the equation or null if no equation was found
|
||||
*/
|
||||
public Element getEquation() {
|
||||
return theEquation;
|
||||
}
|
||||
|
||||
/** Get the sequence number found by the last invocation of <code>parseDisplayEquation</code>
|
||||
*
|
||||
* @return the sequence number or null if no sequence number was found
|
||||
*/
|
||||
public Element getSequence() {
|
||||
return theSequence;
|
||||
}
|
||||
|
||||
/** Get a TexMaths equation from a draw:frame (PNG formula) or draw:g element (SVG)
|
||||
* Such an element is a TexMaths equation if it contains an svg:title element with content "TexMaths"
|
||||
* The actual formula is the content of an svg:desc element
|
||||
|
|
@ -181,133 +158,28 @@ public abstract class ConverterBase implements Converter {
|
|||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/** Get a MathML formula from a draw:frame
|
||||
*
|
||||
* @param node the draw:frame
|
||||
* @return the MathML element, or null if this is not a MathML formula
|
||||
*/
|
||||
public Element getMathmlEquation(Element node) {
|
||||
if (node.getTagName().equals(XMLString.DRAW_FRAME)) {
|
||||
node=Misc.getFirstChildElement(node);
|
||||
}
|
||||
|
||||
String sHref = Misc.getAttribute(node,XMLString.XLINK_HREF);
|
||||
|
||||
if (sHref!=null) { // Embedded object in package or linked object
|
||||
if (ofr.isInPackage(sHref)) { // Embedded object in package
|
||||
if (sHref.startsWith("#")) { sHref=sHref.substring(1); }
|
||||
if (sHref.startsWith("./")) { sHref=sHref.substring(2); }
|
||||
EmbeddedObject object = getEmbeddedObject(sHref);
|
||||
if (object!=null) {
|
||||
if (MIMETypes.MATH.equals(object.getType()) || MIMETypes.ODF.equals(object.getType())) { // Formula!
|
||||
try {
|
||||
Document formuladoc = ((EmbeddedXMLObject) object).getContentDOM();
|
||||
Element formula = Misc.getChildByTagName(formuladoc,XMLString.MATH); // Since OOo 3.2
|
||||
if (formula==null) {
|
||||
formula = Misc.getChildByTagName(formuladoc,XMLString.MATH_MATH);
|
||||
}
|
||||
return formula;
|
||||
}
|
||||
catch (org.xml.sax.SAXException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
catch (java.io.IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else { // flat XML, object is contained in node
|
||||
Element formula = Misc.getChildByTagName(node,XMLString.MATH); // Since OOo 3.2
|
||||
if (formula==null) {
|
||||
formula = Misc.getChildByTagName(node,XMLString.MATH_MATH);
|
||||
}
|
||||
return formula;
|
||||
}
|
||||
return null;
|
||||
public TexMathsStyle getTexMathsStyle(String s) {
|
||||
String[] sContent = s.split("\u00a7");
|
||||
if (sContent.length>=3) { // we only need 3 items of 6
|
||||
if ("display".equals(sContent[1])) {
|
||||
return TexMathsStyle.display;
|
||||
}
|
||||
else if ("latex".equals(sContent[1]) || "text".equals(sContent[1])) { // text is for OOoLaTeX
|
||||
return TexMathsStyle.latex;
|
||||
}
|
||||
}
|
||||
return TexMathsStyle.inline;
|
||||
}
|
||||
|
||||
/** Determine whether or not a paragraph contains a display equation.
|
||||
* A paragraph is a display equation if it contains a single formula and no text content except whitespace
|
||||
* and an optional sequence number which may be in brackets.
|
||||
* As a side effect, this method keeps a reference to the equation and the sequence number
|
||||
*
|
||||
* @param node the paragraph
|
||||
* @return true if this is a display equation
|
||||
*/
|
||||
public boolean parseDisplayEquation(Node node) {
|
||||
theEquation = null;
|
||||
theSequence = null;
|
||||
return doParseDisplayEquation(node);
|
||||
}
|
||||
|
||||
private boolean doParseDisplayEquation(Node node) {
|
||||
Node child = node.getFirstChild();
|
||||
while (child!=null) {
|
||||
if (Misc.isElement(child)) {
|
||||
Element elm = (Element) child;
|
||||
String sName = elm.getTagName();
|
||||
// First check for MathML or TexMaths equation
|
||||
Element equation = getMathmlEquation(elm);
|
||||
if (equation==null) {
|
||||
equation = getTexMathsEquation(elm);
|
||||
}
|
||||
|
||||
if (equation!=null) {
|
||||
if (theEquation==null) {
|
||||
theEquation = equation;
|
||||
}
|
||||
else { // two or more equations -> not a display
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else if (XMLString.TEXT_SEQUENCE.equals(sName)) {
|
||||
if (theSequence==null) {
|
||||
theSequence = elm;
|
||||
}
|
||||
else { // two sequence numbers -> not a display
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else if (XMLString.TEXT_SPAN.equals(sName)) {
|
||||
if (!doParseDisplayEquation(child)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else if (XMLString.TEXT_S.equals(sName)) {
|
||||
// Spaces are allowed
|
||||
}
|
||||
else if (XMLString.TEXT_TAB.equals(sName)) {
|
||||
// Tab stops are allowed
|
||||
}
|
||||
else if (XMLString.TEXT_TAB_STOP.equals(sName)) { // old
|
||||
// Tab stops are allowed
|
||||
}
|
||||
else if (XMLString.TEXT_SOFT_PAGE_BREAK.equals(sName)) { // since ODF 1.1
|
||||
// Soft page breaks are allowed
|
||||
}
|
||||
else {
|
||||
// Other elements -> not a display
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else if (Misc.isText(child)) {
|
||||
String s = child.getNodeValue();
|
||||
int nLen = s.length();
|
||||
for (int i=0; i<nLen; i++) {
|
||||
char c = s.charAt(i);
|
||||
if (c!='(' && c!=')' && c!='[' && c!=']' && c!='{' && c!='}' && c!=' ' && c!='\u00A0') {
|
||||
// Characters except brackets and whitespace -> not a display
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
child = child.getNextSibling();
|
||||
}
|
||||
return true;
|
||||
|
||||
public String getTexMathsEquation(String s) {
|
||||
String[] sContent = s.split("\u00a7");
|
||||
if (sContent.length>=3) { // we only need 3 items of 6
|
||||
return sContent[2];
|
||||
}
|
||||
else {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue