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

MathML without namespace (fix for OOo 3.2)

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@46 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2010-02-19 08:17:03 +00:00
parent d57907d505
commit 5a8dcceea2
8 changed files with 70 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
build.xml
View file

@ -2,15 +2,14 @@
############################################################################ ############################################################################
# This is the Ant build file for writer2latex # This is the Ant build file for writer2latex
# Original: Sep 2004 (mgn) # Original: Sep 2004 (mgn)
# version 1.2 (2009-12-07) # version 1.2 (2010-02-14)
############################################################################ ############################################################################
--> -->
<project name="w2l" default="help" basedir="."> <project name="w2l" default="help" basedir=".">
<!-- set this property to the location of your SO/OOo installation --> <!-- set this property to the location of your SO/OOo installation -->
<!--<property name="OFFICE_HOME" location="c:/Program Files/OpenOffice.org 2.4"/>--> <property name="OFFICE_CLASSES" location="/usr/share/java/openoffice" />
<property name="OFFICE_HOME" location="/opt/openoffice.org/basis3.0" /> <property name="URE_CLASSES" location="/usr/share/java/openoffice" />
<property name="URE_HOME" location="/opt/openoffice.org/ure" />
<description>writer2latex - build file</description> <description>writer2latex - build file</description>
@ -49,9 +48,9 @@
<!-- classpath for the application; needs java-uno classes --> <!-- classpath for the application; needs java-uno classes -->
<path id="main.class.path"> <path id="main.class.path">
<!-- java uno classes --> <!-- java uno classes -->
<filelist dir="${URE_HOME}/share/java" <filelist dir="${URE_CLASSES}"
files="jurt.jar,juh.jar,ridl.jar"/> files="jurt.jar,juh.jar,ridl.jar"/>
<filelist dir="${OFFICE_HOME}/program/classes" <filelist dir="${OFFICE_CLASSES}"
files="unoil.jar"/> files="unoil.jar"/>
<!-- additional uno interfaces generated from idl --> <!-- additional uno interfaces generated from idl -->
<pathelement path="${source.idl}/writer2latex"/> <pathelement path="${source.idl}/writer2latex"/>

4
source/distro/changelog.txt
View file

@ -2,6 +2,10 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
---------- version 1.1.1 ---------- ---------- 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 [w4l] Added help files
[w2x] Bugfix: A textposition of 0% is no longer considered to be superscript [w2x] Bugfix: A textposition of 0% is no longer considered to be superscript

6
source/java/writer2latex/api/ConverterFactory.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright: 2002-2009 by Henrik Just * Copyright: 2002-2010 by Henrik Just
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.2 (2009-12-15) * Version 1.2 (2010-02-19)
* *
*/ */
@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information // Version information
private static final String VERSION = "1.1.1"; 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 version information
* @return the Writer2LaTeX version in the form * @return the Writer2LaTeX version in the form

14
source/java/writer2latex/latex/DrawConverter.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright: 2002-2009 by Henrik Just * Copyright: 2002-2010 by Henrik Just
* *
* All Rights Reserved. * 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 { try {
Document settings = ((EmbeddedXMLObject) object).getSettingsDOM(); Document settings = ((EmbeddedXMLObject) object).getSettingsDOM();
Document formuladoc = ((EmbeddedXMLObject) object).getContentDOM(); 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(" $") ldp.append(" $")
.append(palette.getMathmlCv().convert(settings,formula)) .append(palette.getMathmlCv().convert(settings,formula))
.append("$"); .append("$");
@ -184,7 +187,10 @@ public class DrawConverter extends ConverterHelper {
} }
} }
else { // flat xml, object is contained in node 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) { if (formula!=null) {
ldp.append(" $") ldp.append(" $")
.append(palette.getMathmlCv().convert(null,formula)) .append(palette.getMathmlCv().convert(null,formula))

25
source/java/writer2latex/latex/MathmlConverter.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright: 2002-2009 by Henrik Just * Copyright: 2002-2010 by Henrik Just
* *
* All Rights Reserved. * 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 // TODO: Use settings to determine display mode/text mode
// formula must be a math:math node // formula must be a math:math node
// First try to find a StarMath annotation // 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) { 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) { if (annotation!=null) {
String sStarMath = ""; String sStarMath = "";
if (annotation.hasChildNodes()) { 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! if (MIMETypes.MATH.equals(object.getType()) || MIMETypes.ODF.equals(object.getType())) { // Formula!
try { try {
Document formuladoc = ((EmbeddedXMLObject) object).getContentDOM(); 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) { catch (org.xml.sax.SAXException e) {
e.printStackTrace(); e.printStackTrace();
@ -229,7 +239,10 @@ public final class MathmlConverter extends ConverterHelper {
} }
} }
else { // flat xml, object is contained in node 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; return null;
} }

8
source/java/writer2latex/office/XMLString.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright: 2002-2009 by Henrik Just * Copyright: 2002-2010 by Henrik Just
* *
* All Rights Reserved. * 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_MATH="math:math";
public static final String MATH_SEMANTICS="math:semantics"; public static final String MATH_SEMANTICS="math:semantics";
public static final String MATH_ANNOTATION="math:annotation"; 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";
} }

9
source/java/writer2latex/xhtml/DrawConverter.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright: 2002-2009 by Henrik Just * Copyright: 2002-2010 by Henrik Just
* *
* All Rights Reserved. * 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 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) { if (formula != null) {
hnode.appendChild(converter.createTextNode(" ")); hnode.appendChild(converter.createTextNode(" "));
getMathCv().convert(formula,hnode); getMathCv().convert(formula,hnode);

23
source/java/writer2latex/xhtml/MathConverter.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright: 2002-2009 by Henrik Just * Copyright: 2002-2010 by Henrik Just
* *
* All Rights Reserved. * 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 { else {
Document htmlDOM = hnode.getOwnerDocument(); Document htmlDOM = hnode.getOwnerDocument();
NodeList annotationList NodeList annotationList = ((Element) onode).getElementsByTagName(XMLString.ANNOTATION); // Since OOo 3.2
= ((Element) onode).getElementsByTagName(XMLString.MATH_ANNOTATION); if (annotationList.getLength()>0) {
annotationList = ((Element) onode).getElementsByTagName(XMLString.MATH_ANNOTATION);
}
if (annotationList.getLength()>0 && annotationList.item(0).hasChildNodes()) { if (annotationList.getLength()>0 && annotationList.item(0).hasChildNodes()) {
// Insert the StarMath annotation as a kbd element // Insert the StarMath annotation as a kbd element
Element kbd = htmlDOM.createElement("kbd"); Element kbd = htmlDOM.createElement("kbd");
@ -74,10 +76,18 @@ public class MathConverter extends ConverterHelper {
public void convertNode(Node onode, Node hnode) { public void convertNode(Node onode, Node hnode) {
if (onode.getNodeType()==Node.ELEMENT_NODE) { 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 // ignore this construction
convertNodeList(onode.getChildNodes(),hnode); 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)) { else if (onode.getNodeName().equals(XMLString.MATH_ANNOTATION)) {
// ignore the annotation (StarMath) completely // ignore the annotation (StarMath) completely
// (mozilla renders it for some reason) // (mozilla renders it for some reason)
@ -116,7 +126,8 @@ public class MathConverter extends ConverterHelper {
private String stripNamespace(String s) { private String stripNamespace(String s) {
int nPos = s.indexOf(':'); 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) // OOo exports some characters (from the OpenSymbol/StarSymbol font)