From 2953e5845c89dd5b50472b434b6d567d29fcba03 Mon Sep 17 00:00:00 2001 From: henrikjust Date: Fri, 15 May 2015 06:49:11 +0000 Subject: [PATCH] w2l toolbar configuration: Define behavior of TeX-button git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@245 f0f2a975-2e09-46c8-9428-3b39399b9f3c --- source/distro/changelog.txt | 3 + .../comp/writer2latex/ApplicationsDialog.java | 18 +++- .../da/comp/writer2latex/ExternalApps.java | 39 ++++++-- .../da/comp/writer2latex/TeXify.java | 89 ++++++++++--------- .../writer2latex/api/ConverterFactory.java | 2 +- source/oxt/writer2latex/ToolbarOptions.xcs | 1 + source/oxt/writer2latex/ToolbarOptions.xcu | 3 + .../writer2latex/W2LDialogs2/Applications.xdl | 29 +++--- .../applications.xhp | 18 +++- .../W2XDialogs2/ToolbarSettings.xdl | 4 +- 10 files changed, 142 insertions(+), 64 deletions(-) diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index 8155cbf..0ca199f 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,9 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6 ---------- version 1.5.3 ---------- +[w2l] The Application dialog in the toolbar configuration can now be used to select the behavior after export + (do nothing, compile or (default) export, compile and preview) + ---------- version 1.5.2 ---------- [all] Using the filters from the command line with soffice --headless --convert-to is now documented in the user manual diff --git a/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java b/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java index 5b4b3c2..18cad2d 100644 --- a/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java +++ b/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.6 (2015-04-05) + * Version 1.6 (2015-05-14) * */ @@ -85,6 +85,9 @@ public final class ApplicationsDialog if (sMethod.equals("external_event") ){ return handleExternalEvent(dlg, event); } + else if (sMethod.equals("AfterExportChange")) { + return changeBehavior(dlg); + } else if (sMethod.equals("ApplicationChange")) { return changeApplication(dlg); } @@ -111,7 +114,7 @@ public final class ApplicationsDialog } public String[] getSupportedMethodNames() { - String[] sNames = { "external_event", "ApplicationChange", "BrowseClick", "ExecutableUnfocus", "OptionsUnfocus", "AutomaticClick" }; + String[] sNames = { "external_event", "AfterExportChange", "ApplicationChange", "BrowseClick", "ExecutableUnfocus", "OptionsUnfocus", "AutomaticClick" }; return sNames; } @@ -140,6 +143,7 @@ public final class ApplicationsDialog return true; } else if (sMethod.equals("back") || sMethod.equals("initialize")) { externalApps.load(); + updateBehavior(dlg); return changeApplication(dlg); } } @@ -149,6 +153,16 @@ public final class ApplicationsDialog } return false; } + + private boolean changeBehavior(DialogAccess dlg) { + externalApps.setProcessingLevel(dlg.getListBoxSelectedItem("AfterExport")); + return true; + } + + private boolean updateBehavior(DialogAccess dlg) { + dlg.setListBoxSelectedItem("AfterExport", externalApps.getProcessingLevel()); + return true; + } private boolean changeApplication(DialogAccess dlg) { String sAppName = getSelectedAppName(dlg); diff --git a/source/java/org/openoffice/da/comp/writer2latex/ExternalApps.java b/source/java/org/openoffice/da/comp/writer2latex/ExternalApps.java index d345d13..f2b08db 100644 --- a/source/java/org/openoffice/da/comp/writer2latex/ExternalApps.java +++ b/source/java/org/openoffice/da/comp/writer2latex/ExternalApps.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2014 by Henrik Just + * Copyright: 2002-2015 by Henrik Just * * All Rights Reserved. * - * Version 1.6 (2014-10-29) + * Version 1.6 (2015-05-14) * */ @@ -36,9 +36,10 @@ import java.util.Vector; import org.openoffice.da.comp.w2lcommon.helper.RegistryHelper; import org.openoffice.da.comp.w2lcommon.helper.StreamGobbler; -//import java.util.Map; +import org.openoffice.da.comp.w2lcommon.helper.XPropertySetHelper; import com.sun.star.beans.XMultiHierarchicalPropertySet; +import com.sun.star.beans.XPropertySet; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import com.sun.star.util.XChangesBatch; @@ -49,7 +50,11 @@ import com.sun.star.util.XChangesBatch; * The registry is used for persistent storage of the settings. */ public class ExternalApps { - + + public final static short EXPORT = (short)0; + public final static short BUILD = (short)1; + public final static short PREVIEW = (short)2; + public final static String LATEX = "LaTeX"; public final static String PDFLATEX = "PdfLaTeX"; public final static String XELATEX = "XeLaTeX"; @@ -65,6 +70,8 @@ public class ExternalApps { private XComponentContext xContext; + private short nLevel = (short)2; + private HashMap apps; /** Construct a new ExternalApps object, with empty definitions */ @@ -75,6 +82,22 @@ public class ExternalApps { setApplication(sApps[i], "?", "?"); } } + + /** Set the desired processing level (0: export only, 1: export and build, 2: export, build and preview) + * + * @param nLevel the desired level + */ + public void setProcessingLevel(short nLevel) { + this.nLevel = nLevel; + } + + /** Get the desired processing level (0: export only, 1: export and build, 2: export, build and preview) + * + * @return the level + */ + public short getProcessingLevel() { + return nLevel; + } /** Define an external application * @param sAppName the name of the application to define @@ -175,7 +198,10 @@ public class ExternalApps { return; } - XMultiHierarchicalPropertySet xProps = (XMultiHierarchicalPropertySet) + XPropertySet xSimpleProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class,view); + nLevel = XPropertySetHelper.getPropertyValueAsShort(xSimpleProps,"AfterExport"); + + XMultiHierarchicalPropertySet xProps = (XMultiHierarchicalPropertySet) UnoRuntime.queryInterface(XMultiHierarchicalPropertySet.class, view); for (int i=0; i0) { - throw new IOException("Error executing dvi viewer"); - } + if (externalApps.getProcessingLevel()>=ExternalApps.BUILD) { + boolean bPreview = externalApps.getProcessingLevel()>=ExternalApps.PREVIEW; + boolean bResult = false; + if (nBackend==GENERIC) { + bResult = doTeXify(genericTexify, file, sBibinputs); + if (!bResult) return false; + if (bPreview && externalApps.execute(ExternalApps.DVIVIEWER, + new File(file.getParentFile(),file.getName()+".dvi").getPath(), + file.getParentFile(), null, false)>0) { + throw new IOException("Error executing dvi viewer"); + } + } + else if (nBackend==PDFTEX) { + bResult = doTeXify(pdfTexify, file, sBibinputs); + if (!bResult) return false; + if (bPreview && externalApps.execute(ExternalApps.PDFVIEWER, + new File(file.getParentFile(),file.getName()+".pdf").getPath(), + file.getParentFile(), null, false)>0) { + throw new IOException("Error executing pdf viewer"); + } + } + else if (nBackend==DVIPS) { + bResult = doTeXify(dvipsTexify, file, sBibinputs); + if (!bResult) return false; + if (bPreview && externalApps.execute(ExternalApps.POSTSCRIPTVIEWER, + new File(file.getParentFile(),file.getName()+".ps").getPath(), + file.getParentFile(), null, false)>0) { + throw new IOException("Error executing postscript viewer"); + } + } + else if (nBackend==XETEX) { + bResult = doTeXify(xeTexify, file, sBibinputs); + if (!bResult) return false; + if (bPreview && externalApps.execute(ExternalApps.PDFVIEWER, + new File(file.getParentFile(),file.getName()+".pdf").getPath(), + file.getParentFile(), null, false)>0) { + throw new IOException("Error executing pdf viewer"); + } + } + return bResult; } - else if (nBackend==PDFTEX) { - bResult = doTeXify(pdfTexify, file, sBibinputs); - if (!bResult) return false; - if (externalApps.execute(ExternalApps.PDFVIEWER, - new File(file.getParentFile(),file.getName()+".pdf").getPath(), - file.getParentFile(), null, false)>0) { - throw new IOException("Error executing pdf viewer"); - } - } - else if (nBackend==DVIPS) { - bResult = doTeXify(dvipsTexify, file, sBibinputs); - if (!bResult) return false; - if (externalApps.execute(ExternalApps.POSTSCRIPTVIEWER, - new File(file.getParentFile(),file.getName()+".ps").getPath(), - file.getParentFile(), null, false)>0) { - throw new IOException("Error executing postscript viewer"); - } - } - else if (nBackend==XETEX) { - bResult = doTeXify(xeTexify, file, sBibinputs); - if (!bResult) return false; - if (externalApps.execute(ExternalApps.PDFVIEWER, - new File(file.getParentFile(),file.getName()+".pdf").getPath(), - file.getParentFile(), null, false)>0) { - throw new IOException("Error executing pdf viewer"); - } - } - return bResult; - + return true; } private boolean doTeXify(String[] sAppList, File file, String sBibinputs) throws IOException { diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java index f11144b..5142fb8 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.5.3"; - private static final String DATE = "2015-05-12"; + private static final String DATE = "2015-05-15"; /** Return the Writer2LaTeX version in the form * (major version).(minor version).(patch level)
diff --git a/source/oxt/writer2latex/ToolbarOptions.xcs b/source/oxt/writer2latex/ToolbarOptions.xcs index 34589cf..f655938 100644 --- a/source/oxt/writer2latex/ToolbarOptions.xcs +++ b/source/oxt/writer2latex/ToolbarOptions.xcs @@ -13,6 +13,7 @@ + diff --git a/source/oxt/writer2latex/ToolbarOptions.xcu b/source/oxt/writer2latex/ToolbarOptions.xcu index a06b1ff..aa78d2d 100644 --- a/source/oxt/writer2latex/ToolbarOptions.xcu +++ b/source/oxt/writer2latex/ToolbarOptions.xcu @@ -5,6 +5,9 @@ xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + 2 + latex diff --git a/source/oxt/writer2latex/W2LDialogs2/Applications.xdl b/source/oxt/writer2latex/W2LDialogs2/Applications.xdl index 2c99f65..f97ee10 100644 --- a/source/oxt/writer2latex/W2LDialogs2/Applications.xdl +++ b/source/oxt/writer2latex/W2LDialogs2/Applications.xdl @@ -3,12 +3,17 @@ - - - - - - + + + + + + + + + + + @@ -23,15 +28,19 @@ - + + - + + + + + - + - \ No newline at end of file diff --git a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/applications.xhp b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/applications.xhp index d8f10f4..102efcd 100644 --- a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/applications.xhp +++ b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/applications.xhp @@ -67,7 +67,23 @@ Note: The Writer2LaTeX toolbar is not tested on Mac OS X. - + + + Choose the desired behavior after export + After Export + After Export, Writer2LaTeX can build the result with LaTeX and display the final document in a viewer. Choose the desired behavior in the list. + + + Do nothing will only export the document to LaTeX + + + Build with LaTeX will build the converted document with LaTeX to produce the final result in DVI, PDF or PostScript format + + + Build with LaTeX and view result will display the final result in a DVI, PDF or PostScript viewer + + + Automatic Configuration If you click this button, Writer2LaTeX will try to locate the external programs diff --git a/source/oxt/writer2xhtml/W2XDialogs2/ToolbarSettings.xdl b/source/oxt/writer2xhtml/W2XDialogs2/ToolbarSettings.xdl index ecaebe7..a476c88 100644 --- a/source/oxt/writer2xhtml/W2XDialogs2/ToolbarSettings.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs2/ToolbarSettings.xdl @@ -17,8 +17,8 @@ - - + +