diff --git a/build.xml b/build.xml index 7b351f5..9e05d8c 100644 --- a/build.xml +++ b/build.xml @@ -2,7 +2,7 @@ ############################################################################ # This is the Ant build file for writer2latex # Original: Sep 2004 (mgn) - # version 1.2 (2010-02-14) + # version 1.2 (2010-03-04) ############################################################################ --> @@ -157,12 +157,19 @@ - - - - - - + + + + + + + + + + + + + diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index d9c8eed..70e1938 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,21 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2 ---------- version 1.1.1 ---------- +[w2l] Bugfix: Font is now selected correctly in list labels + +[w2x] New option formulas (values starmath, latex, image+starmath (default), image+latex) + to control export of formulas in xhtml 1.0 strict + +[w2x] Avoid exporting redundant lang+dir information + +[w2x] New option multilingual (default true) to turn of export of language information + (except on the root element ) + +[w2x] New option template_ids (default empty) to give the id's used to identity the parts + of an xhtml template in the order content,header,footer,panel + +[w2x] New option pretty_print (default true) to turn of pretty printing of xhtml source + [w2l] Bugfix: Avoid null pointer exception on empty metadata (date) [w2x] Bugfix: Avoid null pointer exception on empty metadata (subject, keywords) @@ -20,7 +35,7 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2 [w2x] Added support for text:start-value in outline numbering and list styles (the latter is only relevant if use_list_hack is true) -[all] Use zeropadding on exported images (ie file-img001 etc.) +[all] Use zeropadding on exported images (ie. file-img001 etc.) [w2l] Bugfix: Add \par after display equation when formatting>=convert_most diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index 2de5d6d..fe75eb9 100644 Binary files a/source/distro/doc/user-manual.odt and b/source/distro/doc/user-manual.odt differ diff --git a/source/distro/doc/w4l-user-manual.odt b/source/distro/doc/w4l-user-manual.odt deleted file mode 100644 index 19f082d..0000000 Binary files a/source/distro/doc/w4l-user-manual.odt and /dev/null differ diff --git a/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java b/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java index 940ac24..3ccc1ad 100644 --- a/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java +++ b/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.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-11-29) + * Version 1.2 (2010-03-05) * */ @@ -279,65 +279,71 @@ public final class ConfigurationDialog return false; } - // Windows: Test that the given path contains MikTeX - private boolean containsMikTeX(String sPath) { + // Windows: Test that the given path contains a given executable + private boolean containsExecutable(String sPath,String sExecutable) { File dir = new File(sPath); if (dir.exists() && dir.canRead()) { - File latex = new File(dir,"latex.exe"); - return latex.exists(); + File exe = new File(dir,sExecutable); + return exe.exists(); } return false; } // Windows: Configure a certain MikTeX application - private void configureMikTeX(String sPath, String sName, String sAppName, String sArguments, StringBuffer info) { + private boolean configureMikTeX(String sPath, String sName, String sAppName, String sArguments, StringBuffer info, boolean bRequired) { File app = new File(new File(sPath),sAppName+".exe"); if (app.exists()) { externalApps.setApplication(sName, sAppName, sArguments); info.append(" Found "+sName+": "+sAppName+" - OK\n"); + return true; } - else { + else if (bRequired) { externalApps.setApplication(sName, "???", "???"); info.append(" Failed to find "+sName+"\n"); } + return false; } // Configure the applications automatically (OS dependent) private boolean autoConfigure(XWindow xWindow) { String sOsName = System.getProperty("os.name"); + String sOsVersion = System.getProperty("os.version"); + String sOsArch = System.getProperty("os.arch"); StringBuffer info = new StringBuffer(); info.append("Results of configuration:\n\n"); - info.append("Your system identifies itself as "+sOsName+"\n\n"); + info.append("Your system identifies itself as "+sOsName+" version "+sOsVersion+ " (" + sOsArch +")\n\n"); if (sOsName.startsWith("Windows")) { - - // TODO: Get information from the windows registry using external vbs script // Assume MikTeX String sMikTeXPath = null; String[] sPaths = System.getenv("PATH").split(";"); for (String s : sPaths) { - if (s.toLowerCase().indexOf("miktex")>-1 && containsMikTeX(s)) { + if (s.toLowerCase().indexOf("miktex")>-1 && containsExecutable(s,"latex.exe")) { sMikTeXPath = s; break; } } if (sMikTeXPath==null) { for (String s : sPaths) { - if (containsMikTeX(s)) { + if (containsExecutable(s,"latex.exe")) { sMikTeXPath = s; break; } } } + + boolean bFoundTexworks = false; if (sMikTeXPath!=null) { info.append("Found MikTeX\n"); - configureMikTeX(sMikTeXPath, ExternalApps.LATEX, "latex", "--interaction=batchmode %s", info); - configureMikTeX(sMikTeXPath, ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s", info); - configureMikTeX(sMikTeXPath, ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s", info); - configureMikTeX(sMikTeXPath, ExternalApps.DVIPS, "dvips", "%s", info); - configureMikTeX(sMikTeXPath, ExternalApps.BIBTEX, "bibtex", "%s", info); - configureMikTeX(sMikTeXPath, ExternalApps.MAKEINDEX, "makeindex", "%s", info); - configureMikTeX(sMikTeXPath, ExternalApps.MK4HT, "mk4ht", "%c %s", info); - configureMikTeX(sMikTeXPath, ExternalApps.DVIVIEWER, "yap", "--single-instance %s", info); + configureMikTeX(sMikTeXPath, ExternalApps.LATEX, "latex", "--interaction=batchmode %s", info, true); + configureMikTeX(sMikTeXPath, ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s", info, true); + configureMikTeX(sMikTeXPath, ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s", info, true); + configureMikTeX(sMikTeXPath, ExternalApps.DVIPS, "dvips", "%s", info, true); + configureMikTeX(sMikTeXPath, ExternalApps.BIBTEX, "bibtex", "%s", info, true); + configureMikTeX(sMikTeXPath, ExternalApps.MAKEINDEX, "makeindex", "%s", info, true); + configureMikTeX(sMikTeXPath, ExternalApps.MK4HT, "mk4ht", "%c %s", info, true); + configureMikTeX(sMikTeXPath, ExternalApps.DVIVIEWER, "yap", "--single-instance %s", info, true); + // MikTeX 2.8 provides texworks for pdf viewing + bFoundTexworks = configureMikTeX(sMikTeXPath, ExternalApps.PDFVIEWER, "texworks", "%s", info, true); } else { info.append("Failed to find MikTeX\n"); @@ -351,10 +357,29 @@ public final class ConfigurationDialog externalApps.setApplication(ExternalApps.MK4HT, "mk4ht", "%c %s"); externalApps.setApplication(ExternalApps.DVIVIEWER, "yap", "--single-instance %s"); } - // And assume gsview for pdf and ps - // gsview32 may not be in the path, but at least this helps a bit - externalApps.setApplication(ExternalApps.PDFVIEWER, "gsview32.exe", "-e \"%s\""); - externalApps.setApplication(ExternalApps.POSTSCRIPTVIEWER, "gsview32.exe", "-e \"%s\""); + info.append("\n"); + + // Assume gsview for pdf and ps + String sGsview = null; + String sProgramFiles = System.getenv("ProgramFiles"); + if (sProgramFiles!=null) { + if (containsExecutable(sProgramFiles+"\\ghostgum\\gsview","gsview32.exe")) { + sGsview = sProgramFiles+"\\ghostgum\\gsview\\gsview32.exe"; + } + } + + if (sGsview!=null) { + info.append("Found gsview - OK\n"); + } + else { + info.append("Failed to find gsview\n"); + sGsview = "gsview32.exe"; // at least this helps a bit.. + } + if (!bFoundTexworks) { + externalApps.setApplication(ExternalApps.PDFVIEWER, sGsview, "-e \"%s\""); + } + externalApps.setApplication(ExternalApps.POSTSCRIPTVIEWER, sGsview, "-e \"%s\""); + } else { // Assume a unix-like system supporting the "which" command configureApp(ExternalApps.LATEX, "latex", "--interaction=batchmode %s",info); @@ -373,6 +398,10 @@ public final class ConfigurationDialog configureApp(ExternalApps.POSTSCRIPTVIEWER, sPsViewers, "%s",info); } + // Maybe add some info for Ubuntu users + // sudo apt-get install texlive + // sudo apt-get install texlive-xetex + // sudo apt-get install tex4ht displayAutoConfigInfo(info.toString()); changeApplication(xWindow); return true; diff --git a/source/java/writer2latex/latex/DrawConverter.java b/source/java/writer2latex/latex/DrawConverter.java index d2bed3b..d4a6799 100644 --- a/source/java/writer2latex/latex/DrawConverter.java +++ b/source/java/writer2latex/latex/DrawConverter.java @@ -187,7 +187,7 @@ public class DrawConverter extends ConverterHelper { } } else { // flat xml, object is contained in node - Element formula = Misc.getChildByTagName(node,XMLString.MATH); + Element formula = Misc.getChildByTagName(node,XMLString.MATH); // Since OOo 3.2 if (formula==null) { formula = Misc.getChildByTagName(node,XMLString.MATH_MATH); } diff --git a/source/java/writer2latex/latex/ListStyleConverter.java b/source/java/writer2latex/latex/ListStyleConverter.java index 05ea57f..eadbc27 100644 --- a/source/java/writer2latex/latex/ListStyleConverter.java +++ b/source/java/writer2latex/latex/ListStyleConverter.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-04-30) + * Version 1.2 (2010-03-03) * */ @@ -336,7 +336,7 @@ public class ListStyleConverter extends StyleConverter { private void createLabels(ListStyle style, String[] sName, int nMaxLevel, boolean bDeclareCounters, boolean bRenewLabels, boolean bUseTextStyle, LaTeXDocumentPortion ldp) { -// Declare counters if required (eg. "\newcounter{countername1}[countername2]") + // Declare counters if required (eg. "\newcounter{countername1}[countername2]") if (bDeclareCounters) { int j = 0; for (int i=1; i<=nMaxLevel; i++) { @@ -348,14 +348,14 @@ public class ListStyleConverter extends StyleConverter { } } } -// Create numbering for each level (eg. "\arabic{countername}") + // Create numbering for each level (eg. "\arabic{countername}") String[] sNumFormat = new String[nMaxLevel+1]; for (int i=1; i<=nMaxLevel; i++) { String s = numFormat(style.getLevelProperty(i,XMLString.STYLE_NUM_FORMAT)); if (s==null) { sNumFormat[i]=""; } else { sNumFormat[i] = s + "{" + sName[i] + "}"; } } -// Create numberings (ie. define "\thecountername"): + // Create numberings (ie. define "\thecountername"): for (int i=1; i<=nMaxLevel; i++) { if (style.isNumber(i)) { ldp.append("\\renewcommand\\the").append(sName[i]).append("{"); @@ -369,22 +369,22 @@ public class ListStyleConverter extends StyleConverter { ldp.append("}").nl(); } } -// Create labels (ie. define "\labelcountername"): + // Create labels (ie. define "\labelcountername"): for (int i=1; i<=nMaxLevel; i++) { ldp.append(bRenewLabels ? "\\renewcommand" : "\\newcommand") .append("\\label").append(sName[i]).append("{"); -// Apply text style if required + // Apply text style if required BeforeAfter baText = new BeforeAfter(); if (bUseTextStyle) { String sStyleName = style.getLevelProperty(i,XMLString.TEXT_STYLE_NAME); palette.getCharSc().applyTextStyle(sStyleName,baText,new Context()); } -// Create label content + // Create label content if (style.isNumber(i)) { String sPrefix = style.getLevelProperty(i,XMLString.STYLE_NUM_PREFIX); String sSuffix = style.getLevelProperty(i,XMLString.STYLE_NUM_SUFFIX); -// Apply style + // Apply style ldp.append(baText.getBefore()); if (sPrefix!=null) { ldp.append(sPrefix); } ldp.append("\\the").append(sName[i]); @@ -393,16 +393,19 @@ public class ListStyleConverter extends StyleConverter { } else if (style.isBullet(i)) { String sBullet = style.getLevelProperty(i,XMLString.TEXT_BULLET_CHAR); -// Apply style + // Apply style ldp.append(baText.getBefore()); if (sBullet!=null) { -// Bullets are usually symbols, so this should be OK: + String sFontName = palette.getCharSc().getFontName(style.getLevelProperty(i,XMLString.TEXT_STYLE_NAME)); + palette.getI18n().pushSpecialTable(sFontName); + // Bullets are usually symbols, so this should be OK: ldp.append(palette.getI18n().convert(sBullet,false,"en")); + palette.getI18n().popSpecialTable(); } ldp.append(baText.getAfter()); } else { -// TODO: Support images! + // TODO: Support images! ldp.append("\\textbullet"); } diff --git a/source/java/writer2latex/xhtml/BatchConverterImpl.java b/source/java/writer2latex/xhtml/BatchConverterImpl.java index eb25912..4c92b0a 100644 --- a/source/java/writer2latex/xhtml/BatchConverterImpl.java +++ b/source/java/writer2latex/xhtml/BatchConverterImpl.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-05) + * Version 1.2 (2010-03-02) * */ @@ -90,11 +90,7 @@ public class BatchConverterImpl extends BatchConverterBase { public OutputFile createIndexFile(String sHeading, IndexPageEntry[] entries) { // Create the index page (with header/footer or from template) XhtmlDocument htmlDoc = new XhtmlDocument("index",XhtmlDocument.XHTML10); - htmlDoc.setEncoding(config.xhtmlEncoding()); - htmlDoc.setNoDoctype(config.xhtmlNoDoctype()); - htmlDoc.setAddBOM(config.xhtmlAddBOM()); - htmlDoc.setUseNamedEntities(config.useNamedEntities()); - htmlDoc.setHexadecimalEntities(config.hexadecimalEntities()); + htmlDoc.setConfig(config); if (template!=null) { htmlDoc.readFromTemplate(template); } else { htmlDoc.createHeaderFooter(); } diff --git a/source/java/writer2latex/xhtml/Converter.java b/source/java/writer2latex/xhtml/Converter.java index a1160e3..4a5031a 100644 --- a/source/java/writer2latex/xhtml/Converter.java +++ b/source/java/writer2latex/xhtml/Converter.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2010-02-26) + * Version 1.2 (2010-03-02) * */ @@ -442,12 +442,7 @@ public class Converter extends ConverterBase { public Element nextOutFile() { if (nOutFileIndex>=0) { textCv.insertFootnotes(htmlDoc.getContentNode()); } htmlDoc = new XhtmlDocument(getOutFileName(++nOutFileIndex,false),nType); - htmlDoc.setEncoding(config.xhtmlEncoding()); - htmlDoc.setNoDoctype(config.xhtmlNoDoctype()); - htmlDoc.setAddBOM(config.xhtmlAddBOM()); - htmlDoc.setUseNamedEntities(config.useNamedEntities()); - htmlDoc.setHexadecimalEntities(config.hexadecimalEntities()); - htmlDoc.setXsltPath(config.getXsltPath()); + htmlDoc.setConfig(config); if (template!=null) { htmlDoc.readFromTemplate(template); } else if (bNeedHeaderFooter) { htmlDoc.createHeaderFooter(); } outFiles.add(nOutFileIndex,htmlDoc); diff --git a/source/java/writer2latex/xhtml/DrawConverter.java b/source/java/writer2latex/xhtml/DrawConverter.java index 87cbe74..fbfb0f7 100644 --- a/source/java/writer2latex/xhtml/DrawConverter.java +++ b/source/java/writer2latex/xhtml/DrawConverter.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2010-02-19) + * Version 1.2 (2010-03-03) * */ @@ -305,9 +305,13 @@ public class DrawConverter extends ConverterHelper { if (MIMETypes.MATH.equals(object.getType()) || MIMETypes.ODF.equals(object.getType())) { // Formula! EmbeddedXMLObject xmlObject = (EmbeddedXMLObject) object; // Document settings = object.getSettingsDOM(); + Element replacementImage = null; + if (ofr.isOpenDocument()) { // look for replacement image + replacementImage = Misc.getChildByTagName(getFrame(onode),XMLString.DRAW_IMAGE); + } try { hnode.appendChild(converter.createTextNode(" ")); - getMathCv().convert(xmlObject.getContentDOM().getDocumentElement(),hnode); + getMathCv().convert(replacementImage,xmlObject.getContentDOM().getDocumentElement(),hnode); hnode.appendChild(converter.createTextNode(" ")); } catch (SAXException e) { @@ -341,8 +345,12 @@ public class DrawConverter extends ConverterHelper { formula = Misc.getChildByTagName(onode,XMLString.MATH_MATH); } if (formula != null) { + Element replacementImage = null; + if (ofr.isOpenDocument()) { // look for replacement image + replacementImage = Misc.getChildByTagName(getFrame(onode),XMLString.DRAW_IMAGE); + } hnode.appendChild(converter.createTextNode(" ")); - getMathCv().convert(formula,hnode); + getMathCv().convert(replacementImage,formula,hnode); hnode.appendChild(converter.createTextNode(" ")); } else { // unsupported object diff --git a/source/java/writer2latex/xhtml/FrameStyleConverter.java b/source/java/writer2latex/xhtml/FrameStyleConverter.java index 2072e27..42646c3 100644 --- a/source/java/writer2latex/xhtml/FrameStyleConverter.java +++ b/source/java/writer2latex/xhtml/FrameStyleConverter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2008 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.0 (2008-11-22) + * Version 1.2 (2010-03-01) * */ @@ -79,7 +79,7 @@ public class FrameStyleConverter extends StyleWithPropertiesConverterHelper { .append(getDefaultTagName(null)) .append(".").append(getClassNamePrefix()) .append(styleNames.getExportName(sDisplayName)) - .append(" p {").append(props.toString()).append("}\n"); + .append(" p {").append(props.toString()).append("}").append(config.prettyPrint() ? "\n" : " "); } } } diff --git a/source/java/writer2latex/xhtml/ListStyleConverter.java b/source/java/writer2latex/xhtml/ListStyleConverter.java index 4203f09..b92976b 100644 --- a/source/java/writer2latex/xhtml/ListStyleConverter.java +++ b/source/java/writer2latex/xhtml/ListStyleConverter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2008 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.0 (2008-11-22) + * Version 1.2 (2010-03-01) * */ @@ -100,7 +100,8 @@ public class ListStyleConverter extends StyleConverterHelper { buf.append(styleNames.getExportName(sDisplayName)); buf.append(" {"); buf.append(props.toString()); - buf.append("}\n"); + buf.append("}"); + buf.append(config.prettyPrint() ? "\n" : " "); } } } diff --git a/source/java/writer2latex/xhtml/MathConverter.java b/source/java/writer2latex/xhtml/MathConverter.java index 2b397f3..1f9df3f 100644 --- a/source/java/writer2latex/xhtml/MathConverter.java +++ b/source/java/writer2latex/xhtml/MathConverter.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2010-02-19) + * Version 1.2 (2010-03-04) * */ @@ -33,48 +33,106 @@ import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import writer2latex.office.*; +import writer2latex.util.Misc; +import writer2latex.xmerge.BinaryGraphicsDocument; +import writer2latex.latex.StarMathConverter; +/** This class converts formulas: Either as MathML, as an image or as plain text (StarMath or LaTeX format) + */ public class MathConverter extends ConverterHelper { + + private StarMathConverter smc = null; private boolean bSupportMathML; + private boolean bUseImage; + private boolean bUseLaTeX; + /** Create a new MathConverter + * + * @param ofr the OfficeReader to query about the document + * @param config the configuration determining the type of export + * @param converter the converter instance + * @param bSupportMathML true if the formula should be exported as MathML + */ public MathConverter(OfficeReader ofr, XhtmlConfig config, Converter converter, boolean bSupportMathML) { super(ofr,config,converter); this.bSupportMathML = bSupportMathML; + this.bUseImage = config.formulas()==XhtmlConfig.IMAGE_LATEX || config.formulas()==XhtmlConfig.IMAGE_STARMATH; + this.bUseLaTeX = config.formulas()==XhtmlConfig.IMAGE_LATEX || config.formulas()==XhtmlConfig.LATEX; + + if (bUseLaTeX) { smc = new StarMathConverter(); } } - public void convert(Node onode, Node hnode) { + /** Convert a formula + * + * @param image image version of the formula (or null if no image is available) + * @param onode the math node + * @param hnode the xhtml node to which content should be added + */ + public void convert(Node image, Node onode, Node hnode) { if (bSupportMathML) { - convertNode(onode,hnode); + convertAsMathML(onode,hnode); } else { - Document htmlDOM = hnode.getOwnerDocument(); - 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"); - hnode.appendChild(kbd); - NodeList list = annotationList.item(0).getChildNodes(); - int nLen = list.getLength(); - for (int i=0; i0 && annotationList.item(0).hasChildNodes()) { + // First create the annotation (either StarMath or LaTeX) + String sAnnotation = ""; + Node child = annotationList.item(0).getFirstChild(); + while (child!=null) { + sAnnotation+=child.getNodeValue(); + child = child.getNextSibling(); + } + if (bUseLaTeX) { sAnnotation = smc.convert(sAnnotation); } - public void convertNode(Node onode, Node hnode) { + // Next insert the image if required and available + if (bUseImage) { + // Get the image from the ImageLoader + String sHref = Misc.getAttribute(onode,XMLString.XLINK_HREF); + if (sHref==null || sHref.length()==0 || ofr.isInPackage(sHref)) { + BinaryGraphicsDocument bgd = converter.getImageLoader().getImage(image); + if (bgd!=null) { + String sMIME = bgd.getDocumentMIMEType(); + if (MIMETypes.PNG.equals(sMIME) || MIMETypes.JPEG.equals(sMIME) || MIMETypes.GIF.equals(sMIME)) { + converter.addDocument(bgd); + // Create the image and add the StarMath/LaTeX formula as alternative text + Element img = converter.createElement("img"); + img.setAttribute("src",bgd.getFileName()); + img.setAttribute("class", "formula"); + img.setAttribute("alt",sAnnotation); + + hnode.appendChild(img); + + return; + } + } + } + } + + // Otherwise insert the StarMath/LaTeX annotation as a kbd element + Element kbd = converter.createElement("kbd"); + kbd.setAttribute("class", "formula"); + hnode.appendChild(kbd); + kbd.appendChild(converter.createTextNode(sAnnotation)); + } + else { + hnode.appendChild(converter.createTextNode("[Warning: formula ignored]")); + } + } + + // For xhtml+mathml: Insert the mathml, removing the namespace (if any) and the annotation + public void convertAsMathML(Node onode, Node hnode) { if (onode.getNodeType()==Node.ELEMENT_NODE) { if (onode.getNodeName().equals(XMLString.SEMANTICS)) { // Since OOo 3.2 // ignore this construction @@ -120,7 +178,7 @@ public class MathConverter extends ConverterHelper { if (list==null) { return; } int nLen = list.getLength(); for (int i=0; i0) sContentId = sTemplateIds[0].trim(); else sContentId = "content"; + if (nIdCount>1) sHeaderId = sTemplateIds[1].trim(); else sHeaderId = "header"; + if (nIdCount>2) sFooterId = sTemplateIds[2].trim(); else sFooterId = "footer"; + if (nIdCount>3) sPanelId = sTemplateIds[3].trim(); else sPanelId = "panel"; } - + public String getEncoding() { return sEncoding; } - public void setNoDoctype(boolean b) { bNoDoctype = b; } - - public void setAddBOM(boolean b) { bAddBOM = b; } - - public void setUseNamedEntities(boolean b) { - bUseNamedEntities = b; - } - - public void setHexadecimalEntities(boolean b) { - bHexadecimalEntities = b; - } - - public void setXsltPath(String s) { sXsltPath = s; } - public String getFileExtension() { return super.getFileExtension(); } + + private void optimize(Element node, String sLang, String sDir) { + if (node.hasAttribute("xml:lang")) { + if (node.getAttribute("xml:lang").equals(sLang)) { + node.removeAttribute("xml:lang"); + if (node.hasAttribute("lang")) { + node.removeAttribute("lang"); + } + } + else { + sLang = node.getAttribute("xml:lang"); + } + } + if (node.hasAttribute("xml:dir")) { + if (node.getAttribute("xml:dir").equals(sDir)) { + node.removeAttribute("xml:dir"); + } + else { + sDir = node.getAttribute("xml:dir"); + } + } + + Node child = node.getFirstChild(); + while (child!=null) { + if (child.getNodeType()==Node.ELEMENT_NODE) { + optimize((Element)child, sLang, sDir); + } + child = child.getNextSibling(); + } + } /** * Write out content to the supplied OutputStream. @@ -334,7 +365,9 @@ public class XhtmlDocument extends DOMDocument { osw.write(getContentDOM().getDoctype().getSystemId()); osw.write("\">\n"); } - write(getContentDOM().getDocumentElement(),0,osw); + Element doc = getContentDOM().getDocumentElement(); + optimize(doc,null,null); + write(doc,0,osw); osw.flush(); osw.close(); } @@ -357,7 +390,7 @@ public class XhtmlDocument extends DOMDocument { osw.write("<"+node.getNodeName()); writeAttributes(node,osw); osw.write(" />"); - if (nLevel>=0) { osw.write("\n"); } + if (bPrettyPrint && nLevel>=0) { osw.write("\n"); } } else if (node.hasChildNodes()) { // Block pretty print from this node? @@ -374,7 +407,7 @@ public class XhtmlDocument extends DOMDocument { osw.write("<"+node.getNodeName()); writeAttributes(node,osw); osw.write(">"); - if (nLevel>=0 && !bBlockPrettyPrint) { osw.write("\n"); } + if (bPrettyPrint && nLevel>=0 && !bBlockPrettyPrint) { osw.write("\n"); } // Print children for (int i = 0; i < nLen; i++) { int nNextLevel; @@ -385,7 +418,7 @@ public class XhtmlDocument extends DOMDocument { // Print end tag if (nLevel>=0 && !bBlockPrettyPrint) { writeSpaces(nLevel,osw); } osw.write(""); - if (nLevel>=0) { osw.write("\n"); } + if (bPrettyPrint && nLevel>=0) { osw.write("\n"); } } else { // empty element if (nLevel>=0) { writeSpaces(nLevel,osw); } @@ -398,7 +431,7 @@ public class XhtmlDocument extends DOMDocument { else { osw.write(" />"); } - if (nLevel>=0) { osw.write("\n"); } + if (bPrettyPrint && nLevel>=0) { osw.write("\n"); } } break; case Node.TEXT_NODE: @@ -409,7 +442,7 @@ public class XhtmlDocument extends DOMDocument { osw.write(""); - if (nLevel>=0) { osw.write("\n"); } + if (bPrettyPrint && nLevel>=0) { osw.write("\n"); } } } @@ -427,7 +460,9 @@ public class XhtmlDocument extends DOMDocument { } private void writeSpaces(int nCount, OutputStreamWriter osw) throws IOException { - for (int i=0; i