From 5a8dcceea2fc314ac58255446e6047ac944e17c6 Mon Sep 17 00:00:00 2001 From: henrikjust Date: Fri, 19 Feb 2010 08:17:03 +0000 Subject: [PATCH] MathML without namespace (fix for OOo 3.2) git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@46 f0f2a975-2e09-46c8-9428-3b39399b9f3c --- build.xml | 11 ++++---- source/distro/changelog.txt | 4 +++ .../writer2latex/api/ConverterFactory.java | 6 ++--- .../writer2latex/latex/DrawConverter.java | 14 ++++++++--- .../writer2latex/latex/MathmlConverter.java | 25 ++++++++++++++----- .../java/writer2latex/office/XMLString.java | 8 ++++-- .../writer2latex/xhtml/DrawConverter.java | 9 ++++--- .../writer2latex/xhtml/MathConverter.java | 23 ++++++++++++----- 8 files changed, 70 insertions(+), 30 deletions(-) diff --git a/build.xml b/build.xml index 9d02d7a..7b351f5 100644 --- a/build.xml +++ b/build.xml @@ -2,15 +2,14 @@ ############################################################################ # This is the Ant build file for writer2latex # Original: Sep 2004 (mgn) - # version 1.2 (2009-12-07) + # version 1.2 (2010-02-14) ############################################################################ --> - - - + + writer2latex - build file @@ -49,9 +48,9 @@ - - diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index e91bd7e..735799c 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,10 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2 ---------- version 1.1.1 ---------- +[w2x] Adapted to work with MathML without namespace (fix for change in OOo 3.2) + +[w2l] Adapted to work with MathML without namespace (fix for change in OOo 3.2) + [w4l] Added help files [w2x] Bugfix: A textposition of 0% is no longer considered to be superscript diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java index 9642db2..386ccdc 100644 --- a/source/java/writer2latex/api/ConverterFactory.java +++ b/source/java/writer2latex/api/ConverterFactory.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2009-12-15) + * Version 1.2 (2010-02-19) * */ @@ -33,7 +33,7 @@ public class ConverterFactory { // Version information private static final String VERSION = "1.1.1"; - private static final String DATE = "2009-12-15"; + private static final String DATE = "2010-02-19"; /** Return version information * @return the Writer2LaTeX version in the form diff --git a/source/java/writer2latex/latex/DrawConverter.java b/source/java/writer2latex/latex/DrawConverter.java index 67eda6b..d2bed3b 100644 --- a/source/java/writer2latex/latex/DrawConverter.java +++ b/source/java/writer2latex/latex/DrawConverter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2009-05-29) + * Version 1.2 (2010-02-19) * */ @@ -153,7 +153,10 @@ public class DrawConverter extends ConverterHelper { try { Document settings = ((EmbeddedXMLObject) object).getSettingsDOM(); Document formuladoc = ((EmbeddedXMLObject) object).getContentDOM(); - Element formula = Misc.getChildByTagName(formuladoc,XMLString.MATH_MATH); + Element formula = Misc.getChildByTagName(formuladoc,XMLString.MATH); // Since OOo3.2 + if (formula==null) { + formula = Misc.getChildByTagName(formuladoc,XMLString.MATH_MATH); + } ldp.append(" $") .append(palette.getMathmlCv().convert(settings,formula)) .append("$"); @@ -184,7 +187,10 @@ public class DrawConverter extends ConverterHelper { } } else { // flat xml, object is contained in node - Element formula = Misc.getChildByTagName(node,XMLString.MATH_MATH); + Element formula = Misc.getChildByTagName(node,XMLString.MATH); + if (formula==null) { + formula = Misc.getChildByTagName(node,XMLString.MATH_MATH); + } if (formula!=null) { ldp.append(" $") .append(palette.getMathmlCv().convert(null,formula)) diff --git a/source/java/writer2latex/latex/MathmlConverter.java b/source/java/writer2latex/latex/MathmlConverter.java index 639042a..d8ab27d 100644 --- a/source/java/writer2latex/latex/MathmlConverter.java +++ b/source/java/writer2latex/latex/MathmlConverter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2009-09-21) + * Version 1.2 (2010-02-19) * */ @@ -73,9 +73,15 @@ public final class MathmlConverter extends ConverterHelper { // TODO: Use settings to determine display mode/text mode // formula must be a math:math node // First try to find a StarMath annotation - Node semantics = Misc.getChildByTagName(formula,XMLString.MATH_SEMANTICS); + Node semantics = Misc.getChildByTagName(formula,XMLString.SEMANTICS); // Since OOo 3.2 + if (semantics==null) { + semantics = Misc.getChildByTagName(formula,XMLString.MATH_SEMANTICS); + } if (semantics!=null) { - Node annotation = Misc.getChildByTagName(semantics,XMLString.MATH_ANNOTATION); + Node annotation = Misc.getChildByTagName(semantics,XMLString.ANNOTATION); // Since OOo 3.2 + if (annotation==null) { + annotation = Misc.getChildByTagName(semantics,XMLString.MATH_ANNOTATION); + } if (annotation!=null) { String sStarMath = ""; if (annotation.hasChildNodes()) { @@ -216,7 +222,11 @@ public final class MathmlConverter extends ConverterHelper { if (MIMETypes.MATH.equals(object.getType()) || MIMETypes.ODF.equals(object.getType())) { // Formula! try { Document formuladoc = ((EmbeddedXMLObject) object).getContentDOM(); - return Misc.getChildByTagName(formuladoc,XMLString.MATH_MATH); + 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(); @@ -229,7 +239,10 @@ public final class MathmlConverter extends ConverterHelper { } } else { // flat xml, object is contained in node - return Misc.getChildByTagName(node,XMLString.MATH_MATH); + Element formula = Misc.getChildByTagName(node,XMLString.MATH); // Since OOo 3.2 + if (formula==null) { + formula = Misc.getChildByTagName(node,XMLString.MATH_MATH); + } } return null; } diff --git a/source/java/writer2latex/office/XMLString.java b/source/java/writer2latex/office/XMLString.java index c3c4580..caf430d 100644 --- a/source/java/writer2latex/office/XMLString.java +++ b/source/java/writer2latex/office/XMLString.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2009-09-20) + * Version 1.2 (2010-02-19) * */ @@ -455,5 +455,9 @@ public class XMLString { public static final String MATH_MATH="math:math"; public static final String MATH_SEMANTICS="math:semantics"; public static final String MATH_ANNOTATION="math:annotation"; + // math without namespace + public static final String MATH="math"; + public static final String SEMANTICS="semantics"; + public static final String ANNOTATION="annotation"; } diff --git a/source/java/writer2latex/xhtml/DrawConverter.java b/source/java/writer2latex/xhtml/DrawConverter.java index 395ac60..87cbe74 100644 --- a/source/java/writer2latex/xhtml/DrawConverter.java +++ b/source/java/writer2latex/xhtml/DrawConverter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.0 (2009-09-07) + * Version 1.2 (2010-02-19) * */ @@ -336,7 +336,10 @@ public class DrawConverter extends ConverterHelper { } } else { // flat xml format - Node formula = Misc.getChildByTagName(onode,XMLString.MATH_MATH); + Node formula = Misc.getChildByTagName(onode,XMLString.MATH); // Since OOo 3.2 + if (formula==null) { + formula = Misc.getChildByTagName(onode,XMLString.MATH_MATH); + } if (formula != null) { hnode.appendChild(converter.createTextNode(" ")); getMathCv().convert(formula,hnode); diff --git a/source/java/writer2latex/xhtml/MathConverter.java b/source/java/writer2latex/xhtml/MathConverter.java index 6c5f29a..2b397f3 100644 --- a/source/java/writer2latex/xhtml/MathConverter.java +++ b/source/java/writer2latex/xhtml/MathConverter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.0 (2009-02-19) + * Version 1.2 (2010-02-19) * */ @@ -51,8 +51,10 @@ public class MathConverter extends ConverterHelper { } else { Document htmlDOM = hnode.getOwnerDocument(); - NodeList annotationList - = ((Element) onode).getElementsByTagName(XMLString.MATH_ANNOTATION); + NodeList annotationList = ((Element) onode).getElementsByTagName(XMLString.ANNOTATION); // Since OOo 3.2 + if (annotationList.getLength()>0) { + annotationList = ((Element) onode).getElementsByTagName(XMLString.MATH_ANNOTATION); + } if (annotationList.getLength()>0 && annotationList.item(0).hasChildNodes()) { // Insert the StarMath annotation as a kbd element Element kbd = htmlDOM.createElement("kbd"); @@ -74,10 +76,18 @@ public class MathConverter extends ConverterHelper { public void convertNode(Node onode, Node hnode) { if (onode.getNodeType()==Node.ELEMENT_NODE) { - if (onode.getNodeName().equals(XMLString.MATH_SEMANTICS)) { + if (onode.getNodeName().equals(XMLString.SEMANTICS)) { // Since OOo 3.2 // ignore this construction convertNodeList(onode.getChildNodes(),hnode); } + else if (onode.getNodeName().equals(XMLString.MATH_SEMANTICS)) { + // ignore this construction + convertNodeList(onode.getChildNodes(),hnode); + } + else if (onode.getNodeName().equals(XMLString.ANNOTATION)) { // Since OOo 3.2 + // ignore the annotation (StarMath) completely + // (mozilla renders it for some reason) + } else if (onode.getNodeName().equals(XMLString.MATH_ANNOTATION)) { // ignore the annotation (StarMath) completely // (mozilla renders it for some reason) @@ -116,7 +126,8 @@ public class MathConverter extends ConverterHelper { private String stripNamespace(String s) { int nPos = s.indexOf(':'); - return s.substring(nPos+1); + if (nPos>-1) { return s.substring(nPos+1); } + else { return s; } } // OOo exports some characters (from the OpenSymbol/StarSymbol font)