diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index 2a7da26..0f17524 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,7 +2,18 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6 ---------- version 1.5.2 ---------- -[w2l] Added new BibTeX dialog to insert a bibliographic reference to a BibTeX file. The BibTeX files are located as +Items marked with * are work in progress + +[all] *Document the use of soffice --headless --convert-to + +[w2x] *Added EPUB 3 as export format and changed the toolbar to export to EPUB 3 + +[all] Fixed typo in export dialogs: The text on the help button was in danish. + +[w2x] New boolean option embed_img (default false). If set to true, the binary contents of img elements are included + directly on the src attribute as base64. + +[w2l] *Added new BibTeX dialog to insert a bibliographic reference to a BibTeX file. The BibTeX files are located as defined in the configuration, and the reference is inserted as an ordinary reference mark. [w2l] Various improvements to the log viewer dialog: Reduced height to better accommodate small screen resolutions. @@ -10,7 +21,7 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6 [w2x] Changed export format for toolbar from XHTML+MathML to HTML5 -[w2l] Added new option font to load font packages. It accepts a large number of standard font packages such as +[w2l] *Added new option font to load font packages. It accepts a large number of standard font packages such as cmbright or fourier. Only packages with math support are included. Unknown packages defaults to Computer Modern. The font option is currently not available for the backend xetex. In the user interface, this option can be found in the export dialog. To make room for this, the BibTeX diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index 9dd8a9e..14394ff 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/UNOConverter.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/UNOConverter.java index c5c6c66..c1c670f 100644 --- a/source/java/org/openoffice/da/comp/w2lcommon/filter/UNOConverter.java +++ b/source/java/org/openoffice/da/comp/w2lcommon/filter/UNOConverter.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-07) + * Version 1.6 (2015-01-13) * */ package org.openoffice.da.comp.w2lcommon.filter; @@ -79,6 +79,7 @@ public class UNOConverter { filterNames.put("org.openoffice.da.writer2xhtml5","text/html5"); filterNames.put("org.openoffice.da.writer2xhtml.mathml","application/xhtml+xml"); filterNames.put("org.openoffice.da.writer2xhtml.epub","application/epub+zip"); + filterNames.put("org.openoffice.da.writer2xhtml.epub3","epub3"); filterNames.put("org.openoffice.da.calc2xhtml","text/html"); filterNames.put("org.openoffice.da.calc2xhtml11","application/xhtml11"); filterNames.put("org.openoffice.da.calc2xhtml5","text/html5"); 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 3f48d9a..eaf5f4a 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-2014 by Henrik Just + * Copyright: 2002-2015 by Henrik Just * * All Rights Reserved. * - * Version 1.6 (2014-12-27) + * Version 1.6 (2015-01-09) * */ package org.openoffice.da.comp.w2lcommon.filter; @@ -51,7 +51,7 @@ import com.sun.star.util.XModifiable; */ public class UNOPublisher { - public enum TargetFormat { xhtml, xhtml11, xhtml_mathml, html5, epub, latex }; + public enum TargetFormat { xhtml, xhtml11, xhtml_mathml, html5, epub, epub3, latex }; private String sAppName; @@ -294,6 +294,7 @@ public class UNOPublisher { case xhtml_mathml: return ".xhtml"; case html5: return ".html"; case epub: return ".epub"; + case epub3: return ".epub"; case latex: return ".tex"; default: return ""; } @@ -306,6 +307,7 @@ public class UNOPublisher { case xhtml_mathml: case html5: return "org.openoffice.da.comp.writer2xhtml.XhtmlOptionsDialogMath"; case epub: return "org.openoffice.da.comp.writer2xhtml.EpubOptionsDialog"; + case epub3: return "org.openoffice.da.comp.writer2xhtml.EpubOptionsDialog"; case latex: return "org.openoffice.da.comp.writer2latex.LaTeXOptionsDialog"; default: return null; } @@ -318,6 +320,7 @@ public class UNOPublisher { case xhtml_mathml: case html5: return "org.openoffice.da.comp.writer2xhtml.XhtmlOptionsDialogCalc"; case epub: + case epub3: case latex: default: return null; } @@ -330,6 +333,7 @@ public class UNOPublisher { case xhtml_mathml: return "org.openoffice.da.writer2xhtml.mathml"; case html5: return "org.openoffice.da.writer2xhtml5"; case epub: return "org.openoffice.da.writer2xhtml.epub"; + case epub3: return "org.openoffice.da.writer2xhtml.epub"; case latex: return "org.openoffice.da.writer2latex"; default: return ""; } diff --git a/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java b/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java index 3ea8380..438331c 100644 --- a/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java +++ b/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.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.4 (2014-09-26) +* Version 1.6 (2015-01-14) * */ @@ -518,6 +518,7 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer textFieldFromConfig(dlg, "EndnotesHeading", "endnotes_heading"); textFieldFromConfig(dlg, "FootnotesHeading", "footnotes_heading"); checkBoxFromConfig(dlg, "EmbedSvg", "embed_svg"); + checkBoxFromConfig(dlg, "EmbedImg", "embed_img"); } @Override protected void getControls(DialogAccess dlg) { @@ -525,6 +526,7 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer textFieldToConfig(dlg, "EndnotesHeading", "endnotes_heading"); textFieldToConfig(dlg, "FootnotesHeading", "footnotes_heading"); checkBoxToConfig(dlg, "EmbedSvg", "embed_svg"); + checkBoxToConfig(dlg, "EmbedImg", "embed_img"); } @Override protected boolean handleEvent(DialogAccess dlg, String sMethod) { diff --git a/source/java/org/openoffice/da/comp/writer2xhtml/Writer2xhtml.java b/source/java/org/openoffice/da/comp/writer2xhtml/Writer2xhtml.java index 3f23542..baf374a 100644 --- a/source/java/org/openoffice/da/comp/writer2xhtml/Writer2xhtml.java +++ b/source/java/org/openoffice/da/comp/writer2xhtml/Writer2xhtml.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-11-15) + * Version 1.6 (2015-01-09) * */ @@ -59,7 +59,7 @@ public final class Writer2xhtml extends WeakBase // TODO: These should be configurable private TargetFormat xhtmlFormat = TargetFormat.html5; - private TargetFormat epubFormat = TargetFormat.epub; + private TargetFormat epubFormat = TargetFormat.epub3; public Writer2xhtml(XComponentContext xContext) { m_xContext = xContext; diff --git a/source/java/writer2latex/Application.java b/source/java/writer2latex/Application.java index dbf3b1a..0e57121 100644 --- a/source/java/writer2latex/Application.java +++ b/source/java/writer2latex/Application.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.4 (2014-08-25) + * Version 1.6 (2015-01-09) * */ @@ -54,7 +54,7 @@ import writer2latex.util.Misc; *

Where the available options are *