diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt
index d7e239b..ae0ea64 100644
--- a/source/distro/changelog.txt
+++ b/source/distro/changelog.txt
@@ -2,6 +2,8 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
---------- version 1.1.1 ----------
+[w2l] Added XeTeX as possible backend in dialog
+
[all] Bugfix: Paragraphs containing only fields are no longer lost
[w4l] Added Writer4LaTeX extension
diff --git a/source/java/org/openoffice/da/comp/writer2latex/LaTeXOptionsDialog.java b/source/java/org/openoffice/da/comp/writer2latex/LaTeXOptionsDialog.java
index dc39e5e..e18a72e 100644
--- a/source/java/org/openoffice/da/comp/writer2latex/LaTeXOptionsDialog.java
+++ b/source/java/org/openoffice/da/comp/writer2latex/LaTeXOptionsDialog.java
@@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
- * Version 1.0 (2009-02-18)
+ * Version 1.2 (2009-03-31)
*
*/
@@ -44,7 +44,7 @@ public class LaTeXOptionsDialog extends OptionsDialogBase {
// Translate list box items to configuration option values
private static final String[] BACKEND_VALUES =
- { "generic", "pdftex", "dvips", "unspecified" };
+ { "generic", "pdftex", "dvips", "xetex", "unspecified" };
private static final String[] INPUTENCODING_VALUES =
{ "ascii", "latin1", "latin2", "iso-8859-7", "cp1250", "cp1251", "koi8-r", "utf8" };
private static final String[] NOTES_VALUES =
@@ -204,7 +204,7 @@ public class LaTeXOptionsDialog extends OptionsDialogBase {
// Implement XDialogEventHandler
public boolean callHandlerMethod(XDialog xDialog, Object event, String sMethod) {
- if (sMethod.equals("ConfigChange")) {
+ if (sMethod.equals("ConfigChange") || sMethod.equals("BackendChange")) {
updateLockedOptions();
enableControls();
}
@@ -237,10 +237,15 @@ public class LaTeXOptionsDialog extends OptionsDialogBase {
// backend must be pdf for pdfscreen
return getListBoxSelectedItem("Config")==4 || super.isLocked(sOptionName);
}
+ else if ("inputencoding".equals(sOptionName)) {
+ // backend=xetex locks the encoding to utf8
+ return getListBoxSelectedItem("Backend")==3 || super.isLocked(sOptionName);
+ }
else if ("additional_symbols".equals(sOptionName)) {
// additional_symbols is disabled for custom config (where the 5
// individual options can be set independently)
- return getListBoxSelectedItem("Config")==5 || super.isLocked(sOptionName);
+ // it is also disabled for backend=xetex
+ return getListBoxSelectedItem("Backend")==3 || getListBoxSelectedItem("Config")==5 || super.isLocked(sOptionName);
}
else if ("use_pifont".equals(sOptionName)) {
return isLocked("additional_symbols");
diff --git a/source/java/org/openoffice/da/comp/writer4latex/TeXify.java b/source/java/org/openoffice/da/comp/writer4latex/TeXify.java
index 58ada66..d26fdbf 100644
--- a/source/java/org/openoffice/da/comp/writer4latex/TeXify.java
+++ b/source/java/org/openoffice/da/comp/writer4latex/TeXify.java
@@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
- * Version 1.2 (2009-03-30)
+ * Version 1.2 (2009-03-31)
*
*/
@@ -44,6 +44,9 @@ public final class TeXify {
/** Backend format pdfTeX (pdf) */
public static final short PDFTEX = 3;
+
+ /** Backend format XeTeX (also pdf, usually) */
+ public static final short XETEX = 4;
// Define the applications to run for each backend
private static final String[] genericTexify = {
@@ -56,6 +59,9 @@ public final class TeXify {
ExternalApps.LATEX, ExternalApps.BIBTEX, ExternalApps.MAKEINDEX,
ExternalApps.LATEX, ExternalApps.MAKEINDEX, ExternalApps.LATEX,
ExternalApps.DVIPS };
+ private static final String[] xeTexify = {
+ ExternalApps.XELATEX, ExternalApps.BIBTEX, ExternalApps.MAKEINDEX,
+ ExternalApps.XELATEX, ExternalApps.MAKEINDEX, ExternalApps.XELATEX };
// Global objects
//private XComponentContext xContext;
@@ -107,6 +113,14 @@ public final class TeXify {
throw new IOException("Error executing postscript viewer");
}
}
+ else if (nBackend==XETEX) {
+ doTeXify(xeTexify, file);
+ if (externalApps.execute(ExternalApps.PDFVIEWER,
+ new File(file.getParentFile(),file.getName()+".pdf").getPath(),
+ file.getParentFile(), false)>0) {
+ throw new IOException("Error executing pdf viewer");
+ }
+ }
}
diff --git a/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java b/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java
index 7658ee2..8e23a3e 100644
--- a/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java
+++ b/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java
@@ -158,6 +158,10 @@ public final class Writer4LaTeX extends WeakBase
if (updateMediaProperties()) {
process();
}
+ else {
+ MessageBox msgBox = new MessageBox(m_xContext, m_xFrame);
+ msgBox.showMessage("Writer4LaTeX Error","Please install Writer2LaTeX version 1.0 or later");
+ }
}
else {
warnNotSaved();
@@ -169,6 +173,10 @@ public final class Writer4LaTeX extends WeakBase
if (mediaProps!=null || updateMediaProperties()) {
process();
}
+ else {
+ MessageBox msgBox = new MessageBox(m_xContext, m_xFrame);
+ msgBox.showMessage("Writer4LaTeX Error","Please install Writer2LaTeX version 1.0 or later");
+ }
}
else {
warnNotSaved();
@@ -250,6 +258,9 @@ public final class Writer4LaTeX extends WeakBase
else if (sBackend=="dvips") {
texify.process(file, TeXify.DVIPS, true);
}
+ else if (sBackend=="xetex") {
+ texify.process(file, TeXify.XETEX, true);
+ }
else if (sBackend=="generic") {
texify.process(file, TeXify.GENERIC, true);
}
@@ -303,6 +314,12 @@ public final class Writer4LaTeX extends WeakBase
// Display options dialog
Object dialog = m_xContext.getServiceManager()
.createInstanceWithContext("org.openoffice.da.writer2latex.LaTeXOptionsDialog", m_xContext);
+
+ // If Writer2LaTeX is not installed, this will return null
+ if (dialog==null) {
+ mediaProps = null;
+ return false;
+ }
XPropertyAccess xPropertyAccess = (XPropertyAccess)
UnoRuntime.queryInterface(XPropertyAccess.class, dialog);
diff --git a/source/oxt/writer2latex/W2LDialogs/LaTeXOptions.xdl b/source/oxt/writer2latex/W2LDialogs/LaTeXOptions.xdl
index 14d8eda..8151dd9 100644
--- a/source/oxt/writer2latex/W2LDialogs/LaTeXOptions.xdl
+++ b/source/oxt/writer2latex/W2LDialogs/LaTeXOptions.xdl
@@ -22,8 +22,10 @@
+
+