diff --git a/build.xml b/build.xml index f277207..08c82e0 100644 --- a/build.xml +++ b/build.xml @@ -2,7 +2,7 @@ ############################################################################ # This is the Ant build file for writer2latex # Original: Sep 2004 (mgn) - # version 1.6 (2015-07-22) + # version 1.6 (2018-03-06) ############################################################################ --> @@ -10,8 +10,6 @@ - - writer2latex - build file @@ -77,10 +75,9 @@ diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index bc7f29b..f768ad6 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,8 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6 ---------- version 1.6 beta ---------- +[w2l] Removed remark about JabRef plugin for LO from help file, as the functionality is now native in JabRef + [w2l] Enabled export of WMF and EMF graphics to PDF (was disabled due to bugs in earlier versions of LO) [w2x] In the BibTeX dialog, updating references generates a status message. This is now moved from a message box @@ -17,8 +19,6 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6 Also, the default bibtex application has been changed to bibtex8 (but currently no attempt is made to select the proper .csf file) ----------- version 1.5.3 ---------- - [w2l] The command \textsubscript is now defined with \providecommand to avoid problems with other packages that may already have defined this command diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index 8151d86..7fbe86b 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/UNOPublisher.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/UNOPublisher.java index 728a212..cd45a3a 100644 --- a/source/java/org/openoffice/da/comp/w2lcommon/filter/UNOPublisher.java +++ b/source/java/org/openoffice/da/comp/w2lcommon/filter/UNOPublisher.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2015 by Henrik Just + * Copyright: 2002-2018 by Henrik Just * * All Rights Reserved. * - * Version 1.6 (2015-05-28) + * Version 1.6 (2018-03-06) * */ package org.openoffice.da.comp.w2lcommon.filter; @@ -160,7 +160,7 @@ public class UNOPublisher { /** Post process the document after conversion. * - * @param format URL of the converted document + * @param sTargetURL URL of the converted document * @param format the target format */ protected void postProcess(String sTargetURL, TargetFormat format) { diff --git a/source/java/org/openoffice/da/comp/writer2latex/ExternalApps.java b/source/java/org/openoffice/da/comp/writer2latex/ExternalApps.java index b8a328c..c8b5c39 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-2015 by Henrik Just + * Copyright: 2002-2018 by Henrik Just * * All Rights Reserved. * - * Version 1.6 (2015-05-29) + * Version 1.6 (2018-03-06) * */ @@ -151,7 +151,7 @@ public class ExternalApps { /** Define to use the system's default for an external application. This is only possible if the application is a viewer, * otherwise setting the value to true will be ignored * @param sAppName the name of the application - * @param sUseDefault flag defining whether or not to use the default + * @param bUseDefault flag defining whether or not to use the default */ public void setUseDefaultApplication(String sAppName, boolean bUseDefault) { if (bUseDefault && isViewer(sAppName)) { diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java index c5be97e..f255876 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-2015 by Henrik Just + * Copyright: 2002-2018 by Henrik Just * * All Rights Reserved. * - * Version 1.6 (2015-07-28) + * Version 1.6 (2018-03-06) * */ @@ -33,7 +33,7 @@ public class ConverterFactory { // Version information private static final String VERSION = "1.6"; - private static final String DATE = "2015-07-28"; + private static final String DATE = "2018-03-06"; /** Return the Writer2LaTeX version in the form * (major version).(minor version).(patch level)
diff --git a/source/java/writer2latex/base/BibliographyGenerator.java b/source/java/writer2latex/base/BibliographyGenerator.java index b0abf08..a19c4ef 100644 --- a/source/java/writer2latex/base/BibliographyGenerator.java +++ b/source/java/writer2latex/base/BibliographyGenerator.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2015 by Henrik Just + * Copyright: 2002-2018 by Henrik Just * * All Rights Reserved. * - * Version 1.6 (2015-06-20) + * Version 1.6 (2018-03-06) * */ @@ -196,7 +196,7 @@ public abstract class BibliographyGenerator { /** Generate a bibliography * - * @param bibliography a text:bibliography-source element + * @param bibSource a text:bibliography-source element */ protected void generateBibliography(Element bibSource) { Map bibEntryTemplate = collectTemplates(bibSource); diff --git a/source/oxt/w2lconfig/description.xml b/source/oxt/w2lconfig/description.xml index f7a0292..1bdc7b5 100644 --- a/source/oxt/w2lconfig/description.xml +++ b/source/oxt/w2lconfig/description.xml @@ -16,7 +16,7 @@ Writer2LaTeX konfigurationer - Writer4LaTeX configurations + Writer2LaTeX configurations diff --git a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/bibliography.xhp b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/bibliography.xhp index 2540c50..7a9d65b 100644 --- a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/bibliography.xhp +++ b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/bibliography.xhp @@ -95,11 +95,11 @@ folder. The Writer2LaTeX distribution contains a folder named Zotero, which contains a file called BibTeX-Writer2LaTeX.js. This file must be added to Zotero to provide a suitable - BibTeX export: In Zotero, choose Preferences - Advanced and click Show Data Directory. + BibTeX export: In Zotero, choose Edit - Preferences - Advanced and click Show Data Directory. Open the subfolder Translators, and copy BibTeX-Writer2LaTeX.js to this location. - Finally restart Firefox. + Finally restart Zotero. You can now export your Zotero database: In Zotero, select - Export Library, and choose BibTeX (Writer2LaTeX) (not BibTeX). + File - Export Library, and choose BibTeX (Writer2LaTeX) (not BibTeX). Save the file in the folder, you have defined. Check this to convert Zotero citations to LaTeX @@ -109,9 +109,8 @@ is an open source bibliography reference manager using BibTeX as native file format. You can use JabRef to edit your BibTeX files. - In addition JabRef provides a plugin - which permits you to insert citations from JabRef in your %PRODUCTNAME Writer document - using a selection of citation schemes. You should use version 0.8.999 beta or later of the plugin. + In addition JabRef permits you to insert citations directly from JabRef in your %PRODUCTNAME Writer document + using a selection of citation schemes. Check this if you want to convert JabRef citations to LaTeX. This enables you to format the citations using a BibTeX style of your choice. Also, the bibliography created by JabRef will be replaced with a BibTeX-generated bibliography.