diff --git a/build.xml b/build.xml index 434657d..5a1e82e 100644 --- a/build.xml +++ b/build.xml @@ -35,7 +35,7 @@ - + diff --git a/source/distro/Readme.txt b/source/distro/Readme.txt index 18d2ef4..5e488f0 100644 --- a/source/distro/Readme.txt +++ b/source/distro/Readme.txt @@ -1,7 +1,7 @@ -Writer2LaTeX version 1.1.9 (beta test release) -============================================== +Writer2LaTeX version 1.1.6 (alpha test release) +=============================================== -This is the distribution of Writer2LaTeX version 1.1.9 +This is the distribution of Writer2LaTeX version 1.1.6 Latest version can be found at the web site http://writer2latex.sourceforge.net diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index f0c8adf..fd31513 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -1,6 +1,12 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2 ----------- version 1.1.9 ---------- +---------- version 1.1.6 ---------- + +[w4l] Bibliography options page has been reworked to include JabRef support and unify BibTeX directory (which is now allowed + to contain special characters like spaces) + +[w2l] Added support for JabRef reference marks: A new option jabref_bibtex_files has been added to give the names of + the BibTeX files from JabRef [w2x] New option include_toc (default true) for EPUB export: If set to false, the table of content will not be exported diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index 40f7c8a..c204083 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/FilterDataParser.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/FilterDataParser.java index b679b6e..1e3f09a 100644 --- a/source/java/org/openoffice/da/comp/w2lcommon/filter/FilterDataParser.java +++ b/source/java/org/openoffice/da/comp/w2lcommon/filter/FilterDataParser.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2010 by Henrik Just + * Copyright: 2002-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-04-12) + * Version 1.2 (2011-01-15) * */ @@ -54,6 +54,7 @@ import writer2latex.api.Converter; * All errors are silently ignored */ public class FilterDataParser { + // TODO: Use JSON format //private static XComponentContext xComponentContext = null; @@ -108,7 +109,7 @@ public class FilterDataParser { PropertyHelper props = new PropertyHelper(filterData); - // Get the special properties TemplateURL, StyleSheetURL, ConfigURL and AutoCreate + // Get the special properties TemplateURL, StyleSheetURL, Resources, ConfigURL and AutoCreate Object tpl = props.get("TemplateURL"); String sTemplate = null; if (tpl!=null && AnyConverter.isString(tpl)) { @@ -131,6 +132,18 @@ public class FilterDataParser { } } + // This property accepts a semicolon separated list of !! (not very elegant) + Object resources = props.get("Resources"); + String[] sResources = null; + if (resources!=null && AnyConverter.isString(resources)) { + try { + sResources = substituteVariables(AnyConverter.toString(resources)).split(";"); + } + catch (com.sun.star.lang.IllegalArgumentException e) { + // Failed to convert to String; should not happen - ignore + } + } + Object auto = props.get("AutoCreate"); boolean bAutoCreate = false; if (auto!=null && AnyConverter.isString(auto)) { @@ -204,7 +217,38 @@ public class FilterDataParser { // ignore } } - + + // Load the resources from the specified URLs, if any + if (sfa2!=null && sResources!=null) { + for (String sResource : sResources) { + try { + String[] sParts = sResource.split("!"); + if (sParts.length==3) { + // Format is !! + XInputStream xIs = sfa2.openFileRead(sParts[2]); + if (xIs!=null) { + InputStream is = new XInputStreamToInputStreamAdapter(xIs); + converter.readResource(is, sParts[1], sParts[0]); + is.close(); + xIs.closeInput(); + } + } // otherwise wrong format, ignore + } + catch (IOException e) { + // ignore + } + catch (NotConnectedException e) { + // ignore + } + catch (CommandAbortedException e) { + // ignore + } + catch (com.sun.star.uno.Exception e) { + // ignore + } + } + } + // Create config if required try { if (bAutoCreate && sfa2!=null && sConfig!=null && !sConfig.startsWith("*") && !sfa2.exists(sConfig)) { @@ -271,7 +315,8 @@ public class FilterDataParser { Enumeration keys = props.keys(); while (keys.hasMoreElements()) { String sKey = keys.nextElement(); - if (!"ConfigURL".equals(sKey) && !"TemplateURL".equals(sKey) && !"StyleSheetURL".equals(sKey) && !"AutoCreate".equals(sKey)) { + if (!"ConfigURL".equals(sKey) && !"TemplateURL".equals(sKey) && !"StyleSheetURL".equals(sKey) + && !"Resources".equals(sKey) && !"AutoCreate".equals(sKey)) { Object value = props.get(sKey); if (AnyConverter.isString(value)) { try { diff --git a/source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java index d847d5e..0a587c4 100644 --- a/source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java +++ b/source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java @@ -402,6 +402,7 @@ public abstract class OptionsDialogBase extends DialogBase implements filterData.put("ConfigURL",expander.expandMacros(XPropertySetHelper.getPropertyValueAsString(xCfgProps,"ConfigURL"))); filterData.put("TemplateURL",expander.expandMacros(XPropertySetHelper.getPropertyValueAsString(xCfgProps,"TargetTemplateURL"))); filterData.put("StyleSheetURL",expander.expandMacros(XPropertySetHelper.getPropertyValueAsString(xCfgProps,"StyleSheetURL"))); + // TODO: Resources... XPropertySetHelper.setPropertyValue(xProps,"ConfigName",sConfigNames[i]); bFound = true; } diff --git a/source/java/org/openoffice/da/comp/writer4latex/BibliographyDialog.java b/source/java/org/openoffice/da/comp/writer4latex/BibliographyDialog.java index e67e43f..e421c0e 100644 --- a/source/java/org/openoffice/da/comp/writer4latex/BibliographyDialog.java +++ b/source/java/org/openoffice/da/comp/writer4latex/BibliographyDialog.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2010 by Henrik Just + * Copyright: 2002-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-10-10) + * Version 1.2 (2011-01-24) * */ @@ -85,18 +85,18 @@ public final class BibliographyDialog if (sMethod.equals("external_event") ){ return handleExternalEvent(dlg, event); } + else if (sMethod.equals("BibTeXDirClick")) { + return bibTeXDirClick(dlg); + } else if (sMethod.equals("ConvertZoteroCitationsChange")) { return convertZoteroCitationsChange(dlg); } - else if (sMethod.equals("ZoteroBibTeXDirClick")) { - return zoteroBibTeXDirClick(dlg); + else if (sMethod.equals("ConvertJabRefCitationsChange")) { + return convertJabRefCitationsChange(dlg); } else if (sMethod.equals("UseExternalBibTeXFilesChange")) { return useExternalBibTeXFilesChange(dlg); } - else if (sMethod.equals("ExternalBibTeXDirClick")) { - return externalBibTeXDirClick(dlg); - } } catch (com.sun.star.uno.RuntimeException e) { throw e; @@ -108,7 +108,8 @@ public final class BibliographyDialog } public String[] getSupportedMethodNames() { - String[] sNames = { "external_event", "ConvertZoteroCitationsChange", "ZoteroBibTeXDirClick", "UseExternalBibTeXFilesChange", "ExternalBibTeXDirClick" }; + String[] sNames = { "external_event", "UseExternalBibTeXFilesChange", "ConvertZoteroCitationsChange", + "ConvertJabRefCitationsChange", "ExternalBibTeXDirClick" }; return sNames; } @@ -153,16 +154,16 @@ public final class BibliographyDialog try { Object view = registry.getRegistryView(REGISTRY_PATH, false); XPropertySet xProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class,view); - dlg.setCheckBoxStateAsBoolean("ConvertZoteroCitations", - XPropertySetHelper.getPropertyValueAsBoolean(xProps, "ConvertZoteroCitations")); - dlg.setTextFieldText("ZoteroBibTeXDir", - XPropertySetHelper.getPropertyValueAsString(xProps, "ZoteroBibTeXDir")); - dlg.setTextFieldText("NatbibOptions", - XPropertySetHelper.getPropertyValueAsString(xProps, "NatbibOptions")); dlg.setCheckBoxStateAsBoolean("UseExternalBibTeXFiles", XPropertySetHelper.getPropertyValueAsBoolean(xProps, "UseExternalBibTeXFiles")); - dlg.setTextFieldText("ExternalBibTeXDir", - XPropertySetHelper.getPropertyValueAsString(xProps, "ExternalBibTeXDir")); + dlg.setCheckBoxStateAsBoolean("ConvertZoteroCitations", + XPropertySetHelper.getPropertyValueAsBoolean(xProps, "ConvertZoteroCitations")); + dlg.setCheckBoxStateAsBoolean("ConvertJabRefCitations", + XPropertySetHelper.getPropertyValueAsBoolean(xProps, "ConvertJabRefCitations")); + dlg.setTextFieldText("NatbibOptions", + XPropertySetHelper.getPropertyValueAsString(xProps, "NatbibOptions")); + dlg.setTextFieldText("BibTeXDir", + XPropertySetHelper.getPropertyValueAsString(xProps, "BibTeXDir")); registry.disposeRegistryView(view); } catch (Exception e) { @@ -180,11 +181,11 @@ public final class BibliographyDialog try { Object view = registry.getRegistryView(REGISTRY_PATH, true); XPropertySet xProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class,view); - XPropertySetHelper.setPropertyValue(xProps, "ConvertZoteroCitations", dlg.getCheckBoxStateAsBoolean("ConvertZoteroCitations")); - XPropertySetHelper.setPropertyValue(xProps, "ZoteroBibTeXDir", dlg.getTextFieldText("ZoteroBibTeXDir")); - XPropertySetHelper.setPropertyValue(xProps, "NatbibOptions", dlg.getTextFieldText("NatbibOptions")); XPropertySetHelper.setPropertyValue(xProps, "UseExternalBibTeXFiles", dlg.getCheckBoxStateAsBoolean("UseExternalBibTeXFiles")); - XPropertySetHelper.setPropertyValue(xProps, "ExternalBibTeXDir", dlg.getTextFieldText("ExternalBibTeXDir")); + XPropertySetHelper.setPropertyValue(xProps, "ConvertZoteroCitations", dlg.getCheckBoxStateAsBoolean("ConvertZoteroCitations")); + XPropertySetHelper.setPropertyValue(xProps, "ConvertJabRefCitations", dlg.getCheckBoxStateAsBoolean("ConvertJabRefCitations")); + XPropertySetHelper.setPropertyValue(xProps, "NatbibOptions", dlg.getTextFieldText("NatbibOptions")); + XPropertySetHelper.setPropertyValue(xProps, "BibTeXDir", dlg.getTextFieldText("BibTeXDir")); // Commit registry changes XChangesBatch xUpdateContext = (XChangesBatch) @@ -203,45 +204,44 @@ public final class BibliographyDialog } } - private boolean convertZoteroCitationsChange(DialogAccess dlg) { - // Update dialog according to the current setting of the checkbox - boolean bConvert = dlg.getCheckBoxStateAsBoolean("ConvertZoteroCitations"); - dlg.setControlEnabled("ZoteroBibTeXDirLabel", bConvert); - dlg.setControlEnabled("ZoteroBibTeXDir", bConvert); - dlg.setControlEnabled("ZoteroBibTeXDirButton", bConvert); - dlg.setControlEnabled("NatbibOptionsLabel", bConvert); - dlg.setControlEnabled("NatbibOptions", bConvert); - return true; - } - - private boolean zoteroBibTeXDirClick(DialogAccess dlg) { - String sPath = folderPicker.getPath(); - if (sPath!=null) { - try { - dlg.setTextFieldText("ZoteroBibTeXDir", new File(new URI(sPath)).getCanonicalPath()); - } - catch (IOException e) { - } - catch (URISyntaxException e) { - } - } - return true; - } - private boolean useExternalBibTeXFilesChange(DialogAccess dlg) { - // Update dialog according to the current setting of the checkbox - boolean bExternal = dlg.getCheckBoxStateAsBoolean("UseExternalBibTeXFiles"); - dlg.setControlEnabled("ExternalBibTeXDirLabel", bExternal); - dlg.setControlEnabled("ExternalBibTeXDir", bExternal); - dlg.setControlEnabled("ExternalBibTeXDirButton", bExternal); + enableBibTeXDir(dlg); return true; } - private boolean externalBibTeXDirClick(DialogAccess dlg) { + private boolean convertZoteroCitationsChange(DialogAccess dlg) { + enableNatbibOptions(dlg); + enableBibTeXDir(dlg); + return true; + } + + private boolean convertJabRefCitationsChange(DialogAccess dlg) { + enableNatbibOptions(dlg); + enableBibTeXDir(dlg); + return true; + } + + private void enableNatbibOptions(DialogAccess dlg) { + boolean bConvertZotero = dlg.getCheckBoxStateAsBoolean("ConvertZoteroCitations"); + boolean bConvertJabRef = dlg.getCheckBoxStateAsBoolean("ConvertJabRefCitations"); + dlg.setControlEnabled("NatbibOptionsLabel", bConvertZotero || bConvertJabRef); + dlg.setControlEnabled("NatbibOptions", bConvertZotero || bConvertJabRef); + } + + private void enableBibTeXDir(DialogAccess dlg) { + boolean bExternal = dlg.getCheckBoxStateAsBoolean("UseExternalBibTeXFiles"); + boolean bConvertZotero = dlg.getCheckBoxStateAsBoolean("ConvertZoteroCitations"); + boolean bConvertJabRef = dlg.getCheckBoxStateAsBoolean("ConvertJabRefCitations"); + dlg.setControlEnabled("BibTeXDirLabel", bExternal || bConvertZotero || bConvertJabRef); + dlg.setControlEnabled("BibTeXDir", bExternal || bConvertZotero || bConvertJabRef); + dlg.setControlEnabled("BibTeXDirButton", bExternal|| bConvertZotero || bConvertJabRef); + } + + private boolean bibTeXDirClick(DialogAccess dlg) { String sPath = folderPicker.getPath(); if (sPath!=null) { try { - dlg.setTextFieldText("ExternalBibTeXDir", new File(new URI(sPath)).getCanonicalPath()); + dlg.setTextFieldText("BibTeXDir", new File(new URI(sPath)).getCanonicalPath()); } catch (IOException e) { } diff --git a/source/java/org/openoffice/da/comp/writer4latex/ExternalApps.java b/source/java/org/openoffice/da/comp/writer4latex/ExternalApps.java index d4d31c7..2d65e31 100644 --- a/source/java/org/openoffice/da/comp/writer4latex/ExternalApps.java +++ b/source/java/org/openoffice/da/comp/writer4latex/ExternalApps.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2010 by Henrik Just + * Copyright: 2002-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-10-11) + * Version 1.2 (2011-01-25) * */ @@ -31,6 +31,7 @@ import java.io.IOException; import java.lang.Process; import java.lang.ProcessBuilder; import java.util.HashMap; +import java.util.Map; import java.util.Vector; import org.openoffice.da.comp.w2lcommon.helper.RegistryHelper; @@ -99,11 +100,12 @@ public class ExternalApps { * @param sAppName the name of the application to execute * @param sFileName the file name to use * @param workDir the working directory to use + * @param env map of environment variables to set (or null if no variables needs to be set) * @param bWaitFor true if the method should wait for the execution to finish * @return error code */ - public int execute(String sAppName, String sFileName, File workDir, boolean bWaitFor) { - return execute(sAppName, "", sFileName, workDir, bWaitFor); + public int execute(String sAppName, String sFileName, File workDir, Map env, boolean bWaitFor) { + return execute(sAppName, "", sFileName, workDir, env, bWaitFor); } /** Execute an external application @@ -111,10 +113,11 @@ public class ExternalApps { * @param sCommand subcommand/option to pass to the command * @param sFileName the file name to use * @param workDir the working directory to use + * @param env map of environment variables to set (or null if no variables needs to be set) * @param bWaitFor true if the method should wait for the execution to finish * @return error code */ - public int execute(String sAppName, String sCommand, String sFileName, File workDir, boolean bWaitFor) { + public int execute(String sAppName, String sCommand, String sFileName, File workDir, Map env, boolean bWaitFor) { // Assemble the command String[] sApp = getApplication(sAppName); if (sApp==null) { return 1; } @@ -129,6 +132,12 @@ public class ExternalApps { ProcessBuilder pb = new ProcessBuilder(command); pb.directory(workDir); + if (env!=null) { + pb.environment().putAll(env); + if (env.containsKey("BIBINPUTS")) { + System.out.println("Running "+sApp[0]+" with BIBINPUTS="+env.get("BIBINPUTS")); + } + } Process proc = pb.start(); // Gobble the error stream of the application diff --git a/source/java/org/openoffice/da/comp/writer4latex/TeXImportFilter.java b/source/java/org/openoffice/da/comp/writer4latex/TeXImportFilter.java index 7f30963..2dfaa38 100644 --- a/source/java/org/openoffice/da/comp/writer4latex/TeXImportFilter.java +++ b/source/java/org/openoffice/da/comp/writer4latex/TeXImportFilter.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-06-19) + * Version 1.2 (2011-01-25) * */ @@ -291,7 +291,7 @@ public class TeXImportFilter extends WeakBase implements XInitialization, XNamed System.out.println("Executing tex4ht with command "+sCommand+" on file "+file.getName()); - externalApps.execute(ExternalApps.MK4HT, sCommand, file.getName(), file.getParentFile(), true); + externalApps.execute(ExternalApps.MK4HT, sCommand, file.getName(), file.getParentFile(), null, true); if (xStatus!=null) { nStep+=5; xStatus.setValue(nStep); } diff --git a/source/java/org/openoffice/da/comp/writer4latex/TeXify.java b/source/java/org/openoffice/da/comp/writer4latex/TeXify.java index 53f2b1f..5b0e971 100644 --- a/source/java/org/openoffice/da/comp/writer4latex/TeXify.java +++ b/source/java/org/openoffice/da/comp/writer4latex/TeXify.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 (2011-01-25) * */ @@ -28,10 +28,12 @@ package org.openoffice.da.comp.writer4latex; import java.io.File; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import com.sun.star.uno.XComponentContext; -/** This class builds LaTeX documents into dvi, postscript or pdf and displays +/** This class builds LaTeX documents into DVI, Postscript or PDF and displays * the result. */ public final class TeXify { @@ -74,12 +76,13 @@ public final class TeXify { /** Process a document * @param file the LaTeX file to process + * @param sBibinputs value for the BIBINPUTS environment variable (or null if it should not be extended) * @param nBackend the desired backend format (generic, dvips, pdftex) * @param bView set the true if the result should be displayed in the viewer * @throws IOException if the document cannot be read - * @return true if the first LaTeX run was succesful + * @return true if the first LaTeX run was successful */ - public boolean process(File file, short nBackend, boolean bView) throws IOException { + public boolean process(File file, String sBibinputs, short nBackend, boolean bView) throws IOException { // Remove extension from file if (file.getName().endsWith(".tex")) { file = new File(file.getParentFile(), @@ -92,38 +95,38 @@ public final class TeXify { // Process LaTeX document boolean bResult = false; if (nBackend==GENERIC) { - bResult = doTeXify(genericTexify, file); + bResult = doTeXify(genericTexify, file, sBibinputs); if (!bResult) return false; if (externalApps.execute(ExternalApps.DVIVIEWER, new File(file.getParentFile(),file.getName()+".dvi").getPath(), - file.getParentFile(), false)>0) { + file.getParentFile(), null, false)>0) { throw new IOException("Error executing dvi viewer"); } } else if (nBackend==PDFTEX) { - bResult = doTeXify(pdfTexify, file); + bResult = doTeXify(pdfTexify, file, sBibinputs); if (!bResult) return false; if (externalApps.execute(ExternalApps.PDFVIEWER, new File(file.getParentFile(),file.getName()+".pdf").getPath(), - file.getParentFile(), false)>0) { + file.getParentFile(), null, false)>0) { throw new IOException("Error executing pdf viewer"); } } else if (nBackend==DVIPS) { - bResult = doTeXify(dvipsTexify, file); + bResult = doTeXify(dvipsTexify, file, sBibinputs); if (!bResult) return false; if (externalApps.execute(ExternalApps.POSTSCRIPTVIEWER, new File(file.getParentFile(),file.getName()+".ps").getPath(), - file.getParentFile(), false)>0) { + file.getParentFile(), null, false)>0) { throw new IOException("Error executing postscript viewer"); } } else if (nBackend==XETEX) { - bResult = doTeXify(xeTexify, file); + bResult = doTeXify(xeTexify, file, sBibinputs); if (!bResult) return false; if (externalApps.execute(ExternalApps.PDFVIEWER, new File(file.getParentFile(),file.getName()+".pdf").getPath(), - file.getParentFile(), false)>0) { + file.getParentFile(), null, false)>0) { throw new IOException("Error executing pdf viewer"); } } @@ -131,11 +134,16 @@ public final class TeXify { } - private boolean doTeXify(String[] sAppList, File file) throws IOException { + private boolean doTeXify(String[] sAppList, File file, String sBibinputs) throws IOException { for (int i=0; i env =null; + if (ExternalApps.BIBTEX.equals(sAppList[i])) { + env = new HashMap(); + env.put("BIBINPUTS", sBibinputs); + } int nReturnCode = externalApps.execute( - sAppList[i], file.getName(), file.getParentFile(), true); + sAppList[i], file.getName(), file.getParentFile(), env, true); System.out.println("Return code from "+sAppList[i]+": "+nReturnCode); if (i==0 && nReturnCode>0) { return false; diff --git a/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java b/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java index e17a5bb..f8c9696 100644 --- a/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java +++ b/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2010 by Henrik Just + * Copyright: 2002-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-10-13) + * Version 1.2 (2011-01-25) * */ @@ -44,6 +44,7 @@ import com.sun.star.task.XStatusIndicator; import com.sun.star.task.XStatusIndicatorFactory; import com.sun.star.ui.dialogs.ExecutableDialogResults; import com.sun.star.ui.dialogs.XExecutableDialog; +import com.sun.star.uno.AnyConverter; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; @@ -54,6 +55,7 @@ import org.openoffice.da.comp.w2lcommon.helper.RegistryHelper; import org.openoffice.da.comp.w2lcommon.helper.XPropertySetHelper; import writer2latex.util.CSVList; +import writer2latex.util.Misc; /** This class implements the ui (dispatch) commands provided by Writer4LaTeX. * The actual processing is done by the three core classes TeXify, @@ -202,6 +204,8 @@ public final class Writer4LaTeX extends WeakBase // First work a bit on the FilterData (get the backend and set bibliography options) String sBackend = "generic"; + String sBibinputs = null; + PropertyHelper mediaHelper = new PropertyHelper(mediaProps); Object filterData = mediaHelper.get("FilterData"); if (filterData instanceof PropertyValue[]) { @@ -217,14 +221,24 @@ public final class Writer4LaTeX extends WeakBase try { Object view = registry.getRegistryView(BibliographyDialog.REGISTRY_PATH, false); XPropertySet xProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class,view); + String sBibTeXFiles = getFileList(XPropertySetHelper.getPropertyValueAsString(xProps, "BibTeXDir")); if (XPropertySetHelper.getPropertyValueAsBoolean(xProps, "ConvertZoteroCitations")) { - filterHelper.put("zotero_bibtex_files", getFileList(XPropertySetHelper.getPropertyValueAsString(xProps, "ZoteroBibTeXDir"))); + filterHelper.put("zotero_bibtex_files", sBibTeXFiles); + filterHelper.put("natbib_options", XPropertySetHelper.getPropertyValueAsString(xProps, "NatbibOptions")); + } + if (XPropertySetHelper.getPropertyValueAsBoolean(xProps, "ConvertJabRefCitations")) { + filterHelper.put("jabref_bibtex_files", sBibTeXFiles); filterHelper.put("natbib_options", XPropertySetHelper.getPropertyValueAsString(xProps, "NatbibOptions")); } if (XPropertySetHelper.getPropertyValueAsBoolean(xProps, "UseExternalBibTeXFiles")) { - filterHelper.put("external_bibtex_files", getFileList(XPropertySetHelper.getPropertyValueAsString(xProps, "ExternalBibTeXDir"))); + filterHelper.put("external_bibtex_files", sBibTeXFiles); } - mediaHelper.put("FilterData",filterHelper.toArray()); + String sBibTeXDir = XPropertySetHelper.getPropertyValueAsString(xProps, "BibTeXDir"); + if (sBibTeXDir.length()>0) { + sBibinputs = sBibTeXDir+":"; + } + + mediaHelper.put("FilterData",filterHelper.toArray()); mediaProps = mediaHelper.toArray(); registry.disposeRegistryView(view); } @@ -255,16 +269,16 @@ public final class Writer4LaTeX extends WeakBase try { if (sBackend=="pdftex") { - bResult = texify.process(file, TeXify.PDFTEX, true); + bResult = texify.process(file, sBibinputs, TeXify.PDFTEX, true); } else if (sBackend=="dvips") { - bResult = texify.process(file, TeXify.DVIPS, true); + bResult = texify.process(file, sBibinputs, TeXify.DVIPS, true); } else if (sBackend=="xetex") { - bResult = texify.process(file, TeXify.XETEX, true); + bResult = texify.process(file, sBibinputs, TeXify.XETEX, true); } else if (sBackend=="generic") { - bResult = texify.process(file, TeXify.GENERIC, true); + bResult = texify.process(file, sBibinputs, TeXify.GENERIC, true); } } catch (IOException e) { @@ -289,11 +303,13 @@ public final class Writer4LaTeX extends WeakBase File[] files = dir.listFiles(); for (File file : files) { if (file.isFile() && file.getName().endsWith(".bib")) { - filelist.addValue(file.getAbsolutePath()); + //filelist.addValue(file.getAbsolutePath()); + filelist.addValue(Misc.removeExtension(file.getName())); } } } - return filelist.toString(); + String sFileList = filelist.toString(); + return sFileList.length()>0 ? sFileList : "dummy"; } private void viewLog() { diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java index c42b812..e2744c4 100644 --- a/source/java/writer2latex/api/ConverterFactory.java +++ b/source/java/writer2latex/api/ConverterFactory.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2010 by Henrik Just + * Copyright: 2002-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2011-01-12) + * Version 1.2 (2011-01-25) * */ @@ -32,8 +32,8 @@ package writer2latex.api; public class ConverterFactory { // Version information - private static final String VERSION = "1.1.9"; - private static final String DATE = "2011-01-12"; + private static final String VERSION = "1.1.6"; + private static final String DATE = "2011-01-25"; /** Return the Writer2LaTeX version in the form * (major version).(minor version).(patch level)
diff --git a/source/java/writer2latex/latex/FieldConverter.java b/source/java/writer2latex/latex/FieldConverter.java index 08822ef..4b962f0 100644 --- a/source/java/writer2latex/latex/FieldConverter.java +++ b/source/java/writer2latex/latex/FieldConverter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2010 by Henrik Just + * Copyright: 2002-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-10-13) + * Version 1.2 (2011-01-24) * */ @@ -58,6 +58,9 @@ public class FieldConverter extends ConverterHelper { // Identify Zotero items private static final String ZOTERO_ITEM = "ZOTERO_ITEM"; + // Identify JabRef items + private static final String JABREF_ITEM_1 = "JR_cite_1"; + private static final String JABREF_ITEM_2 = "JR_cite_2"; // Links & references private ExportNameCollection targets = new ExportNameCollection(true); @@ -79,6 +82,7 @@ public class FieldConverter extends ConverterHelper { private boolean bUsesTitleref = false; private boolean bUsesOooref = false; private boolean bConvertZotero = false; + private boolean bConvertJabRef = false; private boolean bNeedNatbib = false; public FieldConverter(OfficeReader ofr, LaTeXConfig config, ConverterPalette palette) { @@ -86,6 +90,7 @@ public class FieldConverter extends ConverterHelper { // hyperref.sty is not compatible with titleref.sty and oooref.sty: bUseHyperref = config.useHyperref() && !config.useTitleref() && !config.useOooref(); bConvertZotero = config.useBibtex() && config.zoteroBibtexFiles().length()>0; + bConvertJabRef = config.useBibtex() && config.jabrefBibtexFiles().length()>0; } /**

Append declarations needed by the FieldConverter to @@ -598,7 +603,7 @@ public class FieldConverter extends ConverterHelper { ldp.append("}"); } - oc.setInZoteroText(true); + oc.setInZoteroJabRefText(true); bNeedNatbib = true; @@ -609,6 +614,27 @@ public class FieldConverter extends ConverterHelper { return false; } + // Try to handle this reference name as a JabRef reference, return true on success + private boolean handleJabRefReferenceName(String sName, LaTeXDocumentPortion ldp, Context oc) { + // First parse the reference name: + // A JabRef reference name has the form JR_cite_n_identifiers where + // n=1 for (Author date) and n=2 for Author (date) citations + // identifiers is a comma separated list of BibTeX keys + if (sName.startsWith(JABREF_ITEM_1)) { + ldp.append("\\citep{").append(sName.substring(JABREF_ITEM_1.length()+1)).append("}"); + oc.setInZoteroJabRefText(true); + bNeedNatbib = true; + return true; + } + else if (sName.startsWith(JABREF_ITEM_2)) { + ldp.append("\\citet{").append(sName.substring(JABREF_ITEM_2.length()+1)).append("}"); + oc.setInZoteroJabRefText(true); + bNeedNatbib = true; + return true; + } + return false; + } + private String shortenRefname(String s) { // For Zotero items, use the trailing unique identifier if (s.startsWith(ZOTERO_ITEM)) { @@ -627,8 +653,8 @@ public class FieldConverter extends ConverterHelper { * @param oc the current context */ public void handleReferenceMarkEnd(Element node, LaTeXDocumentPortion ldp, Context oc) { - // Nothing to do, except to mark that this ends any Zotero citation - oc.setInZoteroText(false); + // Nothing to do, except to mark that this ends any Zotero/JabRef citation + oc.setInZoteroJabRefText(false); } /**

Process a reference mark (text:reference-mark or text:reference-mark-start tag)

@@ -640,8 +666,9 @@ public class FieldConverter extends ConverterHelper { public void handleReferenceMark(Element node, LaTeXDocumentPortion ldp, Context oc) { if (!oc.isInSection() && !oc.isInCaption() && !oc.isVerbatim()) { String sName = node.getAttribute(XMLString.TEXT_NAME); - // Zotero (mis)uses reference marks to store citations, so check this first - if (sName!=null && (!bConvertZotero || !handleZoteroReferenceName(sName, ldp, oc))) { + // Zotero and JabRef (mis)uses reference marks to store citations, so check this first + if (sName!=null && (!bConvertZotero || !handleZoteroReferenceName(sName, ldp, oc)) + && (!bConvertJabRef || !handleJabRefReferenceName(sName, ldp, oc))) { // Plain reference mark // Note: Always include \label here, even when it's not used ldp.append("\\label{ref:"+refnames.getExportName(shortenRefname(sName))+"}"); diff --git a/source/java/writer2latex/latex/InlineConverter.java b/source/java/writer2latex/latex/InlineConverter.java index 8300d53..81a7f8d 100644 --- a/source/java/writer2latex/latex/InlineConverter.java +++ b/source/java/writer2latex/latex/InlineConverter.java @@ -195,11 +195,11 @@ public class InlineConverter extends ConverterHelper { case Node.TEXT_NODE: String s = childNode.getNodeValue(); if (s.length() > 0) { - if (oc.isInZoteroText()) { // Comment out Zotero citations + if (oc.isInZoteroJabRefText()) { // Comment out Zotero citations ldp.append("%"); } ldp.append(palette.getI18n().convert(s, false, oc.getLang())); - if (oc.isInZoteroText()) { // End comment out + if (oc.isInZoteroJabRefText()) { // End comment out ldp.nl(); } } diff --git a/source/java/writer2latex/latex/LaTeXConfig.java b/source/java/writer2latex/latex/LaTeXConfig.java index 0f1d4cc..490f571 100644 --- a/source/java/writer2latex/latex/LaTeXConfig.java +++ b/source/java/writer2latex/latex/LaTeXConfig.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2010 by Henrik Just + * Copyright: 2002-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-12-15) + * Version 1.2 (2011-01-23) * */ @@ -48,7 +48,7 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase { ///////////////////////////////////////////////////////////////////////// // I. Define items needed by ConfigBase - protected int getOptionCount() { return 67; } + protected int getOptionCount() { return 68; } protected String getDefaultConfigPath() { return "/writer2latex/latex/config/"; } ///////////////////////////////////////////////////////////////////////// @@ -145,38 +145,39 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase { private static final int BIBTEX_STYLE = 32; private static final int EXTERNAL_BIBTEX_FILES = 33; private static final int ZOTERO_BIBTEX_FILES = 34; - private static final int NATBIB_OPTIONS = 35; - private static final int FORMATTING = 36; - private static final int PAGE_FORMATTING = 37; - private static final int OTHER_STYLES = 38; - private static final int IMAGE_CONTENT = 39; - private static final int TABLE_CONTENT = 40; - private static final int TABLE_FIRST_HEAD_STYLE = 41; - private static final int TABLE_HEAD_STYLE = 42; - private static final int TABLE_FOOT_STYLE = 43; - private static final int TABLE_LAST_FOOT_STYLE = 44; - private static final int IGNORE_HARD_PAGE_BREAKS = 45; - private static final int IGNORE_HARD_LINE_BREAKS = 46; - private static final int IGNORE_EMPTY_PARAGRAPHS = 47; - private static final int IGNORE_DOUBLE_SPACES = 48; - private static final int ALIGN_FRAMES = 49; - private static final int FLOAT_FIGURES = 50; - private static final int FLOAT_TABLES = 51; - private static final int FLOAT_OPTIONS = 52; - private static final int FIGURE_SEQUENCE_NAME = 53; - private static final int TABLE_SEQUENCE_NAME = 54; - private static final int IMAGE_OPTIONS = 55; - private static final int REMOVE_GRAPHICS_EXTENSION = 56; - private static final int ORIGINAL_IMAGE_SIZE = 57; - private static final int SIMPLE_TABLE_LIMIT = 58; - private static final int NOTES = 59; - private static final int METADATA = 60; - private static final int TABSTOP = 61; - private static final int WRAP_LINES_AFTER = 62; - private static final int SPLIT_LINKED_SECTIONS = 63; - private static final int SPLIT_TOPLEVEL_SECTIONS = 64; - private static final int SAVE_IMAGES_IN_SUBDIR = 65; - private static final int DEBUG = 66; + private static final int JABREF_BIBTEX_FILES = 35; + private static final int NATBIB_OPTIONS = 36; + private static final int FORMATTING = 37; + private static final int PAGE_FORMATTING = 38; + private static final int OTHER_STYLES = 39; + private static final int IMAGE_CONTENT = 40; + private static final int TABLE_CONTENT = 41; + private static final int TABLE_FIRST_HEAD_STYLE = 42; + private static final int TABLE_HEAD_STYLE = 43; + private static final int TABLE_FOOT_STYLE = 44; + private static final int TABLE_LAST_FOOT_STYLE = 45; + private static final int IGNORE_HARD_PAGE_BREAKS = 46; + private static final int IGNORE_HARD_LINE_BREAKS = 47; + private static final int IGNORE_EMPTY_PARAGRAPHS = 48; + private static final int IGNORE_DOUBLE_SPACES = 49; + private static final int ALIGN_FRAMES = 50; + private static final int FLOAT_FIGURES = 51; + private static final int FLOAT_TABLES = 52; + private static final int FLOAT_OPTIONS = 53; + private static final int FIGURE_SEQUENCE_NAME = 54; + private static final int TABLE_SEQUENCE_NAME = 55; + private static final int IMAGE_OPTIONS = 56; + private static final int REMOVE_GRAPHICS_EXTENSION = 57; + private static final int ORIGINAL_IMAGE_SIZE = 58; + private static final int SIMPLE_TABLE_LIMIT = 59; + private static final int NOTES = 60; + private static final int METADATA = 61; + private static final int TABSTOP = 62; + private static final int WRAP_LINES_AFTER = 63; + private static final int SPLIT_LINKED_SECTIONS = 64; + private static final int SPLIT_TOPLEVEL_SECTIONS = 65; + private static final int SAVE_IMAGES_IN_SUBDIR = 66; + private static final int DEBUG = 67; ///////////////////////////////////////////////////////////////////////// // IV. Our options data @@ -250,6 +251,7 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase { options[BIBTEX_STYLE] = new Option("bibtex_style","plain"); options[EXTERNAL_BIBTEX_FILES] = new Option("external_bibtex_files",""); options[ZOTERO_BIBTEX_FILES] = new Option("zotero_bibtex_files",""); + options[JABREF_BIBTEX_FILES] = new Option("jabref_bibtex_files",""); options[NATBIB_OPTIONS] = new Option("natbib_options",""); options[FORMATTING] = new IntegerOption("formatting","convert_basic") { public void setString(String sValue) { @@ -661,6 +663,7 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase { public String bibtexStyle() { return options[BIBTEX_STYLE].getString(); } public String externalBibtexFiles() { return options[EXTERNAL_BIBTEX_FILES].getString(); } public String zoteroBibtexFiles() { return options[ZOTERO_BIBTEX_FILES].getString(); } + public String jabrefBibtexFiles() { return options[JABREF_BIBTEX_FILES].getString(); } public String getNatbibOptions() { return options[NATBIB_OPTIONS].getString(); } // Formatting options diff --git a/source/java/writer2latex/latex/SectionConverter.java b/source/java/writer2latex/latex/SectionConverter.java index 064b0f1..124a77f 100644 --- a/source/java/writer2latex/latex/SectionConverter.java +++ b/source/java/writer2latex/latex/SectionConverter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2010 by Henrik Just + * Copyright: 2002-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-10-06) + * Version 1.2 (2011-01-24) * */ @@ -121,6 +121,20 @@ public class SectionConverter extends ConverterHelper { return false; } } + + // Handle a section as a JabRef bibliography + private boolean handleJabRefBibliography(Element node, LaTeXDocumentPortion ldp, Context oc) { + String sName = node.getAttribute(XMLString.TEXT_NAME); + if (config.useBibtex() && config.jabrefBibtexFiles().length()>0 && sName.equals("JR_bib")) { + // This section is a JabRef bibliography, and the user wishes to handle it as such + // A JabRef bibliography is identified by the name JR_bib + // Use the BibTeX style and files given in the configuration + ldp.append("\\bibliographystyle{").append(config.bibtexStyle()).append("}").nl() + .append("\\bibliography{").append(config.jabrefBibtexFiles()).append("}").nl(); + return true; + } + return false; + } /**

Process a section (text:section tag)

* @param node The element containing the section @@ -167,8 +181,8 @@ public class SectionConverter extends ConverterHelper { if (sFileName!=null) { ldp.append("\\input{").append(sFileName).append("}").nl(); } - // Zotero might have generated this section as a bibliograhy: - if (!handleZoteroBibliography(node,sectionLdp,ic)) { + // Zotero or JabRef might have generated this section as a bibliograhy: + if (!handleZoteroBibliography(node,sectionLdp,ic) && !handleJabRefBibliography(node,sectionLdp,ic)) { palette.getBlockCv().traverseBlockText(node,sectionLdp,ic); } if (sectionLdp!=ldp) { sectionLdp.append("\\endinput").nl(); } diff --git a/source/java/writer2latex/latex/util/Context.java b/source/java/writer2latex/latex/util/Context.java index d498a6c..b3fa2e1 100644 --- a/source/java/writer2latex/latex/util/Context.java +++ b/source/java/writer2latex/latex/util/Context.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2010 by Henrik Just + * Copyright: 2002-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-10-04) + * Version 1.2 (2011-01-24) * */ @@ -78,8 +78,8 @@ public class Context { // within a caption private boolean bInCaption = false; - // within a Zotero citation - private boolean bInZoteroText = false; + // within a Zotero/JabRef citation + private boolean bInZoteroJabRefText = false; // within a floating figure (figure environment) private boolean bInFigureFloat = false; @@ -194,9 +194,9 @@ public class Context { public boolean isInCaption() { return bInCaption; } - public void setInZoteroText(boolean bInZoteroText) { this.bInZoteroText = bInZoteroText; } + public void setInZoteroJabRefText(boolean bInZoteroJabRefText) { this.bInZoteroJabRefText = bInZoteroJabRefText; } - public boolean isInZoteroText() { return bInZoteroText; } + public boolean isInZoteroJabRefText() { return bInZoteroJabRefText; } public void setInFigureFloat(boolean bInFigureFloat) { this.bInFigureFloat = bInFigureFloat; } @@ -309,6 +309,7 @@ public class Context { newContext.setInContinuedList(bInContinuedList); newContext.setInSection(bInSection); newContext.setInCaption(bInCaption); + newContext.setInZoteroJabRefText(bInZoteroJabRefText); newContext.setInFigureFloat(bInFigureFloat); newContext.setInTableFloat(bInTableFloat); newContext.setInFrame(bInFrame); diff --git a/source/oxt/writer2latex/description.xml b/source/oxt/writer2latex/description.xml index 1e3329e..3b88e5c 100644 --- a/source/oxt/writer2latex/description.xml +++ b/source/oxt/writer2latex/description.xml @@ -5,7 +5,7 @@ - + diff --git a/source/oxt/writer2xhtml/Options.xcs b/source/oxt/writer2xhtml/Options.xcs index 5124492..75c7cfc 100644 --- a/source/oxt/writer2xhtml/Options.xcs +++ b/source/oxt/writer2xhtml/Options.xcs @@ -15,8 +15,9 @@ - + + diff --git a/source/oxt/writer2xhtml/description.xml b/source/oxt/writer2xhtml/description.xml index 1f8c566..f328c54 100644 --- a/source/oxt/writer2xhtml/description.xml +++ b/source/oxt/writer2xhtml/description.xml @@ -5,7 +5,7 @@ - + diff --git a/source/oxt/writer4latex/Options.xcs b/source/oxt/writer4latex/Options.xcs index 5f54a2d..31dcfc6 100644 --- a/source/oxt/writer4latex/Options.xcs +++ b/source/oxt/writer4latex/Options.xcs @@ -25,11 +25,11 @@ - - - - + + + + \ No newline at end of file diff --git a/source/oxt/writer4latex/Options.xcu b/source/oxt/writer4latex/Options.xcu index ca48d90..19189f1 100644 --- a/source/oxt/writer4latex/Options.xcu +++ b/source/oxt/writer4latex/Options.xcu @@ -87,19 +87,19 @@ + + false + false - - + + false - - false - - + diff --git a/source/oxt/writer4latex/W4LDialogs/Bibliography.xdl b/source/oxt/writer4latex/W4LDialogs/Bibliography.xdl index 2368434..24f049e 100644 --- a/source/oxt/writer4latex/W4LDialogs/Bibliography.xdl +++ b/source/oxt/writer4latex/W4LDialogs/Bibliography.xdl @@ -1,27 +1,23 @@ - + - - + - - - - - - - - - - + + + - - - - + + + + - + + + + + \ No newline at end of file diff --git a/source/oxt/writer4latex/description.xml b/source/oxt/writer4latex/description.xml index 933a9db..0e56167 100644 --- a/source/oxt/writer4latex/description.xml +++ b/source/oxt/writer4latex/description.xml @@ -4,7 +4,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - + diff --git a/source/oxt/xhtml-config-sample/description.xml b/source/oxt/xhtml-config-sample/description.xml index af8e19e..a769646 100644 --- a/source/oxt/xhtml-config-sample/description.xml +++ b/source/oxt/xhtml-config-sample/description.xml @@ -2,5 +2,5 @@ - + diff --git a/source/readme-source.txt b/source/readme-source.txt index 9fa653e..fae5163 100644 --- a/source/readme-source.txt +++ b/source/readme-source.txt @@ -1,4 +1,4 @@ -Writer2LaTeX source version 1.1.9 +Writer2LaTeX source version 1.1.6 ================================= Writer2LaTeX is (c) 2002-2011 by Henrik Just.