diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index ae0ea64..7598198 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,15 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2 ---------- version 1.1.1 ---------- +[all] Filter: Filters out characters that are illegal in xml + (this fixes a problem with rtf documents imported in OOo) + +[w2x] Introduced hack to set link attributes using the link name + accepts a semicolon separated list of name=value, for example + title=link to next page;rel=next + +[all] Added icon and publisher information to the extensions + [w2l] Added XeTeX as possible backend in dialog [all] Bugfix: Paragraphs containing only fields are no longer lost diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index 0e82b28..ff2a33c 100644 Binary files a/source/distro/doc/user-manual.odt and b/source/distro/doc/user-manual.odt differ diff --git a/source/java/org/openoffice/da/comp/w2lcommon/filter/ExportFilterBase.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/ExportFilterBase.java index 91f944a..4d8335b 100644 --- a/source/java/org/openoffice/da/comp/w2lcommon/filter/ExportFilterBase.java +++ b/source/java/org/openoffice/da/comp/w2lcommon/filter/ExportFilterBase.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-2009 by Henrik Just * * All Rights Reserved. * - * Version 1.0 (2008-11-24) + * Version 1.2 (2009-04-23) * */ @@ -132,38 +132,34 @@ public abstract class ExportFilterBase implements return name; } - public String replace(String origString, String origChar, String replaceChar){ - String tmp=""; - int index=origString.indexOf(origChar); - if(index !=-1){ - while (index !=-1){ - String first =origString.substring(0,index); - first=first.concat(replaceChar); - tmp=tmp.concat(first); - origString=origString.substring(index+1,origString.length()); - index=origString.indexOf(origChar); - if(index==-1) { - tmp=tmp.concat(origString); - } - } - } - return tmp; - } - public String needsMask(String origString) { - if (origString.indexOf("&")!=-1){ - origString=replace(origString,"&","&"); - } - if (origString.indexOf("\"")!=-1){ - origString=replace(origString,"\"","""); - } - if (origString.indexOf("<")!=-1){ - origString=replace(origString,"<","<"); - } - if (origString.indexOf(">")!=-1){ - origString=replace(origString,">",">"); - } - return origString; + StringBuffer buf = new StringBuffer(); + int nLen = origString.length(); + for (int i=0; i'){ + buf.append(">"); + } + else if (c=='\u0009' || c=='\n' || c=='\r' || (c>='\u0020' && c<='\uD7FF') || (c>='\uE000' && c<'\uFFFD')) { + // Valid characters found at xml.com + // Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] + buf.append(c); + } + else { + // Found illegal character + System.out.println("Illegal character : "+Integer.toHexString(c)); + } + } + return buf.toString(); } @@ -233,7 +229,7 @@ public abstract class ExportFilterBase implements // Implementation of XDocumentHandler: // Flat xml is created by the sax events and passed through the pipe // created by exporter() - + public void startDocument () { //Do nothing } @@ -301,6 +297,7 @@ public abstract class ExportFilterBase implements } public void characters(String str){ str=needsMask(str); + try{ xOutStream.writeBytes(str.getBytes("UTF-8")); } @@ -370,12 +367,12 @@ public abstract class ExportFilterBase implements converter.setGraphicConverter(new GraphicConverterImpl(xComponentContext)); ConverterResult dataOut = null; - try { + //try { dataOut = converter.convert(xis,sName); - } - catch (IOException e) { + //} + //catch (IOException e) { // Fail silently - } + //} // Write out files Iterator docEnum = dataOut.iterator(); diff --git a/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java b/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java index d02577c..115ba3b 100644 --- a/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java +++ b/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java @@ -20,14 +20,16 @@ * * All Rights Reserved. * - * Version 1.2 (2009-03-30) + * Version 1.2 (2009-04-23) * */ package org.openoffice.da.comp.writer4latex; import java.io.File; +import java.io.IOException; import java.net.URI; +import java.util.Vector; import com.sun.star.awt.XControl; import com.sun.star.awt.XControlContainer; @@ -199,32 +201,99 @@ public final class ConfigurationDialog } return true; } - - private boolean autoConfigure(XWindow xWindow) { - externalApps.setApplication(ExternalApps.LATEX, "latex", "--interaction=batchmode %s"); - externalApps.setApplication(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s"); - externalApps.setApplication(ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s"); - externalApps.setApplication(ExternalApps.DVIPS, "dvips", "%s"); - externalApps.setApplication(ExternalApps.BIBTEX, "bibtex", "%s"); - externalApps.setApplication(ExternalApps.MAKEINDEX, "makeindex", "%s"); - externalApps.setApplication(ExternalApps.OOLATEX, "oolatex", "%s"); + + // Unix: Test to determine wether a certain application is available in the OS + // Requires "which", hence unix only + private boolean hasApp(String sAppName) { + try { + Vector command = new Vector(); + command.add("which"); + command.add(sAppName); + + ProcessBuilder pb = new ProcessBuilder(command); + Process proc = pb.start(); + // Gobble the error stream of the application + StreamGobbler errorGobbler = new + StreamGobbler(proc.getErrorStream(), "ERROR"); + + // Gooble the output stream of the application + StreamGobbler outputGobbler = new + StreamGobbler(proc.getInputStream(), "OUTPUT"); + + errorGobbler.start(); + outputGobbler.start(); + + // The application exists if the process exits with 0 + return proc.waitFor()==0; + } + catch (InterruptedException e) { + return false; + } + catch (IOException e) { + return false; + } + } + + // Unix: Configure a certain application testing the availability + private boolean configureApp(String sName, String sAppName, String sArguments) { + if (hasApp(sAppName)) { + externalApps.setApplication(sName, sAppName, sArguments); + return true; + } + else { + externalApps.setApplication(sName, "???", "???"); + return false; + } + } + + // Unix: Configure a certain application testing the availability + // This variant uses an array of potential apps + private boolean configureApp(String sName, String[] sAppNames, String sArguments) { + for (String sAppName : sAppNames) { + if (configureApp(sName, sAppName, sArguments)) { return true; } + } + return false; + } + + // Configure the applications automatically (OS dependent) + private boolean autoConfigure(XWindow xWindow) { String sOsName = System.getProperty("os.name"); if ("Linux".equals(sOsName)) { - // TODO: Search for applications (which...) - // Viewers may be evince, okular, xdvi, xpdf, ghostview or... - externalApps.setApplication(ExternalApps.DVIVIEWER, "evince", "%s"); - externalApps.setApplication(ExternalApps.PDFVIEWER, "evince", "%s"); - externalApps.setApplication(ExternalApps.POSTSCRIPTVIEWER, "evince", "%s"); + configureApp(ExternalApps.LATEX, "latex", "--interaction=batchmode %s"); + configureApp(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s"); + configureApp(ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s"); + configureApp(ExternalApps.DVIPS, "dvips", "%s"); + configureApp(ExternalApps.BIBTEX, "bibtex", "%s"); + configureApp(ExternalApps.MAKEINDEX, "makeindex", "%s"); + configureApp(ExternalApps.OOLATEX, "oolatex", "%s"); + // We have several possible viewers + String[] sDviViewers = {"evince", "okular", "xdvi"}; + configureApp(ExternalApps.DVIVIEWER, sDviViewers, "%s"); + String[] sPdfViewers = {"evince", "okular", "xpdf"}; + configureApp(ExternalApps.PDFVIEWER, sPdfViewers, "%s"); + String[] sPsViewers = {"evince", "okular", "ghostview"}; + configureApp(ExternalApps.POSTSCRIPTVIEWER, sPsViewers, "%s"); } else if ("Windows".equals(sOsName)) { + // TODO: Get information from the windows registry // Assume MikTeX + externalApps.setApplication(ExternalApps.LATEX, "latex", "--interaction=batchmode %s"); + externalApps.setApplication(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s"); + externalApps.setApplication(ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s"); + externalApps.setApplication(ExternalApps.DVIPS, "dvips", "%s"); + externalApps.setApplication(ExternalApps.BIBTEX, "bibtex", "%s"); + externalApps.setApplication(ExternalApps.MAKEINDEX, "makeindex", "%s"); + externalApps.setApplication(ExternalApps.OOLATEX, "oolatex", "%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\""); } + else { + // Unsupported OS + } changeApplication(xWindow); return true; } diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java index 7369869..33d65d4 100644 --- a/source/java/writer2latex/api/ConverterFactory.java +++ b/source/java/writer2latex/api/ConverterFactory.java @@ -33,7 +33,7 @@ public class ConverterFactory { // Version information private static final String VERSION = "1.1.1"; - private static final String DATE = "2008-03-30"; + private static final String DATE = "2008-04-23"; /** Return version information * @return the Writer2LaTeX version in the form diff --git a/source/java/writer2latex/xhtml/Converter.java b/source/java/writer2latex/xhtml/Converter.java index aaa6ddd..a8903a8 100644 --- a/source/java/writer2latex/xhtml/Converter.java +++ b/source/java/writer2latex/xhtml/Converter.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.0 (2009-03-02) + * Version 1.2 (2009-03-02) * */ @@ -597,8 +597,23 @@ public class Converter extends ConverterBase { anchor.setAttribute("href",sHref); String sName = Misc.getAttribute(onode,XMLString.OFFICE_NAME); if (sName!=null) { - anchor.setAttribute("name",sName); - anchor.setAttribute("title",sName); // OOo does not have title... + // The name attribute is rarely use (usually the user will insert a bookmark) + // Hence we (mis)use it to set additional attributes that are not supported by OOo + if (sName.indexOf(";")==-1 && sName.indexOf("=")==-1) { + // Simple case, use the value to set name and title + anchor.setAttribute("name",sName); + anchor.setAttribute("title",sName); + } + else { + // Complex case - using the syntax: name=value;name=value;... + String[] sElements = sName.split(";"); + for (String sElement : sElements) { + String[] sNameVal = sElement.split("="); + if (sNameVal.length>=2) { + anchor.setAttribute(sNameVal[0],sNameVal[1]); + } + } + } } // TODO: target has been deprecated in xhtml 1.0 strict String sTarget = Misc.getAttribute(onode,XMLString.OFFICE_TARGET_FRAME_NAME); diff --git a/source/oxt/writer2latex/description.xml b/source/oxt/writer2latex/description.xml index 1ed0fba..1936f90 100644 --- a/source/oxt/writer2latex/description.xml +++ b/source/oxt/writer2latex/description.xml @@ -10,7 +10,12 @@ - + + + Writer2LaTeX + + Writer2LaTeX eksportfiltre Writer2LaTeX export filters @@ -21,6 +26,12 @@ Фільтри експорту Writer2LaTeX + + + + + + diff --git a/source/oxt/writer2latex/images/w2lhcicon.png b/source/oxt/writer2latex/images/w2lhcicon.png new file mode 100644 index 0000000..f813179 Binary files /dev/null and b/source/oxt/writer2latex/images/w2lhcicon.png differ diff --git a/source/oxt/writer2latex/images/w2licon.png b/source/oxt/writer2latex/images/w2licon.png new file mode 100644 index 0000000..5debd52 Binary files /dev/null and b/source/oxt/writer2latex/images/w2licon.png differ diff --git a/source/oxt/writer2xhtml/description.xml b/source/oxt/writer2xhtml/description.xml index a5becfd..ccb9402 100644 --- a/source/oxt/writer2xhtml/description.xml +++ b/source/oxt/writer2xhtml/description.xml @@ -1,6 +1,7 @@ + xmlns:d="http://openoffice.org/extensions/description/2006" + xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -10,6 +11,11 @@ + + Writer2LaTeX + + Writer2xhtml eksportfiltre Writer2xhtml export filters @@ -20,6 +26,12 @@ Фільтри експорту Writer2xhtml + + + + + + diff --git a/source/oxt/writer2xhtml/images/w2lhcicon.png b/source/oxt/writer2xhtml/images/w2lhcicon.png new file mode 100644 index 0000000..f813179 Binary files /dev/null and b/source/oxt/writer2xhtml/images/w2lhcicon.png differ diff --git a/source/oxt/writer2xhtml/images/w2licon.png b/source/oxt/writer2xhtml/images/w2licon.png new file mode 100644 index 0000000..5debd52 Binary files /dev/null and b/source/oxt/writer2xhtml/images/w2licon.png differ diff --git a/source/oxt/writer4latex/description.xml b/source/oxt/writer4latex/description.xml index eaf83e3..f8cfab1 100644 --- a/source/oxt/writer4latex/description.xml +++ b/source/oxt/writer4latex/description.xml @@ -1,9 +1,32 @@ + xmlns:d="http://openoffice.org/extensions/description/2006" + xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + Writer2LaTeX + + + + Writer4LaTeX frontend + Writer4LaTeX frontend + + + + + + + + + + + + diff --git a/source/oxt/writer4latex/descriptions/desc_da.txt b/source/oxt/writer4latex/descriptions/desc_da.txt new file mode 100644 index 0000000..d35f91e --- /dev/null +++ b/source/oxt/writer4latex/descriptions/desc_da.txt @@ -0,0 +1,3 @@ +Writer4LaTeX integrerer Writer med din LaTeX distribution. + +Sammen med Writer2LaTeX eksportfilteret (som også skal være installeret) giver det dig mulighed for at bruge Writer som LaTeX frontend \ No newline at end of file diff --git a/source/oxt/writer4latex/descriptions/desc_en.txt b/source/oxt/writer4latex/descriptions/desc_en.txt new file mode 100644 index 0000000..f73212d --- /dev/null +++ b/source/oxt/writer4latex/descriptions/desc_en.txt @@ -0,0 +1,3 @@ +Writer4LaTeX integrates Writer with your LaTeX distribution. + +Working together with the Writer2LaTeX export filter (which must be installed) this enables you to use Writer as a LaTeX frontend \ No newline at end of file diff --git a/source/oxt/writer4latex/images/w2lhcicon.png b/source/oxt/writer4latex/images/w2lhcicon.png new file mode 100644 index 0000000..f813179 Binary files /dev/null and b/source/oxt/writer4latex/images/w2lhcicon.png differ diff --git a/source/oxt/writer4latex/images/w2licon.png b/source/oxt/writer4latex/images/w2licon.png new file mode 100644 index 0000000..5debd52 Binary files /dev/null and b/source/oxt/writer4latex/images/w2licon.png differ