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

A few XeTeX and Writer4LaTeX changes

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@12 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2009-04-01 20:33:34 +00:00
parent 9241a44f6c
commit 42236bbce5
5 changed files with 45 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/distro/changelog.txt
View file

@ -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

13
source/java/org/openoffice/da/comp/writer2latex/LaTeXOptionsDialog.java
View file

@ -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");

16
source/java/org/openoffice/da/comp/writer4latex/TeXify.java
View file

@ -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");
}
}
}

17
source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java
View file

@ -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);

2
source/oxt/writer2latex/W2LDialogs/LaTeXOptions.xdl
View file

@ -22,8 +22,10 @@
<dlg:menuitem dlg:value="&amp;116.Backend.StringItemList"/>
<dlg:menuitem dlg:value="&amp;117.Backend.StringItemList"/>
<dlg:menuitem dlg:value="&amp;118.Backend.StringItemList"/>
<dlg:menuitem dlg:value="XeTeX"/>
<dlg:menuitem dlg:value="&amp;119.Backend.StringItemList"/>
</dlg:menupopup>
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:BackendChange" script:language="UNO"/>
</dlg:menulist>
<dlg:text dlg:id="InputencodingLabel" dlg:tab-index="6" dlg:left="12" dlg:top="50" dlg:width="47" dlg:height="12" dlg:help-text="&amp;22.LaTeXOptions.InputencodingLabel.HelpText" dlg:value="&amp;23.LaTeXOptions.InputencodingLabel.Label"/>
<dlg:menulist dlg:id="Inputencoding" dlg:tab-index="7" dlg:left="65" dlg:top="48" dlg:width="96" dlg:height="12" dlg:help-text="&amp;24.LaTeXOptions.Inputencoding.HelpText" dlg:spin="true" dlg:linecount="8">